-
Notifications
You must be signed in to change notification settings - Fork 769
graphics/microwindows: add Nano-X client/server support and examples for NuttX #3689
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
Acfboy
wants to merge
6
commits into
apache:master
Choose a base branch
from
Acfboy:add-microwindows
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
9b53cfd
graphics/microwindows: add Nano-X client library and built-in server …
Acfboy 283ae16
examples/nanoxcalc: add Nano-X calculator example
Acfboy d669d9a
examples/nanoxterm: add Nano-X terminal emulator example
Acfboy 5af9d9a
graphics/microwindows: add NONETWORK mode for linking Nano-X apps wit…
Acfboy d73a5bf
build: introduce EXPORTED_INCLUDES machanism
Acfboy b3b3dca
example/microwindows: exports microwindows/src/include
Acfboy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| config EXAMPLES_NANOXCALC | ||
| tristate "Nano-X calculator example" | ||
| default n | ||
| depends on MICROWINDOWS_NANOX && LIBC_FLOATINGPOINT | ||
| ---help--- | ||
| Enable the Nano-X calculator example application. It is a | ||
| port of the nxcalc demo from Microwindows which connects to | ||
| the Nano-X server started by examples/nanoxterm and shows | ||
| a calculator keypad operated by the mouse or keyboard. | ||
|
|
||
| if EXAMPLES_NANOXCALC | ||
|
|
||
| config EXAMPLES_NANOXCALC_PROGNAME | ||
| string "Program name" | ||
| default "nanoxcalc" | ||
| ---help--- | ||
| This is the name of the program that will be used when the NSH ELF | ||
| program is installed. | ||
|
|
||
| config EXAMPLES_NANOXCALC_PRIORITY | ||
| int "Nano-X calculator task priority" | ||
| default 100 | ||
|
|
||
| config EXAMPLES_NANOXCALC_STACKSIZE | ||
| int "Nano-X calculator stack size" | ||
| default 16384 | ||
|
|
||
| endif |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| ############################################################################ | ||
| # apps/examples/nanoxcalc/Make.defs | ||
| # | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
| # | ||
| # Licensed to the Apache Software Foundation (ASF) under one or more | ||
| # contributor license agreements. See the NOTICE file distributed with | ||
| # this work for additional information regarding copyright ownership. The | ||
| # ASF licenses this file to you under the Apache License, Version 2.0 (the | ||
| # "License"); you may not use this file except in compliance with the | ||
| # License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
| # License for the specific language governing permissions and limitations | ||
| # under the License. | ||
| # | ||
| ############################################################################ | ||
|
|
||
| ifneq ($(CONFIG_EXAMPLES_NANOXCALC),) | ||
| CONFIGURED_APPS += $(APPDIR)/examples/nanoxcalc | ||
| endif |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| ############################################################################ | ||
| # apps/examples/nanoxcalc/Makefile | ||
| # | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
| # | ||
| # Licensed to the Apache Software Foundation (ASF) under one or more | ||
| # contributor license agreements. See the NOTICE file distributed with | ||
| # this work for additional information regarding copyright ownership. The | ||
| # ASF licenses this file to you under the Apache License, Version 2.0 (the | ||
| # "License"); you may not use this file except in compliance with the | ||
| # License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
| # License for the specific language governing permissions and limitations | ||
| # under the License. | ||
| # | ||
| ############################################################################ | ||
|
|
||
| include $(APPDIR)/Make.defs | ||
|
|
||
| PROGNAME = $(CONFIG_EXAMPLES_NANOXCALC_PROGNAME) | ||
| PRIORITY = $(CONFIG_EXAMPLES_NANOXCALC_PRIORITY) | ||
| STACKSIZE = $(CONFIG_EXAMPLES_NANOXCALC_STACKSIZE) | ||
| MODULE = $(CONFIG_EXAMPLES_NANOXCALC) | ||
|
|
||
| # Port of the upstream nxcalc demo (src/demos/nanox/nxcalc.c) | ||
| MAINSRC = nxcalc.c | ||
| CFLAGS += -Wno-undef | ||
|
|
||
|
|
||
| include $(APPDIR)/Application.mk |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think that this is right srat, but it seems that there needs to be some more work because
from
apps/graphics/microwindows/Make.defsis not propagated some CFLAGS or similar intonuttx-export/scripts/Make.defs.But this correction can go to another pull round by you or us (I would discuss with @michallenc ).