diff --git a/Sming/SmingCore/Wire.cpp b/Sming/SmingCore/Wire.cpp index 36e3c2c932..bdec5b1a19 100644 --- a/Sming/SmingCore/Wire.cpp +++ b/Sming/SmingCore/Wire.cpp @@ -54,20 +54,20 @@ TwoWire::TwoWire(){} // Public Methods ////////////////////////////////////////////////////////////// -void TwoWire::begin(int scl, int sda){ +void TwoWire::begin(int sda, int scl){ default_sda_pin = sda; default_scl_pin = scl; twi_init(sda, scl); flush(); } -void TwoWire::pins(int scl, int sda){ +void TwoWire::pins(int sda, int scl){ default_sda_pin = sda; default_scl_pin = scl; } void TwoWire::begin(void){ - begin(default_scl_pin, default_sda_pin); + begin(default_sda_pin, default_scl_pin); } void TwoWire::begin(uint8_t address){ diff --git a/Sming/SmingCore/Wire.h b/Sming/SmingCore/Wire.h index f2ca80880d..e69604e35b 100644 --- a/Sming/SmingCore/Wire.h +++ b/Sming/SmingCore/Wire.h @@ -48,8 +48,8 @@ class TwoWire : public Stream static void onReceiveService(uint8_t*, int); public: TwoWire(); - void begin(int scl, int sda); - void pins(int scl, int sda); + void begin(int sda, int scl); + void pins(int sda, int scl); void begin(); void begin(uint8_t); void begin(int); diff --git a/samples/Accelerometer_MMA7455/app/application.cpp b/samples/Accelerometer_MMA7455/app/application.cpp index e3773672da..605755eb74 100644 --- a/samples/Accelerometer_MMA7455/app/application.cpp +++ b/samples/Accelerometer_MMA7455/app/application.cpp @@ -29,7 +29,7 @@ void init() Serial.println("Starting..."); // You can change pins: - //Wire.pins(12, 14); // SCL, SDA + //Wire.pins(14, 12); // SDA, SCL Wire.begin(); // Select the Working Mode diff --git a/samples/Arducam/app/application.cpp b/samples/Arducam/app/application.cpp index 397704c6ba..53fbfca837 100644 --- a/samples/Arducam/app/application.cpp +++ b/samples/Arducam/app/application.cpp @@ -75,7 +75,7 @@ void initCam() { Serial.printf("ArduCAM init!"); // initialize I2C - Wire.pins(CAM_SCL, CAM_SDA); + Wire.pins(CAM_SDA, CAM_SCL); Wire.begin(); //Check if the camera module type is OV2640 diff --git a/samples/Basic_ScannerI2C/app/application.cpp b/samples/Basic_ScannerI2C/app/application.cpp index 889e24d298..58d820748c 100644 --- a/samples/Basic_ScannerI2C/app/application.cpp +++ b/samples/Basic_ScannerI2C/app/application.cpp @@ -81,10 +81,10 @@ void init() WDT.enable(false); // First (but not the best) option: fully disable watch dog timer - // Default I2C pins (SCL:0 , SDA: 2) + // Default I2C pins (SDA: 2, SCL:0) // You can change pins: - //Wire.pins(12, 14); // SCL, SDA + //Wire.pins(14, 12); // SDA, SCL Wire.begin(); procTimer.initializeMs(3000, scanBus).start(); diff --git a/samples/DS3232RTC_NTP_Setter/app/application.cpp b/samples/DS3232RTC_NTP_Setter/app/application.cpp index b0f07492e0..4f2d43b23d 100644 --- a/samples/DS3232RTC_NTP_Setter/app/application.cpp +++ b/samples/DS3232RTC_NTP_Setter/app/application.cpp @@ -41,7 +41,7 @@ void init() { Serial.begin(SERIAL_BAUD_RATE); Serial.println("Sming DSRTC_NTP_SETTER started!"); - Wire.pins(0, 2); //Change to your SCL - 0,SDA - 2 GPIO pin number + Wire.pins(2, 0); //Change to your SDA - 2, SCL - 0 GPIO pin number Wire.begin(); // Station - WiFi client diff --git a/samples/Humidity_AM2321/app/application.cpp b/samples/Humidity_AM2321/app/application.cpp index fd3afb8f8e..5949c3d1e9 100644 --- a/samples/Humidity_AM2321/app/application.cpp +++ b/samples/Humidity_AM2321/app/application.cpp @@ -31,7 +31,7 @@ void init() delay(500); // Apply I2C pins - Wire.pins(SCL, SDA); + Wire.pins(SDA, SCL); Wire.begin(); am2321.begin(); // REQUIRED. Call it after choosing I2C pins. diff --git a/samples/Humidity_SI7021/app/application.cpp b/samples/Humidity_SI7021/app/application.cpp index dd0b1772da..eb4ed1383e 100644 --- a/samples/Humidity_SI7021/app/application.cpp +++ b/samples/Humidity_SI7021/app/application.cpp @@ -84,7 +84,7 @@ void init() Serial.begin(SERIAL_BAUD_RATE); // 115200 by default Serial.systemDebugOutput(true); // Allow debug output to serial Serial.print("Start I2c"); - Wire.pins(I2C_SCL, I2C_SDA); // SCL, SDA + Wire.pins(I2C_SDA, I2C_SCL); // SDA, SCL Wire.begin(); procTimer_ht.initializeMs(10000, si_read_ht).start(); procTimer_olt.initializeMs(15000, si_read_olt).start(); diff --git a/samples/MeteoControl_mqtt/app/application.cpp b/samples/MeteoControl_mqtt/app/application.cpp index aa81e93e43..b73c03dd57 100644 --- a/samples/MeteoControl_mqtt/app/application.cpp +++ b/samples/MeteoControl_mqtt/app/application.cpp @@ -14,7 +14,7 @@ void init() { Serial.begin(SERIAL_BAUD_RATE); // 115200 by default - Wire.pins(5, 4); // SCL, SDA + Wire.pins(4, 5); // SDA, SCL Wire.begin(); // initialization config diff --git a/samples/PortExpander_MCP23017/app/application.cpp b/samples/PortExpander_MCP23017/app/application.cpp index 6810c50b23..e42d3680d1 100644 --- a/samples/PortExpander_MCP23017/app/application.cpp +++ b/samples/PortExpander_MCP23017/app/application.cpp @@ -18,7 +18,7 @@ void init() Serial.begin(115200); // You can select ESP I2C pins here: - //Wire.pins(4, 5); // SCL, SDA + //Wire.pins(5, 4); // SDA, SCL mcp.begin(0); // 0 - for default mcp address, possible values: 0..7