summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NxWidgets/libnxwidgets/src/cgraphicsport.cxx3
-rw-r--r--nuttx/configs/sama5d3x-ek/README.txt2
-rw-r--r--nuttx/configs/sama5d4-ek/README.txt23
-rw-r--r--nuttx/graphics/nxconsole/nxcon_kbdin.c1
4 files changed, 14 insertions, 15 deletions
diff --git a/NxWidgets/libnxwidgets/src/cgraphicsport.cxx b/NxWidgets/libnxwidgets/src/cgraphicsport.cxx
index cbda90d6e..f128c3293 100644
--- a/NxWidgets/libnxwidgets/src/cgraphicsport.cxx
+++ b/NxWidgets/libnxwidgets/src/cgraphicsport.cxx
@@ -192,12 +192,9 @@ void CGraphicsPort::drawHorizLine(nxgl_coord_t x, nxgl_coord_t y,
nxgl_coord_t width, nxgl_mxpixel_t color)
{
FAR struct nxgl_rect_s dest;
- nxgl_coord_t halfwidth;
// Express the line as a rectangle
- halfwidth = width >> 1;
-
dest.pt1.x = x;
dest.pt1.y = y;
dest.pt2.x = x + width - 1;
diff --git a/nuttx/configs/sama5d3x-ek/README.txt b/nuttx/configs/sama5d3x-ek/README.txt
index 3178a05ff..187ce27f8 100644
--- a/nuttx/configs/sama5d3x-ek/README.txt
+++ b/nuttx/configs/sama5d3x-ek/README.txt
@@ -3443,7 +3443,7 @@ Configurations
320x320 logo for the opening screen and added image scaling to expand
the images in the taskbar. The expanded images are not great. If I
ever get past the opening screen, the same problems will exist in the
- application toolbar and in the start winow. These icons are not yet
+ application toolbar and in the start window. These icons are not yet
scaled.
Bottom line: Not ready for prime time.
diff --git a/nuttx/configs/sama5d4-ek/README.txt b/nuttx/configs/sama5d4-ek/README.txt
index 8519d5712..d36b4d163 100644
--- a/nuttx/configs/sama5d4-ek/README.txt
+++ b/nuttx/configs/sama5d4-ek/README.txt
@@ -3289,10 +3289,12 @@ Configurations
dramboot: This is a little program to help debug of code in DRAM. See
the description below and the section above entitled "Creating and
Using DRAMBOOT" for more information
- nsh: This is another NSH configuration, not too different from the
- demo configuration. The nsh configuration is, however, bare bones.
- It is the simplest possible NSH configuration and is useful as a
- platform for debugging and integrating new features in isolation.
+ nsh: This is an NuttShell (NSH) configuration that supports extensive
+ functionality as possible (unlike the minimal ramtest configuration).
+ See the detailed description below for a summary of the feature
+ set supported by this configuration. You may want to disable some
+ of these features if you plan to use the NSH as a platform for
+ debugging and integrating new features.
nxwm: This is a special configuration setup for the NxWM window manager
UnitTest. It integrates support for both the SAMA5 LCDC and the
SAMA5 ADC touchscreen controller and provides a more advance
@@ -3911,13 +3913,12 @@ Configurations
$ cd ~/nuttx-git/nuttx
$ make
- NOTE: The NxWM example was designed tiny displays. On this large 800x480
- display, the icons are too tiny to be usable. I have created a large
- 320x320 logo for the opening screen and added image scaling to expand
- the images in the taskbar. The expanded images are not great. If I
- ever get past the opening screen, the same problems will exist in the
- application toolbar and in the start winow. These icons are not yet
- scaled.
+ NOTE: The NxWM example was designed tiny displays. On this larger
+ 800x480 display, the icons are too tiny to be usable. I have created
+ a larger 320x320 logo for the opening screen and added image scaling
+ to expand the images in the taskbar. The expanded images are not great.
+ The same problems exist in the application toolbar and in the start
+ window. These icons are not yet scaled.
STATUS:
See the To-Do list below
diff --git a/nuttx/graphics/nxconsole/nxcon_kbdin.c b/nuttx/graphics/nxconsole/nxcon_kbdin.c
index 4bc27608f..ecf2ef116 100644
--- a/nuttx/graphics/nxconsole/nxcon_kbdin.c
+++ b/nuttx/graphics/nxconsole/nxcon_kbdin.c
@@ -42,6 +42,7 @@
#include <fcntl.h>
#include <sched.h>
#include <assert.h>
+#include <poll.h>
#include <errno.h>
#include <debug.h>