LEDs on port F, not C

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2135 42af7a65-404d-4744-a932-0658087f49c3

5 files changed, 35 insertions, 6 deletions

diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index f31ff42a0..28d04a3f8 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -903,6 +903,8 @@
 	  cannot be used for the full NuttX bring-up).
 	* configs/stm3210e-eval/ostest.  The STM32 now passes the basic NuttX OS test
 	  at examples/ostest.  The rest should be a piece of cake.
+	* configs/stm3210e-eval/nsh.  Added NuttShell (NSH) example.
+	* configs/stm3210e-eval/src/stm32102e-internal.h.  Fix on-board LED GPIO definitions.
 
 	  STM32: Things left to do:  interrupt driver USART console driver, NSH bring-up,
 	  USB driver, LCD driver and NX bringup on the eval board's display, SPI driver,
diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html
index 5baede9d7..98d8fa7f6 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: October 13, 2009</p>
+      <p>Last Updated: October 14, 2009</p>
     </td>
   </tr>
 </table>
@@ -1610,6 +1610,8 @@ nuttx-0.4.12 2009-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
 	  cannot be used for the full NuttX bring-up).
 	* configs/stm3210e-eval/ostest.  The STM32 now passes the basic NuttX OS test
 	  at examples/ostest.  The rest should be a piece of cake.
+	* configs/stm3210e-eval/nsh.  Added NuttShell (NSH) example.
+	* configs/stm3210e-eval/src/stm32102e-internal.h.  Fix on-board LED GPIO definitions.
 
 	  STM32: Things left to do:  interrupt driver USART console driver, NSH bring-up,
 	  USB driver, LCD driver and NX bringup on the eval board's display, SPI driver,
diff --git a/nuttx/configs/stm3210e-eval/README.txt b/nuttx/configs/stm3210e-eval/README.txt
index 6b5817389..5117c0c80 100755
--- a/nuttx/configs/stm3210e-eval/README.txt
+++ b/nuttx/configs/stm3210e-eval/README.txt
@@ -182,6 +182,31 @@ DFU
   in order to find it with the DFU File Manager. You will end up with
   a file called nuttx.dfu that you can use with the STMicro DFU SE program.
 
+LEDs
+^^^^
+
+The STM3210E-EVAL board has four LEDs labeled LD1, LD2, LD3 and LD4 on the
+the board.  Usage of these LEDs is defined in include/board.h and src/up_leds.c.
+They are encoded as follows:
+
+	SYMBOL				Meaning					LED1*	LED2	LED3	LED4
+	-------------------	-----------------------	-------	-------	-------	------
+	LED_STARTED			NuttX has been started	ON		OFF		OFF		OFF
+	LED_HEAPALLOCATE	Heap has been allocated	OFF		ON		OFF		OFF
+	LED_IRQSENABLED		Interrupts enabled		ON		ON		OFF		OFF
+	LED_STACKCREATED	Idle stack created		OFF		OFF		ON		OFF
+	LED_INIRQ			In an interrupt**		ON		N/C		N/C		OFF
+	LED_SIGNAL			In a signal handler***  N/C		ON		N/C		OFF
+	LED_ASSERTION		An assertion failed		ON		ON		N/C		OFF
+	LED_PANIC			The system has crashed	N/C		N/C		N/C		ON
+
+  * If LED1, LED2, LED3 are statically on, then NuttX probably failed to boot
+    and these LEDs will give you some indication of where the failure was
+ ** The normal state is LED3 ON and LED1 faintly glowing.  This faint glow
+    is because of timer interupts that result in the LED being illuminated
+    on a small proportion of the time.
+*** LED2 may also flicker normally if signals are processed.
+
 STM3210E-EVAL-specific Configuration Options
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/nuttx/configs/stm3210e-eval/include/board.h b/nuttx/configs/stm3210e-eval/include/board.h
index e90f104b3..30ad0ae98 100755
--- a/nuttx/configs/stm3210e-eval/include/board.h
+++ b/nuttx/configs/stm3210e-eval/include/board.h
@@ -91,7 +91,7 @@
 
 /* LED definitions ******************************************************************/
 
-/* The STM3210E-EVAL board has 4 LEDs that we will encode as */
+/* The STM3210E-EVAL board has 4 LEDs that we will encode as: */
 
 #define LED_STARTED       0  /* LED1 */
 #define LED_HEAPALLOCATE  1  /* LED2 */
diff --git a/nuttx/configs/stm3210e-eval/src/stm3210e-internal.h b/nuttx/configs/stm3210e-eval/src/stm3210e-internal.h
index 8d101bb2a..aeceef6fb 100755
--- a/nuttx/configs/stm3210e-eval/src/stm3210e-internal.h
+++ b/nuttx/configs/stm3210e-eval/src/stm3210e-internal.h
@@ -65,10 +65,10 @@
 

 /* LEDs */

 

-#define GPIO_LED1     (GPIO_OUTPUT|GPIO_CNF_OUTPP|GPIO_MODE_50MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTC|GPIO_PIN6)

-#define GPIO_LED2     (GPIO_OUTPUT|GPIO_CNF_OUTPP|GPIO_MODE_50MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTC|GPIO_PIN7)

-#define GPIO_LED3     (GPIO_OUTPUT|GPIO_CNF_OUTPP|GPIO_MODE_50MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTC|GPIO_PIN8)

-#define GPIO_LED4     (GPIO_OUTPUT|GPIO_CNF_OUTPP|GPIO_MODE_50MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTC|GPIO_PIN9)

+#define GPIO_LED1     (GPIO_OUTPUT|GPIO_CNF_OUTPP|GPIO_MODE_50MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTF|GPIO_PIN6)

+#define GPIO_LED2     (GPIO_OUTPUT|GPIO_CNF_OUTPP|GPIO_MODE_50MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTF|GPIO_PIN7)

+#define GPIO_LED3     (GPIO_OUTPUT|GPIO_CNF_OUTPP|GPIO_MODE_50MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTF|GPIO_PIN8)

+#define GPIO_LED4     (GPIO_OUTPUT|GPIO_CNF_OUTPP|GPIO_MODE_50MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTF|GPIO_PIN9)

 

 /* MMC/SD SPI1 chip select: PC.12 */