Fixed one bug

Minimized of config message size.
Changed SDK version for 3.0.5

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,7 +32,7 @@ typedef struct
 
 std::vector<espnow_message_t> espnowMessage;
 
-const String firmware{"1.3"};
+const String firmware{"1.4"};
 
 String espnowNetName{"DEFAULT"};
 
@@ -40,7 +40,6 @@ 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};
@@ -53,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);
 
@@ -102,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)
   {
@@ -203,7 +203,7 @@ 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)
     {
       if (workMode)
@@ -251,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");
@@ -272,10 +273,13 @@ void loadConfig()
   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;
@@ -296,6 +300,8 @@ void saveConfig()
   File file = LittleFS.open("/config.json", "w");
   serializeJsonPretty(json, file);
   file.close();
+  delay(50);
+  ETS_GPIO_INTR_ENABLE();
 }
 
 void setupWebServer()
@@ -341,11 +347,12 @@ 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)
   {
@@ -363,7 +370,6 @@ void switchingRelay()
   }
   saveConfig();
   sendStatusMessage();
-  ETS_GPIO_INTR_ENABLE();
 }
 
 void sendAttributesMessage(const uint8_t type)
@@ -419,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["unit"] = 1;
-    json["type"] = HACT_SWITCH;
-    json["class"] = HASWDC_SWITCH;
-    json["template"] = "state";
-    json["payload_on"] = payloadOn;
-    json["payload_off"] = payloadOff;
+    json[MCMT_DEVICE_NAME] = deviceName;
+    json[MCMT_DEVICE_UNIT] = 1;
+    json[MCMT_COMPONENT_TYPE] = HACT_SWITCH;
+    json[MCMT_DEVICE_CLASS] = HASWDC_SWITCH;
+    json[MCMT_VALUE_TEMPLATE] = "state";
   }
   if (type == ENST_DS18B20 || type == ENST_DHT11 || type == ENST_DHT22)
   {
     outgoingData.deviceType = ENDT_SENSOR;
-    json["name"] = deviceName + " temperature";
-    json["unit"] = 2;
-    json["type"] = HACT_SENSOR;
-    json["class"] = HASDC_TEMPERATURE;
-    json["template"] = "temperature";
+    json[MCMT_DEVICE_NAME] = deviceName + " temperature";
+    json[MCMT_DEVICE_UNIT] = 2;
+    json[MCMT_COMPONENT_TYPE] = HACT_SENSOR;
+    json[MCMT_DEVICE_CLASS] = HASDC_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));
@@ -445,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["unit"] = 3;
-    json["type"] = HACT_SENSOR;
-    json["class"] = HASDC_HUMIDITY;
-    json["template"] = "humidity";
+    json[MCMT_DEVICE_NAME] = deviceName + " humidity";
+    json[MCMT_DEVICE_UNIT] = 3;
+    json[MCMT_COMPONENT_TYPE] = HACT_SENSOR;
+    json[MCMT_DEVICE_CLASS] = HASDC_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));
@@ -468,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;