From 085b5aed16f80949324917d225cac4408b6e0d7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= Date: Sat, 28 Oct 2023 14:58:52 +0200 Subject: [PATCH] [boards] Update boardgen to v0.10.1 --- boards/variants/bw12.h | 49 +++++++++++++------- boards/variants/bw15.h | 25 ++++++---- boards/variants/cb1s.h | 24 ++++++---- boards/variants/cb2l.h | 9 ++-- boards/variants/cb2s.h | 18 ++++--- boards/variants/cb3l.h | 9 ++-- boards/variants/cb3s.h | 11 +++-- boards/variants/cb3se.h | 18 ++++--- boards/variants/cblc5.h | 18 ++++--- boards/variants/cbu.h | 24 ++++++---- boards/variants/generic-bk7231n-qfn32-tuya.h | 24 ++++++---- boards/variants/generic-bk7231t-qfn32-tuya.h | 24 ++++++---- boards/variants/generic-bk7252.h | 30 ++++++++---- boards/variants/generic-rtl8710bn-2mb-468k.h | 49 +++++++++++++------- boards/variants/generic-rtl8710bn-2mb-788k.h | 49 +++++++++++++------- boards/variants/generic-rtl8710bx-4mb-980k.h | 49 +++++++++++++------- boards/variants/generic-rtl8720cf-2mb-992k.h | 28 ++++++----- boards/variants/lsc-lma35-t.h | 18 ++++--- boards/variants/lsc-lma35.h | 18 ++++--- boards/variants/t102-v1.1.h | 25 ++++++---- boards/variants/t103-v1.0.h | 49 +++++++++++++------- boards/variants/wa2.h | 15 ++++-- boards/variants/wb1s.h | 18 ++++--- boards/variants/wb2l-m1.h | 24 ++++++---- boards/variants/wb2l.h | 24 ++++++---- boards/variants/wb2s.h | 24 ++++++---- boards/variants/wb3l.h | 24 ++++++---- boards/variants/wb3s.h | 24 ++++++---- boards/variants/wblc5.h | 24 ++++++---- boards/variants/wr1.h | 49 +++++++++++++------- boards/variants/wr1e.h | 49 +++++++++++++------- boards/variants/wr2.h | 25 ++++++---- boards/variants/wr2e.h | 21 ++++++--- boards/variants/wr3.h | 49 +++++++++++++------- boards/variants/wr3e.h | 49 +++++++++++++------- boards/variants/wr3l.h | 49 +++++++++++++------- boards/variants/wr3le.h | 49 +++++++++++++------- boards/variants/wr3n.h | 25 ++++++---- 38 files changed, 728 insertions(+), 382 deletions(-) diff --git a/boards/variants/bw12.h b/boards/variants/bw12.h index 130f383..8d66f68 100644 --- a/boards/variants/bw12.h +++ b/boards/variants/bw12.h @@ -14,14 +14,22 @@ // SPI Interfaces // -------------- -#define PIN_SPI0_CS 19u // PA_19 -#define PIN_SPI0_MISO 22u // PA_22 -#define PIN_SPI0_MOSI 23u // PA_23 -#define PIN_SPI0_SCK 18u // PA_18 -#define PIN_SPI1_CS 19u // PA_19 -#define PIN_SPI1_MISO 22u // PA_22 -#define PIN_SPI1_MOSI 23u // PA_23 -#define PIN_SPI1_SCK 18u // PA_18 +#define PIN_SPI0_CS 19u // PA_19 +#define PIN_SPI0_MISO 22u // PA_22 +#define PIN_SPI0_MOSI 23u // PA_23 +#define PIN_SPI0_SCK 18u // PA_18 +#define PIN_SPI1_CS 19u // PA_19 +#define PIN_SPI1_MISO 22u // PA_22 +#define PIN_SPI1_MOSI 23u // PA_23 +#define PIN_SPI1_SCK 18u // PA_18 +#define PINS_SPI0_CS (pin_size_t[]){19u} +#define PINS_SPI0_MISO (pin_size_t[]){22u} +#define PINS_SPI0_MOSI (pin_size_t[]){23u} +#define PINS_SPI0_SCK (pin_size_t[]){18u} +#define PINS_SPI1_CS (pin_size_t[]){19u} +#define PINS_SPI1_MISO (pin_size_t[]){22u} +#define PINS_SPI1_MOSI (pin_size_t[]){23u} +#define PINS_SPI1_SCK (pin_size_t[]){18u} // Wire Interfaces // --------------- @@ -31,15 +39,25 @@ #define PIN_WIRE0_SDA_1 30u // PA_30 #define PIN_WIRE1_SCL 18u // PA_18 #define PIN_WIRE1_SDA 23u // PA_23 +#define PINS_WIRE0_SCL (pin_size_t[]){29u, 22u} +#define PINS_WIRE0_SDA (pin_size_t[]){19u, 30u} +#define PINS_WIRE1_SCL (pin_size_t[]){18u} +#define PINS_WIRE1_SDA (pin_size_t[]){23u} // Serial ports // ------------ -#define PIN_SERIAL0_CTS 19u // PA_19 -#define PIN_SERIAL0_RTS 22u // PA_22 -#define PIN_SERIAL0_RX 18u // PA_18 -#define PIN_SERIAL0_TX 23u // PA_23 -#define PIN_SERIAL2_RX 29u // PA_29 -#define PIN_SERIAL2_TX 30u // PA_30 +#define PIN_SERIAL0_CTS 19u // PA_19 +#define PIN_SERIAL0_RTS 22u // PA_22 +#define PIN_SERIAL0_RX 18u // PA_18 +#define PIN_SERIAL0_TX 23u // PA_23 +#define PIN_SERIAL2_RX 29u // PA_29 +#define PIN_SERIAL2_TX 30u // PA_30 +#define PINS_SERIAL0_CTS (pin_size_t[]){19u} +#define PINS_SERIAL0_RTS (pin_size_t[]){22u} +#define PINS_SERIAL0_RX (pin_size_t[]){18u} +#define PINS_SERIAL0_TX (pin_size_t[]){23u} +#define PINS_SERIAL2_RX (pin_size_t[]){29u} +#define PINS_SERIAL2_TX (pin_size_t[]){30u} // Pin function macros // ------------------- @@ -62,7 +80,6 @@ #define PIN_PA23 23u // PA_23 #define PIN_PA29 29u // PA_29 #define PIN_PA30 30u // PA_30 -#define PIN_PWM0 23u // PA_23 #define PIN_PWM1 15u // PA_15 #define PIN_PWM2 0u // PA_0 #define PIN_PWM3 12u // PA_12 @@ -73,9 +90,7 @@ #define PIN_RX2 29u // PA_29 #define PIN_SCK0 18u // PA_18 #define PIN_SCK1 18u // PA_18 -#define PIN_SCL0 22u // PA_22 #define PIN_SCL1 18u // PA_18 -#define PIN_SDA0 30u // PA_30 #define PIN_SDA1 23u // PA_23 #define PIN_TX0 23u // PA_23 #define PIN_TX2 30u // PA_30 diff --git a/boards/variants/bw15.h b/boards/variants/bw15.h index eb1f647..fb8100a 100644 --- a/boards/variants/bw15.h +++ b/boards/variants/bw15.h @@ -21,6 +21,10 @@ #define PIN_SPI0_MOSI_1 19u // PIN_A19 #define PIN_SPI0_SCK_0 16u // PIN_A16 #define PIN_SPI0_SCK_1 3u // PIN_A3 +#define PINS_SPI0_CS (pin_size_t[]){2u, 15u} +#define PINS_SPI0_MISO (pin_size_t[]){20u} +#define PINS_SPI0_MOSI (pin_size_t[]){4u, 19u} +#define PINS_SPI0_SCK (pin_size_t[]){16u, 3u} // Wire Interfaces // --------------- @@ -30,6 +34,8 @@ #define PIN_WIRE0_SDA_0 20u // PIN_A20 #define PIN_WIRE0_SDA_1 16u // PIN_A16 #define PIN_WIRE0_SDA_2 3u // PIN_A3 +#define PINS_WIRE0_SCL (pin_size_t[]){2u, 15u, 19u} +#define PINS_WIRE0_SDA (pin_size_t[]){20u, 16u, 3u} // Serial ports // ------------ @@ -44,14 +50,21 @@ #define PIN_SERIAL2_RTS 20u // PIN_A20 #define PIN_SERIAL2_RX 15u // PIN_A15 #define PIN_SERIAL2_TX 16u // PIN_A16 +#define PINS_SERIAL0_RX (pin_size_t[]){13u} +#define PINS_SERIAL0_TX (pin_size_t[]){14u} +#define PINS_SERIAL1_CTS (pin_size_t[]){4u} +#define PINS_SERIAL1_RX (pin_size_t[]){2u, 0u} +#define PINS_SERIAL1_TX (pin_size_t[]){3u, 1u} +#define PINS_SERIAL2_CTS (pin_size_t[]){19u} +#define PINS_SERIAL2_RTS (pin_size_t[]){20u} +#define PINS_SERIAL2_RX (pin_size_t[]){15u} +#define PINS_SERIAL2_TX (pin_size_t[]){16u} // Pin function macros // ------------------- -#define PIN_CS0 15u // PIN_A15 #define PIN_CTS1 4u // PIN_A4 #define PIN_CTS2 19u // PIN_A19 #define PIN_MISO0 20u // PIN_A20 -#define PIN_MOSI0 19u // PIN_A19 #define PIN_PA00 0u // PIN_A0 #define PIN_PA01 1u // PIN_A1 #define PIN_PA02 2u // PIN_A2 @@ -65,23 +78,15 @@ #define PIN_PA18 18u // PIN_A18 #define PIN_PA19 19u // PIN_A19 #define PIN_PA20 20u // PIN_A20 -#define PIN_PWM0 0u // PIN_A0 #define PIN_PWM1 1u // PIN_A1 -#define PIN_PWM2 14u // PIN_A14 -#define PIN_PWM3 3u // PIN_A3 -#define PIN_PWM4 16u // PIN_A16 #define PIN_PWM5 17u // PIN_A17 #define PIN_PWM6 18u // PIN_A18 -#define PIN_PWM7 13u // PIN_A13 #define PIN_RTS2 20u // PIN_A20 #define PIN_RX0 13u // PIN_A13 -#define PIN_RX1 0u // PIN_A0 #define PIN_RX2 15u // PIN_A15 -#define PIN_SCK0 3u // PIN_A3 #define PIN_SCL0 19u // PIN_A19 #define PIN_SDA0 3u // PIN_A3 #define PIN_TX0 14u // PIN_A14 -#define PIN_TX1 1u // PIN_A1 #define PIN_TX2 16u // PIN_A16 // Port availability diff --git a/boards/variants/cb1s.h b/boards/variants/cb1s.h index c652cb0..39e3273 100644 --- a/boards/variants/cb1s.h +++ b/boards/variants/cb1s.h @@ -14,17 +14,25 @@ // Wire Interfaces // --------------- -#define PIN_WIRE1_SCL 20u // GPIO20 -#define PIN_WIRE1_SDA 21u // GPIO21 -#define PIN_WIRE2_SCL 0u // GPIO0 -#define PIN_WIRE2_SDA 1u // GPIO1 +#define PIN_WIRE1_SCL 20u // GPIO20 +#define PIN_WIRE1_SDA 21u // GPIO21 +#define PIN_WIRE2_SCL 0u // GPIO0 +#define PIN_WIRE2_SDA 1u // GPIO1 +#define PINS_WIRE1_SCL (pin_size_t[]){20u} +#define PINS_WIRE1_SDA (pin_size_t[]){21u} +#define PINS_WIRE2_SCL (pin_size_t[]){0u} +#define PINS_WIRE2_SDA (pin_size_t[]){1u} // Serial ports // ------------ -#define PIN_SERIAL1_RX 10u // GPIO10 -#define PIN_SERIAL1_TX 11u // GPIO11 -#define PIN_SERIAL2_RX 1u // GPIO1 -#define PIN_SERIAL2_TX 0u // GPIO0 +#define PIN_SERIAL1_RX 10u // GPIO10 +#define PIN_SERIAL1_TX 11u // GPIO11 +#define PIN_SERIAL2_RX 1u // GPIO1 +#define PIN_SERIAL2_TX 0u // GPIO0 +#define PINS_SERIAL1_RX (pin_size_t[]){10u} +#define PINS_SERIAL1_TX (pin_size_t[]){11u} +#define PINS_SERIAL2_RX (pin_size_t[]){1u} +#define PINS_SERIAL2_TX (pin_size_t[]){0u} // Pin function macros // ------------------- diff --git a/boards/variants/cb2l.h b/boards/variants/cb2l.h index ccbc8d1..57c3abb 100644 --- a/boards/variants/cb2l.h +++ b/boards/variants/cb2l.h @@ -14,9 +14,12 @@ // Serial ports // ------------ -#define PIN_SERIAL1_RX 10u // GPIO10 -#define PIN_SERIAL1_TX 11u // GPIO11 -#define PIN_SERIAL2_TX 0u // GPIO0 +#define PIN_SERIAL1_RX 10u // GPIO10 +#define PIN_SERIAL1_TX 11u // GPIO11 +#define PIN_SERIAL2_TX 0u // GPIO0 +#define PINS_SERIAL1_RX (pin_size_t[]){10u} +#define PINS_SERIAL1_TX (pin_size_t[]){11u} +#define PINS_SERIAL2_TX (pin_size_t[]){0u} // Pin function macros // ------------------- diff --git a/boards/variants/cb2s.h b/boards/variants/cb2s.h index a90ec1c..7f776e8 100644 --- a/boards/variants/cb2s.h +++ b/boards/variants/cb2s.h @@ -14,15 +14,21 @@ // Wire Interfaces // --------------- -#define PIN_WIRE2_SCL 0u // GPIO0 -#define PIN_WIRE2_SDA 1u // GPIO1 +#define PIN_WIRE2_SCL 0u // GPIO0 +#define PIN_WIRE2_SDA 1u // GPIO1 +#define PINS_WIRE2_SCL (pin_size_t[]){0u} +#define PINS_WIRE2_SDA (pin_size_t[]){1u} // Serial ports // ------------ -#define PIN_SERIAL1_RX 10u // GPIO10 -#define PIN_SERIAL1_TX 11u // GPIO11 -#define PIN_SERIAL2_RX 1u // GPIO1 -#define PIN_SERIAL2_TX 0u // GPIO0 +#define PIN_SERIAL1_RX 10u // GPIO10 +#define PIN_SERIAL1_TX 11u // GPIO11 +#define PIN_SERIAL2_RX 1u // GPIO1 +#define PIN_SERIAL2_TX 0u // GPIO0 +#define PINS_SERIAL1_RX (pin_size_t[]){10u} +#define PINS_SERIAL1_TX (pin_size_t[]){11u} +#define PINS_SERIAL2_RX (pin_size_t[]){1u} +#define PINS_SERIAL2_TX (pin_size_t[]){0u} // Pin function macros // ------------------- diff --git a/boards/variants/cb3l.h b/boards/variants/cb3l.h index cd31a53..cc37174 100644 --- a/boards/variants/cb3l.h +++ b/boards/variants/cb3l.h @@ -14,9 +14,12 @@ // Serial ports // ------------ -#define PIN_SERIAL1_RX 10u // GPIO10 -#define PIN_SERIAL1_TX 11u // GPIO11 -#define PIN_SERIAL2_TX 0u // GPIO0 +#define PIN_SERIAL1_RX 10u // GPIO10 +#define PIN_SERIAL1_TX 11u // GPIO11 +#define PIN_SERIAL2_TX 0u // GPIO0 +#define PINS_SERIAL1_RX (pin_size_t[]){10u} +#define PINS_SERIAL1_TX (pin_size_t[]){11u} +#define PINS_SERIAL2_TX (pin_size_t[]){0u} // Pin function macros // ------------------- diff --git a/boards/variants/cb3s.h b/boards/variants/cb3s.h index 711d8b1..fda6596 100644 --- a/boards/variants/cb3s.h +++ b/boards/variants/cb3s.h @@ -17,12 +17,17 @@ #define PIN_WIRE1_SCL 20u // GPIO20 #define PIN_WIRE1_SDA_0 21u // GPIO21 #define PIN_WIRE1_SDA_1 21u // GPIO21 +#define PINS_WIRE1_SCL (pin_size_t[]){20u} +#define PINS_WIRE1_SDA (pin_size_t[]){21u, 21u} // Serial ports // ------------ -#define PIN_SERIAL1_RX 10u // GPIO10 -#define PIN_SERIAL1_TX 11u // GPIO11 -#define PIN_SERIAL2_TX 0u // GPIO0 +#define PIN_SERIAL1_RX 10u // GPIO10 +#define PIN_SERIAL1_TX 11u // GPIO11 +#define PIN_SERIAL2_TX 0u // GPIO0 +#define PINS_SERIAL1_RX (pin_size_t[]){10u} +#define PINS_SERIAL1_TX (pin_size_t[]){11u} +#define PINS_SERIAL2_TX (pin_size_t[]){0u} // Pin function macros // ------------------- diff --git a/boards/variants/cb3se.h b/boards/variants/cb3se.h index 95d3f98..7a1f53e 100644 --- a/boards/variants/cb3se.h +++ b/boards/variants/cb3se.h @@ -14,15 +14,21 @@ // Wire Interfaces // --------------- -#define PIN_WIRE2_SCL 0u // GPIO0 -#define PIN_WIRE2_SDA 1u // GPIO1 +#define PIN_WIRE2_SCL 0u // GPIO0 +#define PIN_WIRE2_SDA 1u // GPIO1 +#define PINS_WIRE2_SCL (pin_size_t[]){0u} +#define PINS_WIRE2_SDA (pin_size_t[]){1u} // Serial ports // ------------ -#define PIN_SERIAL1_RX 10u // GPIO10 -#define PIN_SERIAL1_TX 11u // GPIO11 -#define PIN_SERIAL2_RX 1u // GPIO1 -#define PIN_SERIAL2_TX 0u // GPIO0 +#define PIN_SERIAL1_RX 10u // GPIO10 +#define PIN_SERIAL1_TX 11u // GPIO11 +#define PIN_SERIAL2_RX 1u // GPIO1 +#define PIN_SERIAL2_TX 0u // GPIO0 +#define PINS_SERIAL1_RX (pin_size_t[]){10u} +#define PINS_SERIAL1_TX (pin_size_t[]){11u} +#define PINS_SERIAL2_RX (pin_size_t[]){1u} +#define PINS_SERIAL2_TX (pin_size_t[]){0u} // Pin function macros // ------------------- diff --git a/boards/variants/cblc5.h b/boards/variants/cblc5.h index b6f78f0..159759e 100644 --- a/boards/variants/cblc5.h +++ b/boards/variants/cblc5.h @@ -14,15 +14,21 @@ // Wire Interfaces // --------------- -#define PIN_WIRE2_SCL 0u // GPIO0 -#define PIN_WIRE2_SDA 1u // GPIO1 +#define PIN_WIRE2_SCL 0u // GPIO0 +#define PIN_WIRE2_SDA 1u // GPIO1 +#define PINS_WIRE2_SCL (pin_size_t[]){0u} +#define PINS_WIRE2_SDA (pin_size_t[]){1u} // Serial ports // ------------ -#define PIN_SERIAL1_RX 10u // GPIO10 -#define PIN_SERIAL1_TX 11u // GPIO11 -#define PIN_SERIAL2_RX 1u // GPIO1 -#define PIN_SERIAL2_TX 0u // GPIO0 +#define PIN_SERIAL1_RX 10u // GPIO10 +#define PIN_SERIAL1_TX 11u // GPIO11 +#define PIN_SERIAL2_RX 1u // GPIO1 +#define PIN_SERIAL2_TX 0u // GPIO0 +#define PINS_SERIAL1_RX (pin_size_t[]){10u} +#define PINS_SERIAL1_TX (pin_size_t[]){11u} +#define PINS_SERIAL2_RX (pin_size_t[]){1u} +#define PINS_SERIAL2_TX (pin_size_t[]){0u} // Pin function macros // ------------------- diff --git a/boards/variants/cbu.h b/boards/variants/cbu.h index 6938958..3714d7f 100644 --- a/boards/variants/cbu.h +++ b/boards/variants/cbu.h @@ -14,17 +14,25 @@ // Wire Interfaces // --------------- -#define PIN_WIRE1_SCL 20u // GPIO20 -#define PIN_WIRE1_SDA 21u // GPIO21 -#define PIN_WIRE2_SCL 0u // GPIO0 -#define PIN_WIRE2_SDA 1u // GPIO1 +#define PIN_WIRE1_SCL 20u // GPIO20 +#define PIN_WIRE1_SDA 21u // GPIO21 +#define PIN_WIRE2_SCL 0u // GPIO0 +#define PIN_WIRE2_SDA 1u // GPIO1 +#define PINS_WIRE1_SCL (pin_size_t[]){20u} +#define PINS_WIRE1_SDA (pin_size_t[]){21u} +#define PINS_WIRE2_SCL (pin_size_t[]){0u} +#define PINS_WIRE2_SDA (pin_size_t[]){1u} // Serial ports // ------------ -#define PIN_SERIAL1_RX 10u // GPIO10 -#define PIN_SERIAL1_TX 11u // GPIO11 -#define PIN_SERIAL2_RX 1u // GPIO1 -#define PIN_SERIAL2_TX 0u // GPIO0 +#define PIN_SERIAL1_RX 10u // GPIO10 +#define PIN_SERIAL1_TX 11u // GPIO11 +#define PIN_SERIAL2_RX 1u // GPIO1 +#define PIN_SERIAL2_TX 0u // GPIO0 +#define PINS_SERIAL1_RX (pin_size_t[]){10u} +#define PINS_SERIAL1_TX (pin_size_t[]){11u} +#define PINS_SERIAL2_RX (pin_size_t[]){1u} +#define PINS_SERIAL2_TX (pin_size_t[]){0u} // Pin function macros // ------------------- diff --git a/boards/variants/generic-bk7231n-qfn32-tuya.h b/boards/variants/generic-bk7231n-qfn32-tuya.h index 73d8a9c..45ecbbc 100644 --- a/boards/variants/generic-bk7231n-qfn32-tuya.h +++ b/boards/variants/generic-bk7231n-qfn32-tuya.h @@ -14,17 +14,25 @@ // Wire Interfaces // --------------- -#define PIN_WIRE1_SCL 20u // GPIO20 -#define PIN_WIRE1_SDA 21u // GPIO21 -#define PIN_WIRE2_SCL 0u // GPIO0 -#define PIN_WIRE2_SDA 1u // GPIO1 +#define PIN_WIRE1_SCL 20u // GPIO20 +#define PIN_WIRE1_SDA 21u // GPIO21 +#define PIN_WIRE2_SCL 0u // GPIO0 +#define PIN_WIRE2_SDA 1u // GPIO1 +#define PINS_WIRE1_SCL (pin_size_t[]){20u} +#define PINS_WIRE1_SDA (pin_size_t[]){21u} +#define PINS_WIRE2_SCL (pin_size_t[]){0u} +#define PINS_WIRE2_SDA (pin_size_t[]){1u} // Serial ports // ------------ -#define PIN_SERIAL1_RX 10u // GPIO10 -#define PIN_SERIAL1_TX 11u // GPIO11 -#define PIN_SERIAL2_RX 1u // GPIO1 -#define PIN_SERIAL2_TX 0u // GPIO0 +#define PIN_SERIAL1_RX 10u // GPIO10 +#define PIN_SERIAL1_TX 11u // GPIO11 +#define PIN_SERIAL2_RX 1u // GPIO1 +#define PIN_SERIAL2_TX 0u // GPIO0 +#define PINS_SERIAL1_RX (pin_size_t[]){10u} +#define PINS_SERIAL1_TX (pin_size_t[]){11u} +#define PINS_SERIAL2_RX (pin_size_t[]){1u} +#define PINS_SERIAL2_TX (pin_size_t[]){0u} // Pin function macros // ------------------- diff --git a/boards/variants/generic-bk7231t-qfn32-tuya.h b/boards/variants/generic-bk7231t-qfn32-tuya.h index dd9b587..d79dd75 100644 --- a/boards/variants/generic-bk7231t-qfn32-tuya.h +++ b/boards/variants/generic-bk7231t-qfn32-tuya.h @@ -14,17 +14,25 @@ // Wire Interfaces // --------------- -#define PIN_WIRE1_SCL 20u // GPIO20 -#define PIN_WIRE1_SDA 21u // GPIO21 -#define PIN_WIRE2_SCL 0u // GPIO0 -#define PIN_WIRE2_SDA 1u // GPIO1 +#define PIN_WIRE1_SCL 20u // GPIO20 +#define PIN_WIRE1_SDA 21u // GPIO21 +#define PIN_WIRE2_SCL 0u // GPIO0 +#define PIN_WIRE2_SDA 1u // GPIO1 +#define PINS_WIRE1_SCL (pin_size_t[]){20u} +#define PINS_WIRE1_SDA (pin_size_t[]){21u} +#define PINS_WIRE2_SCL (pin_size_t[]){0u} +#define PINS_WIRE2_SDA (pin_size_t[]){1u} // Serial ports // ------------ -#define PIN_SERIAL1_RX 10u // GPIO10 -#define PIN_SERIAL1_TX 11u // GPIO11 -#define PIN_SERIAL2_RX 1u // GPIO1 -#define PIN_SERIAL2_TX 0u // GPIO0 +#define PIN_SERIAL1_RX 10u // GPIO10 +#define PIN_SERIAL1_TX 11u // GPIO11 +#define PIN_SERIAL2_RX 1u // GPIO1 +#define PIN_SERIAL2_TX 0u // GPIO0 +#define PINS_SERIAL1_RX (pin_size_t[]){10u} +#define PINS_SERIAL1_TX (pin_size_t[]){11u} +#define PINS_SERIAL2_RX (pin_size_t[]){1u} +#define PINS_SERIAL2_TX (pin_size_t[]){0u} // Pin function macros // ------------------- diff --git a/boards/variants/generic-bk7252.h b/boards/variants/generic-bk7252.h index 98a7ac7..20c0b7e 100644 --- a/boards/variants/generic-bk7252.h +++ b/boards/variants/generic-bk7252.h @@ -14,19 +14,29 @@ // Wire Interfaces // --------------- -#define PIN_WIRE1_SCL 20u // GPIO20 -#define PIN_WIRE1_SDA 21u // GPIO21 -#define PIN_WIRE2_SCL 0u // GPIO0 -#define PIN_WIRE2_SDA 1u // GPIO1 +#define PIN_WIRE1_SCL 20u // GPIO20 +#define PIN_WIRE1_SDA 21u // GPIO21 +#define PIN_WIRE2_SCL 0u // GPIO0 +#define PIN_WIRE2_SDA 1u // GPIO1 +#define PINS_WIRE1_SCL (pin_size_t[]){20u} +#define PINS_WIRE1_SDA (pin_size_t[]){21u} +#define PINS_WIRE2_SCL (pin_size_t[]){0u} +#define PINS_WIRE2_SDA (pin_size_t[]){1u} // Serial ports // ------------ -#define PIN_SERIAL1_CTS 12u // GPIO12 -#define PIN_SERIAL1_RTS 13u // GPIO13 -#define PIN_SERIAL1_RX 10u // GPIO10 -#define PIN_SERIAL1_TX 11u // GPIO11 -#define PIN_SERIAL2_RX 1u // GPIO1 -#define PIN_SERIAL2_TX 0u // GPIO0 +#define PIN_SERIAL1_CTS 12u // GPIO12 +#define PIN_SERIAL1_RTS 13u // GPIO13 +#define PIN_SERIAL1_RX 10u // GPIO10 +#define PIN_SERIAL1_TX 11u // GPIO11 +#define PIN_SERIAL2_RX 1u // GPIO1 +#define PIN_SERIAL2_TX 0u // GPIO0 +#define PINS_SERIAL1_CTS (pin_size_t[]){12u} +#define PINS_SERIAL1_RTS (pin_size_t[]){13u} +#define PINS_SERIAL1_RX (pin_size_t[]){10u} +#define PINS_SERIAL1_TX (pin_size_t[]){11u} +#define PINS_SERIAL2_RX (pin_size_t[]){1u} +#define PINS_SERIAL2_TX (pin_size_t[]){0u} // Pin function macros // ------------------- diff --git a/boards/variants/generic-rtl8710bn-2mb-468k.h b/boards/variants/generic-rtl8710bn-2mb-468k.h index e61f834..03075cc 100644 --- a/boards/variants/generic-rtl8710bn-2mb-468k.h +++ b/boards/variants/generic-rtl8710bn-2mb-468k.h @@ -14,14 +14,22 @@ // SPI Interfaces // -------------- -#define PIN_SPI0_CS 19u // PA_19 -#define PIN_SPI0_MISO 22u // PA_22 -#define PIN_SPI0_MOSI 23u // PA_23 -#define PIN_SPI0_SCK 18u // PA_18 -#define PIN_SPI1_CS 19u // PA_19 -#define PIN_SPI1_MISO 22u // PA_22 -#define PIN_SPI1_MOSI 23u // PA_23 -#define PIN_SPI1_SCK 18u // PA_18 +#define PIN_SPI0_CS 19u // PA_19 +#define PIN_SPI0_MISO 22u // PA_22 +#define PIN_SPI0_MOSI 23u // PA_23 +#define PIN_SPI0_SCK 18u // PA_18 +#define PIN_SPI1_CS 19u // PA_19 +#define PIN_SPI1_MISO 22u // PA_22 +#define PIN_SPI1_MOSI 23u // PA_23 +#define PIN_SPI1_SCK 18u // PA_18 +#define PINS_SPI0_CS (pin_size_t[]){19u} +#define PINS_SPI0_MISO (pin_size_t[]){22u} +#define PINS_SPI0_MOSI (pin_size_t[]){23u} +#define PINS_SPI0_SCK (pin_size_t[]){18u} +#define PINS_SPI1_CS (pin_size_t[]){19u} +#define PINS_SPI1_MISO (pin_size_t[]){22u} +#define PINS_SPI1_MOSI (pin_size_t[]){23u} +#define PINS_SPI1_SCK (pin_size_t[]){18u} // Wire Interfaces // --------------- @@ -31,15 +39,25 @@ #define PIN_WIRE0_SDA_1 30u // PA_30 #define PIN_WIRE1_SCL 18u // PA_18 #define PIN_WIRE1_SDA 23u // PA_23 +#define PINS_WIRE0_SCL (pin_size_t[]){22u, 29u} +#define PINS_WIRE0_SDA (pin_size_t[]){19u, 30u} +#define PINS_WIRE1_SCL (pin_size_t[]){18u} +#define PINS_WIRE1_SDA (pin_size_t[]){23u} // Serial ports // ------------ -#define PIN_SERIAL0_CTS 19u // PA_19 -#define PIN_SERIAL0_RTS 22u // PA_22 -#define PIN_SERIAL0_RX 18u // PA_18 -#define PIN_SERIAL0_TX 23u // PA_23 -#define PIN_SERIAL2_RX 29u // PA_29 -#define PIN_SERIAL2_TX 30u // PA_30 +#define PIN_SERIAL0_CTS 19u // PA_19 +#define PIN_SERIAL0_RTS 22u // PA_22 +#define PIN_SERIAL0_RX 18u // PA_18 +#define PIN_SERIAL0_TX 23u // PA_23 +#define PIN_SERIAL2_RX 29u // PA_29 +#define PIN_SERIAL2_TX 30u // PA_30 +#define PINS_SERIAL0_CTS (pin_size_t[]){19u} +#define PINS_SERIAL0_RTS (pin_size_t[]){22u} +#define PINS_SERIAL0_RX (pin_size_t[]){18u} +#define PINS_SERIAL0_TX (pin_size_t[]){23u} +#define PINS_SERIAL2_RX (pin_size_t[]){29u} +#define PINS_SERIAL2_TX (pin_size_t[]){30u} // Pin function macros // ------------------- @@ -75,7 +93,6 @@ #define PIN_PA23 23u // PA_23 #define PIN_PA29 29u // PA_29 #define PIN_PA30 30u // PA_30 -#define PIN_PWM0 23u // PA_23 #define PIN_PWM1 15u // PA_15 #define PIN_PWM2 0u // PA_0 #define PIN_PWM3 12u // PA_12 @@ -86,9 +103,7 @@ #define PIN_RX2 29u // PA_29 #define PIN_SCK0 18u // PA_18 #define PIN_SCK1 18u // PA_18 -#define PIN_SCL0 29u // PA_29 #define PIN_SCL1 18u // PA_18 -#define PIN_SDA0 30u // PA_30 #define PIN_SDA1 23u // PA_23 #define PIN_TX0 23u // PA_23 #define PIN_TX2 30u // PA_30 diff --git a/boards/variants/generic-rtl8710bn-2mb-788k.h b/boards/variants/generic-rtl8710bn-2mb-788k.h index 3174473..a61de78 100644 --- a/boards/variants/generic-rtl8710bn-2mb-788k.h +++ b/boards/variants/generic-rtl8710bn-2mb-788k.h @@ -14,14 +14,22 @@ // SPI Interfaces // -------------- -#define PIN_SPI0_CS 19u // PA_19 -#define PIN_SPI0_MISO 22u // PA_22 -#define PIN_SPI0_MOSI 23u // PA_23 -#define PIN_SPI0_SCK 18u // PA_18 -#define PIN_SPI1_CS 19u // PA_19 -#define PIN_SPI1_MISO 22u // PA_22 -#define PIN_SPI1_MOSI 23u // PA_23 -#define PIN_SPI1_SCK 18u // PA_18 +#define PIN_SPI0_CS 19u // PA_19 +#define PIN_SPI0_MISO 22u // PA_22 +#define PIN_SPI0_MOSI 23u // PA_23 +#define PIN_SPI0_SCK 18u // PA_18 +#define PIN_SPI1_CS 19u // PA_19 +#define PIN_SPI1_MISO 22u // PA_22 +#define PIN_SPI1_MOSI 23u // PA_23 +#define PIN_SPI1_SCK 18u // PA_18 +#define PINS_SPI0_CS (pin_size_t[]){19u} +#define PINS_SPI0_MISO (pin_size_t[]){22u} +#define PINS_SPI0_MOSI (pin_size_t[]){23u} +#define PINS_SPI0_SCK (pin_size_t[]){18u} +#define PINS_SPI1_CS (pin_size_t[]){19u} +#define PINS_SPI1_MISO (pin_size_t[]){22u} +#define PINS_SPI1_MOSI (pin_size_t[]){23u} +#define PINS_SPI1_SCK (pin_size_t[]){18u} // Wire Interfaces // --------------- @@ -31,15 +39,25 @@ #define PIN_WIRE0_SDA_1 30u // PA_30 #define PIN_WIRE1_SCL 18u // PA_18 #define PIN_WIRE1_SDA 23u // PA_23 +#define PINS_WIRE0_SCL (pin_size_t[]){22u, 29u} +#define PINS_WIRE0_SDA (pin_size_t[]){19u, 30u} +#define PINS_WIRE1_SCL (pin_size_t[]){18u} +#define PINS_WIRE1_SDA (pin_size_t[]){23u} // Serial ports // ------------ -#define PIN_SERIAL0_CTS 19u // PA_19 -#define PIN_SERIAL0_RTS 22u // PA_22 -#define PIN_SERIAL0_RX 18u // PA_18 -#define PIN_SERIAL0_TX 23u // PA_23 -#define PIN_SERIAL2_RX 29u // PA_29 -#define PIN_SERIAL2_TX 30u // PA_30 +#define PIN_SERIAL0_CTS 19u // PA_19 +#define PIN_SERIAL0_RTS 22u // PA_22 +#define PIN_SERIAL0_RX 18u // PA_18 +#define PIN_SERIAL0_TX 23u // PA_23 +#define PIN_SERIAL2_RX 29u // PA_29 +#define PIN_SERIAL2_TX 30u // PA_30 +#define PINS_SERIAL0_CTS (pin_size_t[]){19u} +#define PINS_SERIAL0_RTS (pin_size_t[]){22u} +#define PINS_SERIAL0_RX (pin_size_t[]){18u} +#define PINS_SERIAL0_TX (pin_size_t[]){23u} +#define PINS_SERIAL2_RX (pin_size_t[]){29u} +#define PINS_SERIAL2_TX (pin_size_t[]){30u} // Pin function macros // ------------------- @@ -75,7 +93,6 @@ #define PIN_PA23 23u // PA_23 #define PIN_PA29 29u // PA_29 #define PIN_PA30 30u // PA_30 -#define PIN_PWM0 23u // PA_23 #define PIN_PWM1 15u // PA_15 #define PIN_PWM2 0u // PA_0 #define PIN_PWM3 12u // PA_12 @@ -86,9 +103,7 @@ #define PIN_RX2 29u // PA_29 #define PIN_SCK0 18u // PA_18 #define PIN_SCK1 18u // PA_18 -#define PIN_SCL0 29u // PA_29 #define PIN_SCL1 18u // PA_18 -#define PIN_SDA0 30u // PA_30 #define PIN_SDA1 23u // PA_23 #define PIN_TX0 23u // PA_23 #define PIN_TX2 30u // PA_30 diff --git a/boards/variants/generic-rtl8710bx-4mb-980k.h b/boards/variants/generic-rtl8710bx-4mb-980k.h index 272ffca..ffbef94 100644 --- a/boards/variants/generic-rtl8710bx-4mb-980k.h +++ b/boards/variants/generic-rtl8710bx-4mb-980k.h @@ -14,14 +14,22 @@ // SPI Interfaces // -------------- -#define PIN_SPI0_CS 19u // PA_19 -#define PIN_SPI0_MISO 22u // PA_22 -#define PIN_SPI0_MOSI 23u // PA_23 -#define PIN_SPI0_SCK 18u // PA_18 -#define PIN_SPI1_CS 19u // PA_19 -#define PIN_SPI1_MISO 22u // PA_22 -#define PIN_SPI1_MOSI 23u // PA_23 -#define PIN_SPI1_SCK 18u // PA_18 +#define PIN_SPI0_CS 19u // PA_19 +#define PIN_SPI0_MISO 22u // PA_22 +#define PIN_SPI0_MOSI 23u // PA_23 +#define PIN_SPI0_SCK 18u // PA_18 +#define PIN_SPI1_CS 19u // PA_19 +#define PIN_SPI1_MISO 22u // PA_22 +#define PIN_SPI1_MOSI 23u // PA_23 +#define PIN_SPI1_SCK 18u // PA_18 +#define PINS_SPI0_CS (pin_size_t[]){19u} +#define PINS_SPI0_MISO (pin_size_t[]){22u} +#define PINS_SPI0_MOSI (pin_size_t[]){23u} +#define PINS_SPI0_SCK (pin_size_t[]){18u} +#define PINS_SPI1_CS (pin_size_t[]){19u} +#define PINS_SPI1_MISO (pin_size_t[]){22u} +#define PINS_SPI1_MOSI (pin_size_t[]){23u} +#define PINS_SPI1_SCK (pin_size_t[]){18u} // Wire Interfaces // --------------- @@ -31,15 +39,25 @@ #define PIN_WIRE0_SDA_1 30u // PA_30 #define PIN_WIRE1_SCL 18u // PA_18 #define PIN_WIRE1_SDA 23u // PA_23 +#define PINS_WIRE0_SCL (pin_size_t[]){22u, 29u} +#define PINS_WIRE0_SDA (pin_size_t[]){19u, 30u} +#define PINS_WIRE1_SCL (pin_size_t[]){18u} +#define PINS_WIRE1_SDA (pin_size_t[]){23u} // Serial ports // ------------ -#define PIN_SERIAL0_CTS 19u // PA_19 -#define PIN_SERIAL0_RTS 22u // PA_22 -#define PIN_SERIAL0_RX 18u // PA_18 -#define PIN_SERIAL0_TX 23u // PA_23 -#define PIN_SERIAL2_RX 29u // PA_29 -#define PIN_SERIAL2_TX 30u // PA_30 +#define PIN_SERIAL0_CTS 19u // PA_19 +#define PIN_SERIAL0_RTS 22u // PA_22 +#define PIN_SERIAL0_RX 18u // PA_18 +#define PIN_SERIAL0_TX 23u // PA_23 +#define PIN_SERIAL2_RX 29u // PA_29 +#define PIN_SERIAL2_TX 30u // PA_30 +#define PINS_SERIAL0_CTS (pin_size_t[]){19u} +#define PINS_SERIAL0_RTS (pin_size_t[]){22u} +#define PINS_SERIAL0_RX (pin_size_t[]){18u} +#define PINS_SERIAL0_TX (pin_size_t[]){23u} +#define PINS_SERIAL2_RX (pin_size_t[]){29u} +#define PINS_SERIAL2_TX (pin_size_t[]){30u} // Pin function macros // ------------------- @@ -74,7 +92,6 @@ #define PIN_PA23 23u // PA_23 #define PIN_PA29 29u // PA_29 #define PIN_PA30 30u // PA_30 -#define PIN_PWM0 23u // PA_23 #define PIN_PWM1 15u // PA_15 #define PIN_PWM2 0u // PA_0 #define PIN_PWM3 12u // PA_12 @@ -85,9 +102,7 @@ #define PIN_RX2 29u // PA_29 #define PIN_SCK0 18u // PA_18 #define PIN_SCK1 18u // PA_18 -#define PIN_SCL0 29u // PA_29 #define PIN_SCL1 18u // PA_18 -#define PIN_SDA0 30u // PA_30 #define PIN_SDA1 23u // PA_23 #define PIN_TX0 23u // PA_23 #define PIN_TX2 30u // PA_30 diff --git a/boards/variants/generic-rtl8720cf-2mb-992k.h b/boards/variants/generic-rtl8720cf-2mb-992k.h index fddd627..4ddb3e7 100644 --- a/boards/variants/generic-rtl8720cf-2mb-992k.h +++ b/boards/variants/generic-rtl8720cf-2mb-992k.h @@ -25,6 +25,10 @@ #define PIN_SPI0_SCK_0 3u // PIN_A3 #define PIN_SPI0_SCK_1 8u // PIN_A8 #define PIN_SPI0_SCK_2 16u // PIN_A16 +#define PINS_SPI0_CS (pin_size_t[]){2u, 7u, 15u} +#define PINS_SPI0_MISO (pin_size_t[]){10u, 20u} +#define PINS_SPI0_MOSI (pin_size_t[]){4u, 9u, 19u} +#define PINS_SPI0_SCK (pin_size_t[]){3u, 8u, 16u} // Wire Interfaces // --------------- @@ -36,6 +40,8 @@ #define PIN_WIRE0_SDA_1 12u // PIN_A12 #define PIN_WIRE0_SDA_2 16u // PIN_A16 #define PIN_WIRE0_SDA_3 20u // PIN_A20 +#define PINS_WIRE0_SCL (pin_size_t[]){2u, 11u, 15u, 19u} +#define PINS_WIRE0_SDA (pin_size_t[]){3u, 12u, 16u, 20u} // Serial ports // ------------ @@ -54,6 +60,17 @@ #define PIN_SERIAL2_RTS 20u // PIN_A20 #define PIN_SERIAL2_RX 15u // PIN_A15 #define PIN_SERIAL2_TX 16u // PIN_A16 +#define PINS_SERIAL0_CTS (pin_size_t[]){10u} +#define PINS_SERIAL0_RTS (pin_size_t[]){9u} +#define PINS_SERIAL0_RX (pin_size_t[]){12u, 13u} +#define PINS_SERIAL0_TX (pin_size_t[]){11u, 14u} +#define PINS_SERIAL1_CTS (pin_size_t[]){4u} +#define PINS_SERIAL1_RX (pin_size_t[]){0u, 2u} +#define PINS_SERIAL1_TX (pin_size_t[]){1u, 3u} +#define PINS_SERIAL2_CTS (pin_size_t[]){19u} +#define PINS_SERIAL2_RTS (pin_size_t[]){20u} +#define PINS_SERIAL2_RX (pin_size_t[]){15u} +#define PINS_SERIAL2_TX (pin_size_t[]){16u} // Pin function macros // ------------------- @@ -61,7 +78,6 @@ #define PIN_CTS0 10u // PIN_A10 #define PIN_CTS1 4u // PIN_A4 #define PIN_CTS2 19u // PIN_A19 -#define PIN_MISO0 20u // PIN_A20 #define PIN_MOSI0 19u // PIN_A19 #define PIN_PA00 0u // PIN_A0 #define PIN_PA01 1u // PIN_A1 @@ -84,23 +100,13 @@ #define PIN_PA20 20u // PIN_A20 #define PIN_PA23 23u // PIN_A23 #define PIN_PWM0 20u // PIN_A20 -#define PIN_PWM1 12u // PIN_A12 -#define PIN_PWM2 14u // PIN_A14 -#define PIN_PWM3 15u // PIN_A15 -#define PIN_PWM4 16u // PIN_A16 #define PIN_PWM5 17u // PIN_A17 #define PIN_PWM6 18u // PIN_A18 #define PIN_PWM7 23u // PIN_A23 #define PIN_RTS0 9u // PIN_A9 #define PIN_RTS2 20u // PIN_A20 -#define PIN_RX0 13u // PIN_A13 -#define PIN_RX1 2u // PIN_A2 #define PIN_RX2 15u // PIN_A15 #define PIN_SCK0 16u // PIN_A16 -#define PIN_SCL0 19u // PIN_A19 -#define PIN_SDA0 20u // PIN_A20 -#define PIN_TX0 14u // PIN_A14 -#define PIN_TX1 3u // PIN_A3 #define PIN_TX2 16u // PIN_A16 // Port availability diff --git a/boards/variants/lsc-lma35-t.h b/boards/variants/lsc-lma35-t.h index 695df45..75ba4fb 100644 --- a/boards/variants/lsc-lma35-t.h +++ b/boards/variants/lsc-lma35-t.h @@ -14,15 +14,21 @@ // Wire Interfaces // --------------- -#define PIN_WIRE2_SCL 0u // GPIO0 -#define PIN_WIRE2_SDA 1u // GPIO1 +#define PIN_WIRE2_SCL 0u // GPIO0 +#define PIN_WIRE2_SDA 1u // GPIO1 +#define PINS_WIRE2_SCL (pin_size_t[]){0u} +#define PINS_WIRE2_SDA (pin_size_t[]){1u} // Serial ports // ------------ -#define PIN_SERIAL1_RX 10u // GPIO10 -#define PIN_SERIAL1_TX 11u // GPIO11 -#define PIN_SERIAL2_RX 1u // GPIO1 -#define PIN_SERIAL2_TX 0u // GPIO0 +#define PIN_SERIAL1_RX 10u // GPIO10 +#define PIN_SERIAL1_TX 11u // GPIO11 +#define PIN_SERIAL2_RX 1u // GPIO1 +#define PIN_SERIAL2_TX 0u // GPIO0 +#define PINS_SERIAL1_RX (pin_size_t[]){10u} +#define PINS_SERIAL1_TX (pin_size_t[]){11u} +#define PINS_SERIAL2_RX (pin_size_t[]){1u} +#define PINS_SERIAL2_TX (pin_size_t[]){0u} // Pin function macros // ------------------- diff --git a/boards/variants/lsc-lma35.h b/boards/variants/lsc-lma35.h index 4a0d153..37b2623 100644 --- a/boards/variants/lsc-lma35.h +++ b/boards/variants/lsc-lma35.h @@ -14,15 +14,21 @@ // Wire Interfaces // --------------- -#define PIN_WIRE2_SCL 0u // GPIO0 -#define PIN_WIRE2_SDA 1u // GPIO1 +#define PIN_WIRE2_SCL 0u // GPIO0 +#define PIN_WIRE2_SDA 1u // GPIO1 +#define PINS_WIRE2_SCL (pin_size_t[]){0u} +#define PINS_WIRE2_SDA (pin_size_t[]){1u} // Serial ports // ------------ -#define PIN_SERIAL1_RX 10u // GPIO10 -#define PIN_SERIAL1_TX 11u // GPIO11 -#define PIN_SERIAL2_RX 1u // GPIO1 -#define PIN_SERIAL2_TX 0u // GPIO0 +#define PIN_SERIAL1_RX 10u // GPIO10 +#define PIN_SERIAL1_TX 11u // GPIO11 +#define PIN_SERIAL2_RX 1u // GPIO1 +#define PIN_SERIAL2_TX 0u // GPIO0 +#define PINS_SERIAL1_RX (pin_size_t[]){10u} +#define PINS_SERIAL1_TX (pin_size_t[]){11u} +#define PINS_SERIAL2_RX (pin_size_t[]){1u} +#define PINS_SERIAL2_TX (pin_size_t[]){0u} // Pin function macros // ------------------- diff --git a/boards/variants/t102-v1.1.h b/boards/variants/t102-v1.1.h index 845ef38..77860ee 100644 --- a/boards/variants/t102-v1.1.h +++ b/boards/variants/t102-v1.1.h @@ -14,17 +14,25 @@ // Wire Interfaces // --------------- -#define PIN_WIRE0_SCL 29u // PA_29 -#define PIN_WIRE0_SDA 30u // PA_30 -#define PIN_WIRE1_SCL 18u // PA_18 -#define PIN_WIRE1_SDA 23u // PA_23 +#define PIN_WIRE0_SCL 29u // PA_29 +#define PIN_WIRE0_SDA 30u // PA_30 +#define PIN_WIRE1_SCL 18u // PA_18 +#define PIN_WIRE1_SDA 23u // PA_23 +#define PINS_WIRE0_SCL (pin_size_t[]){29u} +#define PINS_WIRE0_SDA (pin_size_t[]){30u} +#define PINS_WIRE1_SCL (pin_size_t[]){18u} +#define PINS_WIRE1_SDA (pin_size_t[]){23u} // Serial ports // ------------ -#define PIN_SERIAL0_RX 18u // PA_18 -#define PIN_SERIAL0_TX 23u // PA_23 -#define PIN_SERIAL2_RX 29u // PA_29 -#define PIN_SERIAL2_TX 30u // PA_30 +#define PIN_SERIAL0_RX 18u // PA_18 +#define PIN_SERIAL0_TX 23u // PA_23 +#define PIN_SERIAL2_RX 29u // PA_29 +#define PIN_SERIAL2_TX 30u // PA_30 +#define PINS_SERIAL0_RX (pin_size_t[]){18u} +#define PINS_SERIAL0_TX (pin_size_t[]){23u} +#define PINS_SERIAL2_RX (pin_size_t[]){29u} +#define PINS_SERIAL2_TX (pin_size_t[]){30u} // Pin function macros // ------------------- @@ -39,7 +47,6 @@ #define PIN_PA23 23u // PA_23 #define PIN_PA29 29u // PA_29 #define PIN_PA30 30u // PA_30 -#define PIN_PWM0 14u // PA_14 #define PIN_PWM1 15u // PA_15 #define PIN_PWM2 0u // PA_0 #define PIN_PWM3 12u // PA_12 diff --git a/boards/variants/t103-v1.0.h b/boards/variants/t103-v1.0.h index 8a3ea9f..140407b 100644 --- a/boards/variants/t103-v1.0.h +++ b/boards/variants/t103-v1.0.h @@ -14,14 +14,22 @@ // SPI Interfaces // -------------- -#define PIN_SPI0_CS 19u // PA_19 -#define PIN_SPI0_MISO 22u // PA_22 -#define PIN_SPI0_MOSI 23u // PA_23 -#define PIN_SPI0_SCK 18u // PA_18 -#define PIN_SPI1_CS 19u // PA_19 -#define PIN_SPI1_MISO 22u // PA_22 -#define PIN_SPI1_MOSI 23u // PA_23 -#define PIN_SPI1_SCK 18u // PA_18 +#define PIN_SPI0_CS 19u // PA_19 +#define PIN_SPI0_MISO 22u // PA_22 +#define PIN_SPI0_MOSI 23u // PA_23 +#define PIN_SPI0_SCK 18u // PA_18 +#define PIN_SPI1_CS 19u // PA_19 +#define PIN_SPI1_MISO 22u // PA_22 +#define PIN_SPI1_MOSI 23u // PA_23 +#define PIN_SPI1_SCK 18u // PA_18 +#define PINS_SPI0_CS (pin_size_t[]){19u} +#define PINS_SPI0_MISO (pin_size_t[]){22u} +#define PINS_SPI0_MOSI (pin_size_t[]){23u} +#define PINS_SPI0_SCK (pin_size_t[]){18u} +#define PINS_SPI1_CS (pin_size_t[]){19u} +#define PINS_SPI1_MISO (pin_size_t[]){22u} +#define PINS_SPI1_MOSI (pin_size_t[]){23u} +#define PINS_SPI1_SCK (pin_size_t[]){18u} // Wire Interfaces // --------------- @@ -31,15 +39,25 @@ #define PIN_WIRE0_SDA_1 30u // PA_30 #define PIN_WIRE1_SCL 18u // PA_18 #define PIN_WIRE1_SDA 23u // PA_23 +#define PINS_WIRE0_SCL (pin_size_t[]){22u, 29u} +#define PINS_WIRE0_SDA (pin_size_t[]){19u, 30u} +#define PINS_WIRE1_SCL (pin_size_t[]){18u} +#define PINS_WIRE1_SDA (pin_size_t[]){23u} // Serial ports // ------------ -#define PIN_SERIAL0_CTS 19u // PA_19 -#define PIN_SERIAL0_RTS 22u // PA_22 -#define PIN_SERIAL0_RX 18u // PA_18 -#define PIN_SERIAL0_TX 23u // PA_23 -#define PIN_SERIAL2_RX 29u // PA_29 -#define PIN_SERIAL2_TX 30u // PA_30 +#define PIN_SERIAL0_CTS 19u // PA_19 +#define PIN_SERIAL0_RTS 22u // PA_22 +#define PIN_SERIAL0_RX 18u // PA_18 +#define PIN_SERIAL0_TX 23u // PA_23 +#define PIN_SERIAL2_RX 29u // PA_29 +#define PIN_SERIAL2_TX 30u // PA_30 +#define PINS_SERIAL0_CTS (pin_size_t[]){19u} +#define PINS_SERIAL0_RTS (pin_size_t[]){22u} +#define PINS_SERIAL0_RX (pin_size_t[]){18u} +#define PINS_SERIAL0_TX (pin_size_t[]){23u} +#define PINS_SERIAL2_RX (pin_size_t[]){29u} +#define PINS_SERIAL2_TX (pin_size_t[]){30u} // Pin function macros // ------------------- @@ -63,7 +81,6 @@ #define PIN_PA23 23u // PA_23 #define PIN_PA29 29u // PA_29 #define PIN_PA30 30u // PA_30 -#define PIN_PWM0 23u // PA_23 #define PIN_PWM1 15u // PA_15 #define PIN_PWM2 0u // PA_0 #define PIN_PWM3 12u // PA_12 @@ -74,9 +91,7 @@ #define PIN_RX2 29u // PA_29 #define PIN_SCK0 18u // PA_18 #define PIN_SCK1 18u // PA_18 -#define PIN_SCL0 29u // PA_29 #define PIN_SCL1 18u // PA_18 -#define PIN_SDA0 30u // PA_30 #define PIN_SDA1 23u // PA_23 #define PIN_TX0 23u // PA_23 #define PIN_TX2 30u // PA_30 diff --git a/boards/variants/wa2.h b/boards/variants/wa2.h index 6c12143..f383a1a 100644 --- a/boards/variants/wa2.h +++ b/boards/variants/wa2.h @@ -14,14 +14,19 @@ // Wire Interfaces // --------------- -#define PIN_WIRE1_SCL 20u // GPIO20 -#define PIN_WIRE1_SDA 21u // GPIO21 +#define PIN_WIRE1_SCL 20u // GPIO20 +#define PIN_WIRE1_SDA 21u // GPIO21 +#define PINS_WIRE1_SCL (pin_size_t[]){20u} +#define PINS_WIRE1_SDA (pin_size_t[]){21u} // Serial ports // ------------ -#define PIN_SERIAL1_RX 10u // GPIO10 -#define PIN_SERIAL1_TX 11u // GPIO11 -#define PIN_SERIAL2_TX 0u // GPIO0 +#define PIN_SERIAL1_RX 10u // GPIO10 +#define PIN_SERIAL1_TX 11u // GPIO11 +#define PIN_SERIAL2_TX 0u // GPIO0 +#define PINS_SERIAL1_RX (pin_size_t[]){10u} +#define PINS_SERIAL1_TX (pin_size_t[]){11u} +#define PINS_SERIAL2_TX (pin_size_t[]){0u} // Pin function macros // ------------------- diff --git a/boards/variants/wb1s.h b/boards/variants/wb1s.h index e68cd92..ef785dc 100644 --- a/boards/variants/wb1s.h +++ b/boards/variants/wb1s.h @@ -14,15 +14,21 @@ // Wire Interfaces // --------------- -#define PIN_WIRE2_SCL 0u // GPIO0 -#define PIN_WIRE2_SDA 1u // GPIO1 +#define PIN_WIRE2_SCL 0u // GPIO0 +#define PIN_WIRE2_SDA 1u // GPIO1 +#define PINS_WIRE2_SCL (pin_size_t[]){0u} +#define PINS_WIRE2_SDA (pin_size_t[]){1u} // Serial ports // ------------ -#define PIN_SERIAL1_RX 10u // GPIO10 -#define PIN_SERIAL1_TX 11u // GPIO11 -#define PIN_SERIAL2_RX 1u // GPIO1 -#define PIN_SERIAL2_TX 0u // GPIO0 +#define PIN_SERIAL1_RX 10u // GPIO10 +#define PIN_SERIAL1_TX 11u // GPIO11 +#define PIN_SERIAL2_RX 1u // GPIO1 +#define PIN_SERIAL2_TX 0u // GPIO0 +#define PINS_SERIAL1_RX (pin_size_t[]){10u} +#define PINS_SERIAL1_TX (pin_size_t[]){11u} +#define PINS_SERIAL2_RX (pin_size_t[]){1u} +#define PINS_SERIAL2_TX (pin_size_t[]){0u} // Pin function macros // ------------------- diff --git a/boards/variants/wb2l-m1.h b/boards/variants/wb2l-m1.h index d9a0aff..31e4c39 100644 --- a/boards/variants/wb2l-m1.h +++ b/boards/variants/wb2l-m1.h @@ -14,17 +14,25 @@ // Wire Interfaces // --------------- -#define PIN_WIRE1_SCL 20u // GPIO20 -#define PIN_WIRE1_SDA 21u // GPIO21 -#define PIN_WIRE2_SCL 0u // GPIO0 -#define PIN_WIRE2_SDA 1u // GPIO1 +#define PIN_WIRE1_SCL 20u // GPIO20 +#define PIN_WIRE1_SDA 21u // GPIO21 +#define PIN_WIRE2_SCL 0u // GPIO0 +#define PIN_WIRE2_SDA 1u // GPIO1 +#define PINS_WIRE1_SCL (pin_size_t[]){20u} +#define PINS_WIRE1_SDA (pin_size_t[]){21u} +#define PINS_WIRE2_SCL (pin_size_t[]){0u} +#define PINS_WIRE2_SDA (pin_size_t[]){1u} // Serial ports // ------------ -#define PIN_SERIAL1_RX 10u // GPIO10 -#define PIN_SERIAL1_TX 11u // GPIO11 -#define PIN_SERIAL2_RX 1u // GPIO1 -#define PIN_SERIAL2_TX 0u // GPIO0 +#define PIN_SERIAL1_RX 10u // GPIO10 +#define PIN_SERIAL1_TX 11u // GPIO11 +#define PIN_SERIAL2_RX 1u // GPIO1 +#define PIN_SERIAL2_TX 0u // GPIO0 +#define PINS_SERIAL1_RX (pin_size_t[]){10u} +#define PINS_SERIAL1_TX (pin_size_t[]){11u} +#define PINS_SERIAL2_RX (pin_size_t[]){1u} +#define PINS_SERIAL2_TX (pin_size_t[]){0u} // Pin function macros // ------------------- diff --git a/boards/variants/wb2l.h b/boards/variants/wb2l.h index 55a5d1b..6a12059 100644 --- a/boards/variants/wb2l.h +++ b/boards/variants/wb2l.h @@ -14,17 +14,25 @@ // Wire Interfaces // --------------- -#define PIN_WIRE1_SCL 20u // GPIO20 -#define PIN_WIRE1_SDA 21u // GPIO21 -#define PIN_WIRE2_SCL 0u // GPIO0 -#define PIN_WIRE2_SDA 1u // GPIO1 +#define PIN_WIRE1_SCL 20u // GPIO20 +#define PIN_WIRE1_SDA 21u // GPIO21 +#define PIN_WIRE2_SCL 0u // GPIO0 +#define PIN_WIRE2_SDA 1u // GPIO1 +#define PINS_WIRE1_SCL (pin_size_t[]){20u} +#define PINS_WIRE1_SDA (pin_size_t[]){21u} +#define PINS_WIRE2_SCL (pin_size_t[]){0u} +#define PINS_WIRE2_SDA (pin_size_t[]){1u} // Serial ports // ------------ -#define PIN_SERIAL1_RX 10u // GPIO10 -#define PIN_SERIAL1_TX 11u // GPIO11 -#define PIN_SERIAL2_RX 1u // GPIO1 -#define PIN_SERIAL2_TX 0u // GPIO0 +#define PIN_SERIAL1_RX 10u // GPIO10 +#define PIN_SERIAL1_TX 11u // GPIO11 +#define PIN_SERIAL2_RX 1u // GPIO1 +#define PIN_SERIAL2_TX 0u // GPIO0 +#define PINS_SERIAL1_RX (pin_size_t[]){10u} +#define PINS_SERIAL1_TX (pin_size_t[]){11u} +#define PINS_SERIAL2_RX (pin_size_t[]){1u} +#define PINS_SERIAL2_TX (pin_size_t[]){0u} // Pin function macros // ------------------- diff --git a/boards/variants/wb2s.h b/boards/variants/wb2s.h index b7b5102..bb7db58 100644 --- a/boards/variants/wb2s.h +++ b/boards/variants/wb2s.h @@ -14,17 +14,25 @@ // Wire Interfaces // --------------- -#define PIN_WIRE1_SCL 20u // GPIO20 -#define PIN_WIRE1_SDA 21u // GPIO21 -#define PIN_WIRE2_SCL 0u // GPIO0 -#define PIN_WIRE2_SDA 1u // GPIO1 +#define PIN_WIRE1_SCL 20u // GPIO20 +#define PIN_WIRE1_SDA 21u // GPIO21 +#define PIN_WIRE2_SCL 0u // GPIO0 +#define PIN_WIRE2_SDA 1u // GPIO1 +#define PINS_WIRE1_SCL (pin_size_t[]){20u} +#define PINS_WIRE1_SDA (pin_size_t[]){21u} +#define PINS_WIRE2_SCL (pin_size_t[]){0u} +#define PINS_WIRE2_SDA (pin_size_t[]){1u} // Serial ports // ------------ -#define PIN_SERIAL1_RX 10u // GPIO10 -#define PIN_SERIAL1_TX 11u // GPIO11 -#define PIN_SERIAL2_RX 1u // GPIO1 -#define PIN_SERIAL2_TX 0u // GPIO0 +#define PIN_SERIAL1_RX 10u // GPIO10 +#define PIN_SERIAL1_TX 11u // GPIO11 +#define PIN_SERIAL2_RX 1u // GPIO1 +#define PIN_SERIAL2_TX 0u // GPIO0 +#define PINS_SERIAL1_RX (pin_size_t[]){10u} +#define PINS_SERIAL1_TX (pin_size_t[]){11u} +#define PINS_SERIAL2_RX (pin_size_t[]){1u} +#define PINS_SERIAL2_TX (pin_size_t[]){0u} // Pin function macros // ------------------- diff --git a/boards/variants/wb3l.h b/boards/variants/wb3l.h index 77e07bc..f3c0b1a 100644 --- a/boards/variants/wb3l.h +++ b/boards/variants/wb3l.h @@ -14,17 +14,25 @@ // Wire Interfaces // --------------- -#define PIN_WIRE1_SCL 20u // GPIO20 -#define PIN_WIRE1_SDA 21u // GPIO21 -#define PIN_WIRE2_SCL 0u // GPIO0 -#define PIN_WIRE2_SDA 1u // GPIO1 +#define PIN_WIRE1_SCL 20u // GPIO20 +#define PIN_WIRE1_SDA 21u // GPIO21 +#define PIN_WIRE2_SCL 0u // GPIO0 +#define PIN_WIRE2_SDA 1u // GPIO1 +#define PINS_WIRE1_SCL (pin_size_t[]){20u} +#define PINS_WIRE1_SDA (pin_size_t[]){21u} +#define PINS_WIRE2_SCL (pin_size_t[]){0u} +#define PINS_WIRE2_SDA (pin_size_t[]){1u} // Serial ports // ------------ -#define PIN_SERIAL1_RX 10u // GPIO10 -#define PIN_SERIAL1_TX 11u // GPIO11 -#define PIN_SERIAL2_RX 1u // GPIO1 -#define PIN_SERIAL2_TX 0u // GPIO0 +#define PIN_SERIAL1_RX 10u // GPIO10 +#define PIN_SERIAL1_TX 11u // GPIO11 +#define PIN_SERIAL2_RX 1u // GPIO1 +#define PIN_SERIAL2_TX 0u // GPIO0 +#define PINS_SERIAL1_RX (pin_size_t[]){10u} +#define PINS_SERIAL1_TX (pin_size_t[]){11u} +#define PINS_SERIAL2_RX (pin_size_t[]){1u} +#define PINS_SERIAL2_TX (pin_size_t[]){0u} // Pin function macros // ------------------- diff --git a/boards/variants/wb3s.h b/boards/variants/wb3s.h index f875fe8..c7a2c32 100644 --- a/boards/variants/wb3s.h +++ b/boards/variants/wb3s.h @@ -14,17 +14,25 @@ // Wire Interfaces // --------------- -#define PIN_WIRE1_SCL 20u // GPIO20 -#define PIN_WIRE1_SDA 21u // GPIO21 -#define PIN_WIRE2_SCL 0u // GPIO0 -#define PIN_WIRE2_SDA 1u // GPIO1 +#define PIN_WIRE1_SCL 20u // GPIO20 +#define PIN_WIRE1_SDA 21u // GPIO21 +#define PIN_WIRE2_SCL 0u // GPIO0 +#define PIN_WIRE2_SDA 1u // GPIO1 +#define PINS_WIRE1_SCL (pin_size_t[]){20u} +#define PINS_WIRE1_SDA (pin_size_t[]){21u} +#define PINS_WIRE2_SCL (pin_size_t[]){0u} +#define PINS_WIRE2_SDA (pin_size_t[]){1u} // Serial ports // ------------ -#define PIN_SERIAL1_RX 10u // GPIO10 -#define PIN_SERIAL1_TX 11u // GPIO11 -#define PIN_SERIAL2_RX 1u // GPIO1 -#define PIN_SERIAL2_TX 0u // GPIO0 +#define PIN_SERIAL1_RX 10u // GPIO10 +#define PIN_SERIAL1_TX 11u // GPIO11 +#define PIN_SERIAL2_RX 1u // GPIO1 +#define PIN_SERIAL2_TX 0u // GPIO0 +#define PINS_SERIAL1_RX (pin_size_t[]){10u} +#define PINS_SERIAL1_TX (pin_size_t[]){11u} +#define PINS_SERIAL2_RX (pin_size_t[]){1u} +#define PINS_SERIAL2_TX (pin_size_t[]){0u} // Pin function macros // ------------------- diff --git a/boards/variants/wblc5.h b/boards/variants/wblc5.h index 256336a..02d25c0 100644 --- a/boards/variants/wblc5.h +++ b/boards/variants/wblc5.h @@ -14,17 +14,25 @@ // Wire Interfaces // --------------- -#define PIN_WIRE1_SCL 20u // GPIO20 -#define PIN_WIRE1_SDA 21u // GPIO21 -#define PIN_WIRE2_SCL 0u // GPIO0 -#define PIN_WIRE2_SDA 1u // GPIO1 +#define PIN_WIRE1_SCL 20u // GPIO20 +#define PIN_WIRE1_SDA 21u // GPIO21 +#define PIN_WIRE2_SCL 0u // GPIO0 +#define PIN_WIRE2_SDA 1u // GPIO1 +#define PINS_WIRE1_SCL (pin_size_t[]){20u} +#define PINS_WIRE1_SDA (pin_size_t[]){21u} +#define PINS_WIRE2_SCL (pin_size_t[]){0u} +#define PINS_WIRE2_SDA (pin_size_t[]){1u} // Serial ports // ------------ -#define PIN_SERIAL1_RX 10u // GPIO10 -#define PIN_SERIAL1_TX 11u // GPIO11 -#define PIN_SERIAL2_RX 1u // GPIO1 -#define PIN_SERIAL2_TX 0u // GPIO0 +#define PIN_SERIAL1_RX 10u // GPIO10 +#define PIN_SERIAL1_TX 11u // GPIO11 +#define PIN_SERIAL2_RX 1u // GPIO1 +#define PIN_SERIAL2_TX 0u // GPIO0 +#define PINS_SERIAL1_RX (pin_size_t[]){10u} +#define PINS_SERIAL1_TX (pin_size_t[]){11u} +#define PINS_SERIAL2_RX (pin_size_t[]){1u} +#define PINS_SERIAL2_TX (pin_size_t[]){0u} // Pin function macros // ------------------- diff --git a/boards/variants/wr1.h b/boards/variants/wr1.h index aee98f0..8c2cd4c 100644 --- a/boards/variants/wr1.h +++ b/boards/variants/wr1.h @@ -14,14 +14,22 @@ // SPI Interfaces // -------------- -#define PIN_SPI0_CS 19u // PA_19 -#define PIN_SPI0_MISO 22u // PA_22 -#define PIN_SPI0_MOSI 23u // PA_23 -#define PIN_SPI0_SCK 18u // PA_18 -#define PIN_SPI1_CS 19u // PA_19 -#define PIN_SPI1_MISO 22u // PA_22 -#define PIN_SPI1_MOSI 23u // PA_23 -#define PIN_SPI1_SCK 18u // PA_18 +#define PIN_SPI0_CS 19u // PA_19 +#define PIN_SPI0_MISO 22u // PA_22 +#define PIN_SPI0_MOSI 23u // PA_23 +#define PIN_SPI0_SCK 18u // PA_18 +#define PIN_SPI1_CS 19u // PA_19 +#define PIN_SPI1_MISO 22u // PA_22 +#define PIN_SPI1_MOSI 23u // PA_23 +#define PIN_SPI1_SCK 18u // PA_18 +#define PINS_SPI0_CS (pin_size_t[]){19u} +#define PINS_SPI0_MISO (pin_size_t[]){22u} +#define PINS_SPI0_MOSI (pin_size_t[]){23u} +#define PINS_SPI0_SCK (pin_size_t[]){18u} +#define PINS_SPI1_CS (pin_size_t[]){19u} +#define PINS_SPI1_MISO (pin_size_t[]){22u} +#define PINS_SPI1_MOSI (pin_size_t[]){23u} +#define PINS_SPI1_SCK (pin_size_t[]){18u} // Wire Interfaces // --------------- @@ -31,15 +39,25 @@ #define PIN_WIRE0_SDA_1 19u // PA_19 #define PIN_WIRE1_SCL 18u // PA_18 #define PIN_WIRE1_SDA 23u // PA_23 +#define PINS_WIRE0_SCL (pin_size_t[]){29u, 22u} +#define PINS_WIRE0_SDA (pin_size_t[]){30u, 19u} +#define PINS_WIRE1_SCL (pin_size_t[]){18u} +#define PINS_WIRE1_SDA (pin_size_t[]){23u} // Serial ports // ------------ -#define PIN_SERIAL0_CTS 19u // PA_19 -#define PIN_SERIAL0_RTS 22u // PA_22 -#define PIN_SERIAL0_RX 18u // PA_18 -#define PIN_SERIAL0_TX 23u // PA_23 -#define PIN_SERIAL2_RX 29u // PA_29 -#define PIN_SERIAL2_TX 30u // PA_30 +#define PIN_SERIAL0_CTS 19u // PA_19 +#define PIN_SERIAL0_RTS 22u // PA_22 +#define PIN_SERIAL0_RX 18u // PA_18 +#define PIN_SERIAL0_TX 23u // PA_23 +#define PIN_SERIAL2_RX 29u // PA_29 +#define PIN_SERIAL2_TX 30u // PA_30 +#define PINS_SERIAL0_CTS (pin_size_t[]){19u} +#define PINS_SERIAL0_RTS (pin_size_t[]){22u} +#define PINS_SERIAL0_RX (pin_size_t[]){18u} +#define PINS_SERIAL0_TX (pin_size_t[]){23u} +#define PINS_SERIAL2_RX (pin_size_t[]){29u} +#define PINS_SERIAL2_TX (pin_size_t[]){30u} // Pin function macros // ------------------- @@ -62,7 +80,6 @@ #define PIN_PA23 23u // PA_23 #define PIN_PA29 29u // PA_29 #define PIN_PA30 30u // PA_30 -#define PIN_PWM0 14u // PA_14 #define PIN_PWM1 15u // PA_15 #define PIN_PWM2 0u // PA_0 #define PIN_PWM4 29u // PA_29 @@ -72,9 +89,7 @@ #define PIN_RX2 29u // PA_29 #define PIN_SCK0 18u // PA_18 #define PIN_SCK1 18u // PA_18 -#define PIN_SCL0 22u // PA_22 #define PIN_SCL1 18u // PA_18 -#define PIN_SDA0 19u // PA_19 #define PIN_SDA1 23u // PA_23 #define PIN_TX0 23u // PA_23 #define PIN_TX2 30u // PA_30 diff --git a/boards/variants/wr1e.h b/boards/variants/wr1e.h index 2a643d8..6d885f1 100644 --- a/boards/variants/wr1e.h +++ b/boards/variants/wr1e.h @@ -14,14 +14,22 @@ // SPI Interfaces // -------------- -#define PIN_SPI0_CS 19u // PA_19 -#define PIN_SPI0_MISO 22u // PA_22 -#define PIN_SPI0_MOSI 23u // PA_23 -#define PIN_SPI0_SCK 18u // PA_18 -#define PIN_SPI1_CS 19u // PA_19 -#define PIN_SPI1_MISO 22u // PA_22 -#define PIN_SPI1_MOSI 23u // PA_23 -#define PIN_SPI1_SCK 18u // PA_18 +#define PIN_SPI0_CS 19u // PA_19 +#define PIN_SPI0_MISO 22u // PA_22 +#define PIN_SPI0_MOSI 23u // PA_23 +#define PIN_SPI0_SCK 18u // PA_18 +#define PIN_SPI1_CS 19u // PA_19 +#define PIN_SPI1_MISO 22u // PA_22 +#define PIN_SPI1_MOSI 23u // PA_23 +#define PIN_SPI1_SCK 18u // PA_18 +#define PINS_SPI0_CS (pin_size_t[]){19u} +#define PINS_SPI0_MISO (pin_size_t[]){22u} +#define PINS_SPI0_MOSI (pin_size_t[]){23u} +#define PINS_SPI0_SCK (pin_size_t[]){18u} +#define PINS_SPI1_CS (pin_size_t[]){19u} +#define PINS_SPI1_MISO (pin_size_t[]){22u} +#define PINS_SPI1_MOSI (pin_size_t[]){23u} +#define PINS_SPI1_SCK (pin_size_t[]){18u} // Wire Interfaces // --------------- @@ -31,15 +39,25 @@ #define PIN_WIRE0_SDA_1 19u // PA_19 #define PIN_WIRE1_SCL 18u // PA_18 #define PIN_WIRE1_SDA 23u // PA_23 +#define PINS_WIRE0_SCL (pin_size_t[]){29u, 22u} +#define PINS_WIRE0_SDA (pin_size_t[]){30u, 19u} +#define PINS_WIRE1_SCL (pin_size_t[]){18u} +#define PINS_WIRE1_SDA (pin_size_t[]){23u} // Serial ports // ------------ -#define PIN_SERIAL0_CTS 19u // PA_19 -#define PIN_SERIAL0_RTS 22u // PA_22 -#define PIN_SERIAL0_RX 18u // PA_18 -#define PIN_SERIAL0_TX 23u // PA_23 -#define PIN_SERIAL2_RX 29u // PA_29 -#define PIN_SERIAL2_TX 30u // PA_30 +#define PIN_SERIAL0_CTS 19u // PA_19 +#define PIN_SERIAL0_RTS 22u // PA_22 +#define PIN_SERIAL0_RX 18u // PA_18 +#define PIN_SERIAL0_TX 23u // PA_23 +#define PIN_SERIAL2_RX 29u // PA_29 +#define PIN_SERIAL2_TX 30u // PA_30 +#define PINS_SERIAL0_CTS (pin_size_t[]){19u} +#define PINS_SERIAL0_RTS (pin_size_t[]){22u} +#define PINS_SERIAL0_RX (pin_size_t[]){18u} +#define PINS_SERIAL0_TX (pin_size_t[]){23u} +#define PINS_SERIAL2_RX (pin_size_t[]){29u} +#define PINS_SERIAL2_TX (pin_size_t[]){30u} // Pin function macros // ------------------- @@ -62,7 +80,6 @@ #define PIN_PA23 23u // PA_23 #define PIN_PA29 29u // PA_29 #define PIN_PA30 30u // PA_30 -#define PIN_PWM0 14u // PA_14 #define PIN_PWM1 15u // PA_15 #define PIN_PWM3 12u // PA_12 #define PIN_PWM4 29u // PA_29 @@ -72,9 +89,7 @@ #define PIN_RX2 29u // PA_29 #define PIN_SCK0 18u // PA_18 #define PIN_SCK1 18u // PA_18 -#define PIN_SCL0 22u // PA_22 #define PIN_SCL1 18u // PA_18 -#define PIN_SDA0 19u // PA_19 #define PIN_SDA1 23u // PA_23 #define PIN_TX0 23u // PA_23 #define PIN_TX2 30u // PA_30 diff --git a/boards/variants/wr2.h b/boards/variants/wr2.h index 142cf0a..b80d862 100644 --- a/boards/variants/wr2.h +++ b/boards/variants/wr2.h @@ -14,17 +14,25 @@ // Wire Interfaces // --------------- -#define PIN_WIRE0_SCL 29u // PA_29 -#define PIN_WIRE0_SDA 30u // PA_30 -#define PIN_WIRE1_SCL 18u // PA_18 -#define PIN_WIRE1_SDA 23u // PA_23 +#define PIN_WIRE0_SCL 29u // PA_29 +#define PIN_WIRE0_SDA 30u // PA_30 +#define PIN_WIRE1_SCL 18u // PA_18 +#define PIN_WIRE1_SDA 23u // PA_23 +#define PINS_WIRE0_SCL (pin_size_t[]){29u} +#define PINS_WIRE0_SDA (pin_size_t[]){30u} +#define PINS_WIRE1_SCL (pin_size_t[]){18u} +#define PINS_WIRE1_SDA (pin_size_t[]){23u} // Serial ports // ------------ -#define PIN_SERIAL0_RX 18u // PA_18 -#define PIN_SERIAL0_TX 23u // PA_23 -#define PIN_SERIAL2_RX 29u // PA_29 -#define PIN_SERIAL2_TX 30u // PA_30 +#define PIN_SERIAL0_RX 18u // PA_18 +#define PIN_SERIAL0_TX 23u // PA_23 +#define PIN_SERIAL2_RX 29u // PA_29 +#define PIN_SERIAL2_TX 30u // PA_30 +#define PINS_SERIAL0_RX (pin_size_t[]){18u} +#define PINS_SERIAL0_TX (pin_size_t[]){23u} +#define PINS_SERIAL2_RX (pin_size_t[]){29u} +#define PINS_SERIAL2_TX (pin_size_t[]){30u} // Pin function macros // ------------------- @@ -40,7 +48,6 @@ #define PIN_PA23 23u // PA_23 #define PIN_PA29 29u // PA_29 #define PIN_PA30 30u // PA_30 -#define PIN_PWM0 14u // PA_14 #define PIN_PWM1 15u // PA_15 #define PIN_PWM2 0u // PA_0 #define PIN_PWM3 12u // PA_12 diff --git a/boards/variants/wr2e.h b/boards/variants/wr2e.h index d663350..f13cb1a 100644 --- a/boards/variants/wr2e.h +++ b/boards/variants/wr2e.h @@ -19,14 +19,23 @@ #define PIN_WIRE0_SDA_1 30u // PA_30 #define PIN_WIRE1_SCL 18u // PA_18 #define PIN_WIRE1_SDA 23u // PA_23 +#define PINS_WIRE0_SCL (pin_size_t[]){29u} +#define PINS_WIRE0_SDA (pin_size_t[]){19u, 30u} +#define PINS_WIRE1_SCL (pin_size_t[]){18u} +#define PINS_WIRE1_SDA (pin_size_t[]){23u} // Serial ports // ------------ -#define PIN_SERIAL0_CTS 19u // PA_19 -#define PIN_SERIAL0_RX 18u // PA_18 -#define PIN_SERIAL0_TX 23u // PA_23 -#define PIN_SERIAL2_RX 29u // PA_29 -#define PIN_SERIAL2_TX 30u // PA_30 +#define PIN_SERIAL0_CTS 19u // PA_19 +#define PIN_SERIAL0_RX 18u // PA_18 +#define PIN_SERIAL0_TX 23u // PA_23 +#define PIN_SERIAL2_RX 29u // PA_29 +#define PIN_SERIAL2_TX 30u // PA_30 +#define PINS_SERIAL0_CTS (pin_size_t[]){19u} +#define PINS_SERIAL0_RX (pin_size_t[]){18u} +#define PINS_SERIAL0_TX (pin_size_t[]){23u} +#define PINS_SERIAL2_RX (pin_size_t[]){29u} +#define PINS_SERIAL2_TX (pin_size_t[]){30u} // Pin function macros // ------------------- @@ -46,7 +55,6 @@ #define PIN_PA23 23u // PA_23 #define PIN_PA29 29u // PA_29 #define PIN_PA30 30u // PA_30 -#define PIN_PWM0 14u // PA_14 #define PIN_PWM1 15u // PA_15 #define PIN_PWM3 12u // PA_12 #define PIN_PWM4 29u // PA_29 @@ -56,7 +64,6 @@ #define PIN_SCK1 18u // PA_18 #define PIN_SCL0 29u // PA_29 #define PIN_SCL1 18u // PA_18 -#define PIN_SDA0 30u // PA_30 #define PIN_SDA1 23u // PA_23 #define PIN_TX0 23u // PA_23 #define PIN_TX2 30u // PA_30 diff --git a/boards/variants/wr3.h b/boards/variants/wr3.h index e479168..df456a7 100644 --- a/boards/variants/wr3.h +++ b/boards/variants/wr3.h @@ -14,14 +14,22 @@ // SPI Interfaces // -------------- -#define PIN_SPI0_CS 19u // PA_19 -#define PIN_SPI0_MISO 22u // PA_22 -#define PIN_SPI0_MOSI 23u // PA_23 -#define PIN_SPI0_SCK 18u // PA_18 -#define PIN_SPI1_CS 19u // PA_19 -#define PIN_SPI1_MISO 22u // PA_22 -#define PIN_SPI1_MOSI 23u // PA_23 -#define PIN_SPI1_SCK 18u // PA_18 +#define PIN_SPI0_CS 19u // PA_19 +#define PIN_SPI0_MISO 22u // PA_22 +#define PIN_SPI0_MOSI 23u // PA_23 +#define PIN_SPI0_SCK 18u // PA_18 +#define PIN_SPI1_CS 19u // PA_19 +#define PIN_SPI1_MISO 22u // PA_22 +#define PIN_SPI1_MOSI 23u // PA_23 +#define PIN_SPI1_SCK 18u // PA_18 +#define PINS_SPI0_CS (pin_size_t[]){19u} +#define PINS_SPI0_MISO (pin_size_t[]){22u} +#define PINS_SPI0_MOSI (pin_size_t[]){23u} +#define PINS_SPI0_SCK (pin_size_t[]){18u} +#define PINS_SPI1_CS (pin_size_t[]){19u} +#define PINS_SPI1_MISO (pin_size_t[]){22u} +#define PINS_SPI1_MOSI (pin_size_t[]){23u} +#define PINS_SPI1_SCK (pin_size_t[]){18u} // Wire Interfaces // --------------- @@ -31,15 +39,25 @@ #define PIN_WIRE0_SDA_1 30u // PA_30 #define PIN_WIRE1_SCL 18u // PA_18 #define PIN_WIRE1_SDA 23u // PA_23 +#define PINS_WIRE0_SCL (pin_size_t[]){22u, 29u} +#define PINS_WIRE0_SDA (pin_size_t[]){19u, 30u} +#define PINS_WIRE1_SCL (pin_size_t[]){18u} +#define PINS_WIRE1_SDA (pin_size_t[]){23u} // Serial ports // ------------ -#define PIN_SERIAL0_CTS 19u // PA_19 -#define PIN_SERIAL0_RTS 22u // PA_22 -#define PIN_SERIAL0_RX 18u // PA_18 -#define PIN_SERIAL0_TX 23u // PA_23 -#define PIN_SERIAL2_RX 29u // PA_29 -#define PIN_SERIAL2_TX 30u // PA_30 +#define PIN_SERIAL0_CTS 19u // PA_19 +#define PIN_SERIAL0_RTS 22u // PA_22 +#define PIN_SERIAL0_RX 18u // PA_18 +#define PIN_SERIAL0_TX 23u // PA_23 +#define PIN_SERIAL2_RX 29u // PA_29 +#define PIN_SERIAL2_TX 30u // PA_30 +#define PINS_SERIAL0_CTS (pin_size_t[]){19u} +#define PINS_SERIAL0_RTS (pin_size_t[]){22u} +#define PINS_SERIAL0_RX (pin_size_t[]){18u} +#define PINS_SERIAL0_TX (pin_size_t[]){23u} +#define PINS_SERIAL2_RX (pin_size_t[]){29u} +#define PINS_SERIAL2_TX (pin_size_t[]){30u} // Pin function macros // ------------------- @@ -63,7 +81,6 @@ #define PIN_PA23 23u // PA_23 #define PIN_PA29 29u // PA_29 #define PIN_PA30 30u // PA_30 -#define PIN_PWM0 23u // PA_23 #define PIN_PWM1 15u // PA_15 #define PIN_PWM2 0u // PA_0 #define PIN_PWM3 12u // PA_12 @@ -74,9 +91,7 @@ #define PIN_RX2 29u // PA_29 #define PIN_SCK0 18u // PA_18 #define PIN_SCK1 18u // PA_18 -#define PIN_SCL0 29u // PA_29 #define PIN_SCL1 18u // PA_18 -#define PIN_SDA0 30u // PA_30 #define PIN_SDA1 23u // PA_23 #define PIN_TX0 23u // PA_23 #define PIN_TX2 30u // PA_30 diff --git a/boards/variants/wr3e.h b/boards/variants/wr3e.h index 4a4c942..38269d3 100644 --- a/boards/variants/wr3e.h +++ b/boards/variants/wr3e.h @@ -14,14 +14,22 @@ // SPI Interfaces // -------------- -#define PIN_SPI0_CS 19u // PA_19 -#define PIN_SPI0_MISO 22u // PA_22 -#define PIN_SPI0_MOSI 23u // PA_23 -#define PIN_SPI0_SCK 18u // PA_18 -#define PIN_SPI1_CS 19u // PA_19 -#define PIN_SPI1_MISO 22u // PA_22 -#define PIN_SPI1_MOSI 23u // PA_23 -#define PIN_SPI1_SCK 18u // PA_18 +#define PIN_SPI0_CS 19u // PA_19 +#define PIN_SPI0_MISO 22u // PA_22 +#define PIN_SPI0_MOSI 23u // PA_23 +#define PIN_SPI0_SCK 18u // PA_18 +#define PIN_SPI1_CS 19u // PA_19 +#define PIN_SPI1_MISO 22u // PA_22 +#define PIN_SPI1_MOSI 23u // PA_23 +#define PIN_SPI1_SCK 18u // PA_18 +#define PINS_SPI0_CS (pin_size_t[]){19u} +#define PINS_SPI0_MISO (pin_size_t[]){22u} +#define PINS_SPI0_MOSI (pin_size_t[]){23u} +#define PINS_SPI0_SCK (pin_size_t[]){18u} +#define PINS_SPI1_CS (pin_size_t[]){19u} +#define PINS_SPI1_MISO (pin_size_t[]){22u} +#define PINS_SPI1_MOSI (pin_size_t[]){23u} +#define PINS_SPI1_SCK (pin_size_t[]){18u} // Wire Interfaces // --------------- @@ -31,15 +39,25 @@ #define PIN_WIRE0_SDA_1 19u // PA_19 #define PIN_WIRE1_SCL 18u // PA_18 #define PIN_WIRE1_SDA 23u // PA_23 +#define PINS_WIRE0_SCL (pin_size_t[]){29u, 22u} +#define PINS_WIRE0_SDA (pin_size_t[]){30u, 19u} +#define PINS_WIRE1_SCL (pin_size_t[]){18u} +#define PINS_WIRE1_SDA (pin_size_t[]){23u} // Serial ports // ------------ -#define PIN_SERIAL0_CTS 19u // PA_19 -#define PIN_SERIAL0_RTS 22u // PA_22 -#define PIN_SERIAL0_RX 18u // PA_18 -#define PIN_SERIAL0_TX 23u // PA_23 -#define PIN_SERIAL2_RX 29u // PA_29 -#define PIN_SERIAL2_TX 30u // PA_30 +#define PIN_SERIAL0_CTS 19u // PA_19 +#define PIN_SERIAL0_RTS 22u // PA_22 +#define PIN_SERIAL0_RX 18u // PA_18 +#define PIN_SERIAL0_TX 23u // PA_23 +#define PIN_SERIAL2_RX 29u // PA_29 +#define PIN_SERIAL2_TX 30u // PA_30 +#define PINS_SERIAL0_CTS (pin_size_t[]){19u} +#define PINS_SERIAL0_RTS (pin_size_t[]){22u} +#define PINS_SERIAL0_RX (pin_size_t[]){18u} +#define PINS_SERIAL0_TX (pin_size_t[]){23u} +#define PINS_SERIAL2_RX (pin_size_t[]){29u} +#define PINS_SERIAL2_TX (pin_size_t[]){30u} // Pin function macros // ------------------- @@ -63,7 +81,6 @@ #define PIN_PA23 23u // PA_23 #define PIN_PA29 29u // PA_29 #define PIN_PA30 30u // PA_30 -#define PIN_PWM0 23u // PA_23 #define PIN_PWM1 15u // PA_15 #define PIN_PWM2 0u // PA_0 #define PIN_PWM3 12u // PA_12 @@ -74,9 +91,7 @@ #define PIN_RX2 29u // PA_29 #define PIN_SCK0 18u // PA_18 #define PIN_SCK1 18u // PA_18 -#define PIN_SCL0 22u // PA_22 #define PIN_SCL1 18u // PA_18 -#define PIN_SDA0 19u // PA_19 #define PIN_SDA1 23u // PA_23 #define PIN_TX0 23u // PA_23 #define PIN_TX2 30u // PA_30 diff --git a/boards/variants/wr3l.h b/boards/variants/wr3l.h index 5a692a6..0a10156 100644 --- a/boards/variants/wr3l.h +++ b/boards/variants/wr3l.h @@ -14,14 +14,22 @@ // SPI Interfaces // -------------- -#define PIN_SPI0_CS 19u // PA_19 -#define PIN_SPI0_MISO 22u // PA_22 -#define PIN_SPI0_MOSI 23u // PA_23 -#define PIN_SPI0_SCK 18u // PA_18 -#define PIN_SPI1_CS 19u // PA_19 -#define PIN_SPI1_MISO 22u // PA_22 -#define PIN_SPI1_MOSI 23u // PA_23 -#define PIN_SPI1_SCK 18u // PA_18 +#define PIN_SPI0_CS 19u // PA_19 +#define PIN_SPI0_MISO 22u // PA_22 +#define PIN_SPI0_MOSI 23u // PA_23 +#define PIN_SPI0_SCK 18u // PA_18 +#define PIN_SPI1_CS 19u // PA_19 +#define PIN_SPI1_MISO 22u // PA_22 +#define PIN_SPI1_MOSI 23u // PA_23 +#define PIN_SPI1_SCK 18u // PA_18 +#define PINS_SPI0_CS (pin_size_t[]){19u} +#define PINS_SPI0_MISO (pin_size_t[]){22u} +#define PINS_SPI0_MOSI (pin_size_t[]){23u} +#define PINS_SPI0_SCK (pin_size_t[]){18u} +#define PINS_SPI1_CS (pin_size_t[]){19u} +#define PINS_SPI1_MISO (pin_size_t[]){22u} +#define PINS_SPI1_MOSI (pin_size_t[]){23u} +#define PINS_SPI1_SCK (pin_size_t[]){18u} // Wire Interfaces // --------------- @@ -31,15 +39,25 @@ #define PIN_WIRE0_SDA_1 30u // PA_30 #define PIN_WIRE1_SCL 18u // PA_18 #define PIN_WIRE1_SDA 23u // PA_23 +#define PINS_WIRE0_SCL (pin_size_t[]){22u, 29u} +#define PINS_WIRE0_SDA (pin_size_t[]){19u, 30u} +#define PINS_WIRE1_SCL (pin_size_t[]){18u} +#define PINS_WIRE1_SDA (pin_size_t[]){23u} // Serial ports // ------------ -#define PIN_SERIAL0_CTS 19u // PA_19 -#define PIN_SERIAL0_RTS 22u // PA_22 -#define PIN_SERIAL0_RX 18u // PA_18 -#define PIN_SERIAL0_TX 23u // PA_23 -#define PIN_SERIAL2_RX 29u // PA_29 -#define PIN_SERIAL2_TX 30u // PA_30 +#define PIN_SERIAL0_CTS 19u // PA_19 +#define PIN_SERIAL0_RTS 22u // PA_22 +#define PIN_SERIAL0_RX 18u // PA_18 +#define PIN_SERIAL0_TX 23u // PA_23 +#define PIN_SERIAL2_RX 29u // PA_29 +#define PIN_SERIAL2_TX 30u // PA_30 +#define PINS_SERIAL0_CTS (pin_size_t[]){19u} +#define PINS_SERIAL0_RTS (pin_size_t[]){22u} +#define PINS_SERIAL0_RX (pin_size_t[]){18u} +#define PINS_SERIAL0_TX (pin_size_t[]){23u} +#define PINS_SERIAL2_RX (pin_size_t[]){29u} +#define PINS_SERIAL2_TX (pin_size_t[]){30u} // Pin function macros // ------------------- @@ -63,7 +81,6 @@ #define PIN_PA23 23u // PA_23 #define PIN_PA29 29u // PA_29 #define PIN_PA30 30u // PA_30 -#define PIN_PWM0 23u // PA_23 #define PIN_PWM1 15u // PA_15 #define PIN_PWM2 0u // PA_0 #define PIN_PWM3 12u // PA_12 @@ -74,9 +91,7 @@ #define PIN_RX2 29u // PA_29 #define PIN_SCK0 18u // PA_18 #define PIN_SCK1 18u // PA_18 -#define PIN_SCL0 29u // PA_29 #define PIN_SCL1 18u // PA_18 -#define PIN_SDA0 30u // PA_30 #define PIN_SDA1 23u // PA_23 #define PIN_TX0 23u // PA_23 #define PIN_TX2 30u // PA_30 diff --git a/boards/variants/wr3le.h b/boards/variants/wr3le.h index 8063f1b..da682ac 100644 --- a/boards/variants/wr3le.h +++ b/boards/variants/wr3le.h @@ -14,14 +14,22 @@ // SPI Interfaces // -------------- -#define PIN_SPI0_CS 19u // PA_19 -#define PIN_SPI0_MISO 22u // PA_22 -#define PIN_SPI0_MOSI 23u // PA_23 -#define PIN_SPI0_SCK 18u // PA_18 -#define PIN_SPI1_CS 19u // PA_19 -#define PIN_SPI1_MISO 22u // PA_22 -#define PIN_SPI1_MOSI 23u // PA_23 -#define PIN_SPI1_SCK 18u // PA_18 +#define PIN_SPI0_CS 19u // PA_19 +#define PIN_SPI0_MISO 22u // PA_22 +#define PIN_SPI0_MOSI 23u // PA_23 +#define PIN_SPI0_SCK 18u // PA_18 +#define PIN_SPI1_CS 19u // PA_19 +#define PIN_SPI1_MISO 22u // PA_22 +#define PIN_SPI1_MOSI 23u // PA_23 +#define PIN_SPI1_SCK 18u // PA_18 +#define PINS_SPI0_CS (pin_size_t[]){19u} +#define PINS_SPI0_MISO (pin_size_t[]){22u} +#define PINS_SPI0_MOSI (pin_size_t[]){23u} +#define PINS_SPI0_SCK (pin_size_t[]){18u} +#define PINS_SPI1_CS (pin_size_t[]){19u} +#define PINS_SPI1_MISO (pin_size_t[]){22u} +#define PINS_SPI1_MOSI (pin_size_t[]){23u} +#define PINS_SPI1_SCK (pin_size_t[]){18u} // Wire Interfaces // --------------- @@ -31,15 +39,25 @@ #define PIN_WIRE0_SDA_1 19u // PA_19 #define PIN_WIRE1_SCL 18u // PA_18 #define PIN_WIRE1_SDA 23u // PA_23 +#define PINS_WIRE0_SCL (pin_size_t[]){29u, 22u} +#define PINS_WIRE0_SDA (pin_size_t[]){30u, 19u} +#define PINS_WIRE1_SCL (pin_size_t[]){18u} +#define PINS_WIRE1_SDA (pin_size_t[]){23u} // Serial ports // ------------ -#define PIN_SERIAL0_CTS 19u // PA_19 -#define PIN_SERIAL0_RTS 22u // PA_22 -#define PIN_SERIAL0_RX 18u // PA_18 -#define PIN_SERIAL0_TX 23u // PA_23 -#define PIN_SERIAL2_RX 29u // PA_29 -#define PIN_SERIAL2_TX 30u // PA_30 +#define PIN_SERIAL0_CTS 19u // PA_19 +#define PIN_SERIAL0_RTS 22u // PA_22 +#define PIN_SERIAL0_RX 18u // PA_18 +#define PIN_SERIAL0_TX 23u // PA_23 +#define PIN_SERIAL2_RX 29u // PA_29 +#define PIN_SERIAL2_TX 30u // PA_30 +#define PINS_SERIAL0_CTS (pin_size_t[]){19u} +#define PINS_SERIAL0_RTS (pin_size_t[]){22u} +#define PINS_SERIAL0_RX (pin_size_t[]){18u} +#define PINS_SERIAL0_TX (pin_size_t[]){23u} +#define PINS_SERIAL2_RX (pin_size_t[]){29u} +#define PINS_SERIAL2_TX (pin_size_t[]){30u} // Pin function macros // ------------------- @@ -63,7 +81,6 @@ #define PIN_PA23 23u // PA_23 #define PIN_PA29 29u // PA_29 #define PIN_PA30 30u // PA_30 -#define PIN_PWM0 23u // PA_23 #define PIN_PWM1 15u // PA_15 #define PIN_PWM2 0u // PA_0 #define PIN_PWM3 12u // PA_12 @@ -74,9 +91,7 @@ #define PIN_RX2 29u // PA_29 #define PIN_SCK0 18u // PA_18 #define PIN_SCK1 18u // PA_18 -#define PIN_SCL0 22u // PA_22 #define PIN_SCL1 18u // PA_18 -#define PIN_SDA0 19u // PA_19 #define PIN_SDA1 23u // PA_23 #define PIN_TX0 23u // PA_23 #define PIN_TX2 30u // PA_30 diff --git a/boards/variants/wr3n.h b/boards/variants/wr3n.h index 0c44afa..e608a29 100644 --- a/boards/variants/wr3n.h +++ b/boards/variants/wr3n.h @@ -14,17 +14,25 @@ // Wire Interfaces // --------------- -#define PIN_WIRE0_SCL 29u // PA_29 -#define PIN_WIRE0_SDA 30u // PA_30 -#define PIN_WIRE1_SCL 18u // PA_18 -#define PIN_WIRE1_SDA 23u // PA_23 +#define PIN_WIRE0_SCL 29u // PA_29 +#define PIN_WIRE0_SDA 30u // PA_30 +#define PIN_WIRE1_SCL 18u // PA_18 +#define PIN_WIRE1_SDA 23u // PA_23 +#define PINS_WIRE0_SCL (pin_size_t[]){29u} +#define PINS_WIRE0_SDA (pin_size_t[]){30u} +#define PINS_WIRE1_SCL (pin_size_t[]){18u} +#define PINS_WIRE1_SDA (pin_size_t[]){23u} // Serial ports // ------------ -#define PIN_SERIAL0_RX 18u // PA_18 -#define PIN_SERIAL0_TX 23u // PA_23 -#define PIN_SERIAL2_RX 29u // PA_29 -#define PIN_SERIAL2_TX 30u // PA_30 +#define PIN_SERIAL0_RX 18u // PA_18 +#define PIN_SERIAL0_TX 23u // PA_23 +#define PIN_SERIAL2_RX 29u // PA_29 +#define PIN_SERIAL2_TX 30u // PA_30 +#define PINS_SERIAL0_RX (pin_size_t[]){18u} +#define PINS_SERIAL0_TX (pin_size_t[]){23u} +#define PINS_SERIAL2_RX (pin_size_t[]){29u} +#define PINS_SERIAL2_TX (pin_size_t[]){30u} // Pin function macros // ------------------- @@ -40,7 +48,6 @@ #define PIN_PA23 23u // PA_23 #define PIN_PA29 29u // PA_29 #define PIN_PA30 30u // PA_30 -#define PIN_PWM0 23u // PA_23 #define PIN_PWM1 15u // PA_15 #define PIN_PWM2 0u // PA_0 #define PIN_PWM3 12u // PA_12