summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/examples/nximage/nximage_bitmap.c11
-rw-r--r--nuttx/Documentation/NuttX.html19
-rwxr-xr-xnuttx/Documentation/NuttXLinks.html22
-rw-r--r--nuttx/Documentation/index.html2
4 files changed, 48 insertions, 6 deletions
diff --git a/apps/examples/nximage/nximage_bitmap.c b/apps/examples/nximage/nximage_bitmap.c
index 17bfd4c8e..f672ce3fe 100644
--- a/apps/examples/nximage/nximage_bitmap.c
+++ b/apps/examples/nximage/nximage_bitmap.c
@@ -144,11 +144,18 @@ static const nxgl_mxpixel_t g_lut[IMAGE_NLUTCODES] =
0x53fc /* Codes 140-140 */
};
-/* RGB8 (332) Colors */
+/* 8-bit color lookups. NOTE: This is really dumb! The lookup index is 8-bits and it used
+ * to lookup an 8-bit value. There is no savings in that! It would be better to just put
+ * the 8-bit color/greyscale value in the run-length encoded image and save the cost of these
+ * pointless lookups. But these p;ointless lookups do make the logic compatible with the
+ * 16- and 24-bit types.
+ */
#elif CONFIG_EXAMPLES_NXIMAGE_BPP == 8
# ifdef CONFIG_EXAMPLES_NXIMAGE_GREYSCALE
+/* 8-bit Greyscale */
+
static const uint8_t g_lut[IMAGE_NLUTCODES] =
{
0x00, 0x19, 0x8b, 0x46, 0x4a, 0x0b, 0x8d, 0x41, 0x44, 0x27, 0x32, 0x92, 0x59, 0x34, 0x6d, 0xdb, /* Codes 0-15 */
@@ -163,6 +170,8 @@ static const uint8_t g_lut[IMAGE_NLUTCODES] =
# else /* CONFIG_EXAMPLES_NXIMAGE_GREYSCALE */
+/* RGB8 (332) Colors */
+
static const nxgl_mxpixel_t g_lut[IMAGE_NLUTCODES] =
{
0x00, 0x25, 0x77, 0x4b, 0x01, 0x47, 0x26, 0x4a, 0x4f, 0x72, 0xdf, 0x93, 0xff, 0x27, 0xbb, 0xdb, /* Codes 0-15 */
diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html
index 672921ce8..9c9ba2389 100644
--- a/nuttx/Documentation/NuttX.html
+++ b/nuttx/Documentation/NuttX.html
@@ -8,7 +8,7 @@
<tr align="center" bgcolor="#e4e4e4">
<td>
<h1><big><font color="#3c34ec"><i>NuttX RTOS</i></font></big></h1>
- <p>Last Updated: July 17, 2011</p>
+ <p>Last Updated: July 21, 2011</p>
</td>
</tr>
</table>
@@ -2559,6 +2559,8 @@ nuttx-6.7 2011-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
* arch/arm/src/lpc17xx/lpc17_can.c: Added a CAN driver contributed by
Li Zhuoyi (Lzyy).
* include/stddefs.h and sys/types: Added type wchar_t.
+ * fs/fat/fat_fat32dirent.c: Move all FAT directory operations to this
+ new file; Implement VFAT long file name support.
* fs/fat/fat_fat32dirent.c: The configuration CONFIG_FAT_LCNAMES has
been around for some time but never tested until now. This setting
will mimic the NT 8.3 file name behavior: File names or extensions
@@ -2575,11 +2577,26 @@ nuttx-6.7 2011-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
SDIO transfer completion events and DMA completion eventes were
not being coordinated correctly.
* configs/stm3210e-eval/nsh2: Enable FAT long file name support
+ * sched/sem_timedwait.c: Add the standard sem_timedwait() interface.
+ * graphics/nxfonts/nxfonts_getfont.c, nxfonts_bitmap.c,
+ Makefile.source, and include/nuttx/nxfonts.h: Support for multiple
+ fonts included. A new interface, nxf_getfonthandle() takes a font
+ ID and returns a handle that is now used at all other font interfaces
+ to specify which of the multiple fonts to use.
+ * arch/arm/src/lpc17xx/lpc17_syscon.h: Fix typo (reported by Li Zhuoyi).
apps-6.7 2011-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
* apps/examples/nx and nxtext: These examples can now be built as NSH
&quot;built-in&quot; commands.
+ * apps/examples/nxhello: The simplest graphics example: It just says
+ &quot;Hello, World!&quot; in the center of the display. This example can also be
+ built as an NSH &quot;built-in&quot; command.
+ * apps/examples/nx, ntext, and nxhello: All updated to use the new
+ NuttX font interfaces.
+ * apps/examples/nximage: Another super simple graphics example: It just puts
+ the NuttX logo in the center of the display. This example can also be
+ built as an NSH &quot;built-in&quot; command.
pascal-3.1 2011-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
diff --git a/nuttx/Documentation/NuttXLinks.html b/nuttx/Documentation/NuttXLinks.html
index d24e7b4f7..5eb615653 100755
--- a/nuttx/Documentation/NuttXLinks.html
+++ b/nuttx/Documentation/NuttXLinks.html
@@ -12,14 +12,14 @@
<img height="20" width="20" src="favicon.ico">
</td>
<td bgcolor="#e4e4e4">
- <font color="#3c34ec"><i><b>Links</b></i></font>
+ <font color="#3c34ec"><i><b>Project Links</b></i></font>
</td>
</tr>
<tr>
<td>&nbsp</td>
<td>
<li><a href="http://www.nuttx.org/NuttX.html" target="main">Home</a></li>
- <li><a href="http://sourceforge.net/projects/nuttx/develop" target="_top">Project</a></li>
+ <li><a href="http://sourceforge.net/projects/nuttx/develop" target="_top">SourceForge</a></li>
<li><a href="http://freshmeat.net/projects/nuttx/" target="_top">FreshMeat</a></li>
<li><a href="http://tech.groups.yahoo.com/group/nuttx/" target="_top">Forum</a></li>
<li><a href="http://sourceforge.net/projects/nuttx/files/" target="_top">Downloads</a></li>
@@ -34,7 +34,7 @@
<img height="20" width="20" src="favicon.ico">
</td>
<td bgcolor="#e4e4e4">
- <font color="#3c34ec"><i><b>Documentation</b></i></font>
+ <font color="#3c34ec"><i><b>NuttX Documentation</b></i></font>
</td>
</tr>
<tr>
@@ -51,6 +51,22 @@
<li><a href="TODO.txt" target="main">To-Do List</a></li>
</tr>
<tr>
+ <td align="center" valign="top" width="22">
+ <img height="20" width="20" src="favicon.ico">
+ </td>
+ <td bgcolor="#e4e4e4">
+ <font color="#3c34ec"><i><b>Commercial Sites</b></i></font>
+ </td>
+ </tr>
+ <tr>
+ <td>&nbsp</td>
+ <td>
+ <li><a href="http://www.nx-engineering.com" target="main">NX-Engineering</a></li>
+ <li><a href="http://www.raztek-inc.com" target="main">Raztek Solutions</a></li>
+ <li><a href="http://www.2g-eng.com" target="top">2G Engineering</a></li>
+ <li><a href="http://isotel.eu/Home/" target="top">ISOTEL Research</a></li>
+ </tr>
+ <tr>
<td colspan="2" align="center" valign="top">
<a href="http://download.famouswhy.com/nuttx/" target="_blank">
<img src="http://download.famouswhy.com/awards/Famous_Software_Award_Logo.png" alt="NuttX" style="border:0">
diff --git a/nuttx/Documentation/index.html b/nuttx/Documentation/index.html
index b2f1687e4..b0256f301 100644
--- a/nuttx/Documentation/index.html
+++ b/nuttx/Documentation/index.html
@@ -5,7 +5,7 @@
<frameset rows="96,*" framespacing="0" border="0" frameborder="0">
<frame name="header" scrolling="no" target="main" src="NuttXBanner.html" marginwidth="0" marginheight="0">
<frameset cols="15%,*">
- <frame name="links" scrolling="no" target="main" src="NuttXLinks.html" marginwidth="0" marginheight="0">
+ <frame name="links" scrolling="auto" target="main" src="NuttXLinks.html" marginwidth="0" marginheight="0">
<frame name="main" src="NuttX.html">
</frameset>
<noframes>