Merge pull request #2 from PavelSheremetev/main

Fix checkout esp-robonomics -client and calibration sws energy monitoring
airalab · Feb 10, 2025 · e7babc7 · e7babc7
2 parents 74fd50b + fb658bf
commit e7babc7
Show file tree

Hide file tree

Showing 3 changed files with 139 additions and 90 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,8 +1,8 @@
 name: build tasmota firmware
 on:
   push:
-    paths:
-      - 'firmware/**'
+#    paths:
+#      - 'firmware/**'
 jobs:
   checkout:
     runs-on: ubuntu-latest
@@ -28,6 +28,12 @@ jobs:
       with:
         repository: LoSk-p/esp-robonomics-client
         path: firmware/Tasmota/Tasmota/lib/default/esp-robonomics-client
+    - run: |
+        cd firmware/Tasmota/Tasmota/lib/default/esp-robonomics-client
+        git fetch --tags
+        latesttag=$(git describe --tags "$(git rev-list --tags --max-count=1)")
+        echo checking out ${latesttag}
+        git checkout ${latesttag}
     - name: link tasmota robonomics driver templates
       run: |
         ln -s ../../lib/default/esp-robonomics-client/examples/Tasmota_driver/xdrv_100_robonomics.ino firmware/Tasmota/Tasmota/tasmota/tasmota_xdrv_driver/xdrv_100_robonomics.ino
@@ -51,8 +57,8 @@ jobs:
           - sws-2g-e-esp32
           - sws-1g-e-esp32c6
           - sws-2g-e-esp32c6
-          - sws-1g-e-th-esp32c6
-          - sws-2g-e-th-esp32c6
+          - sws-1g-eth-esp32c6
+          - sws-2g-eth-esp32c6
     steps:
     - name: Download sources
       uses: actions/download-artifact@v4

diff --git a/firmware/Tasmota/platformio_tasmota_cenv.ini b/firmware/Tasmota/platformio_tasmota_cenv.ini
@@ -8,65 +8,65 @@ build_flags                 =
 extends                 = env:tasmota32_base
 lib_deps                = ${env:tasmota32_base.lib_deps}
                             Crypto
-lib_ignore              = ${env:tasmota32_base.lib_ignore}
-                            ESP8266Audio
-                            ESP8266SAM
-                            Adafruit CCS811 Library
-                            Adafruit MAX31865 library
-                            Adafruit MCP9808 Library
-                            Adafruit PM25 AQI Sensor
-                            Adafruit SGP30 Sensor
-                            Adafruit SGP40 Sensor
-                            Adafruit VEML7700 Library
-                            Adafruit seesaw Library
-                            BME8563
-                            JPEGDEC
-                            MPU6050 I2C
-                            Mutichannel_Gas_Sensor
-                            OpenTherm Library
-                            SPL06-007
-                            ScioSense ENS16x
-                            ScioSense ENS210
-                            Sensirion I2C SGP41
-                            SevenSegmentTM1637
-                            VL53L0X
-                            VL53L1X
-                            arduino-mcp2515
-                            A4988_Stepper
-                            Adafruit Fingerprint Sensor Library
-                            Adafruit GFX Library
-                            Adafruit LED Backpack Library
-                            Adafruit TSL2591
-                            DS2480 Library
-                            FT5206_Library
-                            FrogmoreScd30
-                            FrogmoreScd40
-                            GT911
-                            LOLIN_HP303B
-                            LedControl
-                            LiquidCrystal_I2C
-                            LoRa
-                            MFRC522
-                            MLX90640
-                            MPU_accel
-                            BlueRobotics_MS5837_Library
-                            NeoPixelBus
-                            OneWire
-                            RA8876
-                            RF24
-                            RadioLib
-                            Sensirion I2C SEN5X
-                            TM1638plus
-                            Joba_Tsl2561
-                            XPT2046_Touchscreen
-                            BME68x
-                            Waveshare esp 2.9 inch e-paper display driver
-                            Waveshare esp 4.2 inch e-paper display driver
-                            Display renderer
-                            ESP KNX IP Library
-                            HPMA115S0 Arduino Library
-                            mp3_shine_esp32
-                            universal display Library
+;lib_ignore              = ${env:tasmota32_base.lib_ignore}
+;                            ESP8266Audio
+;                            ESP8266SAM
+;                            Adafruit CCS811 Library
+;                            Adafruit MAX31865 library
+;                            Adafruit MCP9808 Library
+;                            Adafruit PM25 AQI Sensor
+;                            Adafruit SGP30 Sensor
+;                            Adafruit SGP40 Sensor
+;                            Adafruit VEML7700 Library
+;                            Adafruit seesaw Library
+;                            BME8563
+;                            JPEGDEC
+;                            MPU6050 I2C
+;                            Mutichannel_Gas_Sensor
+;                            OpenTherm Library
+;                            SPL06-007
+;                            ScioSense ENS16x
+;                            ScioSense ENS210
+;                            Sensirion I2C SGP41
+;                            SevenSegmentTM1637
+;                            VL53L0X
+;                            VL53L1X
+;                            arduino-mcp2515
+;                            A4988_Stepper
+;                            Adafruit Fingerprint Sensor Library
+;                            Adafruit GFX Library
+;                            Adafruit LED Backpack Library
+;                            Adafruit TSL2591
+;                            DS2480 Library
+;                            FT5206_Library
+;                            FrogmoreScd30
+;                            FrogmoreScd40
+;                            GT911
+;                            LOLIN_HP303B
+;                            LedControl
+;                            LiquidCrystal_I2C
+;                            LoRa
+;                            MFRC522
+;                            MLX90640
+;                            MPU_accel
+;                            BlueRobotics_MS5837_Library
+;                            NeoPixelBus
+;                            OneWire
+;                            RA8876
+;                            RF24
+;                            RadioLib
+;                            Sensirion I2C SEN5X
+;                            TM1638plus
+;                            Joba_Tsl2561
+;                            XPT2046_Touchscreen
+;                            BME68x
+;                            Waveshare esp 2.9 inch e-paper display driver
+;                            Waveshare esp 4.2 inch e-paper display driver
+;                            Display renderer
+;                            ESP KNX IP Library
+;                            HPMA115S0 Arduino Library
+;                            mp3_shine_esp32
+;                            universal display Library
 
 build_flags             = ${env:tasmota32_base.build_flags}
                           -DOTA_URL='""'
@@ -127,12 +127,12 @@ extends                 = env:robonomics_c6
 build_flags             = ${env:robonomics_c6.build_flags}
                           -DFIRMWARE_SWS_2G_E_ESP32C6
 
-[env:sws-1g-e-th-esp32c6]
+[env:sws-1g-eth-esp32c6]
 extends                 = env:robonomics_c6
 build_flags             = ${env:robonomics_c6.build_flags}
-                          -DFIRMWARE_SWS_1G_E_TH_ESP32C6
+                          -DFIRMWARE_SWS_1G_ETH_ESP32C6
 
-[env:sws-2g-e-th-esp32c6]
+[env:sws-2g-eth-esp32c6]
 extends                 = env:robonomics_c6
 build_flags             = ${env:robonomics_c6.build_flags}
-                          -DFIRMWARE_SWS_2G_E_TH_ESP32C6
+                          -DFIRMWARE_SWS_2G_ETH_ESP32C6
diff --git a/firmware/Tasmota/user_config_override.h b/firmware/Tasmota/user_config_override.h
@@ -701,20 +701,6 @@ disable all
 
   #endif
 
-  #ifdef FIRMWARE_ES_SDS_ESP8266
-    // This line will issue a warning during the build (yellow in 
-    // VSCode) so you see which section is used
-    #warning **** Build: ES-SDS-ESP8266 ****
-    // -- CODE_IMAGE_STR is the name shown between brackets on the 
-    //    Information page or in INFO MQTT messages
-    #undef CODE_IMAGE_STR
-    #define CODE_IMAGE_STR "ES-SDS-ESP8266"
-
-    #undef USER_TEMPLATE
-    #define USER_TEMPLATE "{\"NAME\":\"Generic\",\"GPIO\":[1,1,1,1,1,1,1,1,1,1,1,1,1,1],\"FLAG\":0,\"BASE\":18}"  // [Template] Set JSON template
-
-  #endif
-
   #ifdef FIRMWARE_IR_ESP32
     // This line will issue a warning during the build (yellow in 
     // VSCode) so you see which section is used
@@ -832,6 +818,16 @@ disable all
     #undef FALLBACK_MODULE
     #endif
     #define FALLBACK_MODULE        USER_MODULE   // to Select the default model as FALLBACK when the user does a RESET 1 
+    #define USE_ENERGY_SENSOR
+
+    #define USE_BL09XX
+
+      #define BL0940_PREF 713
+      #define BL0940_UREF 17159
+      #define BL0940_IREF 266013
+
+      #define BL09XX_WRITE_COMMAND 0xA8
+      #define BL09XX_READ_COMMAND 0x58
 
     #undef DEVICE_NAME
     #define DEVICE_NAME "SWS-1G-E-ESP32C6"
@@ -864,6 +860,14 @@ disable all
     #define FALLBACK_MODULE        USER_MODULE   // to Select the default model as FALLBACK when the user does a RESET 1 
 
     #define USE_ENERGY_SENSOR
+    #define USE_BL09XX
+
+      #define BL0940_PREF 713
+      #define BL0940_UREF 17159
+      #define BL0940_IREF 266013
+
+      #define BL09XX_WRITE_COMMAND 0xA8
+      #define BL09XX_READ_COMMAND 0x58
 
     #undef DEVICE_NAME
     #define DEVICE_NAME "SWS-2G-E-ESP32C6"
@@ -875,14 +879,14 @@ disable all
 
   #endif
 
-  #ifdef FIRMWARE_SWS_1G_E_TH_ESP32C6
+  #ifdef FIRMWARE_SWS_1G_ETH_ESP32C6
     // This line will issue a warning during the build (yellow in 
     // VSCode) so you see which section is used
-    #warning **** Build: SWS-1G-E_TH-ESP32C6 ****
+    #warning **** Build: SWS-1G-ETH-ESP32C6 ****
     // -- CODE_IMAGE_STR is the name shown between brackets on the 
     //    Information page or in INFO MQTT messages
     #undef CODE_IMAGE_STR
-    #define CODE_IMAGE_STR "SWS-1G-E-TH-ESP32C6"
+    #define CODE_IMAGE_STR "SWS-1GE-TH-ESP32C6"
 
     #ifdef MODULE
     #undef MODULE
@@ -895,24 +899,44 @@ disable all
     #define FALLBACK_MODULE        USER_MODULE   // to Select the default model as FALLBACK when the user does a RESET 1 
 
     #undef DEVICE_NAME
-    #define DEVICE_NAME "SWS-1G-E-TH-ESP32C6"
+    #define DEVICE_NAME "SWS-1G-ETH-ESP32C6"
     #undef FRIENDLY_NAME
     #define FRIENDLY_NAME "Robonomics 1 gang Switch"
 
+    #undef USE_ENHANCED_GUI_WIFI_SCAN
+    #undef USE_TIMERS_WEB
+
+    #define USE_ENERGY_SENSOR
+    #define USE_BL09XX
+
+      #define BL0940_PREF 713
+      #define BL0940_UREF 17159
+      #define BL0940_IREF 266013
+
+      #define BL09XX_WRITE_COMMAND 0xA8
+      #define BL09XX_READ_COMMAND 0x58
+
+    #define USE_I2C
+    #undef USE_WE517
+    #undef USE_SHT
+    #undef USE_VEML6070 // UV sensor with conflicting I2C address
+    #undef USE_AHT1x
+    #undef USE_AHT2x
+    #define USE_AHT2x
 
     #undef USER_TEMPLATE
     #define USER_TEMPLATE "{\"NAME\":\"Robonomics-1L-Switch\",\"GPIO\":[1,1,1,1,1,1,1,1,1,1,1,1,576,32,288,1,1,1,7552,1,3200,224,1,5440,0,0,0,0,0,0,0],\"FLAG\":0,\"BASE\":1}"
 
   #endif
 
-  #ifdef FIRMWARE_SWS_2G_E_TH_ESP32C6
+  #ifdef FIRMWARE_SWS_2G_ETH_ESP32C6
     // This line will issue a warning during the build (yellow in 
     // VSCode) so you see which section is used
-    #warning **** Build: SWS-2G-E-TH-ESP32C6 ****
+    #warning **** Build: SWS-2G-ETH-ESP32C6 ****
     // -- CODE_IMAGE_STR is the name shown between brackets on the 
     //    Information page or in INFO MQTT messages
     #undef CODE_IMAGE_STR
-    #define CODE_IMAGE_STR "SWS-2G-E-TH-ESP32C6"
+    #define CODE_IMAGE_STR "SWS-2G-ETH-ESP32C6"
 
     #ifdef MODULE
     #undef MODULE
@@ -924,15 +948,34 @@ disable all
     #endif
     #define FALLBACK_MODULE        USER_MODULE   // to Select the default model as FALLBACK when the user does a RESET 1 
 
+    #undef USE_ENHANCED_GUI_WIFI_SCAN
+    #undef USE_TIMERS_WEB
+
     #define USE_ENERGY_SENSOR
+    #define USE_BL09XX
+
+      #define BL0940_PREF 713
+      #define BL0940_UREF 17159
+      #define BL0940_IREF 266013
+
+      #define BL09XX_WRITE_COMMAND 0xA8
+      #define BL09XX_READ_COMMAND 0x58
+
+    #define USE_I2C
+    #undef USE_WE517
+    #undef USE_SHT
+    #undef USE_VEML6070 // UV sensor with conflicting I2C address
+    #undef USE_AHT1x
+    #undef USE_AHT2x
+    #define USE_AHT2x
 
     #undef DEVICE_NAME
-    #define DEVICE_NAME "SWS-2G-E-TH-ESP32C6"
+    #define DEVICE_NAME "SWS-2G-ETH-ESP32C6"
     #undef FRIENDLY_NAME
     #define FRIENDLY_NAME "Robonomics 2 gang Switch"
 
     #undef USER_TEMPLATE
-    #define USER_TEMPLATE "{\"NAME\":\"Robonomics-2L-Switch\",\"GPIO\":[1,32,1,1,1,1,288,1,1,1,1,1,576,1,289,33,1,1,7552,1,3200,224,225,5440,0,0,0,0,0,0,0],\"FLAG\":0,\"BASE\":1}"
+    #define USER_TEMPLATE "{\"NAME\":\"Robonomics-2L-Switch\",\"GPIO\":[0,0,640,608,32,288,0,0,0,0,0,0,0,0,224,3200,5440,225,0,0,0,289,33,0,0,0,0,0,0,0,0],\"FLAG\":0,\"BASE\":1}"
 
   #endif