Merge pull request #867 from cyberman54/development

development

platformio_orig.ini

@@ -54,7 +54,7 @@ extra_scripts = pre:build.py
 otakeyfile = ota.conf
 lorakeyfile = loraconf.h
 lmicconfigfile = lmic_config.h
-platform_espressif32 = espressif32@3.5.0
+platform_espressif32 = espressif32@4.1.0
 monitor_speed = 115200
 upload_speed = 115200 ; set by build.py and taken from hal file
 display_library = ; set by build.py and taken from hal file
@@ -77,7 +77,7 @@ lib_deps_sensors =
     boschsensortec/BSEC Software Library @ 1.6.1480
     https://github.com/cyberman54/sds-dust-sensors-arduino-library.git
 lib_deps_basic =
-    https://github.com/dbSuS/libpax.git @ ^1.0.0
+    https://github.com/dbSuS/libpax.git
     https://github.com/SukkoPera/Arduino-Rokkit-Hash.git
     bblanchon/ArduinoJson @ ^6
     makuna/RTC @ ^2.3.5
@@ -122,15 +122,11 @@ monitor_filters = time, esp32_exception_decoder, default
 
 [env:ota]
 upload_protocol = custom
-platform = https://github.com/platformio/platform-espressif32.git#feature/arduino-upstream
-platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#1e388a2
 
 [env:usb]
 upload_protocol = esptool
-platform = https://github.com/platformio/platform-espressif32.git#feature/arduino-upstream
-platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#1e388a2
 
 [env:dev]
 upload_protocol = esptool
 platform = https://github.com/platformio/platform-espressif32.git#feature/arduino-upstream
-platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#c1e388a2
+platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git

src/i2c.cpp

@@ -49,7 +49,7 @@ void i2c_scan(void) {
   ESP_LOGI(TAG, "Starting I2C bus scan...");
 
   memset(&bbi2c, 0, sizeof(bbi2c));
-  bbi2c.bWire = 0;
+  bbi2c.bWire = 1;
   bbi2c.iSDA = MY_DISPLAY_SDA;
   bbi2c.iSCL = MY_DISPLAY_SCL;
   I2CInit(&bbi2c, 100000L); // Scan at 100KHz low speed