diff --git a/libraries/Wire/src/Wire.cpp b/libraries/Wire/src/Wire.cpp index 0bab0fd58..ae05e2752 100644 --- a/libraries/Wire/src/Wire.cpp +++ b/libraries/Wire/src/Wire.cpp @@ -77,8 +77,12 @@ bool TwoWire::initPins(int sdaPin, int sclPin) } } else { if(sda==-1) { +#ifdef WIRE1_PIN_DEFINED + sdaPin = SDA1; +#else log_e("no Default SDA Pin for Second Peripheral"); return false; //no Default pin for Second Peripheral +#endif } else { sdaPin = sda; // reuse prior pin } @@ -94,8 +98,12 @@ bool TwoWire::initPins(int sdaPin, int sclPin) } } else { if(scl == -1) { +#ifdef WIRE1_PIN_DEFINED + sclPin = SCL1; +#else log_e("no Default SCL Pin for Second Peripheral"); return false; //no Default pin for Second Peripheral +#endif } else { sclPin = scl; // reuse prior pin } diff --git a/variants/Microduino-esp32/pins_arduino.h b/variants/Microduino-esp32/pins_arduino.h index 368be4ad1..034bd6173 100644 --- a/variants/Microduino-esp32/pins_arduino.h +++ b/variants/Microduino-esp32/pins_arduino.h @@ -26,6 +26,7 @@ static const uint8_t RX = 3; static const uint8_t SDA = 22;//23; static const uint8_t SCL = 21;//19; +#define WIRE1_PIN_DEFINED 1 // See Wire.cpp at bool TwoWire::initPins(int sdaPin, int sclPin) static const uint8_t SDA1 = 12; static const uint8_t SCL1 = 13; diff --git a/variants/adafruit_qtpy_esp32/pins_arduino.h b/variants/adafruit_qtpy_esp32/pins_arduino.h index cfd3af3a1..a72310676 100644 --- a/variants/adafruit_qtpy_esp32/pins_arduino.h +++ b/variants/adafruit_qtpy_esp32/pins_arduino.h @@ -23,6 +23,7 @@ static const uint8_t RX = 7; static const uint8_t SDA = 4; static const uint8_t SCL = 33; +#define WIRE1_PIN_DEFINED 1 // See Wire.cpp at bool TwoWire::initPins(int sdaPin, int sclPin) static const uint8_t SDA1 = 22; static const uint8_t SCL1 = 19; diff --git a/variants/adafruit_qtpy_esp32s2/pins_arduino.h b/variants/adafruit_qtpy_esp32s2/pins_arduino.h index d2ebca325..4c9c15247 100644 --- a/variants/adafruit_qtpy_esp32s2/pins_arduino.h +++ b/variants/adafruit_qtpy_esp32s2/pins_arduino.h @@ -29,6 +29,7 @@ static const uint8_t SDA = 7; static const uint8_t SCL = 6; +#define WIRE1_PIN_DEFINED 1 // See Wire.cpp at bool TwoWire::initPins(int sdaPin, int sclPin) static const uint8_t SDA1 = 41; static const uint8_t SCL1 = 40; diff --git a/variants/adafruit_qtpy_esp32s3_nopsram/pins_arduino.h b/variants/adafruit_qtpy_esp32s3_nopsram/pins_arduino.h index 86e893129..22336df4a 100644 --- a/variants/adafruit_qtpy_esp32s3_nopsram/pins_arduino.h +++ b/variants/adafruit_qtpy_esp32s3_nopsram/pins_arduino.h @@ -30,6 +30,7 @@ static const uint8_t RX = 16; static const uint8_t SDA = 7; static const uint8_t SCL = 6; +#define WIRE1_PIN_DEFINED 1 // See Wire.cpp at bool TwoWire::initPins(int sdaPin, int sclPin) static const uint8_t SDA1 = 41; static const uint8_t SCL1 = 40; diff --git a/variants/esp32micromod/pins_arduino.h b/variants/esp32micromod/pins_arduino.h index 80dd6ee54..abf2735e4 100755 --- a/variants/esp32micromod/pins_arduino.h +++ b/variants/esp32micromod/pins_arduino.h @@ -21,6 +21,7 @@ static const uint8_t SDA = 21; static const uint8_t SCL = 22; static const uint8_t I2C_INT = 4; +#define WIRE1_PIN_DEFINED 1 // See Wire.cpp at bool TwoWire::initPins(int sdaPin, int sclPin) static const uint8_t SDA1 = 26; static const uint8_t SCL1 = 25; diff --git a/variants/openkb/pins_arduino.h b/variants/openkb/pins_arduino.h index d16409617..4928bd495 100644 --- a/variants/openkb/pins_arduino.h +++ b/variants/openkb/pins_arduino.h @@ -81,6 +81,7 @@ static const uint8_t OUTPUT2 = 27; static const uint8_t SDA0 = 21; static const uint8_t SCL0 = 22; +#define WIRE1_PIN_DEFINED 1 // See Wire.cpp at bool TwoWire::initPins(int sdaPin, int sclPin) static const uint8_t SDA1 = 4; static const uint8_t SCL1 = 5;