README.md

@@ -1,54 +1,38 @@
 # ESP-NOW gateway for ESP8266/ESP32
 
-Gateway for data exchange between ESP-NOW devices and MQTT broker via WiFi/LAN.
+Gateway for data exchange between ESP-NOW devices and MQTT broker via WiFi.
 
 ## Features
 
 1. Creates an access point named "ESP-NOW gateway XXXXXXXXXXXX" with password "12345678" (IP 192.168.4.1).
-2. Possibility a device search through the Windows Network Environment via SSDP (at ESP_NOW_WIFI mode).
+2. Possibility a device search through the Windows Network Environment via SSDP.
-3. Periodically transmission of system information to the MQTT broker (every 60 seconds), availability status to the ESP-NOW network and to the MQTT broker (every 10 seconds) and current date and time to the ESP-NOW network (every 10 seconds).
+3. Periodically transmission of system information to the MQTT broker (every 60 seconds) and availability status to the ESP-NOW network and to the MQTT broker (every 10 seconds).
 4. Automatically adds gateway configuration to Home Assistan via MQTT discovery as a binary_sensor.
 5. Automatically adds supported ESP-NOW devices configurations to Home Assistan via MQTT discovery.
-6. Automatically adds supported nRF24 devices configurations to Home Assistan via MQTT discovery.
+6. Possibility firmware update over OTA.
-7. Possibility firmware update over OTA (at ESP_NOW_LAN mode via access point only).
+7. Web interface for settings.
-8. Web interface for settings (at ESP_NOW_LAN mode via access point only).
-9. 3 operating modes:
-
-```text
-ESP_NOW       ESP-NOW node only. Default mode after flashing.
-ESP_NOW_WIFI  Gateway between ESP-NOW devices and MQTT broker via WiFi.
-ESP_NOW_LAN   Gateway between ESP-NOW devices and MQTT broker via Ethernet. Preferred mode.
- ```
   
 ## Notes
 
 1. ESP-NOW mesh network based on the library [ZHNetwork](https://github.com/aZholtikov/ZHNetwork).
 2. Regardless of the status of connections to WiFi or MQTT the device perform ESP-NOW node function.
 3. For restart the device (without using the Web interface and only if MQTT connection established) send an "restart" command to the device's root topic (example - "homeassistant/espnow_gateway/70039F44BEF7").
-4. W5500 connection:
-
-```text
-ESP8266 (GPIO05 - CS, GPIO14 - SCK, GPIO12 - MISO, GPIO13 - MOSI).
-ESP32   (GPIO05 - CS, GPIO18 - SCK, GPIO19 - MISO, GPIO23 - MOSI).
-```
 
 ## Attention
 
 1. ESP-NOW network name must be set same of all another ESP-NOW devices in network.
 2. If encryption is used, the key must be set same of all another ESP-NOW devices in network.
 3. Upload the "data" folder (with web interface) into the filesystem before flashing.
-4. At ESP_NOW_WIFI mode WiFi router must be set on channel 1.
+4. WiFi router must be set on channel 1.
 
 ## Tested on
 
-1. NodeMCU 1.0 (ESP-12E Module). ESP_NOW_WIFI mode. Unstable work.
+1. NodeMCU 1.0 (ESP-12E Module). ESP-NOW + WiFi mode. Unstable work.
-2. AZ-Delivery ESP-32 Dev Kit C V4. ESP_NOW_WIFI mode. Stable work.
+2. AZ-Delivery ESP-32 Dev Kit C V4. ESP-NOW + WiFi mode. Stable work.
-3. NodeMCU 1.0 (ESP-12E Module) + W5500. ESP_NOW_LAN mode. Stable work.
-4. AZ-Delivery ESP-32 Dev Kit C V4 + W5500. ESP_NOW_LAN mode. Stable work.
 
 ## Supported devices
 
-1. [RF Gateway](https://github.com/aZholtikov/RF-Gateway)
+1. [RF Gateway](https://github.com/aZholtikov/RF-Gateway) (coming soon)
 2. [ESP-NOW Switch](https://github.com/aZholtikov/ESP-NOW-Switch)
 3. [ESP-NOW Light/Led Strip](https://github.com/aZholtikov/ESP-NOW-Light-Led-Strip)
 4. [ESP-NOW Window/Door Sensor](https://github.com/aZholtikov/ESP-NOW-Window-Door-Sensor)
@@ -57,9 +41,7 @@ ESP32   (GPIO05 - CS, GPIO18 - SCK, GPIO19 - MISO, GPIO23 - MOSI).
 ## To Do
 
 - [X] Automatically add ESP-NOW devices configurations to Home Assistan via MQTT discovery.
-- [X] LAN connection support.
+- [ ] LAN connection support.
-- [X] nRF24 device support (via [RF Gateway](https://github.com/aZholtikov/RF-Gateway)).
+- [ ] nRF24 device support (in current time uses "RF Gateway").
-- [ ] BLE device support (via BLE Gateway).
+- [ ] BLE device support (for ESP32).
-- [ ] LoRa device support (via LoRa Gateway).
+- [ ] LoRa device support.
-
-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

@@ -10,7 +10,7 @@ function createXmlHttpObject() {
 
 function load() {
     if (xmlHttp.readyState == 0 || xmlHttp.readyState == 4) {
-        xmlHttp.open('GET', '/config', true);
+        xmlHttp.open('PUT', '/config.json', true);
         xmlHttp.send(null);
         xmlHttp.onload = function () {
             jsonResponse = JSON.parse(xmlHttp.responseText);
@@ -29,7 +29,6 @@ function loadBlock() {
     }
     document.getElementsByTagName('body')[0].innerHTML = newString;
     setFirmvareValue('version', 'firmware');
-    setGpioValue('workModeSelect', 'workMode');
     handleServerResponse();
 }
 
@@ -38,12 +37,6 @@ function getValue(id) {
     return value;
 }
 
-function getSelectValue(id) {
-    var select = document.getElementById(id);
-    var value = select.value;
-    return value;
-}
-
 function sendRequest(submit, server) {
     request = new XMLHttpRequest();
     request.open("GET", server, true);
@@ -52,14 +45,11 @@ function sendRequest(submit, server) {
 
 function saveSetting(submit) {
     server = "/setting?ssid=" + getValue('ssid') + "&password=" + encodeURIComponent(getValue('password'))
-        + "&mqttHostName=" + getValue('mqttHostName') + "&mqttHostPort=" + getValue('mqttHostPort')
+        + "&host=" + getValue('mqttHostName') + "&port=" + getValue('mqttHostPort')
-        + "&mqttUserLogin=" + getValue('mqttUserLogin') + "&mqttUserPassword=" + encodeURIComponent(getValue('mqttUserPassword'))
+        + "&login=" + getValue('mqttUserLogin') + "&pass=" + encodeURIComponent(getValue('mqttUserPassword'))
-        + "&topicPrefix=" + getValue('topicPrefix')
+        + "&prefix=" + getValue('topicPrefix')
-        + "&deviceName=" + getValue('deviceName')
+        + "&name=" + getValue('deviceName')
-        + "&espnowNetName=" + getValue('espnowNetName')
+        + "&net=" + getValue('espnowNetName');
-        + "&workMode=" + getSelectValue('workModeSelect')
-        + "&ntpHostName=" + getValue('ntpHostName')
-        + "&gmtOffset=" + getValue('gmtOffset');
     sendRequest(submit, server);
     alert("Please restart device for changes apply.");
 }
@@ -72,8 +62,3 @@ function restart(submit) {
 function setFirmvareValue(id, value) {
     document.getElementById(id).innerHTML = document.getElementById(value).value;
 }
-
-function setGpioValue(id, value) {
-    var select = document.getElementById(id);
-    select.value = document.getElementById(value).value;
-}

data/index.htm

@@ -29,16 +29,6 @@
                 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">ESP-NOW</option>
-                    <option value="1">ESP-NOW WIFI</option>
-                    <option value="2">ESP-NOW LAN</option>
-                </select></p>
-        </div>
-
         <p class="text">WiFi settings</p>
         <div class="wrapper">
             <input class="text-inp" id="ssid" value="{{ssid}}" placeholder="SSID" label title="WiFi network name" />
@@ -46,13 +36,6 @@
                 autocomplete="off" label title="WiFi password" />
         </div>
 
-        <p class="text">NTP settings</p>
-        <div class="wrapper">
-            <input class="text-inp" id="ntpHostName" value="{{ntpHostName}}" placeholder="URL or IP" label
-                title="NTP server URL or IP" />
-            <input id="gmtOffset" value="{{gmtOffset}}" placeholder="Time zone" label title="Time zone" />
-        </div>
-
         <p class="text">MQTT settings</p>
         <div class="wrapper">
             <input class="text-inp" id="mqttHostName" value="{{mqttHostName}}" placeholder="URL or IP" label

data/style.css

@@ -29,13 +29,6 @@ h1 {
     margin: 10px 0;
 }
 
-.text-select {
-    width: 35%;
-    font-weight: 600;
-    flex-shrink: 0;
-    margin-right: 10px;
-}
-
 .text-inp {
     width: 48%;
     min-height: 30px;
@@ -68,28 +61,11 @@ input {
     margin-left: 10px;
 }
 
-select {
-    width: 140px;
-    min-height: 30px;
-    border-radius: 5px;
-    border: none;
-    margin-bottom: 10px;
-    padding: 0 10px;
-    color: rgb(0, 0, 0);
-    background: #a3e0f1;
-    transition: .5s;
-}
-
 input:hover {
     background: white;
     cursor: pointer;
 }
 
-select:hover {
-    background: white;
-    cursor: pointer;
-}
-
 .btn {
     width: 48%;
     background: rgb(65, 125, 238);
@@ -112,7 +88,7 @@ select:hover {
 }
 
 #espnowNetName {
-    margin-bottom: 15px;
+    margin-bottom: 10px;
 }
 
 .wrapper.wrapper--end {

platformio.ini

@@ -1,63 +1,49 @@
 [env:ESP8266]
 platform = espressif8266
-board = esp12e
+board = nodemcuv2
 framework = arduino
-build_flags = -D PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK305
-board_build.filesystem = littlefs
 lib_deps = 
 	https://github.com/aZholtikov/ZHNetwork
 	https://github.com/aZholtikov/ZHConfig
-	https://github.com/aZholtikov/Async-Web-Server
+	bblanchon/ArduinoJson@^6.19.4
-	https://github.com/bblanchon/ArduinoJson
+	me-no-dev/ESP Async WebServer@^1.2.3
-	https://github.com/arduino-libraries/Ethernet
+	marvinroger/AsyncMqttClient@^0.9.0
-	https://github.com/knolleary/pubsubclient
-	https://github.com/arduino-libraries/NTPClient
 
 [env:ESP8266-OTA]
 platform = espressif8266
-board = esp12e
+board = nodemcuv2
 framework = arduino
-build_flags = -D PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK305
+upload_port = 192.168.1.113
-board_build.filesystem = littlefs
-upload_port = 192.168.4.1
 upload_protocol = espota
 lib_deps = 
 	https://github.com/aZholtikov/ZHNetwork
 	https://github.com/aZholtikov/ZHConfig
-	https://github.com/aZholtikov/Async-Web-Server
+	bblanchon/ArduinoJson@^6.19.4
-	https://github.com/bblanchon/ArduinoJson
+	me-no-dev/ESP Async WebServer@^1.2.3
-	https://github.com/arduino-libraries/Ethernet
+	marvinroger/AsyncMqttClient@^0.9.0
-	https://github.com/knolleary/pubsubclient
-	https://github.com/arduino-libraries/NTPClient
 
 [env:ESP32]
 platform = espressif32
-board = esp32dev
+board = az-delivery-devkit-v4
 framework = arduino
-board_build.filesystem = littlefs
 lib_deps = 
 	https://github.com/aZholtikov/ZHNetwork
 	https://github.com/aZholtikov/ZHConfig
-	https://github.com/aZholtikov/Async-Web-Server
+	bblanchon/ArduinoJson@^6.19.4
-	https://github.com/bblanchon/ArduinoJson
+	me-no-dev/ESP Async WebServer@^1.2.3
-	https://github.com/arduino-libraries/Ethernet
+	marvinroger/AsyncMqttClient@^0.9.0
-	https://github.com/knolleary/pubsubclient
+	luc-github/ESP32SSDP@^1.2.0
-	https://github.com/arduino-libraries/NTPClient
-	https://github.com/luc-github/ESP32SSDP
 
 [env:ESP32-OTA]
 platform = espressif32
-board = esp32dev
+board = az-delivery-devkit-v4
 framework = arduino
-board_build.filesystem = littlefs
+upload_port = 192.168.1.110
-upload_port = 192.168.4.1
 upload_protocol = espota
 lib_deps = 
 	https://github.com/aZholtikov/ZHNetwork
 	https://github.com/aZholtikov/ZHConfig
-	https://github.com/aZholtikov/Async-Web-Server
+	bblanchon/ArduinoJson@^6.19.4
-	https://github.com/bblanchon/ArduinoJson
+	me-no-dev/ESP Async WebServer@^1.2.3
-	https://github.com/arduino-libraries/Ethernet
+	marvinroger/AsyncMqttClient@^0.9.0
-	https://github.com/knolleary/pubsubclient
+	luc-github/ESP32SSDP@^1.2.0
-	https://github.com/arduino-libraries/NTPClient
-	https://github.com/luc-github/ESP32SSDP

src/main.cpp

@@ -1,28 +1,28 @@
 #include "ArduinoJson.h"
 #include "ArduinoOTA.h"
-#include "ESPAsyncWebServer.h" // https://github.com/aZholtikov/Async-Web-Server
+#include "ESPAsyncWebServer.h"
-#include "Ethernet.h"          // https://github.com/arduino-libraries/Ethernet
+#include "AsyncMQTTClient.h"
-#include "PubSubClient.h"
-#include "LittleFS.h"
-#include "EEPROM.h"
 #include "Ticker.h"
-#include "NTPClient.h"
 #include "ZHNetwork.h"
 #include "ZHConfig.h"
 #if defined(ESP8266)
 #include "ESP8266SSDP.h"
 #endif
 #if defined(ESP32)
+#include "SPIFFS.h"
 #include "ESP32SSDP.h"
 #endif
 
+void onWifiEvent(WiFiEvent_t event);
+
 void onEspnowMessage(const char *data, const uint8_t *sender);
 
-void onMqttMessage(char *topic, byte *payload, unsigned int length);
+void onMqttConnect(bool sessionPresent);
+void onMqttDisconnect(AsyncMqttClientDisconnectReason reason);
+void onMqttMessage(char *topic, char *payload, AsyncMqttClientMessageProperties properties, size_t len, size_t index, size_t total);
 
 void sendKeepAliveMessage(void);
 void sendAttributesMessage(void);
-void sendConfigMessage(void);
 
 String getValue(String data, char separator, uint8_t index);
 
@@ -32,110 +32,68 @@ void saveConfig(void);
 String xmlNode(String tags, String data);
 void setupWebServer(void);
 
-void checkMqttAvailability(void);
+void connectToMqtt(void);
 
-void mqttPublish(const char *topic, const char *payload, bool retained);
+const String firmware{"1.25"};
 
-typedef enum : uint8_t
+String espnowNetName{"DEFAULT"};
-{
-    ESP_NOW,
-    ESP_NOW_WIFI,
-    ESP_NOW_LAN
-} work_mode_t;
 
-struct deviceConfig
-{
 #if defined(ESP8266)
 String deviceName = "ESP-NOW gateway " + String(ESP.getChipId(), HEX);
 #endif
 #if defined(ESP32)
 String deviceName = "ESP-NOW gateway " + String(ESP.getEfuseMac(), HEX);
 #endif
-    String espnowNetName{"DEFAULT"};
+
-    uint8_t workMode{ESP_NOW};
 String ssid{"SSID"};
 String password{"PASSWORD"};
+
 String mqttHostName{"MQTT"};
 uint16_t mqttHostPort{1883};
 String mqttUserLogin{""};
 String mqttUserPassword{""};
 String topicPrefix{"homeassistant"};
-    String ntpHostName{"NTP"};
-    uint16_t gmtOffset{10800};
-} config;
-
-const String firmware{"1.6"};
-
-const char *mqttUserID{"ESP"};
-
-uint8_t w5500Mac[6] = {0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED}; // Change it if necessary.
 
 ZHNetwork myNet;
 AsyncWebServer webServer(80);
+AsyncMqttClient mqttClient;
 
-EthernetClient ethClient;
+Ticker mqttReconnectTimer;
-WiFiClient wifiClient;
+bool mqttReconnectTimerSemaphore{false};
-
+void mqttReconnectTimerCallback(void);
-PubSubClient mqttEthClient(ethClient);
-PubSubClient mqttWifiClient(wifiClient);
-
-WiFiUDP udpWiFiClient;
-EthernetUDP udpEthClient;
-
-NTPClient ntpWiFiClient(udpWiFiClient, config.ntpHostName.c_str(), config.gmtOffset);
-NTPClient ntpEthClient(udpEthClient, config.ntpHostName.c_str(), config.gmtOffset);
-
-Ticker mqttAvailabilityCheckTimer;
-bool mqttAvailabilityCheckTimerSemaphore{true};
-bool isMqttAvailable{false};
-void mqttAvailabilityCheckTimerCallback(void);
 
 Ticker keepAliveMessageTimer;
 bool keepAliveMessageTimerSemaphore{true};
 void keepAliveMessageTimerCallback(void);
 
 Ticker attributesMessageTimer;
-bool attributesMessageTimerSemaphore{true};
+bool attributesMessageTimerSemaphore{false};
 void attributesMessageTimerCallback(void);
 
 void setup()
 {
-#if defined(ESP8266)
+    SPIFFS.begin();
-    LittleFS.begin();
-#endif
-#if defined(ESP32)
-    LittleFS.begin(true);
-#endif
 
     loadConfig();
 
-    if (config.workMode == ESP_NOW_LAN)
+    WiFi.onEvent(onWifiEvent);
-    {
-        Ethernet.init(5);
-        Ethernet.begin(w5500Mac);
-    }
 
-    if (config.workMode == ESP_NOW_WIFI)
-    {
 #if defined(ESP8266)
     WiFi.setSleepMode(WIFI_NONE_SLEEP);
 #endif
 #if defined(ESP32)
     WiFi.setSleep(WIFI_PS_NONE);
 #endif
+
     WiFi.persistent(false);
     WiFi.setAutoConnect(false);
     WiFi.setAutoReconnect(true);
-    }
 
-    myNet.begin(config.espnowNetName.c_str(), true);
+    myNet.begin(espnowNetName.c_str(), true);
-
-    if (config.workMode)
-    {
     // myNet.setCryptKey("VERY_LONG_CRYPT_KEY"); // If encryption is used, the key must be set same of all another ESP-NOW devices in network.
+
     myNet.setOnBroadcastReceivingCallback(onEspnowMessage);
     myNet.setOnUnicastReceivingCallback(onEspnowMessage);
-    }
 
 #if defined(ESP8266)
     WiFi.softAP(("ESP-NOW gateway " + String(ESP.getChipId(), HEX)).c_str(), "12345678");
@@ -144,9 +102,7 @@ void setup()
     WiFi.softAP(("ESP-NOW gateway " + String(ESP.getEfuseMac(), HEX)).c_str(), "12345678");
 #endif
 
-    if (config.workMode == ESP_NOW_WIFI)
+    uint8_t scan = WiFi.scanNetworks(false, false, 1);
-    {
-        uint8_t scan = WiFi.scanNetworks(false, false);
     String name;
     int32_t rssi;
     uint8_t encryption;
@@ -161,278 +117,240 @@ void setup()
 #if defined(ESP32)
         WiFi.getNetworkInfo(i, name, encryption, rssi, bssid, channel);
 #endif
-            if (name == config.ssid)
+        if (name == ssid)
-                WiFi.begin(config.ssid.c_str(), config.password.c_str());
+            WiFi.begin(ssid.c_str(), password.c_str());
-        }
     }
 
-    if (config.workMode == ESP_NOW_WIFI)
+    mqttClient.onConnect(onMqttConnect);
-    {
+    mqttClient.onDisconnect(onMqttDisconnect);
-        ntpWiFiClient.begin();
+    mqttClient.onMessage(onMqttMessage);
-        mqttWifiClient.setBufferSize(2048);
+    mqttClient.setServer(mqttHostName.c_str(), mqttHostPort);
-        mqttWifiClient.setServer(config.mqttHostName.c_str(), config.mqttHostPort);
+    mqttClient.setCredentials(mqttUserLogin.c_str(), mqttUserPassword.c_str());
-        mqttWifiClient.setCallback(onMqttMessage);
-    }
-
-    if (config.workMode == ESP_NOW_LAN)
-    {
-        ntpEthClient.begin();
-        mqttEthClient.setBufferSize(2048);
-        mqttEthClient.setServer(config.mqttHostName.c_str(), config.mqttHostPort);
-        mqttEthClient.setCallback(onMqttMessage);
-    }
 
     setupWebServer();
 
     ArduinoOTA.begin();
 
     keepAliveMessageTimer.attach(10, keepAliveMessageTimerCallback);
-    mqttAvailabilityCheckTimer.attach(5, mqttAvailabilityCheckTimerCallback);
-    attributesMessageTimer.attach(60, attributesMessageTimerCallback);
 }
 
 void loop()
 {
-    if (mqttAvailabilityCheckTimerSemaphore)
+    if (mqttReconnectTimerSemaphore)
-        checkMqttAvailability();
+        connectToMqtt();
     if (keepAliveMessageTimerSemaphore)
         sendKeepAliveMessage();
     if (attributesMessageTimerSemaphore)
         sendAttributesMessage();
-    if (config.workMode == ESP_NOW_WIFI)
-        mqttWifiClient.loop();
-    if (config.workMode == ESP_NOW_LAN)
-        mqttEthClient.loop();
     myNet.maintenance();
     ArduinoOTA.handle();
 }
 
+void onWifiEvent(WiFiEvent_t event)
+{
+#if defined(ESP8266)
+    if (event == WIFI_EVENT_STAMODE_GOT_IP)
+#endif
+#if defined(ESP32)
+        if (event == ARDUINO_EVENT_WIFI_STA_GOT_IP)
+#endif
+            mqttClient.connect();
+}
+
 void onEspnowMessage(const char *data, const uint8_t *sender)
 {
-    if (!isMqttAvailable)
+    if (!mqttClient.connected())
         return;
     esp_now_payload_data_t incomingData;
     memcpy(&incomingData, data, sizeof(esp_now_payload_data_t));
     if (incomingData.payloadsType == ENPT_ATTRIBUTES)
-        mqttPublish((config.topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/" + getValueName(incomingData.payloadsType)).c_str(), incomingData.message, true);
+        mqttClient.publish((topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/" + getValueName(incomingData.payloadsType)).c_str(), 2, true, incomingData.message);
     if (incomingData.payloadsType == ENPT_KEEP_ALIVE)
-        mqttPublish((config.topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/" + getValueName(incomingData.payloadsType)).c_str(), "online", true);
+        mqttClient.publish((topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/" + getValueName(incomingData.payloadsType)).c_str(), 2, true, "online");
     if (incomingData.payloadsType == ENPT_STATE)
-        mqttPublish((config.topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/" + getValueName(incomingData.payloadsType)).c_str(), incomingData.message, true);
+        mqttClient.publish((topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/" + getValueName(incomingData.payloadsType)).c_str(), 2, true, incomingData.message);
     if (incomingData.payloadsType == ENPT_CONFIG)
     {
         if (incomingData.deviceType == ENDT_SWITCH)
         {
             esp_now_payload_data_t configData;
             memcpy(&configData.message, &incomingData.message, sizeof(esp_now_payload_data_t::message));
-            DynamicJsonDocument json(sizeof(esp_now_payload_data_t::message));
+            StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json;
             deserializeJson(json, configData.message);
-            uint8_t unit = json[MCMT_DEVICE_UNIT].as<uint8_t>();
+            uint8_t unit = json["unit"].as<uint8_t>();
-            DynamicJsonDocument jsonConfig(2048); // Same as PubSubClient buffer size.
+            ha_component_type_t type = json["type"].as<ha_component_type_t>();
+            StaticJsonDocument<2048> jsonConfig;
             jsonConfig["platform"] = "mqtt";
-            jsonConfig["name"] = json[MCMT_DEVICE_NAME];
+            jsonConfig["name"] = json["name"];
             jsonConfig["unique_id"] = myNet.macToString(sender) + "-" + unit;
-            jsonConfig["device_class"] = getValueName(json[MCMT_DEVICE_CLASS].as<ha_switch_device_class_t>());
+            jsonConfig["device_class"] = getValueName(json["class"].as<ha_switch_device_class_t>());
-            jsonConfig["state_topic"] = config.topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/state";
+            jsonConfig["state_topic"] = topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/state";
-            jsonConfig["value_template"] = "{{ value_json." + json[MCMT_VALUE_TEMPLATE].as<String>() + " }}";
+            jsonConfig["value_template"] = "{{ value_json." + json["template"].as<String>() + " }}";
-            jsonConfig["command_topic"] = config.topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/set";
+            jsonConfig["command_topic"] = topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/set";
-            jsonConfig["json_attributes_topic"] = config.topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/attributes";
+            jsonConfig["json_attributes_topic"] = topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/attributes";
-            jsonConfig["availability_topic"] = config.topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/status";
+            jsonConfig["availability_topic"] = topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/status";
-            if (json[MCMT_PAYLOAD_ON])
+            jsonConfig["payload_on"] = json["payload_on"];
-                jsonConfig["payload_on"] = json[MCMT_PAYLOAD_ON];
+            jsonConfig["payload_off"] = json["payload_off"];
-            if (json[MCMT_PAYLOAD_OFF])
-                jsonConfig["payload_off"] = json[MCMT_PAYLOAD_OFF];
             jsonConfig["optimistic"] = "false";
+            jsonConfig["qos"] = 2;
             jsonConfig["retain"] = "true";
             char buffer[2048]{0};
             serializeJsonPretty(jsonConfig, buffer);
-            mqttPublish((config.topicPrefix + "/" + getValueName(json[MCMT_COMPONENT_TYPE].as<ha_component_type_t>()) + "/" + myNet.macToString(sender) + "-" + unit + "/config").c_str(), buffer, true);
+            mqttClient.publish((topicPrefix + "/" + getValueName(type) + "/" + myNet.macToString(sender) + "-" + unit + "/config").c_str(), 2, true, buffer);
         }
         if (incomingData.deviceType == ENDT_LED)
         {
             esp_now_payload_data_t configData;
             memcpy(&configData.message, &incomingData.message, sizeof(esp_now_payload_data_t::message));
-            DynamicJsonDocument json(sizeof(esp_now_payload_data_t::message));
+            StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json;
             deserializeJson(json, configData.message);
-            uint8_t unit = json[MCMT_DEVICE_UNIT].as<uint8_t>();
+            uint8_t unit = json["unit"].as<uint8_t>();
-            esp_now_led_type_t ledClass = json[MCMT_DEVICE_CLASS];
+            ha_component_type_t type = json["type"].as<ha_component_type_t>();
-            DynamicJsonDocument jsonConfig(2048); // Same as PubSubClient buffer size.
+            esp_now_led_type_t ledClass = json["class"];
+            StaticJsonDocument<2048> jsonConfig;
             jsonConfig["platform"] = "mqtt";
-            jsonConfig["name"] = json[MCMT_DEVICE_NAME];
+            jsonConfig["name"] = json["name"];
             jsonConfig["unique_id"] = myNet.macToString(sender) + "-" + unit;
-            jsonConfig["state_topic"] = config.topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/state";
+            jsonConfig["state_topic"] = topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/state";
             jsonConfig["state_value_template"] = "{{ value_json.state }}";
-            jsonConfig["command_topic"] = config.topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/set";
+            jsonConfig["command_topic"] = topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/set";
-            jsonConfig["brightness_state_topic"] = config.topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/state";
+            jsonConfig["brightness_state_topic"] = topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/state";
             jsonConfig["brightness_value_template"] = "{{ value_json.brightness }}";
-            jsonConfig["brightness_command_topic"] = config.topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/brightness";
+            jsonConfig["brightness_command_topic"] = topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/brightness";
             if (ledClass == ENLT_RGB || ledClass == ENLT_RGBW || ledClass == ENLT_RGBWW)
             {
-                jsonConfig["rgb_state_topic"] = config.topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/state";
+                jsonConfig["rgb_state_topic"] = topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/state";
                 jsonConfig["rgb_value_template"] = "{{ value_json.rgb | join(',') }}";
-                jsonConfig["rgb_command_topic"] = config.topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/rgb";
+                jsonConfig["rgb_command_topic"] = topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/rgb";
             }
             if (ledClass == ENLT_WW || ledClass == ENLT_RGBWW)
             {
-                jsonConfig["color_temp_state_topic"] = config.topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/state";
+                jsonConfig["color_temp_state_topic"] = topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/state";
                 jsonConfig["color_temp_value_template"] = "{{ value_json.temperature }}";
-                jsonConfig["color_temp_command_topic"] = config.topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/temperature";
+                jsonConfig["color_temp_command_topic"] = topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/temperature";
             }
-            jsonConfig["json_attributes_topic"] = config.topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/attributes";
+            jsonConfig["json_attributes_topic"] = topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/attributes";
-            jsonConfig["availability_topic"] = config.topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/status";
+            jsonConfig["availability_topic"] = topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/status";
-            if (json[MCMT_PAYLOAD_ON])
+            jsonConfig["payload_on"] = json["payload_on"];
-                jsonConfig["payload_on"] = json[MCMT_PAYLOAD_ON];
+            jsonConfig["payload_off"] = json["payload_off"];
-            if (json[MCMT_PAYLOAD_OFF])
-                jsonConfig["payload_off"] = json[MCMT_PAYLOAD_OFF];
             jsonConfig["optimistic"] = "false";
+            jsonConfig["qos"] = 2;
             jsonConfig["retain"] = "true";
             char buffer[2048]{0};
             serializeJsonPretty(jsonConfig, buffer);
-            mqttPublish((config.topicPrefix + "/" + getValueName(json[MCMT_COMPONENT_TYPE].as<ha_component_type_t>()) + "/" + myNet.macToString(sender) + "-" + unit + "/config").c_str(), buffer, true);
+            mqttClient.publish((topicPrefix + "/" + getValueName(type) + "/" + myNet.macToString(sender) + "-" + unit + "/config").c_str(), 2, true, buffer);
         }
         if (incomingData.deviceType == ENDT_SENSOR)
         {
             esp_now_payload_data_t configData;
             memcpy(&configData.message, &incomingData.message, sizeof(esp_now_payload_data_t::message));
-            DynamicJsonDocument json(sizeof(esp_now_payload_data_t::message));
+            StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json;
             deserializeJson(json, configData.message);
-            uint8_t unit = json[MCMT_DEVICE_UNIT].as<uint8_t>();
+            uint8_t unit = json["unit"].as<uint8_t>();
-            ha_component_type_t type = json[MCMT_COMPONENT_TYPE].as<ha_component_type_t>();
+            ha_component_type_t type = json["type"].as<ha_component_type_t>();
-            DynamicJsonDocument jsonConfig(2048); // Same as PubSubClient buffer size.
+            StaticJsonDocument<2048> jsonConfig;
             jsonConfig["platform"] = "mqtt";
-            jsonConfig["name"] = json[MCMT_DEVICE_NAME];
+            jsonConfig["name"] = json["name"];
             jsonConfig["unique_id"] = myNet.macToString(sender) + "-" + unit;
-            jsonConfig["state_topic"] = config.topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/state";
+            jsonConfig["state_topic"] = topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/state";
-            jsonConfig["value_template"] = "{{ value_json." + json[MCMT_VALUE_TEMPLATE].as<String>() + " }}";
+            jsonConfig["value_template"] = "{{ value_json." + json["template"].as<String>() + " }}";
-            jsonConfig["json_attributes_topic"] = config.topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/attributes";
+            jsonConfig["json_attributes_topic"] = topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/attributes";
             jsonConfig["force_update"] = "true";
+            jsonConfig["qos"] = 2;
             jsonConfig["retain"] = "true";
             if (type == HACT_SENSOR)
-            {
+                jsonConfig["device_class"] = getValueName(json["class"].as<ha_sensor_device_class_t>());
-                jsonConfig["device_class"] = getValueName(json[MCMT_DEVICE_CLASS].as<ha_sensor_device_class_t>());
-                jsonConfig["unit_of_measurement"] = json[MCMT_UNIT_OF_MEASUREMENT];
-            }
             if (type == HACT_BINARY_SENSOR)
-                jsonConfig["device_class"] = getValueName(json[MCMT_DEVICE_CLASS].as<ha_binary_sensor_device_class_t>());
+            {
-            if (json[MCMT_EXPIRE_AFTER])
+                jsonConfig["device_class"] = getValueName(json["class"].as<ha_binary_sensor_device_class_t>());
-                jsonConfig["expire_after"] = json[MCMT_EXPIRE_AFTER];
+                jsonConfig["payload_on"] = json["payload_on"];
-            if (json[MCMT_OFF_DELAY])
+                jsonConfig["payload_off"] = json["payload_off"];
-                jsonConfig["off_delay"] = json[MCMT_OFF_DELAY];
+            }
-            if (json[MCMT_PAYLOAD_ON])
-                jsonConfig["payload_on"] = json[MCMT_PAYLOAD_ON];
-            if (json[MCMT_PAYLOAD_OFF])
-                jsonConfig["payload_off"] = json[MCMT_PAYLOAD_OFF];
             char buffer[2048]{0};
             serializeJsonPretty(jsonConfig, buffer);
-            mqttPublish((config.topicPrefix + "/" + getValueName(type) + "/" + myNet.macToString(sender) + "-" + unit + "/config").c_str(), buffer, true);
+            mqttClient.publish((topicPrefix + "/" + getValueName(type) + "/" + myNet.macToString(sender) + "-" + unit + "/config").c_str(), 2, true, buffer);
-        }
-        if (incomingData.deviceType == ENDT_RF_SENSOR)
-        {
-            esp_now_payload_data_t configData;
-            memcpy(&configData.message, &incomingData.message, sizeof(esp_now_payload_data_t::message));
-            DynamicJsonDocument json(sizeof(esp_now_payload_data_t::message));
-            deserializeJson(json, configData.message);
-            uint8_t unit = json[MCMT_DEVICE_UNIT].as<uint8_t>();
-            ha_component_type_t haComponentType = json[MCMT_COMPONENT_TYPE].as<ha_component_type_t>();
-            rf_sensor_type_t rfSensorType = json[MCMT_RF_SENSOR_TYPE].as<rf_sensor_type_t>();
-            uint16_t rfSensorId = json[MCMT_RF_SENSOR_ID].as<uint16_t>();
-            String valueTemplate = json[MCMT_VALUE_TEMPLATE].as<String>();
-            DynamicJsonDocument jsonConfig(2048); // Same as PubSubClient buffer size.
-            jsonConfig["platform"] = "mqtt";
-            jsonConfig["name"] = getValueName(rfSensorType) + " " + rfSensorId + " " + valueTemplate;
-            jsonConfig["unique_id"] = String(rfSensorId) + "-" + unit;
-            jsonConfig["state_topic"] = config.topicPrefix + "/rf_sensor/" + getValueName(rfSensorType) + "/" + rfSensorId + "/state";
-            jsonConfig["value_template"] = "{{ value_json." + valueTemplate + " }}";
-            jsonConfig["force_update"] = "true";
-            jsonConfig["retain"] = "true";
-            if (haComponentType == HACT_SENSOR)
-            {
-                jsonConfig["device_class"] = getValueName(json[MCMT_DEVICE_CLASS].as<ha_sensor_device_class_t>());
-                jsonConfig["unit_of_measurement"] = json[MCMT_UNIT_OF_MEASUREMENT];
-            }
-            if (haComponentType == HACT_BINARY_SENSOR)
-                jsonConfig["device_class"] = getValueName(json[MCMT_DEVICE_CLASS].as<ha_binary_sensor_device_class_t>());
-            if (json[MCMT_EXPIRE_AFTER])
-                jsonConfig["expire_after"] = json[MCMT_EXPIRE_AFTER];
-            if (json[MCMT_OFF_DELAY])
-                jsonConfig["off_delay"] = json[MCMT_OFF_DELAY];
-            if (json[MCMT_PAYLOAD_ON])
-                jsonConfig["payload_on"] = json[MCMT_PAYLOAD_ON];
-            if (json[MCMT_PAYLOAD_OFF])
-                jsonConfig["payload_off"] = json[MCMT_PAYLOAD_OFF];
-            char buffer[2048]{0};
-            serializeJsonPretty(jsonConfig, buffer);
-            mqttPublish((config.topicPrefix + "/" + getValueName(haComponentType) + "/" + rfSensorId + "-" + unit + "/config").c_str(), buffer, true);
-        }
-        if (incomingData.deviceType == ENDT_RF_GATEWAY)
-        {
-            esp_now_payload_data_t configData;
-            memcpy(&configData.message, &incomingData.message, sizeof(esp_now_payload_data_t::message));
-            DynamicJsonDocument json(sizeof(esp_now_payload_data_t::message));
-            deserializeJson(json, configData.message);
-            uint8_t unit = json[MCMT_DEVICE_UNIT].as<uint8_t>();
-            DynamicJsonDocument jsonConfig(2048); // Same as PubSubClient buffer size.
-            jsonConfig["platform"] = "mqtt";
-            jsonConfig["name"] = json[MCMT_DEVICE_NAME];
-            jsonConfig["unique_id"] = myNet.macToString(sender) + "-" + unit;
-            jsonConfig["device_class"] = getValueName(json[MCMT_DEVICE_CLASS].as<ha_binary_sensor_device_class_t>());
-            jsonConfig["state_topic"] = config.topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/status";
-            jsonConfig["json_attributes_topic"] = config.topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/attributes";
-            jsonConfig["payload_on"] = json[MCMT_PAYLOAD_ON];
-            jsonConfig["expire_after"] = json[MCMT_EXPIRE_AFTER];
-            jsonConfig["force_update"] = "true";
-            jsonConfig["retain"] = "true";
-            char buffer[2048]{0};
-            serializeJsonPretty(jsonConfig, buffer);
-            mqttPublish((config.topicPrefix + "/" + getValueName(json[MCMT_COMPONENT_TYPE].as<ha_component_type_t>()) + "/" + myNet.macToString(sender) + "-" + unit + "/config").c_str(), buffer, true);
         }
     }
     if (incomingData.payloadsType == ENPT_FORWARD)
     {
         esp_now_payload_data_t forwardData;
         memcpy(&forwardData.message, &incomingData.message, sizeof(esp_now_payload_data_t::message));
-        DynamicJsonDocument json(sizeof(esp_now_payload_data_t::message));
+        StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json;
         deserializeJson(json, forwardData.message);
-        if (incomingData.deviceType == ENDT_RF_GATEWAY)
+        mqttClient.publish((topicPrefix + "/rf_sensor/" + getValueName(json["type"].as<rf_sensor_type_t>()) + "/" + json["id"].as<uint16_t>()).c_str(), 2, false, incomingData.message);
-            mqttPublish((config.topicPrefix + "/rf_sensor/" + getValueName(json["type"].as<rf_sensor_type_t>()) + "/" + json["id"].as<uint16_t>() + "/state").c_str(), incomingData.message, false);
     }
 }
 
-void onMqttMessage(char *topic, byte *payload, unsigned int length)
+void onMqttConnect(bool sessionPresent)
+{
+    mqttClient.subscribe((topicPrefix + "/espnow_gateway/#").c_str(), 2);
+    mqttClient.subscribe((topicPrefix + "/espnow_switch/#").c_str(), 2);
+    mqttClient.subscribe((topicPrefix + "/espnow_led/#").c_str(), 2);
+
+    StaticJsonDocument<1024> json;
+    json["platform"] = "mqtt";
+    json["name"] = deviceName;
+    json["unique_id"] = myNet.getNodeMac() + "-1";
+    json["device_class"] = "connectivity";
+    json["state_topic"] = topicPrefix + "/espnow_gateway/" + myNet.getNodeMac() + "/status";
+    json["json_attributes_topic"] = topicPrefix + "/espnow_gateway/" + myNet.getNodeMac() + "/attributes";
+    json["payload_on"] = "online";
+    json["expire_after"] = 30;
+    json["force_update"] = "true";
+    json["qos"] = 2;
+    json["retain"] = "true";
+    char buffer[1024]{0};
+    serializeJsonPretty(json, buffer);
+    mqttClient.publish((topicPrefix + "/binary_sensor/" + myNet.getNodeMac() + "-1" + "/config").c_str(), 2, true, buffer);
+
+    sendKeepAliveMessage();
+    sendAttributesMessage();
+    attributesMessageTimer.attach(60, attributesMessageTimerCallback);
+}
+
+void onMqttDisconnect(AsyncMqttClientDisconnectReason reason)
+{
+    mqttReconnectTimer.once(5, mqttReconnectTimerCallback);
+    sendKeepAliveMessage();
+    attributesMessageTimer.detach();
+}
+
+void onMqttMessage(char *topic, char *payload, AsyncMqttClientMessageProperties properties, size_t len, size_t index, size_t total)
 {
     String mac = getValue(String(topic).substring(0, String(topic).length()), '/', 2);
     String message;
     bool flag{false};
-    for (uint16_t i = 0; i < length; ++i)
+    for (uint16_t i = 0; i < len; ++i)
     {
         message += (char)payload[i];
     }
     esp_now_payload_data_t outgoingData;
     outgoingData.deviceType = ENDT_GATEWAY;
-    outgoingData.payloadsType = ENPT_SET;
+    StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json;
-    DynamicJsonDocument json(sizeof(esp_now_payload_data_t::message));
     if (message == "update" || message == "restart")
     {
+        mqttClient.publish(topic, 2, true, "");
+        mqttClient.publish((String(topic) + "/status").c_str(), 2, true, "offline");
         if (mac == myNet.getNodeMac() && message == "restart")
             ESP.restart();
         flag = true;
     }
-    if (String(topic) == config.topicPrefix + "/espnow_switch/" + mac + "/set" || String(topic) == config.topicPrefix + "/espnow_led/" + mac + "/set")
+    if (String(topic) == topicPrefix + "/espnow_switch/" + mac + "/set" || String(topic) == topicPrefix + "/espnow_led/" + mac + "/set")
     {
         flag = true;
         json["set"] = message;
     }
-    if (String(topic) == config.topicPrefix + "/espnow_led/" + mac + "/brightness")
+    if (String(topic) == topicPrefix + "/espnow_led/" + mac + "/brightness")
     {
         flag = true;
         json["brightness"] = message;
     }
-    if (String(topic) == config.topicPrefix + "/espnow_led/" + mac + "/temperature")
+    if (String(topic) == topicPrefix + "/espnow_led/" + mac + "/temperature")
     {
         flag = true;
         json["temperature"] = message;
     }
-    if (String(topic) == config.topicPrefix + "/espnow_led/" + mac + "/rgb")
+    if (String(topic) == topicPrefix + "/espnow_led/" + mac + "/rgb")
     {
         flag = true;
         json["rgb"] = message;
@@ -441,9 +359,11 @@ void onMqttMessage(char *topic, byte *payload, unsigned int length)
     {
         if (message == "restart")
             outgoingData.payloadsType = ENPT_RESTART;
-        if (message == "update")
+        else
-            outgoingData.payloadsType = ENPT_UPDATE;
+            outgoingData.payloadsType = message == "update" ? ENPT_UPDATE : ENPT_SET;
-        serializeJsonPretty(json, outgoingData.message);
+        char buffer[sizeof(esp_now_payload_data_t::message)]{0};
+        serializeJsonPretty(json, buffer);
+        memcpy(&outgoingData.message, &buffer, sizeof(esp_now_payload_data_t::message));
         char temp[sizeof(esp_now_payload_data_t)]{0};
         memcpy(&temp, &outgoingData, sizeof(esp_now_payload_data_t));
         uint8_t target[6];
@@ -455,30 +375,14 @@ void onMqttMessage(char *topic, byte *payload, unsigned int length)
 void sendKeepAliveMessage()
 {
     keepAliveMessageTimerSemaphore = false;
-    if (isMqttAvailable)
+    if (mqttClient.connected())
-        mqttPublish((config.topicPrefix + "/espnow_gateway/" + myNet.getNodeMac() + "/status").c_str(), "online", true);
+        mqttClient.publish((topicPrefix + "/espnow_gateway/" + myNet.getNodeMac() + "/status").c_str(), 2, true, "online");
     esp_now_payload_data_t outgoingData;
     outgoingData.deviceType = ENDT_GATEWAY;
     outgoingData.payloadsType = ENPT_KEEP_ALIVE;
-    DynamicJsonDocument json(sizeof(esp_now_payload_data_t::message));
+    StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json;
-    json["MQTT"] = isMqttAvailable ? "online" : "offline";
+    json["MQTT"] = mqttClient.connected() ? "online" : "offline";
     json["frequency"] = 10; // For compatibility with the previous version. Will be removed in future releases.
-    if (config.workMode == ESP_NOW_WIFI && WiFi.isConnected())
-    {
-        ntpWiFiClient.update();
-        uint64_t epochTime = ntpWiFiClient.getEpochTime();
-        struct tm *time = gmtime((time_t *)&epochTime);
-        json["time"] = ntpWiFiClient.getFormattedTime();
-        json["date"] = String(time->tm_mday) + "." + String(time->tm_mon + 1) + "." + String(time->tm_year + 1900);
-    }
-    if (config.workMode == ESP_NOW_LAN && Ethernet.linkStatus() == LinkON)
-    {
-        ntpEthClient.update();
-        uint64_t epochTime = ntpEthClient.getEpochTime();
-        struct tm *time = gmtime((time_t *)&epochTime);
-        json["time"] = ntpEthClient.getFormattedTime();
-        json["date"] = String(time->tm_mday) + "." + String(time->tm_mon + 1) + "." + String(time->tm_year + 1900);
-    }
     char buffer[sizeof(esp_now_payload_data_t::message)]{0};
     serializeJsonPretty(json, buffer);
     memcpy(&outgoingData.message, &buffer, sizeof(esp_now_payload_data_t::message));
@@ -489,14 +393,12 @@ void sendKeepAliveMessage()
 
 void sendAttributesMessage()
 {
-    if (!isMqttAvailable)
-        return;
     attributesMessageTimerSemaphore = false;
     uint32_t secs = millis() / 1000;
     uint32_t mins = secs / 60;
     uint32_t hours = mins / 60;
     uint32_t days = hours / 24;
-    DynamicJsonDocument json(sizeof(esp_now_payload_data_t::message));
+    StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json;
     json["Type"] = "ESP-NOW gateway";
 #if defined(ESP8266)
     json["MCU"] = "ESP8266";
@@ -507,32 +409,11 @@ void sendAttributesMessage()
     json["MAC"] = myNet.getNodeMac();
     json["Firmware"] = firmware;
     json["Library"] = myNet.getFirmwareVersion();
-    if (config.workMode == ESP_NOW_WIFI)
     json["IP"] = WiFi.localIP().toString();
-    if (config.workMode == ESP_NOW_LAN)
-        json["IP"] = Ethernet.localIP().toString();
     json["Uptime"] = "Days:" + String(days) + " Hours:" + String(hours - (days * 24)) + " Mins:" + String(mins - (hours * 60));
     char buffer[sizeof(esp_now_payload_data_t::message)]{0};
     serializeJsonPretty(json, buffer);
-    mqttPublish((config.topicPrefix + "/espnow_gateway/" + myNet.getNodeMac() + "/attributes").c_str(), buffer, true);
+    mqttClient.publish((topicPrefix + "/espnow_gateway/" + myNet.getNodeMac() + "/attributes").c_str(), 2, true, buffer);
-}
-
-void sendConfigMessage()
-{
-    DynamicJsonDocument json(2048); // Same as PubSubClient buffer size.
-    json["platform"] = "mqtt";
-    json["name"] = config.deviceName;
-    json["unique_id"] = myNet.getNodeMac() + "-1";
-    json["device_class"] = "connectivity";
-    json["state_topic"] = config.topicPrefix + "/espnow_gateway/" + myNet.getNodeMac() + "/status";
-    json["json_attributes_topic"] = config.topicPrefix + "/espnow_gateway/" + myNet.getNodeMac() + "/attributes";
-    json["payload_on"] = "online";
-    json["expire_after"] = 30;
-    json["force_update"] = "true";
-    json["retain"] = "true";
-    char buffer[1024]{0};
-    serializeJsonPretty(json, buffer);
-    mqttPublish((config.topicPrefix + "/binary_sensor/" + myNet.getNodeMac() + "-1" + "/config").c_str(), buffer, true);
 }
 
 String getValue(String data, char separator, uint8_t index)
@@ -552,27 +433,41 @@ String getValue(String data, char separator, uint8_t index)
 
 void loadConfig()
 {
-    EEPROM.begin(4096);
+    if (!SPIFFS.exists("/config.json"))
-    if (EEPROM.read(4095) == 254)
-    {
-        EEPROM.get(0, config);
-        EEPROM.end();
-    }
-    else
-    {
-        EEPROM.end();
         saveConfig();
-    }
+    File file = SPIFFS.open("/config.json", "r");
-    delay(50);
+    String jsonFile = file.readString();
+    StaticJsonDocument<1024> json;
+    deserializeJson(json, jsonFile);
+    espnowNetName = json["espnowNetName"].as<String>();
+    deviceName = json["deviceName"].as<String>();
+    ssid = json["ssid"].as<String>();
+    password = json["password"].as<String>();
+    mqttHostName = json["mqttHostName"].as<String>();
+    mqttHostPort = json["mqttHostPort"];
+    mqttUserLogin = json["mqttUserLogin"].as<String>();
+    mqttUserPassword = json["mqttUserPassword"].as<String>();
+    topicPrefix = json["topicPrefix"].as<String>();
+    file.close();
 }
 
 void saveConfig()
 {
-    EEPROM.begin(4096);
+    StaticJsonDocument<1024> json;
-    EEPROM.write(4095, 254);
+    json["firmware"] = firmware;
-    EEPROM.put(0, config);
+    json["espnowNetName"] = espnowNetName;
-    EEPROM.end();
+    json["deviceName"] = deviceName;
-    delay(50);
+    json["ssid"] = ssid;
+    json["password"] = password;
+    json["mqttHostName"] = mqttHostName;
+    json["mqttHostPort"] = mqttHostPort;
+    json["mqttUserLogin"] = mqttUserLogin;
+    json["mqttUserPassword"] = mqttUserPassword;
+    json["topicPrefix"] = topicPrefix;
+    json["system"] = "empty";
+    File file = SPIFFS.open("/config.json", "w");
+    serializeJsonPretty(json, file);
+    file.close();
 }
 
 String xmlNode(String tags, String data)
@@ -594,7 +489,7 @@ void setupWebServer()
         ssdpHeader = xmlNode("specVersion", ssdpHeader);
         ssdpHeader += xmlNode("URLBase", "http://" + WiFi.localIP().toString());
         String ssdpDescription = xmlNode("deviceType", "upnp:rootdevice");
-        ssdpDescription += xmlNode("friendlyName", config.deviceName);
+        ssdpDescription += xmlNode("friendlyName", deviceName);
         ssdpDescription += xmlNode("presentationURL", "/");
         ssdpDescription += xmlNode("serialNumber", "0000000" + String(random(1000)));
         ssdpDescription += xmlNode("modelName", "ESP-NOW gateway");
@@ -610,118 +505,49 @@ void setupWebServer()
         request->send(200, "text/xml", ssdpSend); });
 
     webServer.on("/", HTTP_GET, [](AsyncWebServerRequest *request)
-                 { request->send(LittleFS, "/index.htm"); });
+                 { request->send(SPIFFS, "/index.htm"); });
-
-    webServer.on("/function.js", HTTP_GET, [](AsyncWebServerRequest *request)
-                 { request->send(LittleFS, "/function.js"); });
-
-    webServer.on("/style.css", HTTP_GET, [](AsyncWebServerRequest *request)
-                 { request->send(LittleFS, "/style.css"); });
 
     webServer.on("/setting", HTTP_GET, [](AsyncWebServerRequest *request)
                  {
-        config.ssid = request->getParam("ssid")->value();
+        ssid = request->getParam("ssid")->value();
-        config.password = request->getParam("password")->value();
+        password = request->getParam("password")->value();
-        config.mqttHostName = request->getParam("mqttHostName")->value();
+        mqttHostName = request->getParam("host")->value();
-        config.mqttHostPort = request->getParam("mqttHostPort")->value().toInt();
+        mqttHostPort = request->getParam("port")->value().toInt();
-        config.mqttUserLogin = request->getParam("mqttUserLogin")->value();
+        mqttUserLogin = request->getParam("login")->value();
-        config.mqttUserPassword = request->getParam("mqttUserPassword")->value();
+        mqttUserPassword = request->getParam("pass")->value();
-        config.topicPrefix = request->getParam("topicPrefix")->value();
+        topicPrefix = request->getParam("prefix")->value();
-        config.deviceName = request->getParam("deviceName")->value();
+        deviceName = request->getParam("name")->value();
-        config.espnowNetName = request->getParam("espnowNetName")->value();
+        espnowNetName = request->getParam("net")->value();
-        config.workMode = request->getParam("workMode")->value().toInt();
-        config.ntpHostName = request->getParam("ntpHostName")->value();
-        config.gmtOffset = request->getParam("gmtOffset")->value().toInt();
         request->send(200);
         saveConfig(); });
 
-    webServer.on("/config", HTTP_GET, [](AsyncWebServerRequest *request)
-                 {
-        String configJson;
-        DynamicJsonDocument json(2048); // For overflow protection.
-        json["firmware"] = firmware;
-        json["espnowNetName"] = config.espnowNetName;
-        json["deviceName"] = config.deviceName;
-        json["ssid"] = config.ssid;
-        json["password"] = config.password;
-        json["mqttHostName"] = config.mqttHostName;
-        json["mqttHostPort"] = config.mqttHostPort;
-        json["mqttUserLogin"] = config.mqttUserLogin;
-        json["mqttUserPassword"] = config.mqttUserPassword;
-        json["topicPrefix"] = config.topicPrefix;
-        json["workMode"] = config.workMode;
-        json["ntpHostName"] = config.ntpHostName;
-        json["gmtOffset"] = config.gmtOffset;
-        serializeJsonPretty(json, configJson);
-        request->send(200, "application/json", configJson); });
-
     webServer.on("/restart", HTTP_GET, [](AsyncWebServerRequest *request)
-                 {request->send(200);
+                 {
+        request->send(200);
         ESP.restart(); });
 
     webServer.onNotFound([](AsyncWebServerRequest *request)
-                         { request->send(404, "text/plain", "File Not Found"); });
+                         { 
+        if (SPIFFS.exists(request->url()))
+        request->send(SPIFFS, request->url());
+        else
+        {
+        request->send(404, "text/plain", "File Not Found");
+        } });
 
-    if (config.workMode == ESP_NOW_WIFI)
     SSDP.begin();
-
     webServer.begin();
 }
 
-void checkMqttAvailability()
+void connectToMqtt()
 {
-    mqttAvailabilityCheckTimerSemaphore = false;
+    mqttReconnectTimerSemaphore = false;
-
+    mqttClient.connect();
-    if (config.workMode == ESP_NOW_WIFI)
-        if (WiFi.isConnected())
-            if (!mqttWifiClient.connected())
-            {
-                isMqttAvailable = false;
-                if (mqttWifiClient.connect(mqttUserID, config.mqttUserLogin.c_str(), config.mqttUserPassword.c_str()))
-                {
-                    isMqttAvailable = true;
-
-                    mqttWifiClient.subscribe((config.topicPrefix + "/espnow_gateway/#").c_str());
-                    mqttWifiClient.subscribe((config.topicPrefix + "/espnow_switch/#").c_str());
-                    mqttWifiClient.subscribe((config.topicPrefix + "/espnow_led/#").c_str());
-
-                    sendConfigMessage();
-                    sendAttributesMessage();
-                    sendKeepAliveMessage();
-                }
 }
 
-    if (config.workMode == ESP_NOW_LAN)
+void mqttReconnectTimerCallback()
-        if (Ethernet.linkStatus() == LinkON)
-            if (!mqttEthClient.connected())
 {
-                isMqttAvailable = false;
+    mqttReconnectTimerSemaphore = true;
-                if (mqttEthClient.connect(mqttUserID, config.mqttUserLogin.c_str(), config.mqttUserPassword.c_str()))
-                {
-                    isMqttAvailable = true;
-
-                    mqttEthClient.subscribe((config.topicPrefix + "/espnow_gateway/#").c_str());
-                    mqttEthClient.subscribe((config.topicPrefix + "/espnow_switch/#").c_str());
-                    mqttEthClient.subscribe((config.topicPrefix + "/espnow_led/#").c_str());
-
-                    sendConfigMessage();
-                    sendAttributesMessage();
-                    sendKeepAliveMessage();
-                }
-            }
-}
-
-void mqttPublish(const char *topic, const char *payload, bool retained)
-{
-    if (config.workMode == ESP_NOW_WIFI)
-        mqttWifiClient.publish(topic, payload, retained);
-    if (config.workMode == ESP_NOW_LAN)
-        mqttEthClient.publish(topic, payload, retained);
-}
-
-void mqttAvailabilityCheckTimerCallback()
-{
-    mqttAvailabilityCheckTimerSemaphore = true;
 }
 
 void keepAliveMessageTimerCallback()