Merge branch 'development' into new-release

benzino77 · Jun 5, 2024 · aa7d999 · aa7d999
2 parents eb5c971 + 272916e
commit aa7d999
Show file tree

Hide file tree

Showing 35 changed files with 446 additions and 242 deletions.
diff --git a/FEATURES_DESC.md b/FEATURES_DESC.md
@@ -1,28 +1,33 @@
 #### This file includes description of sensors included in features group one could select.
 
-| Energy sensors     | Air sensors        | Temperature/Humidity/Pressure Sensors | Displays                | Distance sensors | Light sensors  |
-| ------------------ | ------------------ | ------------------------------------- | ----------------------- | ---------------- | -------------- |
-| `USE_HLW8012`      | `USE_MHZ19`        | `USE_SONOFF_SC`                       | `USE_DISPLAY_MODES1TO5` | `USE_SR04`       | `USE_BH1750`   |
-| `USE_CSE7766`      | `USE_SENSEAIR`     | `USE_DS18x20`                         | `USE_DISPLAY_SSD1306`   | `USE_VL53L0X`    | `USE_VEML6070` |
-| `USE_PZEM004T`     | `USE_PMS5003`      | `USE_DHT`                             | `USE_DISPLAY_MATRIX`    | `USE_HRXL`       | `USE_TSL2561`  |
-| `USE_MCP39F501`    | `USE_MGS`          | `USE_SHT`                             | `USE_DISPLAY_ILI9341`   | `USE_DYP`        | `USE_SI1145`   |
-| `USE_PZEM_AC`      | `USE_NOVA_SDS`     | `USE_HTU`                             | `USE_DISPLAY_EPAPER_29` | `USE_VL53L1X`    | `USE_APDS9960` |
-| `USE_PZEM_DC`      | `USE_SGP30`        | `USE_BMP`                             | `USE_DISPLAY_EPAPER_42` |                  | `USE_VEML6075` |
-| `USE_ADE7953`      | `USE_CCS811`       | `USE_SHT3X`                           | `USE_DISPLAY_SH1106`    |                  | `USE_MAX44009` |
-| `USE_SDM120`       | `USE_SCD30`        | `USE_LM75AD`                          | `USE_DISPLAY_ILI9488`   |                  | `USE_TSL2591`  |
-| `USE_DDS2382`      | `USE_SPS30`        | `USE_APDS9960`                        | `USE_DISPLAY_SSD1351`   |                  | `USE_AS3935`   |
-| `USE_SDM630`       | `USE_HPMA`         | `USE_AZ7798`                          | `USE_DISPLAY_RA8876`    |                  | `USE_VEML7700` |
-| `USE_DDSU666`      | `USE_IAQ`          | `USE_MAX31855`                        | `USE_DISPLAY_SEVENSEG`  |                  |                |
-| `USE_SOLAX_X1`     | `USE_T67XX`        | `USE_MLX90614`                        | `USE_DISPLAY_ST7789`    |                  |                |
-| `USE_LE01MR`       | `USE_VINDRIKTNING` | `USE_MAX31865`                        | `USE_DISPLAY_SSD1331`   |                  |                |
-| `USE_BL09XX`       | `USE_SCD40`        | `USE_HIH6`                            |                         |                  |                |
-| `USE_TELEINFO`     | `USE_HM330X`       | `USE_DHT12`                           |                         |                  |                |
-| `USE_IEM3000`      | `USE_SEN5X`        | `USE_DS1624`                          |                         |                  |                |
-| `USE_WE517`        | `USE_SGP4X`        | `USE_AHT1x`                           |                         |                  |                |
-| `USE_ENERGY_DUMMY` |                    | `USE_HDC1080`                         |                         |                  |                |
-| `USE_IEM3000`      |                    | `USE_MCP9808`                         |                         |                  |                |
-|                    |                    | `USE_LMT01`                           |                         |                  |                |
-|                    |                    | `USE_AM2320`                          |                         |                  |                |
+> [!Note]
+>
+> All of the features includes by default `USE_I2C` and `USE_SPI`
+
+| Energy sensors     | Air sensors        | Temperature/Humidity/Pressure Sensors | Displays                 | LVGL                              | Distance sensors | Light sensors  |
+| ------------------ | ------------------ | ------------------------------------- | ------------------------ | --------------------------------- | ---------------- | -------------- |
+| `USE_HLW8012`      | `USE_MHZ19`        | `USE_SONOFF_SC`                       | `USE_DISPLAY_TM1637`     | `USE_LVGL`                        | `USE_SR04`       | `USE_BH1750`   |
+| `USE_CSE7766`      | `USE_SENSEAIR`     | `USE_DS18x20`                         | `USE_DISPLAY_MAX7219`    | `USE_MPU_ACCEL`                   | `USE_VL53L0X`    | `USE_VEML6070` |
+| `USE_PZEM004T`     | `USE_PMS5003`      | `USE_DHT`                             | `USE_DISPLAY_MODES1TO5`  | `USE_RTC_CHIPS`                   | `USE_HRXL`       | `USE_TSL2561`  |
+| `USE_MCP39F501`    | `USE_MGS`          | `USE_SHT`                             | `USE_DISPLAY_LCD `       | `USE_BM8563`                      | `USE_DYP`        | `USE_SI1145`   |
+| `USE_PZEM_AC`      | `USE_NOVA_SDS`     | `USE_HTU`                             | `USE_DISPLAY_MATRIX `    | `USE_XPT2046`                     | `USE_VL53L1X`    | `USE_APDS9960` |
+| `USE_PZEM_DC`      | `USE_SGP30`        | `USE_BMP`                             | `USE_DISPLAY_TM1650 `    | `USE_FT5206`                      | `USE_VEML6075`   |
+| `USE_ADE7953`      | `USE_CCS811`       | `USE_SHT3X`                           | `USE_DISPLAY_EPAPER_29 ` | `USE_GT911`                       | `USE_MAX44009`   |
+| `USE_SDM120`       | `USE_SCD30`        | `USE_LM75AD`                          | `USE_DISPLAY_EPAPER_42`  | `USE_CST816S`                     | `USE_TSL2591`    |
+| `USE_DDS2382`      | `USE_SPS30`        | `USE_APDS9960`                        | `USE_DISPLAY_RA8876`     | `USE_DISPLAY_LVGL_ONLY`           | `USE_AS3935`     |
+| `USE_SDM630`       | `USE_HPMA`         | `USE_AZ7798`                          | `USE_DISPLAY_SEVENSEG`   | `USE_ENHANCED_GUI_WIFI_SCAN`      | `USE_VEML7700`   |
+| `USE_DDSU666`      | `USE_IAQ`          | `USE_MAX31855`                        | `USE_DISPLAY`            | `ROTARY_V1`                       |                  |
+| `USE_SOLAX_X1`     | `USE_T67XX`        | `USE_MLX90614`                        | `USE_UNIVERSAL_DISPLAY`  | `USE_BUZZER`                      |                  |
+| `USE_LE01MR`       | `USE_VINDRIKTNING` | `USE_MAX31865`                        | `USE_UNIVERSAL_TOUCH`    | `USE_LIGHT_PALETTE`               |                  |
+| `USE_BL09XX`       | `USE_SCD40`        | `USE_HIH6`                            | `USE_TASMOTA_DISCOVERY`  | `USE_SHELLY_PRO`                  |                  |
+| `USE_TELEINFO`     | `USE_HM330X`       | `USE_DHT12`                           |                          | `USE_SERIAL_BRIDGE`               |                  |
+| `USE_IEM3000`      | `USE_SEN5X`        | `USE_DS1624`                          |                          | `USE_DISPLAY`                     |                  |
+| `USE_WE517`        | `USE_SGP4X`        | `USE_AHT1x`                           |                          | `USE_UNIVERSAL_DISPLAY`           |                  |
+| `USE_ENERGY_DUMMY` |                    | `USE_HDC1080`                         |                          | `USE_UNIVERSAL_TOUCH`             |                  |
+| `USE_IEM3000`      |                    | `USE_MCP9808`                         |                          | `USE_TASMOTA_DISCOVERY`           |                  |
+|                    |                    | `USE_LMT01`                           |                          | `SET_ESP32_STACK_SIZE` - editable |                  |
+|                    |                    | `USE_AM2320`                          |                          |                                   |                  |
+|                    |                    | `USE_BME68X`                          |                          |                                   |                  |
 
 | Alexa                | Rules                  | Bluetooth       | IO port expander             | SD card/LittleFS | ModBus Bridge          | Shutters and Blinds                       |
 | -------------------- | ---------------------- | --------------- | ---------------------------- | ---------------- | ---------------------- | ----------------------------------------- |

diff --git a/ansible/roles/compile/files/esp32_c2/platformio_override.ini b/ansible/roles/compile/files/esp32_c2/platformio_override.ini
@@ -0,0 +1,8 @@
+[platformio]
+default_envs = tasmota32c2
+
+[env:tasmota32c2]
+extends = env:tasmota32_base
+board = esp32c2
+build_unflags = ${env:tasmota32_base.build_unflags} -mno-target-align
+build_flags = ${env:tasmota32_base.build_flags}
diff --git a/...stackcore2/user_config_override_minimal.h → ...s/esp32_c2/user_config_override_minimal.h b/...stackcore2/user_config_override_minimal.h → ...s/esp32_c2/user_config_override_minimal.h
@@ -4,7 +4,7 @@
 #ifdef CODE_IMAGE_STR
   #undef CODE_IMAGE_STR
 #endif
-#define CODE_IMAGE_STR "TasmoCompiler-esp32m5"
+#define CODE_IMAGE_STR "TasmoCompiler-esp32c2"
 
 #ifdef USE_ENERGY_SENSOR
   #undef USE_ENERGY_SENSOR
@@ -46,6 +46,10 @@
   #undef USE_SPS30
 #endif
 
+#ifdef USE_SGP4X
+  #undef USE_SGP4X
+#endif
+
 #ifdef USE_SEN5X
   #undef USE_SEN5X
 #endif
@@ -112,6 +116,66 @@
   #undef USE_ADC_VCC
 #endif
 
+#ifdef USE_DISPLAY
+  #undef USE_DISPLAY
+#endif
+
+#ifdef USE_DISPLAY_MODES1TO5
+  #undef USE_DISPLAY_MODES1TO5
+#endif
+
+#ifdef USE_DISPLAY_LCD
+  #undef USE_DISPLAY_LCD
+#endif
+
+#ifdef USE_DISPLAY_SSD1306
+  #undef USE_DISPLAY_SSD1306
+#endif
+
+#ifdef USE_DISPLAY_MATRIX
+  #undef USE_DISPLAY_MATRIX
+#endif
+
+#ifdef USE_DISPLAY_ILI9341
+  #undef USE_DISPLAY_ILI9341
+#endif
+
+#ifdef USE_DISPLAY_EPAPER_29
+  #undef USE_DISPLAY_EPAPER_29
+#endif
+
+#ifdef USE_DISPLAY_EPAPER_42
+  #undef USE_DISPLAY_EPAPER_42
+#endif
+
+#ifdef USE_DISPLAY_SH1106
+  #undef USE_DISPLAY_SH1106
+#endif
+
+#ifdef USE_DISPLAY_ILI9488
+  #undef USE_DISPLAY_ILI9488
+#endif
+
+#ifdef USE_DISPLAY_SSD1351
+  #undef USE_DISPLAY_SSD1351
+#endif
+
+#ifdef USE_DISPLAY_RA8876
+  #undef USE_DISPLAY_RA8876
+#endif
+
+#ifdef USE_DISPLAY_SEVENSEG
+  #undef USE_DISPLAY_SEVENSEG
+#endif
+
+#ifdef USE_DISPLAY_ST7789
+  #undef USE_DISPLAY_ST7789
+#endif
+
+#ifdef USE_DISPLAY_SSD1331
+  #undef USE_DISPLAY_SSD1331
+#endif
+
 #ifdef USE_SR04
   #undef USE_SR04
 #endif
@@ -215,7 +279,6 @@
 #ifdef USE_I2C
   #undef USE_I2C
 #endif
-#define USE_I2C
 
 #ifdef USE_MCP230xx
   #undef USE_MCP230xx
@@ -285,12 +348,12 @@
   #undef USE_DISCOVERY
 #endif
 
-#ifdef USE_MODBUSBRIDGE
-  #undef USE_MODBUSBRIDGE
+#ifdef USE_MODBUS_BRIDGE
+  #undef USE_MODBUS_BRIDGE
 #endif
 
-#ifdef USE_MODBUSBRIDGE_TCP
-  #undef USE_MODBUSBRIDGE_TCP
+#ifdef USE_MODBUS_BRIDGE_TCP
+  #undef USE_MODBUS_BRIDGE_TCP
 #endif
 
 #ifdef USE_MQTT_TLS
@@ -433,6 +496,10 @@
   #undef USE_AM2320
 #endif
 
+#ifdef USE_BME68X
+  #undef USE_BME68X
+#endif
+
 #ifdef USE_TIMERS
   #undef USE_TIMERS
 #endif
@@ -455,31 +522,6 @@
   #undef USE_ZIGBEE
 #endif
 
-#ifdef USE_DISPLAY
-  #undef USE_DISPLAY
-#endif
-#define USE_DISPLAY
-
-#ifdef USE_I2S_SAY_TIME
-  #undef USE_I2S_SAY_TIME
-#endif
-#define USE_I2S_SAY_TIME
-
-#ifdef USE_I2S_WEBRADIO
-  #undef USE_I2S_WEBRADIO
-#endif
-#define USE_I2S_WEBRADIO
-
-#ifdef USE_SENDMAIL
-  #undef USE_SENDMAIL
-#endif
-#define USE_SENDMAIL
-
-#ifdef USE_ESP32MAIL
-  #undef USE_ESP32MAIL
-#endif
-#define USE_ESP32MAIL
-
 #ifdef MY_LANGUAGE
   #undef MY_LANGUAGE
 #endif

diff --git a/...stackcore2/user_config_override_temphum.h → ...s/esp32_c2/user_config_override_temphum.h b/...stackcore2/user_config_override_temphum.h → ...s/esp32_c2/user_config_override_temphum.h
@@ -4,7 +4,7 @@
 #ifdef CODE_IMAGE_STR
   #undef CODE_IMAGE_STR
 #endif
-#define CODE_IMAGE_STR "TasmoCompiler-esp32m5"
+#define CODE_IMAGE_STR "TasmoCompiler-esp32c2"
 
 #ifdef USE_ENERGY_SENSOR
   #undef USE_ENERGY_SENSOR
@@ -46,6 +46,10 @@
   #undef USE_SPS30
 #endif
 
+#ifdef USE_SGP4X
+  #undef USE_SGP4X
+#endif
+
 #ifdef USE_SEN5X
   #undef USE_SEN5X
 #endif
@@ -112,6 +116,66 @@
   #undef USE_ADC_VCC
 #endif
 
+#ifdef USE_DISPLAY
+  #undef USE_DISPLAY
+#endif
+
+#ifdef USE_DISPLAY_MODES1TO5
+  #undef USE_DISPLAY_MODES1TO5
+#endif
+
+#ifdef USE_DISPLAY_LCD
+  #undef USE_DISPLAY_LCD
+#endif
+
+#ifdef USE_DISPLAY_SSD1306
+  #undef USE_DISPLAY_SSD1306
+#endif
+
+#ifdef USE_DISPLAY_MATRIX
+  #undef USE_DISPLAY_MATRIX
+#endif
+
+#ifdef USE_DISPLAY_ILI9341
+  #undef USE_DISPLAY_ILI9341
+#endif
+
+#ifdef USE_DISPLAY_EPAPER_29
+  #undef USE_DISPLAY_EPAPER_29
+#endif
+
+#ifdef USE_DISPLAY_EPAPER_42
+  #undef USE_DISPLAY_EPAPER_42
+#endif
+
+#ifdef USE_DISPLAY_SH1106
+  #undef USE_DISPLAY_SH1106
+#endif
+
+#ifdef USE_DISPLAY_ILI9488
+  #undef USE_DISPLAY_ILI9488
+#endif
+
+#ifdef USE_DISPLAY_SSD1351
+  #undef USE_DISPLAY_SSD1351
+#endif
+
+#ifdef USE_DISPLAY_RA8876
+  #undef USE_DISPLAY_RA8876
+#endif
+
+#ifdef USE_DISPLAY_SEVENSEG
+  #undef USE_DISPLAY_SEVENSEG
+#endif
+
+#ifdef USE_DISPLAY_ST7789
+  #undef USE_DISPLAY_ST7789
+#endif
+
+#ifdef USE_DISPLAY_SSD1331
+  #undef USE_DISPLAY_SSD1331
+#endif
+
 #ifdef USE_SR04
   #undef USE_SR04
 #endif
@@ -286,12 +350,12 @@
   #undef USE_DISCOVERY
 #endif
 
-#ifdef USE_MODBUSBRIDGE
-  #undef USE_MODBUSBRIDGE
+#ifdef USE_MODBUS_BRIDGE
+  #undef USE_MODBUS_BRIDGE
 #endif
 
-#ifdef USE_MODBUSBRIDGE_TCP
-  #undef USE_MODBUSBRIDGE_TCP
+#ifdef USE_MODBUS_BRIDGE_TCP
+  #undef USE_MODBUS_BRIDGE_TCP
 #endif
 
 #ifdef USE_MQTT_TLS
@@ -455,6 +519,11 @@
 #endif
 #define USE_AM2320
 
+#ifdef USE_BME68X
+  #undef USE_BME68X
+#endif
+#define USE_BME68X
+
 #ifdef USE_TIMERS
   #undef USE_TIMERS
 #endif
@@ -477,31 +546,6 @@
   #undef USE_ZIGBEE
 #endif
 
-#ifdef USE_DISPLAY
-  #undef USE_DISPLAY
-#endif
-#define USE_DISPLAY
-
-#ifdef USE_I2S_SAY_TIME
-  #undef USE_I2S_SAY_TIME
-#endif
-#define USE_I2S_SAY_TIME
-
-#ifdef USE_I2S_WEBRADIO
-  #undef USE_I2S_WEBRADIO
-#endif
-#define USE_I2S_WEBRADIO
-
-#ifdef USE_SENDMAIL
-  #undef USE_SENDMAIL
-#endif
-#define USE_SENDMAIL
-
-#ifdef USE_ESP32MAIL
-  #undef USE_ESP32MAIL
-#endif
-#define USE_ESP32MAIL
-
 #ifdef MY_LANGUAGE
   #undef MY_LANGUAGE
 #endif

diff --git a/ansible/roles/compile/files/esp32_c3/platformio_override.ini b/ansible/roles/compile/files/esp32_c3/platformio_override.ini
@@ -4,6 +4,5 @@ default_envs = tasmota32c3
 [env:tasmota32c3]
 extends = env:tasmota32_base
 board = esp32c3
-build_unflags = {env:tasmota32_base.build_unflags} -flto -mtarget-align
-build_flags = ${env:tasmota32_base.build_flags} -fno-lto
-lib_ignore = TTGO TWatch Library, epdiy, Micro-RTSP, mp3_shine_esp32
+build_unflags = ${env:tasmota32_base.build_unflags} -mno-target-align
+build_flags = ${env:tasmota32_base.build_flags}
diff --git a/ansible/roles/compile/files/esp32_c3/user_config_override_temphum.h b/ansible/roles/compile/files/esp32_c3/user_config_override_temphum.h
@@ -515,6 +515,11 @@
 #endif
 #define USE_AM2320
 
+#ifdef USE_BME68X
+  #undef USE_BME68X
+#endif
+#define USE_BME68X
+
 #ifdef USE_TIMERS
   #undef USE_TIMERS
 #endif

diff --git a/ansible/roles/compile/files/esp32_c6/platformio_override.ini b/ansible/roles/compile/files/esp32_c6/platformio_override.ini
@@ -0,0 +1,8 @@
+[platformio]
+default_envs = tasmota32c6
+
+[env:tasmota32c6]
+extends = env:tasmota32_base
+board = esp32c6
+build_unflags = ${env:tasmota32_base.build_unflags} -mno-target-align
+build_flags = ${env:tasmota32_base.build_flags}