diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-12-01 10:05:40 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-12-01 10:05:40 -0600 |
| commit | e8507f6d069cb1fc103bf8c880a159fe8ce3f3a4 (patch) | |
| tree | 93cd0d564eda72747549c058ab288eaa64ec6f0b | |
| parent | 94f14c031a0628cfaaeea0e59640be68aafc50cb (diff) | |
| download | px4-nuttx-e8507f6d069cb1fc103bf8c880a159fe8ce3f3a4.tar.gz px4-nuttx-e8507f6d069cb1fc103bf8c880a159fe8ce3f3a4.tar.bz2 px4-nuttx-e8507f6d069cb1fc103bf8c880a159fe8ce3f3a4.zip | |
ViewTool STM32F107: Basic NSH checks out okay
| -rw-r--r-- | nuttx/arch/arm/src/stm32/chip/stm32f107vc_pinmap.h | 4 | ||||
| -rw-r--r-- | nuttx/configs/viewtool-stm32f107/README.txt | 52 | ||||
| -rw-r--r-- | nuttx/configs/viewtool-stm32f107/nsh/defconfig | 2 |
3 files changed, 44 insertions, 14 deletions
diff --git a/nuttx/arch/arm/src/stm32/chip/stm32f107vc_pinmap.h b/nuttx/arch/arm/src/stm32/chip/stm32f107vc_pinmap.h index 2419620fc..541163c56 100644 --- a/nuttx/arch/arm/src/stm32/chip/stm32f107vc_pinmap.h +++ b/nuttx/arch/arm/src/stm32/chip/stm32f107vc_pinmap.h @@ -358,8 +358,8 @@ #define GPIO_USART1_RTS (GPIO_ALT|GPIO_CNF_AFPP|GPIO_MODE_50MHz|GPIO_PORTA|GPIO_PIN12) #define GPIO_USART1_CK (GPIO_ALT|GPIO_CNF_AFPP|GPIO_MODE_50MHz|GPIO_PORTA|GPIO_PIN8) #if defined(CONFIG_STM32_USART1_REMAP) -# define GPIO_USART1_TX (GPIO_ALT|GPIO_CNF_AFPP|GPIO_MODE_50MHz|GPIO_PORTA|GPIO_PIN9) -# define GPIO_USART1_RX (GPIO_INPUT|GPIO_CNF_INFLOAT|GPIO_MODE_INPUT|GPIO_PORTA|GPIO_PIN10) +# define GPIO_USART1_TX (GPIO_ALT|GPIO_CNF_AFPP|GPIO_MODE_50MHz|GPIO_PORTB|GPIO_PIN6) +# define GPIO_USART1_RX (GPIO_INPUT|GPIO_CNF_INFLOAT|GPIO_MODE_INPUT|GPIO_PORTB|GPIO_PIN7) #else # define GPIO_USART1_TX (GPIO_ALT|GPIO_CNF_AFPP|GPIO_MODE_50MHz|GPIO_PORTA|GPIO_PIN9) # define GPIO_USART1_RX (GPIO_INPUT|GPIO_CNF_INFLOAT|GPIO_MODE_INPUT|GPIO_PORTA|GPIO_PIN10) diff --git a/nuttx/configs/viewtool-stm32f107/README.txt b/nuttx/configs/viewtool-stm32f107/README.txt index 4056af485..5f156c292 100644 --- a/nuttx/configs/viewtool-stm32f107/README.txt +++ b/nuttx/configs/viewtool-stm32f107/README.txt @@ -21,11 +21,15 @@ Contents o User and Wake-Up keys o LEDs o Serial Console + - Console Configuration + - J5 - USART1 + - PL-2013 USB-to-Serial Intface + - RS-232 Module o Toolchains - NOTE about Windows native toolchains o Configurations - Information Common to All Configurations - - Configuration sub-directories + - Configuration Sub-directories User and Wake-Up keys ===================== @@ -73,20 +77,46 @@ LEDs Serial Console ============== + Console Configuration + --------------------- + The NuttX console is configurated by default on USART1 at 115200 BAUD 8N1 + (8-bits, not parity, one stop bit). These setting can, of course, easily + be changed by reconfiguring NuttX. + + J5 - USART1 + ----------- The boards come with a PL-2303 based USB-to-serial board. Also available as an option is an RS-232 board. Both have the same pin out on a 6-pin connector that mates with the upper row of J5. - PIN MODULE BOARD J5 - --- ------ --------------------------- - 1 5V 1 POWER Power jumper - 2 GND 3 GND Ground - 3 TXD 5 RXD1 PA10 USART1_RXD - 4 RXD 7 TXD1 PA9 USART1_TXD - 5 RTS? 9 CTS? PA12 USART1_RTS - 6 CTS? 11 RTS? PA11 USART1_CTS + PIN MODULE BOARD J5 + --- ------ --------------------------- + 1 5V 1 POWER Power jumper + 2 GND 3 GND Ground + 3 TXD 5 RXD1 PA10 USART1_RXD + 4 RXD 7 TXD1 PA9 USART1_TXD + 5 RTS? 9 CTS? PA12 USART1_RTS + 6 CTS? 11 RTS? PA11 USART1_CTS + + PL-2013 USB-to-Serial Intface + ----------------------------- + + J37 - CON4. Jumper Settings: + 1 <-> 3 : Connects PA9 to the RXD1 output pin + 2 <-> 4 : Connects PA10 to the TXD1 input pin + + J35 - CON2. Jumper Setting: + Open. the PL2303 adapter receives its power from the USB host. + + RS-232 Module + ------------- + + J37 - CON4. Jumper Settings: + 1 <-> 3 : Connects PA9 to the RXD1 output pin + 2 <-> 4 : Connects PA10 to the TXD1 input pin - Note: This requires USART1 pin remapping + J35 - CON2. Jumper Setting: + 1 <-> 2 : Proves 3.3V to the RS-232 module. Toolchains ========== @@ -182,7 +212,7 @@ Configurations See also the "NOTE about Windows native toolchains" in the section call "GNU Toolchain Options" above. - Configuration sub-directories + Configuration Sub-directories ----------------------------- nsh: diff --git a/nuttx/configs/viewtool-stm32f107/nsh/defconfig b/nuttx/configs/viewtool-stm32f107/nsh/defconfig index b60f7519e..a634a6e63 100644 --- a/nuttx/configs/viewtool-stm32f107/nsh/defconfig +++ b/nuttx/configs/viewtool-stm32f107/nsh/defconfig @@ -246,7 +246,7 @@ CONFIG_STM32_USART1=y # # Alternate Pin Mapping # -CONFIG_STM32_USART1_REMAP=y +# CONFIG_STM32_USART1_REMAP is not set # CONFIG_STM32_JTAG_DISABLE is not set CONFIG_STM32_JTAG_FULL_ENABLE=y # CONFIG_STM32_JTAG_NOJNTRST_ENABLE is not set |