diff --git a/WThermostat/.clang_complete b/WThermostat/.clang_complete index 4a4c368..b6cdfe1 100644 --- a/WThermostat/.clang_complete +++ b/WThermostat/.clang_complete @@ -47,7 +47,7 @@ -I/home/klausahrenberg/.platformio/packages/toolchain-xtensa/lib/gcc/xtensa-lx106-elf/4.8.2/include-fixed -I/home/klausahrenberg/.platformio/packages/toolchain-xtensa/xtensa-lx106-elf/include -I/home/klausahrenberg/.platformio/packages/tool-unity --DPLATFORMIO=50004 +-DPLATFORMIO=50100 -DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 diff --git a/WThermostat/.gcc-flags.json b/WThermostat/.gcc-flags.json index be37407..5340aa0 100644 --- a/WThermostat/.gcc-flags.json +++ b/WThermostat/.gcc-flags.json @@ -1,7 +1,7 @@ { "execPath": "/home/klausahrenberg/.platformio/packages/toolchain-xtensa/bin/xtensa-lx106-elf-g++", - "gccDefaultCFlags": "-fsyntax-only -std=gnu99 -Wpointer-arith -Wno-implicit-function-declaration -Wl,-EL -fno-inline-functions -nostdlib -Os -mlongcalls -mtext-section-literals -falign-functions=4 -U__STRICT_ANSI__ -ffunction-sections -fdata-sections -fno-exceptions -Wall -DPLATFORMIO=50004 -DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DF_CPU=80000000L -D__ets__ -DICACHE_FLASH -DARDUINO=10805 -DARDUINO_BOARD=\"PLATFORMIO_ESP01_1M\" -DFLASHMODE_DOUT -DLWIP_OPEN_SRC -DNONOSDK22x_190703=1 -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0 -DVTABLES_IN_FLASH", - "gccDefaultCppFlags": "-fsyntax-only -fno-rtti -std=c++11 -Os -mlongcalls -mtext-section-literals -falign-functions=4 -U__STRICT_ANSI__ -ffunction-sections -fdata-sections -fno-exceptions -Wall -DPLATFORMIO=50004 -DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DF_CPU=80000000L -D__ets__ -DICACHE_FLASH -DARDUINO=10805 -DARDUINO_BOARD=\"PLATFORMIO_ESP01_1M\" -DFLASHMODE_DOUT -DLWIP_OPEN_SRC -DNONOSDK22x_190703=1 -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0 -DVTABLES_IN_FLASH", + "gccDefaultCFlags": "-fsyntax-only -std=gnu99 -Wpointer-arith -Wno-implicit-function-declaration -Wl,-EL -fno-inline-functions -nostdlib -Os -mlongcalls -mtext-section-literals -falign-functions=4 -U__STRICT_ANSI__ -ffunction-sections -fdata-sections -fno-exceptions -Wall -DPLATFORMIO=50100 -DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DF_CPU=80000000L -D__ets__ -DICACHE_FLASH -DARDUINO=10805 -DARDUINO_BOARD=\"PLATFORMIO_ESP01_1M\" -DFLASHMODE_DOUT -DLWIP_OPEN_SRC -DNONOSDK22x_190703=1 -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0 -DVTABLES_IN_FLASH", + "gccDefaultCppFlags": "-fsyntax-only -fno-rtti -std=c++11 -Os -mlongcalls -mtext-section-literals -falign-functions=4 -U__STRICT_ANSI__ -ffunction-sections -fdata-sections -fno-exceptions -Wall -DPLATFORMIO=50100 -DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DF_CPU=80000000L -D__ets__ -DICACHE_FLASH -DARDUINO=10805 -DARDUINO_BOARD=\"PLATFORMIO_ESP01_1M\" -DFLASHMODE_DOUT -DLWIP_OPEN_SRC -DNONOSDK22x_190703=1 -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0 -DVTABLES_IN_FLASH", "gccErrorLimit": 15, "gccIncludePaths": "/mnt/Daten/Users/klaus/Projects/Atom/WThermostatBeca/WThermostat/include,/mnt/Daten/Users/klaus/Projects/Atom/WThermostatBeca/WThermostat/src,/home/klausahrenberg/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266HTTPClient/src,/mnt/Daten/Users/klaus/Projects/Atom/WThermostatBeca/WThermostat/.pio/libdeps/esp01_1m/Time,/mnt/Daten/Users/klaus/Projects/Atom/WThermostatBeca/WThermostat/.pio/libdeps/esp01_1m/NTPClient,/home/klausahrenberg/.platformio/packages/framework-arduinoespressif8266/libraries/EEPROM,/home/klausahrenberg/.platformio/packages/framework-arduinoespressif8266/libraries/DNSServer/src,/mnt/Daten/Users/klaus/Projects/Atom/WThermostatBeca/WThermostat/.pio/libdeps/esp01_1m/PubSubClient/src,/home/klausahrenberg/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266mDNS/src,/mnt/Daten/Users/klaus/Projects/Atom/WThermostatBeca/WThermostat/.pio/libdeps/esp01_1m/ESP Async WebServer/src,/home/klausahrenberg/.platformio/packages/framework-arduinoespressif8266/libraries/Hash/src,/mnt/Daten/Users/klaus/Projects/Atom/WThermostatBeca/WThermostat/.pio/libdeps/esp01_1m/ESPAsyncTCP/src,/home/klausahrenberg/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266WiFi/src,/mnt/Daten/Users/klaus/Projects/Atom/WAdapter/WAdapter,/home/klausahrenberg/.platformio/packages/framework-arduinoespressif8266/tools/sdk/include,/home/klausahrenberg/.platformio/packages/framework-arduinoespressif8266/tools/sdk/libc/xtensa-lx106-elf/include,/home/klausahrenberg/.platformio/packages/framework-arduinoespressif8266/cores/esp8266,/home/klausahrenberg/.platformio/packages/framework-arduinoespressif8266/tools/sdk/lwip2/include,/home/klausahrenberg/.platformio/packages/framework-arduinoespressif8266/variants/generic,/home/klausahrenberg/.platformio/lib/Adafruit MPR121,/home/klausahrenberg/.platformio/packages/framework-arduinoespressif8266/libraries/ArduinoOTA,/home/klausahrenberg/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266AVRISP/src,/home/klausahrenberg/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266HTTPUpdateServer/src,/home/klausahrenberg/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266LLMNR,/home/klausahrenberg/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266NetBIOS,/home/klausahrenberg/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266SSDP,/home/klausahrenberg/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266SdFat/src,/home/klausahrenberg/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266WebServer/src,/home/klausahrenberg/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266WiFiMesh/src,/home/klausahrenberg/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266httpUpdate/src,/home/klausahrenberg/.platformio/packages/framework-arduinoespressif8266/libraries/Ethernet/src,/home/klausahrenberg/.platformio/packages/framework-arduinoespressif8266/libraries/GDBStub/src,/home/klausahrenberg/.platformio/packages/framework-arduinoespressif8266/libraries/LittleFS/src,/home/klausahrenberg/.platformio/packages/framework-arduinoespressif8266/libraries/SD/src,/home/klausahrenberg/.platformio/packages/framework-arduinoespressif8266/libraries/SDFS/src,/home/klausahrenberg/.platformio/packages/framework-arduinoespressif8266/libraries/SPI,/home/klausahrenberg/.platformio/packages/framework-arduinoespressif8266/libraries/SPISlave/src,/home/klausahrenberg/.platformio/packages/framework-arduinoespressif8266/libraries/Servo/src,/home/klausahrenberg/.platformio/packages/framework-arduinoespressif8266/libraries/SoftwareSerial/src,/home/klausahrenberg/.platformio/packages/framework-arduinoespressif8266/libraries/TFT_Touch_Shield_V2,/home/klausahrenberg/.platformio/packages/framework-arduinoespressif8266/libraries/Ticker/src,/home/klausahrenberg/.platformio/packages/framework-arduinoespressif8266/libraries/Wire,/home/klausahrenberg/.platformio/packages/framework-arduinoespressif8266/libraries/esp8266/src,/home/klausahrenberg/.platformio/packages/toolchain-xtensa/xtensa-lx106-elf/include/c++/4.8.2,/home/klausahrenberg/.platformio/packages/toolchain-xtensa/xtensa-lx106-elf/include/c++/4.8.2/xtensa-lx106-elf,/home/klausahrenberg/.platformio/packages/toolchain-xtensa/lib/gcc/xtensa-lx106-elf/4.8.2/include,/home/klausahrenberg/.platformio/packages/toolchain-xtensa/lib/gcc/xtensa-lx106-elf/4.8.2/include-fixed,/home/klausahrenberg/.platformio/packages/toolchain-xtensa/xtensa-lx106-elf/include,/home/klausahrenberg/.platformio/packages/tool-unity", "gccSuppressWarnings": false diff --git a/WThermostat/src/WThermostat.cpp b/WThermostat/src/WThermostat.cpp index 280adba..127a8e8 100644 --- a/WThermostat/src/WThermostat.cpp +++ b/WThermostat/src/WThermostat.cpp @@ -13,7 +13,7 @@ #include "WThermostat_DLX_LH01.h" #define APPLICATION "Thermostat" -#define VERSION "1.20j" +#define VERSION "1.20k" #define FLAG_SETTINGS 0x20 #define DEBUG false diff --git a/WThermostat/src/WThermostat_ME102H.h b/WThermostat/src/WThermostat_ME102H.h index a0023f0..5c8436c 100644 --- a/WThermostat/src/WThermostat_ME102H.h +++ b/WThermostat/src/WThermostat_ME102H.h @@ -73,7 +73,8 @@ protected : //consume some unsupported commands switch (cByte) { case 0x17 : - //Temperature Scale C / MCU: 55 aa 03 07 00 05 17 04 00 01 00 + //Temperature Scale C / + //MCU: 55 aa 03 07 00 05 17 04 00 01 00 knownCommand = true; break; case 0x13 : @@ -101,7 +102,8 @@ protected : knownCommand = true; break; case 0x2d : - //unknown Wifi state? / MCU: 55 aa 03 07 00 05 2d 05 00 01 00 + //unknown Wifi state? / + //MCU: 55 aa 03 07 00 05 2d 05 00 01 00 knownCommand = true; break; case 0x24 : diff --git a/WThermostat/src/WThermostat_ME81H.h b/WThermostat/src/WThermostat_ME81H.h index d08788b..a84291f 100644 --- a/WThermostat/src/WThermostat_ME81H.h +++ b/WThermostat/src/WThermostat_ME81H.h @@ -84,9 +84,9 @@ protected : } else if (cByte == this->byteSensorSelection) { if (commandLength == 0x05) { //sensor selection - - //internal: 55 aa 03 07 00 05 2d 05 00 01 00 - //floor: 55 aa 03 07 00 05 2d 05 00 01 01 - //both: 55 aa 03 07 00 05 2d 05 00 01 02 + //internal: 55 aa 03 07 00 05 2b 04 00 01 00 + //floor: 55 aa 03 07 00 05 2b 04 00 01 01 + //both: 55 aa 03 07 00 05 2b 04 00 01 02 newS = this->sensorSelection->getEnumString(receivedCommand[10]); if (newS != nullptr) { changed = ((changed) || (this->sensorSelection->setString(newS))); diff --git a/WThermostat/src/WTuyaDevice.h b/WThermostat/src/WTuyaDevice.h index d8fdf96..3c6384c 100644 --- a/WThermostat/src/WTuyaDevice.h +++ b/WThermostat/src/WTuyaDevice.h @@ -82,9 +82,10 @@ public : lastHeartBeat = now; } //Query - if ((now - lastHeartBeat > MINIMUM_INTERVAL) - && (now - lastQueryStatus > QUERY_INTERVAL)) { - //queryState(); + if ((lastHeartBeat > 0) && + (now - lastQueryStatus > MINIMUM_INTERVAL) && + (now - lastQueryStatus > QUERY_INTERVAL)) { + this->queryDeviceState(); lastQueryStatus = now; } } diff --git a/WThermostat_1.20j_beta.bin b/WThermostat_1.20k_beta.bin similarity index 64% rename from WThermostat_1.20j_beta.bin rename to WThermostat_1.20k_beta.bin index 5003e2d..928885f 100644 Binary files a/WThermostat_1.20j_beta.bin and b/WThermostat_1.20k_beta.bin differ