diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-10-27 18:21:26 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-10-27 18:21:26 +0000 |
| commit | 42000d013c9e817baf40d6445ac015991bb4a50b (patch) | |
| tree | 406de17abc4dcaf0ee6ea4ad85bc4c45ea1d4e85 /nuttx | |
| parent | b3ee6803286f2d85eb1893780b4c20265d6b8f67 (diff) | |
| download | px4-nuttx-42000d013c9e817baf40d6445ac015991bb4a50b.tar.gz px4-nuttx-42000d013c9e817baf40d6445ac015991bb4a50b.tar.bz2 px4-nuttx-42000d013c9e817baf40d6445ac015991bb4a50b.zip | |
Add port of cJSON from Darcy Gong
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5267 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/ChangeLog | 2 | ||||
| -rw-r--r-- | nuttx/Documentation/README.html | 4 | ||||
| -rw-r--r-- | nuttx/README.txt | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index a80e5009a..3b39eabb4 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -3523,4 +3523,6 @@ Add a configuration for testing the ARM ELF loader. * binfmt/libelf: Can't use fstat(). NuttX does not yet support it. Damn! * binfmt/libelf: The basic ELF module execution appears fully functional. + * configs/shenzhou/src/up_relays.c: Add support for relays from the + Shenzhou board. Contributed by Darcy Gong. diff --git a/nuttx/Documentation/README.html b/nuttx/Documentation/README.html index 942426260..5fef40fc1 100644 --- a/nuttx/Documentation/README.html +++ b/nuttx/Documentation/README.html @@ -8,7 +8,7 @@ <tr align="center" bgcolor="#e4e4e4"> <td> <h1><big><font color="#3c34ec"><i>NuttX README Files</i></font></big></h1> - <p>Last Updated: September 25, 2012</p> + <p>Last Updated: October 27, 2012</p> </td> </tr> </table> @@ -247,6 +247,7 @@ `- apps/ |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/README.txt"><b>README.txt</b></a> |- examples/ + | |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/examples/json/README.txt">json/README.txt</a> | |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/examples/pashello/README.txt">pashello/README.txt</a> | `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/examples/README.txt"><b><i>README.txt</i></b></a> |- graphics/ @@ -259,6 +260,7 @@ |- netutils/ | | |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/netutils/discover/README.txt">discover/README.txt</a> | | |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/netutils/ftpc/README.txt">ftpc/README.txt</a> + | | |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/netutils/json/README.txt">json/README.txt</a> | | |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/netutils/telnetd/README.txt">telnetd/README.txt</a> | `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/netutils/README.txt"><b><i>README.txt</i></b></a> |- nshlib/ diff --git a/nuttx/README.txt b/nuttx/README.txt index d60da2d88..4c008e6f1 100644 --- a/nuttx/README.txt +++ b/nuttx/README.txt @@ -828,6 +828,7 @@ nuttx apps |- examples/ + | |- json/README.txt | |- pashello/README.txt | `- README.txt |- graphics/ @@ -843,6 +844,8 @@ apps | | `- README.txt | |- ftpc | | `- README.txt + | |- json + | | `- README.txt | |- telnetd | | `- README.txt | `- README.txt |