diff --git a/platformio.ini b/platformio.ini index 568b395b..258c4699 100644 --- a/platformio.ini +++ b/platformio.ini @@ -39,9 +39,9 @@ ; MoonModules entries ; =================== -; default_envs = esp32_4MB_min, esp32_4MB_max, esp32_16MB_max, esp8266_4MB_min, esp32_4MB_PSRAM_max, esp32S3_8MB_max, wemos_shield_esp32_4MB_max, wemos_shield_esp32_4MB_ICS4343x_max, wemos_shield_esp32_4MB_SPM1423_max, wemos_shield_esp32_4MB_LineIn_max, wemos_shield_esp32_16MB_max, , wemos_shield_esp32_16MB_ICS4343x_max, wemos_shield_esp32_16MB_SPM1423_max, wemos_shield_esp32_16MB_LineIn_max, esp32_pico_4MB_max +default_envs = esp32_4MB_min, esp32_4MB_max, esp32_16MB_max, esp8266_4MB_min, esp32_4MB_PSRAM_max, esp32S3_8MB_max, wemos_shield_esp32_4MB_max, wemos_shield_esp32_4MB_ICS4343x_max, wemos_shield_esp32_4MB_SPM1423_max, wemos_shield_esp32_4MB_LineIn_max, wemos_shield_esp32_16MB_max, , wemos_shield_esp32_16MB_ICS4343x_max, wemos_shield_esp32_16MB_SPM1423_max, wemos_shield_esp32_16MB_LineIn_max, esp32_pico_4MB_max ; default_envs = esp32_4MB_min -default_envs = esp32_4MB_max ; recommended default +; default_envs = esp32_4MB_max ; recommended default ; default_envs = esp32_16MB_max ; default_envs = esp8266_4MB_min ; default_envs = esp32_4MB_V4_min @@ -625,7 +625,7 @@ lib_deps_min = ; monitor_filters = esp32_exception_decoder ; used to show crash details build_flags_max = - -D WLED_MAX_USERMODS=12 ; default only 4-6 + -D WLED_MAX_USERMODS=14 ; default only 4-6 ;; -D ARDUINO_USB_CDC_ON_BOOT=0 ; needed for arduino-esp32 >=2.0.4 ewowi to softhack: move to build_flags_min? - We need a different solution -D WLED_USE_MY_CONFIG ; include custom my_config.h ewowi to softhack: redundant as also in build_flags_min? -D USERMOD_DALLASTEMPERATURE @@ -640,12 +640,17 @@ build_flags_max = -D USERMOD_BATTERY_USE_LIPO ;; use new "decharging curve" for LiPo cells -D USERMOD_BH1750 -D USERMOD_ANIMATED_STAIRCASE + ; -D USERMOD_RTC ;; experimental + ; -D USERMOD_SENSORSTOMQTT ;; experimental lib_deps_max = OneWire@~2.3.5 ; used for USERMOD_FOUR_LINE_DISPLAY and USERMOD_DALLASTEMPERATURE olikraus/U8g2 @ ^2.28.8 ; used for USERMOD_FOUR_LINE_DISPLAY ElectronicCats/MPU6050 @ 0.6.0 ; used for USERMOD_MPU6050_IMU claws/BH1750 @^1.2.0 ; used for USERMOD_BH1750 + ; adafruit/Adafruit BMP280 Library @ 2.1.0 ;; experimental for usermod USERMOD_SENSORSTOMQTT + ; adafruit/Adafruit CCS811 Library @ 1.0.4 ;; experimental for usermod USERMOD_SENSORSTOMQTT + ; adafruit/Adafruit Si7021 Library @ 1.4.0 ;; experimental for usermod USERMOD_SENSORSTOMQTT ; end of common diff --git a/usermods/BH1750_v2/usermod_bh1750.h b/usermods/BH1750_v2/usermod_bh1750.h index 1e7ae48b..a3754e6d 100644 --- a/usermods/BH1750_v2/usermod_bh1750.h +++ b/usermods/BH1750_v2/usermod_bh1750.h @@ -1,5 +1,5 @@ -// force the compiler to show a warning to confirm that this file is included -#warning **** Included USERMOD_BH1750 **** +// force the compiler to show a warning to confirm that this file is included WLEDMM: commented this warning as we want serious warnings ;-) +// #warning **** Included USERMOD_BH1750 **** #pragma once diff --git a/usermods/BME280_v2/usermod_bme280.h b/usermods/BME280_v2/usermod_bme280.h index c27adfc8..e32314f4 100644 --- a/usermods/BME280_v2/usermod_bme280.h +++ b/usermods/BME280_v2/usermod_bme280.h @@ -1,5 +1,5 @@ -// force the compiler to show a warning to confirm that this file is included -#warning **** Included USERMOD_BME280 version 2.0 **** +// force the compiler to show a warning to confirm that this file is included WLEDMM: commented this warning as we want serious warnings ;-) +// #warning **** Included USERMOD_BME280 version 2.0 **** #pragma once diff --git a/usermods/mpu6050_imu/usermod_mpu6050_imu.h b/usermods/mpu6050_imu/usermod_mpu6050_imu.h index b1b9f4de..12904c0a 100644 --- a/usermods/mpu6050_imu/usermod_mpu6050_imu.h +++ b/usermods/mpu6050_imu/usermod_mpu6050_imu.h @@ -119,13 +119,10 @@ class MPU6050Driver : public Usermod { void setup() { // WLEDMM begin USER_PRINTLN(F("mpu setup")); - int8_t hw_scl = i2c_scl; - int8_t hw_sda = i2c_sda; - - PinManagerPinType pins[2] = { { hw_scl, true }, { hw_sda, true } }; - if ((hw_scl < 0) || (hw_sda < 0)) { + PinManagerPinType pins[2] = { { i2c_scl, true }, { i2c_sda, true } }; + if ((i2c_scl < 0) || (i2c_sda < 0)) { //enabled = false; - USER_PRINTF("mpu6050: warning - ivalid I2C pins: sda=%d scl=%d\n", hw_sda, hw_scl); + USER_PRINTF("mpu6050: warning - ivalid I2C pins: sda=%d scl=%d\n", i2c_sda, i2c_scl); //return; } @@ -133,7 +130,7 @@ class MPU6050Driver : public Usermod { if (!pinManager.allocateMultiplePins(pins, 2, PinOwner::HW_I2C)) { enabled = false; - USER_PRINTF("mpu6050: failed to allocate I2C sda=%d scl=%d\n", hw_sda, hw_scl); + USER_PRINTF("mpu6050: failed to allocate I2C sda=%d scl=%d\n", i2c_sda, i2c_scl); return; } // WLEDMM end diff --git a/usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.h b/usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.h index a110794a..ec03ff34 100644 --- a/usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.h +++ b/usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.h @@ -1186,9 +1186,7 @@ class FourLineDisplayUsermod : public Usermod { bool isHW = (oldPin[0]==spi_sclk && oldPin[1]==spi_mosi); if (isHW) po = PinOwner::HW_SPI; } else { - uint8_t hw_scl = i2c_scl; - uint8_t hw_sda = i2c_sda; - bool isHW = (oldPin[0]==hw_scl && oldPin[1]==hw_sda); + bool isHW = (oldPin[0]==i2c_scl && oldPin[1]==i2c_sda); if (isHW) po = PinOwner::HW_I2C; } pinManager.deallocateMultiplePins((const uint8_t *)oldPin, 2, po); diff --git a/wled00/wled.h b/wled00/wled.h index a888e1e8..2260e559 100644 --- a/wled00/wled.h +++ b/wled00/wled.h @@ -8,7 +8,7 @@ */ // version code in format yymmddb (b = daily build) -#define VERSION 2301030 +#define VERSION 2301080 //uncomment this if you have a "my_config.h" file you'd like to use //#define WLED_USE_MY_CONFIG