From 3e9f6d69fb102a216d2d437c505d1b000fe9c458 Mon Sep 17 00:00:00 2001 From: Leonardo Cavagnis Date: Fri, 25 Jul 2025 11:23:27 +0200 Subject: [PATCH 1/2] add WIRE_INTERFACES_COUNT for back-compatibility --- variants/MINIMA/pins_arduino.h | 7 ++++--- variants/MUXTO/pins_arduino.h | 7 ++++--- variants/NANOR4/pins_arduino.h | 11 ++++++----- variants/OPTA_ANALOG/pins_arduino.h | 5 +++-- variants/OPTA_DIGITAL/pins_arduino.h | 7 ++++--- variants/PORTENTA_C33/pins_arduino.h | 19 ++++++++++--------- variants/UNOWIFIR4/pins_arduino.h | 11 ++++++----- 7 files changed, 37 insertions(+), 30 deletions(-) diff --git a/variants/MINIMA/pins_arduino.h b/variants/MINIMA/pins_arduino.h index 2786bc95a..a541b1f27 100644 --- a/variants/MINIMA/pins_arduino.h +++ b/variants/MINIMA/pins_arduino.h @@ -110,9 +110,10 @@ static const uint8_t D15 = PIN_D15; /****** WIRE CORE DEFINES ******/ -#define WIRE_HOWMANY 1 -#define WIRE_SDA_PIN 18 /* A4 */ -#define WIRE_SCL_PIN 19 /* A5 */ +#define WIRE_HOWMANY 1 +#define WIRE_INTERFACES_COUNT WIRE_HOWMANY +#define WIRE_SDA_PIN 18 /* A4 */ +#define WIRE_SCL_PIN 19 /* A5 */ static const uint8_t SDA = WIRE_SDA_PIN; static const uint8_t SCL = WIRE_SCL_PIN; diff --git a/variants/MUXTO/pins_arduino.h b/variants/MUXTO/pins_arduino.h index 002ea3bfa..aebe8c891 100644 --- a/variants/MUXTO/pins_arduino.h +++ b/variants/MUXTO/pins_arduino.h @@ -145,9 +145,10 @@ static const uint8_t A6 = PIN_A6; /****** WIRE CORE DEFINES ******/ -#define WIRE_HOWMANY 1 -#define WIRE_SDA_PIN 20 -#define WIRE_SCL_PIN 21 +#define WIRE_HOWMANY 1 +#define WIRE_INTERFACES_COUNT WIRE_HOWMANY +#define WIRE_SDA_PIN 20 +#define WIRE_SCL_PIN 21 // TODO: removeme #ifdef __cplusplus diff --git a/variants/NANOR4/pins_arduino.h b/variants/NANOR4/pins_arduino.h index d0ad8a41d..af5fbca7d 100644 --- a/variants/NANOR4/pins_arduino.h +++ b/variants/NANOR4/pins_arduino.h @@ -117,11 +117,12 @@ static const uint8_t D15 = PIN_D15; /****** WIRE CORE DEFINES ******/ -#define WIRE_HOWMANY 2 -#define WIRE_SDA_PIN 18 /* A4 */ -#define WIRE_SCL_PIN 19 /* A5 */ -#define WIRE1_SDA_PIN 27 -#define WIRE1_SCL_PIN 26 +#define WIRE_HOWMANY 2 +#define WIRE_INTERFACES_COUNT WIRE_HOWMANY +#define WIRE_SDA_PIN 18 /* A4 */ +#define WIRE_SCL_PIN 19 /* A5 */ +#define WIRE1_SDA_PIN 27 +#define WIRE1_SCL_PIN 26 static const uint8_t SDA = WIRE_SDA_PIN; static const uint8_t SCL = WIRE_SCL_PIN; diff --git a/variants/OPTA_ANALOG/pins_arduino.h b/variants/OPTA_ANALOG/pins_arduino.h index 37981bffd..4f6dc0e38 100644 --- a/variants/OPTA_ANALOG/pins_arduino.h +++ b/variants/OPTA_ANALOG/pins_arduino.h @@ -74,8 +74,9 @@ extern "C" unsigned int PINCOUNT_fn(); #define UART1_RX_PIN UART_RX /* ************************** WIRE CORE DEFINES **************************** */ #define WIRE_HOWMANY 1 -#define WIRE_SDA_PIN I2C_SDA -#define WIRE_SCL_PIN I2C_SCL +#define WIRE_INTERFACES_COUNT WIRE_HOWMANY +#define WIRE_SDA_PIN I2C_SDA +#define WIRE_SCL_PIN I2C_SCL static const uint8_t SDA = WIRE_SDA_PIN; static const uint8_t SCL = WIRE_SDA_PIN; /* *************************** SPI CORE DEFINES **************************** */ diff --git a/variants/OPTA_DIGITAL/pins_arduino.h b/variants/OPTA_DIGITAL/pins_arduino.h index d163e0817..8fcfe2dfd 100644 --- a/variants/OPTA_DIGITAL/pins_arduino.h +++ b/variants/OPTA_DIGITAL/pins_arduino.h @@ -138,9 +138,10 @@ static const uint8_t A15 = AN15; #define UART1_RX_PIN UART_TX /****** WIRE CORE DEFINES ******/ -#define WIRE_HOWMANY 1 -#define WIRE_SDA_PIN I2C_SDA -#define WIRE_SCL_PIN I2C_SCL +#define WIRE_HOWMANY 1 +#define WIRE_INTERFACES_COUNT WIRE_HOWMANY +#define WIRE_SDA_PIN I2C_SDA +#define WIRE_SCL_PIN I2C_SCL static const uint8_t SDA = WIRE_SDA_PIN; static const uint8_t SCL = WIRE_SDA_PIN; diff --git a/variants/PORTENTA_C33/pins_arduino.h b/variants/PORTENTA_C33/pins_arduino.h index 2193ee5b9..ab66f611d 100644 --- a/variants/PORTENTA_C33/pins_arduino.h +++ b/variants/PORTENTA_C33/pins_arduino.h @@ -99,15 +99,16 @@ static const uint8_t D7 = PIN_D7; /****** WIRE CORE DEFINES ******/ -#define WIRE_HOWMANY 4 -#define WIRE_SDA_PIN 11 -#define WIRE_SCL_PIN 12 -#define WIRE1_SDA_PIN 37 -#define WIRE1_SCL_PIN 38 -#define WIRE2_SDA_PIN 39 -#define WIRE2_SCL_PIN 40 -#define WIRE3_SDA_PIN 96 -#define WIRE3_SCL_PIN 97 +#define WIRE_HOWMANY 4 +#define WIRE_INTERFACES_COUNT WIRE_HOWMANY +#define WIRE_SDA_PIN 11 +#define WIRE_SCL_PIN 12 +#define WIRE1_SDA_PIN 37 +#define WIRE1_SCL_PIN 38 +#define WIRE2_SDA_PIN 39 +#define WIRE2_SCL_PIN 40 +#define WIRE3_SDA_PIN 96 +#define WIRE3_SCL_PIN 97 /****** SPI CORE DEFINES ******/ diff --git a/variants/UNOWIFIR4/pins_arduino.h b/variants/UNOWIFIR4/pins_arduino.h index b16d73fd3..846232136 100644 --- a/variants/UNOWIFIR4/pins_arduino.h +++ b/variants/UNOWIFIR4/pins_arduino.h @@ -113,11 +113,12 @@ static const uint8_t D15 = PIN_D15; /****** WIRE CORE DEFINES ******/ -#define WIRE_HOWMANY 2 -#define WIRE_SDA_PIN 18 /* A4 */ -#define WIRE_SCL_PIN 19 /* A5 */ -#define WIRE1_SDA_PIN 27 -#define WIRE1_SCL_PIN 26 +#define WIRE_HOWMANY 2 +#define WIRE_INTERFACES_COUNT WIRE_HOWMANY +#define WIRE_SDA_PIN 18 /* A4 */ +#define WIRE_SCL_PIN 19 /* A5 */ +#define WIRE1_SDA_PIN 27 +#define WIRE1_SCL_PIN 26 static const uint8_t SDA = WIRE_SDA_PIN; static const uint8_t SCL = WIRE_SCL_PIN; From 8e57285331709635367523c9de9875d047cce39c Mon Sep 17 00:00:00 2001 From: Leonardo Cavagnis Date: Fri, 25 Jul 2025 11:23:46 +0200 Subject: [PATCH 2/2] fix wire scl pin in opta analog and digital --- variants/OPTA_ANALOG/pins_arduino.h | 2 +- variants/OPTA_DIGITAL/pins_arduino.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/variants/OPTA_ANALOG/pins_arduino.h b/variants/OPTA_ANALOG/pins_arduino.h index 4f6dc0e38..b28a92613 100644 --- a/variants/OPTA_ANALOG/pins_arduino.h +++ b/variants/OPTA_ANALOG/pins_arduino.h @@ -78,7 +78,7 @@ extern "C" unsigned int PINCOUNT_fn(); #define WIRE_SDA_PIN I2C_SDA #define WIRE_SCL_PIN I2C_SCL static const uint8_t SDA = WIRE_SDA_PIN; -static const uint8_t SCL = WIRE_SDA_PIN; +static const uint8_t SCL = WIRE_SCL_PIN; /* *************************** SPI CORE DEFINES **************************** */ #define SPI_HOWMANY 1 #define PIN_SPI_MOSI SPI_MOSI diff --git a/variants/OPTA_DIGITAL/pins_arduino.h b/variants/OPTA_DIGITAL/pins_arduino.h index 8fcfe2dfd..f976f2cbf 100644 --- a/variants/OPTA_DIGITAL/pins_arduino.h +++ b/variants/OPTA_DIGITAL/pins_arduino.h @@ -144,7 +144,7 @@ static const uint8_t A15 = AN15; #define WIRE_SCL_PIN I2C_SCL static const uint8_t SDA = WIRE_SDA_PIN; -static const uint8_t SCL = WIRE_SDA_PIN; +static const uint8_t SCL = WIRE_SCL_PIN; /****** SPI CORE DEFINES ******/