diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-11-04 15:21:49 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-11-04 15:21:49 +0000 |
| commit | ce0f9a8068b14dc74689e6fc08b4553ebc0506bc (patch) | |
| tree | d85561c7bc74dab34ad7c3d5da4ab843654a5af4 /os/hal | |
| parent | aa22a11237c32465352e061ef21f9d5eefa5f232 (diff) | |
| download | ChibiOS-ce0f9a8068b14dc74689e6fc08b4553ebc0506bc.tar.gz ChibiOS-ce0f9a8068b14dc74689e6fc08b4553ebc0506bc.tar.bz2 ChibiOS-ce0f9a8068b14dc74689e6fc08b4553ebc0506bc.zip | |
More Nucleo 32 demos, not tested.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8433 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal')
| -rw-r--r-- | os/hal/boards/ST_NUCLEO32_F031K6/board.h | 8 | ||||
| -rw-r--r-- | os/hal/boards/ST_NUCLEO32_F031K6/cfg/board.chcfg | 4 | ||||
| -rw-r--r-- | os/hal/boards/ST_NUCLEO32_F042K6/board.h | 8 | ||||
| -rw-r--r-- | os/hal/boards/ST_NUCLEO32_F042K6/cfg/board.chcfg | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/os/hal/boards/ST_NUCLEO32_F031K6/board.h b/os/hal/boards/ST_NUCLEO32_F031K6/board.h index 5877d52ec..12867057e 100644 --- a/os/hal/boards/ST_NUCLEO32_F031K6/board.h +++ b/os/hal/boards/ST_NUCLEO32_F031K6/board.h @@ -219,7 +219,7 @@ *
* PA0 - ARD_A0 (input pullup).
* PA1 - ARD_A1 (input pullup).
- * PA2 - VCP_TX (alternate 7).
+ * PA2 - VCP_TX (alternate 1).
* PA3 - ARD_A2 (input pullup).
* PA4 - ARD_A3 (input pullup).
* PA5 - ARD_A4 (input floating).
@@ -232,7 +232,7 @@ * PA12 - ARD_D2 (input pullup).
* PA13 - SWDIO (alternate 0).
* PA14 - SWCLK (alternate 0).
- * PA15 - VCP_RX (alternate 7).
+ * PA15 - VCP_RX (alternate 1).
*/
#define VAL_GPIOA_MODER (PIN_MODE_INPUT(GPIOA_ARD_A0) | \
PIN_MODE_INPUT(GPIOA_ARD_A1) | \
@@ -316,7 +316,7 @@ PIN_ODR_HIGH(GPIOA_VCP_RX))
#define VAL_GPIOA_AFRL (PIN_AFIO_AF(GPIOA_ARD_A0, 0) | \
PIN_AFIO_AF(GPIOA_ARD_A1, 0) | \
- PIN_AFIO_AF(GPIOA_VCP_TX, 7) | \
+ PIN_AFIO_AF(GPIOA_VCP_TX, 1) | \
PIN_AFIO_AF(GPIOA_ARD_A2, 0) | \
PIN_AFIO_AF(GPIOA_ARD_A3, 0) | \
PIN_AFIO_AF(GPIOA_ARD_A4, 0) | \
@@ -329,7 +329,7 @@ PIN_AFIO_AF(GPIOA_ARD_D2, 0) | \
PIN_AFIO_AF(GPIOA_SWDIO, 0) | \
PIN_AFIO_AF(GPIOA_SWCLK, 0) | \
- PIN_AFIO_AF(GPIOA_VCP_RX, 7))
+ PIN_AFIO_AF(GPIOA_VCP_RX, 1))
/*
* GPIOB setup:
diff --git a/os/hal/boards/ST_NUCLEO32_F031K6/cfg/board.chcfg b/os/hal/boards/ST_NUCLEO32_F031K6/cfg/board.chcfg index 472d470fd..0ede126ec 100644 --- a/os/hal/boards/ST_NUCLEO32_F031K6/cfg/board.chcfg +++ b/os/hal/boards/ST_NUCLEO32_F031K6/cfg/board.chcfg @@ -39,7 +39,7 @@ Speed="High" Resistor="Floating" Mode="Alternate" - Alternate="7" /> + Alternate="1" /> <pin3 ID="ARD_A2" Type="PushPull" @@ -143,7 +143,7 @@ Speed="Maximum" Resistor="Floating" Mode="Alternate" - Alternate="7" /> + Alternate="1" /> </GPIOA> <GPIOB> <pin0 diff --git a/os/hal/boards/ST_NUCLEO32_F042K6/board.h b/os/hal/boards/ST_NUCLEO32_F042K6/board.h index 21d6a4cdf..2ee3d7946 100644 --- a/os/hal/boards/ST_NUCLEO32_F042K6/board.h +++ b/os/hal/boards/ST_NUCLEO32_F042K6/board.h @@ -219,7 +219,7 @@ *
* PA0 - ARD_A0 (input pullup).
* PA1 - ARD_A1 (input pullup).
- * PA2 - VCP_TX (alternate 7).
+ * PA2 - VCP_TX (alternate 1).
* PA3 - ARD_A2 (input pullup).
* PA4 - ARD_A3 (input pullup).
* PA5 - ARD_A4 (input floating).
@@ -232,7 +232,7 @@ * PA12 - ARD_D2 (input pullup).
* PA13 - SWDIO (alternate 0).
* PA14 - SWCLK (alternate 0).
- * PA15 - VCP_RX (alternate 7).
+ * PA15 - VCP_RX (alternate 1).
*/
#define VAL_GPIOA_MODER (PIN_MODE_INPUT(GPIOA_ARD_A0) | \
PIN_MODE_INPUT(GPIOA_ARD_A1) | \
@@ -316,7 +316,7 @@ PIN_ODR_HIGH(GPIOA_VCP_RX))
#define VAL_GPIOA_AFRL (PIN_AFIO_AF(GPIOA_ARD_A0, 0) | \
PIN_AFIO_AF(GPIOA_ARD_A1, 0) | \
- PIN_AFIO_AF(GPIOA_VCP_TX, 7) | \
+ PIN_AFIO_AF(GPIOA_VCP_TX, 1) | \
PIN_AFIO_AF(GPIOA_ARD_A2, 0) | \
PIN_AFIO_AF(GPIOA_ARD_A3, 0) | \
PIN_AFIO_AF(GPIOA_ARD_A4, 0) | \
@@ -329,7 +329,7 @@ PIN_AFIO_AF(GPIOA_ARD_D2, 0) | \
PIN_AFIO_AF(GPIOA_SWDIO, 0) | \
PIN_AFIO_AF(GPIOA_SWCLK, 0) | \
- PIN_AFIO_AF(GPIOA_VCP_RX, 7))
+ PIN_AFIO_AF(GPIOA_VCP_RX, 1))
/*
* GPIOB setup:
diff --git a/os/hal/boards/ST_NUCLEO32_F042K6/cfg/board.chcfg b/os/hal/boards/ST_NUCLEO32_F042K6/cfg/board.chcfg index 90654656d..c6e219907 100644 --- a/os/hal/boards/ST_NUCLEO32_F042K6/cfg/board.chcfg +++ b/os/hal/boards/ST_NUCLEO32_F042K6/cfg/board.chcfg @@ -39,7 +39,7 @@ Speed="High" Resistor="Floating" Mode="Alternate" - Alternate="7" /> + Alternate="1" /> <pin3 ID="ARD_A2" Type="PushPull" @@ -143,7 +143,7 @@ Speed="Maximum" Resistor="Floating" Mode="Alternate" - Alternate="7" /> + Alternate="1" /> </GPIOA> <GPIOB> <pin0 |