diff options
| author | Damien George | 2015-05-27 16:51:04 +0100 |
|---|---|---|
| committer | Damien George | 2015-05-27 16:51:04 +0100 |
| commit | 1775b65e07fae808dc50f9cee2005608cd3a26de (patch) | |
| tree | 128a45e0be3e09165980c94bfe3614309123077b /stmhal/boards | |
| parent | 9ae3fc65235303322ef5282d3cdd4ca99a2c37cc (diff) | |
stmhal: Remove PYBVxx defines and use config vars for UART/CAN names.
Now all stmhal-based boards can name their peripherals (if they want) to
any string.
Diffstat (limited to 'stmhal/boards')
| -rw-r--r-- | stmhal/boards/PYBV10/mpconfigboard.h | 10 | ||||
| -rw-r--r-- | stmhal/boards/PYBV3/mpconfigboard.h | 2 | ||||
| -rw-r--r-- | stmhal/boards/PYBV4/mpconfigboard.h | 11 |
3 files changed, 17 insertions, 6 deletions
diff --git a/stmhal/boards/PYBV10/mpconfigboard.h b/stmhal/boards/PYBV10/mpconfigboard.h index 7fe33894d..ca3764c2b 100644 --- a/stmhal/boards/PYBV10/mpconfigboard.h +++ b/stmhal/boards/PYBV10/mpconfigboard.h @@ -1,5 +1,3 @@ -#define PYBV10 - #define MICROPY_HW_BOARD_NAME "PYBv1.0" #define MICROPY_HW_MCU_NAME "STM32F405RG" #define MICROPY_PY_SYS_PLATFORM "pyboard" @@ -29,18 +27,22 @@ #define MICROPY_HW_RTC_USE_LSE (1) // UART config +#define MICROPY_HW_UART1_NAME "XB" #define MICROPY_HW_UART1_PORT (GPIOB) #define MICROPY_HW_UART1_PINS (GPIO_PIN_6 | GPIO_PIN_7) #define MICROPY_HW_UART2_PORT (GPIOA) #define MICROPY_HW_UART2_PINS (GPIO_PIN_2 | GPIO_PIN_3) #define MICROPY_HW_UART2_RTS (GPIO_PIN_1) #define MICROPY_HW_UART2_CTS (GPIO_PIN_0) +#define MICROPY_HW_UART3_NAME "YB" #define MICROPY_HW_UART3_PORT (GPIOB) #define MICROPY_HW_UART3_PINS (GPIO_PIN_10 | GPIO_PIN_11) #define MICROPY_HW_UART3_RTS (GPIO_PIN_14) #define MICROPY_HW_UART3_CTS (GPIO_PIN_13) +#define MICROPY_HW_UART4_NAME "XA" #define MICROPY_HW_UART4_PORT (GPIOA) #define MICROPY_HW_UART4_PINS (GPIO_PIN_0 | GPIO_PIN_1) +#define MICROPY_HW_UART6_NAME "YA" #define MICROPY_HW_UART6_PORT (GPIOC) #define MICROPY_HW_UART6_PINS (GPIO_PIN_6 | GPIO_PIN_7) @@ -52,6 +54,10 @@ #define MICROPY_HW_I2C2_SCL (pin_B10) #define MICROPY_HW_I2C2_SDA (pin_B11) +// CAN busses +#define MICROPY_HW_CAN1_NAME "YA" // CAN1 on RX,TX = Y3,Y4 = PB8,PB9 +#define MICROPY_HW_CAN2_NAME "YB" // CAN2 on RX,TX = Y5,Y6 = PB12,PB13 + // USRSW has no pullup or pulldown, and pressing the switch makes the input go low #define MICROPY_HW_USRSW_PIN (pin_B3) #define MICROPY_HW_USRSW_PULL (GPIO_PULLUP) diff --git a/stmhal/boards/PYBV3/mpconfigboard.h b/stmhal/boards/PYBV3/mpconfigboard.h index 86daf0c39..a837aaf4a 100644 --- a/stmhal/boards/PYBV3/mpconfigboard.h +++ b/stmhal/boards/PYBV3/mpconfigboard.h @@ -1,5 +1,3 @@ -#define PYBV3 - #define MICROPY_HW_BOARD_NAME "PYBv3" #define MICROPY_HW_MCU_NAME "STM32F405RG" diff --git a/stmhal/boards/PYBV4/mpconfigboard.h b/stmhal/boards/PYBV4/mpconfigboard.h index 4c46052b2..8b57d1e60 100644 --- a/stmhal/boards/PYBV4/mpconfigboard.h +++ b/stmhal/boards/PYBV4/mpconfigboard.h @@ -1,7 +1,6 @@ -#define PYBV4 - #define MICROPY_HW_BOARD_NAME "PYBv4" #define MICROPY_HW_MCU_NAME "STM32F405RG" +#define MICROPY_PY_SYS_PLATFORM "pyboard" #define MICROPY_HW_HAS_SWITCH (1) #define MICROPY_HW_HAS_SDCARD (1) @@ -28,18 +27,22 @@ #define MICROPY_HW_RTC_USE_LSE (1) // UART config +#define MICROPY_HW_UART1_NAME "XB" #define MICROPY_HW_UART1_PORT (GPIOB) #define MICROPY_HW_UART1_PINS (GPIO_PIN_6 | GPIO_PIN_7) #define MICROPY_HW_UART2_PORT (GPIOA) #define MICROPY_HW_UART2_PINS (GPIO_PIN_2 | GPIO_PIN_3) #define MICROPY_HW_UART2_RTS (GPIO_PIN_1) #define MICROPY_HW_UART2_CTS (GPIO_PIN_0) +#define MICROPY_HW_UART3_NAME "YB" #define MICROPY_HW_UART3_PORT (GPIOB) #define MICROPY_HW_UART3_PINS (GPIO_PIN_10 | GPIO_PIN_11) #define MICROPY_HW_UART3_RTS (GPIO_PIN_14) #define MICROPY_HW_UART3_CTS (GPIO_PIN_13) +#define MICROPY_HW_UART4_NAME "XA" #define MICROPY_HW_UART4_PORT (GPIOA) #define MICROPY_HW_UART4_PINS (GPIO_PIN_0 | GPIO_PIN_1) +#define MICROPY_HW_UART6_NAME "YA" #define MICROPY_HW_UART6_PORT (GPIOC) #define MICROPY_HW_UART6_PINS (GPIO_PIN_6 | GPIO_PIN_7) @@ -51,6 +54,10 @@ #define MICROPY_HW_I2C2_SCL (pin_B10) #define MICROPY_HW_I2C2_SDA (pin_B11) +// CAN busses +#define MICROPY_HW_CAN1_NAME "YA" // CAN1 on RX,TX = Y3,Y4 = PB8,PB9 +#define MICROPY_HW_CAN2_NAME "YB" // CAN2 on RX,TX = Y5,Y6 = PB12,PB13 + // USRSW has no pullup or pulldown, and pressing the switch makes the input go low #define MICROPY_HW_USRSW_PIN (pin_B3) #define MICROPY_HW_USRSW_PULL (GPIO_PULLUP) |