Fixed one bug

Minimized of config message size.
Changed SDK version for 3.0.5

README.md

@@ -11,6 +11,7 @@ ESP-NOW based switch for ESP8266. Alternate firmware for Tuya/SmartLife/eWeLink
 5. Possibility firmware update over OTA (if is allows the size of the flash memory).
 6. Web interface for settings.
 7. Optionally support one external one wire digital climate sensor (DS18B20, DHT11 or DHT22) with automatically added sensor configuration to Home Assistan via MQTT discovery as a sensor. Periodically transmission sensor status (every 300 seconds) to the gateway.
+8. Normal or reverse relay mode (normal by default).
   
 ## Notes
 
@@ -29,3 +30,5 @@ See [here](https://github.com/aZholtikov/ESP-NOW-Switch/tree/main/hardware).
 3. If encryption is used, the key must be set same of all another ESP-NOW devices in network.
 4. Upload the "data" folder (with web interface) into the filesystem before flashing.
 5. For using this firmware on Tuya/SmartLife/eWeLink WiFi switches, the WiFi module must be replaced with an ESP8266 compatible module (if necessary).
+
+Any feedback via [e-mail](mailto:github@zh.com.ru) would be appreciated. Or... [Buy me a coffee](https://paypal.me/aZholtikov).

data/function.js

@@ -29,6 +29,7 @@ function loadBlock() {
     }
     document.getElementsByTagName('body')[0].innerHTML = newString;
     setFirmvareValue('version', 'firmware');
+    setGpioValue('workModeSelect', 'workMode');
     setGpioValue('relayPinSelect', 'relayPin');
     setGpioValue('relayPinTypeSelect', 'relayPinType');
     setGpioValue('ledPinSelect', 'ledPin');
@@ -71,7 +72,8 @@ function saveSetting(submit) {
         + "&extButtonPin=" + getSelectValue('extButtonPinSelect')
         + "&extButtonPinType=" + getSelectValue('extButtonPinTypeSelect')
         + "&sensorPin=" + getSelectValue('sensorPinSelect')
-        + "&sensorType=" + getSelectValue('sensorTypeSelect');
+        + "&sensorType=" + getSelectValue('sensorTypeSelect')
+        + "&workMode=" + getSelectValue('workModeSelect');
     sendRequest(submit, server);
     alert("Please restart device for changes apply.");
 }

data/index.htm

@@ -29,6 +29,15 @@
                 title="ESP-NOW network name (1 to 20 characters)" />
         </div>
 
+        <div class="wrapper">
+            <p class="text-select">Work mode:</p>
+            <input id="workMode" value="{{workMode}}" hidden />
+            <p><select id="workModeSelect">
+                    <option value="0">NORMAL</option>
+                    <option value="1">REVERSE</option>
+                </select></p>
+        </div>
+
         <div class="wrapper">
             <p class="text-select">Relay GPIO:</p>
             <input id="relayPin" value="{{relayPin}}" hidden />

hardware/README.md

@@ -21,7 +21,6 @@
 
 ```text
     Relay GPIO          GPIO12      HIGH
-    Led GPIO            GPIO13      LOW
     Button GPIO         GPIO04      RISING
     Ext sensor GPIO     GPIO14      DS18B20
 ```

platformio.ini

@@ -2,8 +2,9 @@
 platform = espressif8266
 board = esp12e
 framework = arduino
+build_flags = -D PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK305
 board_build.filesystem = littlefs
-board_build.ldscript = eagle.flash.4m2m.ld
+board_build.ldscript = eagle.flash.4m1m.ld
 lib_deps = 
 	https://github.com/aZholtikov/ZHNetwork
 	https://github.com/aZholtikov/ZHConfig
@@ -16,8 +17,9 @@ lib_deps =
 platform = espressif8266
 board = esp12e
 framework = arduino
+build_flags = -D PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK305
 board_build.filesystem = littlefs
-board_build.ldscript = eagle.flash.4m2m.ld
+board_build.ldscript = eagle.flash.4m1m.ld
 upload_port = 192.168.4.1
 upload_protocol = espota
 lib_deps = 
@@ -32,8 +34,9 @@ lib_deps =
 platform = espressif8266
 board = esp8285
 framework = arduino
+build_flags = -D PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK305
 board_build.filesystem = littlefs
-board_build.ldscript = eagle.flash.2m256.ld
+board_build.ldscript = eagle.flash.2m64.ld
 lib_deps = 
 	https://github.com/aZholtikov/ZHNetwork
 	https://github.com/aZholtikov/ZHConfig
@@ -46,8 +49,9 @@ lib_deps =
 platform = espressif8266
 board = esp8285
 framework = arduino
+build_flags = -D PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK305
 board_build.filesystem = littlefs
-board_build.ldscript = eagle.flash.2m256.ld
+board_build.ldscript = eagle.flash.2m64.ld
 upload_port = 192.168.4.1
 upload_protocol = espota
 lib_deps = 
@@ -62,6 +66,7 @@ lib_deps =
 platform = espressif8266
 board = esp8285
 framework = arduino
+build_flags = -D PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK305
 board_build.filesystem = littlefs
 board_build.ldscript = eagle.flash.1m64.ld
 lib_deps = 

src/main.cpp

@@ -32,13 +32,14 @@ typedef struct
 
 std::vector<espnow_message_t> espnowMessage;
 
-const String firmware{"1.2"};
+const String firmware{"1.4"};
 
 String espnowNetName{"DEFAULT"};
 
+uint8_t workMode{0};
+
 String deviceName = "ESP-NOW switch " + String(ESP.getChipId(), HEX);
 
-bool relayStatus{false};
 uint8_t relayPin{0};
 uint8_t relayPinType{1};
 uint8_t buttonPin{0};
@@ -51,13 +52,12 @@ uint8_t ledPinType{0};
 uint8_t sensorPin{0};
 uint8_t sensorType{0};
 
+bool relayStatus{false};
+
 bool wasMqttAvailable{false};
 
 uint8_t gatewayMAC[6]{0};
 
-const String payloadOn{"ON"};
-const String payloadOff{"OFF"};
-
 ZHNetwork myNet;
 AsyncWebServer webServer(80);
 
@@ -100,11 +100,13 @@ void setup()
     if (sensorType == ENST_DHT11 || sensorType == ENST_DHT22)
       dht.setup(sensorPin, DHTesp::AUTO_DETECT);
   }
-
   if (relayPin)
   {
     pinMode(relayPin, OUTPUT);
-    digitalWrite(relayPin, relayPinType ? relayStatus : !relayStatus);
+    if (workMode)
+      digitalWrite(relayPin, relayPinType ? !relayStatus : relayStatus);
+    else
+      digitalWrite(relayPin, relayPinType ? relayStatus : !relayStatus);
   }
   if (ledPin)
   {
@@ -179,6 +181,12 @@ void onBroadcastReceiving(const char *data, const uint8_t *sender)
         sendConfigMessage();
         if (sensorPin)
           sendConfigMessage(sensorType);
+        sendAttributesMessage();
+        if (sensorPin)
+          sendAttributesMessage(sensorType);
+        sendStatusMessage();
+        if (sensorPin)
+          sendStatusMessage(sensorType);
       }
     }
     gatewayAvailabilityCheckTimer.once(15, gatewayAvailabilityCheckTimerCallback);
@@ -195,11 +203,21 @@ void onUnicastReceiving(const char *data, const uint8_t *sender)
   if (incomingData.payloadsType == ENPT_SET)
   {
     deserializeJson(json, incomingData.message);
-    relayStatus = json["set"] == payloadOn ? true : false;
+    relayStatus = json["set"] == "ON" ? true : false;
     if (relayPin)
-      digitalWrite(relayPin, relayPinType ? relayStatus : !relayStatus);
+    {
+      if (workMode)
+        digitalWrite(relayPin, relayPinType ? !relayStatus : relayStatus);
+      else
+        digitalWrite(relayPin, relayPinType ? relayStatus : !relayStatus);
+    }
     if (ledPin)
-      digitalWrite(ledPin, ledPinType ? relayStatus : !relayStatus);
+    {
+      if (workMode)
+        digitalWrite(ledPin, ledPinType ? !relayStatus : relayStatus);
+      else
+        digitalWrite(ledPin, ledPinType ? relayStatus : !relayStatus);
+    }
     saveConfig();
     sendStatusMessage();
   }
@@ -233,6 +251,7 @@ void onConfirmReceiving(const uint8_t *target, const uint16_t id, const bool sta
 
 void loadConfig()
 {
+  ETS_GPIO_INTR_DISABLE();
   if (!LittleFS.exists("/config.json"))
     saveConfig();
   File file = LittleFS.open("/config.json", "r");
@@ -252,11 +271,15 @@ void loadConfig()
   ledPinType = json["ledPinType"];
   sensorPin = json["sensorPin"];
   sensorType = json["sensorType"];
+  workMode = json["workMode"];
   file.close();
+  delay(50);
+  ETS_GPIO_INTR_ENABLE();
 }
 
 void saveConfig()
 {
+  ETS_GPIO_INTR_DISABLE();
   StaticJsonDocument<512> json;
   json["firmware"] = firmware;
   json["espnowNetName"] = espnowNetName;
@@ -272,10 +295,13 @@ void saveConfig()
   json["ledPinType"] = ledPinType;
   json["sensorPin"] = sensorPin;
   json["sensorType"] = sensorType;
+  json["workMode"] = workMode;
   json["system"] = "empty";
   File file = LittleFS.open("/config.json", "w");
   serializeJsonPretty(json, file);
   file.close();
+  delay(50);
+  ETS_GPIO_INTR_ENABLE();
 }
 
 void setupWebServer()
@@ -295,6 +321,7 @@ void setupWebServer()
         ledPinType = request->getParam("ledPinType")->value().toInt();
         sensorPin = request->getParam("sensorPin")->value().toInt();
         sensorType = request->getParam("sensorType")->value().toInt();
+        workMode = request->getParam("workMode")->value().toInt();
         deviceName = request->getParam("deviceName")->value();
         espnowNetName = request->getParam("espnowNetName")->value();
         request->send(200);
@@ -320,19 +347,29 @@ void setupWebServer()
 void IRAM_ATTR buttonInterrupt()
 {
   ETS_GPIO_INTR_DISABLE();
-  buttonInterruptTimer.once_ms(100, switchingRelay); // For prevent contact chatter.
+  buttonInterruptTimer.once_ms(500, switchingRelay); // For prevent contact chatter.
 }
 
 void switchingRelay()
 {
+  ETS_GPIO_INTR_ENABLE();
   relayStatus = !relayStatus;
   if (relayPin)
-    digitalWrite(relayPin, relayPinType ? relayStatus : !relayStatus);
+  {
+    if (workMode)
+      digitalWrite(relayPin, relayPinType ? !relayStatus : relayStatus);
+    else
+      digitalWrite(relayPin, relayPinType ? relayStatus : !relayStatus);
+  }
   if (ledPin)
-    digitalWrite(ledPin, ledPinType ? relayStatus : !relayStatus);
+  {
+    if (workMode)
+      digitalWrite(ledPin, ledPinType ? !relayStatus : relayStatus);
+    else
+      digitalWrite(ledPin, ledPinType ? relayStatus : !relayStatus);
+  }
   saveConfig();
   sendStatusMessage();
-  ETS_GPIO_INTR_ENABLE();
 }
 
 void sendAttributesMessage(const uint8_t type)
@@ -388,22 +425,22 @@ void sendConfigMessage(const uint8_t type)
   StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json;
   if (type == ENST_NONE)
   {
-    json["name"] = deviceName;
+    json[MCMT_DEVICE_NAME] = deviceName;
-    json["unit"] = 1;
+    json[MCMT_DEVICE_UNIT] = 1;
-    json["type"] = HACT_SWITCH;
+    json[MCMT_COMPONENT_TYPE] = HACT_SWITCH;
-    json["class"] = HASWDC_SWITCH;
+    json[MCMT_DEVICE_CLASS] = HASWDC_SWITCH;
-    json["template"] = "state";
+    json[MCMT_VALUE_TEMPLATE] = "state";
-    json["payload_on"] = payloadOn;
-    json["payload_off"] = payloadOff;
   }
   if (type == ENST_DS18B20 || type == ENST_DHT11 || type == ENST_DHT22)
   {
     outgoingData.deviceType = ENDT_SENSOR;
-    json["name"] = deviceName + " temperature";
+    json[MCMT_DEVICE_NAME] = deviceName + " temperature";
-    json["unit"] = 2;
+    json[MCMT_DEVICE_UNIT] = 2;
-    json["type"] = HACT_SENSOR;
+    json[MCMT_COMPONENT_TYPE] = HACT_SENSOR;
-    json["class"] = HASDC_TEMPERATURE;
+    json[MCMT_DEVICE_CLASS] = HASDC_TEMPERATURE;
-    json["template"] = "temperature";
+    json[MCMT_VALUE_TEMPLATE] = "temperature";
+    json[MCMT_UNIT_OF_MEASUREMENT] = "°C";
+    json[MCMT_EXPIRE_AFTER] = 900;
   }
   serializeJsonPretty(json, outgoingData.message);
   memcpy(&message.message, &outgoingData, sizeof(esp_now_payload_data_t));
@@ -414,11 +451,13 @@ void sendConfigMessage(const uint8_t type)
   if (type == ENST_DHT11 || type == ENST_DHT22)
   {
     outgoingData.deviceType = ENDT_SENSOR;
-    json["name"] = deviceName + " humidity";
+    json[MCMT_DEVICE_NAME] = deviceName + " humidity";
-    json["unit"] = 3;
+    json[MCMT_DEVICE_UNIT] = 3;
-    json["type"] = HACT_SENSOR;
+    json[MCMT_COMPONENT_TYPE] = HACT_SENSOR;
-    json["class"] = HASDC_HUMIDITY;
+    json[MCMT_DEVICE_CLASS] = HASDC_HUMIDITY;
-    json["template"] = "humidity";
+    json[MCMT_VALUE_TEMPLATE] = "humidity";
+    json[MCMT_UNIT_OF_MEASUREMENT] = "%";
+    json[MCMT_EXPIRE_AFTER] = 900;
 
     serializeJsonPretty(json, outgoingData.message);
     memcpy(&message.message, &outgoingData, sizeof(esp_now_payload_data_t));
@@ -437,7 +476,7 @@ void sendStatusMessage(const uint8_t type)
   espnow_message_t message;
   StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json;
   if (type == ENST_NONE)
-    json["state"] = relayStatus ? payloadOn : payloadOff;
+    json["state"] = relayStatus ? "ON" : "OFF";
   if (type == ENST_DS18B20)
   {
     outgoingData.deviceType = ENDT_SENSOR;