Compare commits
11 Commits
Author | SHA1 | Date | |
---|---|---|---|
24ba0a09f4 | |||
eebaca38b7 | |||
8e9082f05e | |||
1c306e031b | |||
74c6279f50 | |||
8c3b51304e | |||
7b60f9efb3 | |||
06487167f4 | |||
219cf17855 | |||
3aca3b7bbd | |||
9a86f806e4 |
30
README.md
30
README.md
@ -4,41 +4,43 @@ 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).
|
||||
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.
|
||||
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. Possibility firmware update over OTA.
|
||||
6. Web interface for settings.
|
||||
5. Automatically adds supported ESP-NOW devices configurations to Home Assistan via MQTT discovery.
|
||||
6. Possibility firmware update over OTA.
|
||||
7. Web interface for settings.
|
||||
|
||||
## 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/gateway/70039F44BEF7").
|
||||
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").
|
||||
|
||||
## Attention
|
||||
|
||||
1. ESP-NOW network name must be set same of all another ESP-NOW devices in network.
|
||||
2. Upload the "data" folder (with web interface) into the filesystem before flashing.
|
||||
3. WiFi router must be set on channel 1.
|
||||
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. WiFi router must be set on channel 1.
|
||||
|
||||
## Tested on
|
||||
|
||||
1. NodeMCU 1.0 (ESP-12E Module). Unstable work.
|
||||
2. AZ-Delivery ESP-32 Dev Kit C V4. Stable 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.
|
||||
|
||||
## Supported devices
|
||||
|
||||
1. [RF - Gateway](https://github.com/aZholtikov/RF-Gateway) (coming soon)
|
||||
2. [ESP-NOW Switch](https://github.com/aZholtikov/ESP-NOW-Switch) (coming soon)
|
||||
3. [ESP-NOW Led Light/Strip](https://github.com/aZholtikov/ESP-NOW-Led-Light-Strip) (coming soon)
|
||||
4. [ESP-NOW Window/Door Sensor](https://github.com/aZholtikov/ESP-NOW-Window-Door-Sensor) (coming soon)
|
||||
5. [ESP-NOW Water Leakage Sensor](https://github.com/aZholtikov/ESP-NOW-Water-Leakage-Sensor) (coming soon)
|
||||
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)
|
||||
5. [ESP-NOW Water Leakage Sensor](https://github.com/aZholtikov/ESP-NOW-Water-Leakage-Sensor)
|
||||
|
||||
## To Do
|
||||
|
||||
- [ ] Automatically add ESP-NOW devices configurations to Home Assistan via MQTT discovery.
|
||||
- [X] Automatically add ESP-NOW devices configurations to Home Assistan via MQTT discovery.
|
||||
- [ ] LAN connection support.
|
||||
- [ ] nRF24 device support (in current time uses "RF Gateway").
|
||||
- [ ] BLE device support (for ESP32).
|
||||
|
@ -31,20 +31,20 @@
|
||||
|
||||
<p class="text">WiFi settings</p>
|
||||
<div class="wrapper">
|
||||
<input id="ssid" value="{{ssid}}" placeholder="SSID" label title="WiFi network name" />
|
||||
<input class="text-inp" id="ssid" value="{{ssid}}" placeholder="SSID" label title="WiFi network name" />
|
||||
<input id="password" value="{{password}}" onfocus="this.type='text'" type="password" placeholder="Password"
|
||||
autocomplete="off" label title="WiFi password" />
|
||||
</div>
|
||||
|
||||
<p class="text">MQTT settings</p>
|
||||
<div class="wrapper">
|
||||
<input id="mqttHostName" value="{{mqttHostName}}" placeholder="URL or IP" label
|
||||
<input class="text-inp" id="mqttHostName" value="{{mqttHostName}}" placeholder="URL or IP" label
|
||||
title="MQTT server URL or IP" />
|
||||
<input id="mqttHostPort" value="{{mqttHostPort}}" placeholder="Port" label title="MQTT server port" />
|
||||
</div>
|
||||
|
||||
<div class="wrapper">
|
||||
<input id="mqttUserLogin" value="{{mqttUserLogin}}" placeholder="Login" label
|
||||
<input class="text-inp" id="mqttUserLogin" value="{{mqttUserLogin}}" placeholder="Login" label
|
||||
title="MQTT server user login" />
|
||||
<input id="mqttUserPassword" value="{{mqttUserPassword}}" onfocus="this.type='text'" type="password"
|
||||
placeholder="Password" autocomplete="off" label title="MQTT server user password" />
|
||||
|
@ -1,3 +1,7 @@
|
||||
p{
|
||||
margin: 0 0;
|
||||
}
|
||||
|
||||
body {
|
||||
font-family: "Gill Sans", sans-serif;
|
||||
background: rgb(255, 255, 255);
|
||||
@ -21,6 +25,21 @@ h1 {
|
||||
font-weight: 600;
|
||||
flex-shrink: 0;
|
||||
margin-right: 10px;
|
||||
margin-left: 10px;
|
||||
margin: 10px 0;
|
||||
}
|
||||
|
||||
.text-inp {
|
||||
width: 48%;
|
||||
min-height: 30px;
|
||||
border-radius: 5px;
|
||||
border: none;
|
||||
margin-bottom: 10px;
|
||||
padding: 0 10px;
|
||||
color: rgb(0, 0, 0);
|
||||
background: #a3e0f1;
|
||||
transition: .5s;
|
||||
margin-left: 0;
|
||||
}
|
||||
|
||||
.wrapper {
|
||||
@ -39,6 +58,7 @@ input {
|
||||
color: rgb(0, 0, 0);
|
||||
background: #a3e0f1;
|
||||
transition: .5s;
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
input:hover {
|
||||
@ -51,6 +71,8 @@ input:hover {
|
||||
background: rgb(65, 125, 238);
|
||||
color: white;
|
||||
transition: .5s;
|
||||
margin-left: 0;
|
||||
margin-top: 8px;
|
||||
}
|
||||
|
||||
.btn:hover {
|
||||
@ -65,6 +87,10 @@ input:hover {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
#espnowNetName {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.wrapper.wrapper--end {
|
||||
align-items: baseline;
|
||||
}
|
@ -1,49 +1,53 @@
|
||||
[env:esp8266]
|
||||
[env:ESP8266]
|
||||
platform = espressif8266
|
||||
board = nodemcuv2
|
||||
framework = arduino
|
||||
board_build.filesystem = littlefs
|
||||
lib_deps =
|
||||
https://github.com/aZholtikov/ZHNetwork
|
||||
https://github.com/aZholtikov/ZHConfig
|
||||
bblanchon/ArduinoJson@^6.19.4
|
||||
me-no-dev/ESP Async WebServer@^1.2.3
|
||||
marvinroger/AsyncMqttClient@^0.9.0
|
||||
https://github.com/aZholtikov/Async-Web-Server
|
||||
https://github.com/bblanchon/ArduinoJson
|
||||
https://github.com/marvinroger/async-mqtt-client
|
||||
|
||||
[env:esp8266-ota]
|
||||
[env:ESP8266-OTA]
|
||||
platform = espressif8266
|
||||
board = nodemcuv2
|
||||
framework = arduino
|
||||
board_build.filesystem = littlefs
|
||||
upload_port = 192.168.1.113
|
||||
upload_protocol = espota
|
||||
lib_deps =
|
||||
https://github.com/aZholtikov/ZHNetwork
|
||||
https://github.com/aZholtikov/ZHConfig
|
||||
bblanchon/ArduinoJson@^6.19.4
|
||||
me-no-dev/ESP Async WebServer@^1.2.3
|
||||
marvinroger/AsyncMqttClient@^0.9.0
|
||||
https://github.com/aZholtikov/Async-Web-Server
|
||||
https://github.com/bblanchon/ArduinoJson
|
||||
https://github.com/marvinroger/async-mqtt-client
|
||||
|
||||
[env:esp32]
|
||||
[env:ESP32]
|
||||
platform = espressif32
|
||||
board = az-delivery-devkit-v4
|
||||
framework = arduino
|
||||
board_build.filesystem = littlefs
|
||||
lib_deps =
|
||||
https://github.com/aZholtikov/ZHNetwork
|
||||
https://github.com/aZholtikov/ZHConfig
|
||||
bblanchon/ArduinoJson@^6.19.4
|
||||
me-no-dev/ESP Async WebServer@^1.2.3
|
||||
marvinroger/AsyncMqttClient@^0.9.0
|
||||
luc-github/ESP32SSDP@^1.2.0
|
||||
https://github.com/aZholtikov/Async-Web-Server
|
||||
https://github.com/bblanchon/ArduinoJson
|
||||
https://github.com/marvinroger/async-mqtt-client
|
||||
https://github.com/luc-github/ESP32SSDP
|
||||
|
||||
[env:esp32-ota]
|
||||
[env:ESP32-OTA]
|
||||
platform = espressif32
|
||||
board = az-delivery-devkit-v4
|
||||
framework = arduino
|
||||
upload_port = 192.168.1.144
|
||||
board_build.filesystem = littlefs
|
||||
upload_port = 192.168.1.110
|
||||
upload_protocol = espota
|
||||
lib_deps =
|
||||
https://github.com/aZholtikov/ZHNetwork
|
||||
https://github.com/aZholtikov/ZHConfig
|
||||
bblanchon/ArduinoJson@^6.19.4
|
||||
me-no-dev/ESP Async WebServer@^1.2.3
|
||||
marvinroger/AsyncMqttClient@^0.9.0
|
||||
luc-github/ESP32SSDP@^1.2.0
|
||||
https://github.com/aZholtikov/Async-Web-Server
|
||||
https://github.com/bblanchon/ArduinoJson
|
||||
https://github.com/marvinroger/async-mqtt-client
|
||||
https://github.com/luc-github/ESP32SSDP
|
||||
|
134
src/main.cpp
134
src/main.cpp
@ -1,7 +1,8 @@
|
||||
#include "ArduinoJson.h"
|
||||
#include "ArduinoOTA.h"
|
||||
#include "ESPAsyncWebServer.h"
|
||||
#include "ESPAsyncWebServer.h" // https://github.com/aZholtikov/Async-Web-Server
|
||||
#include "AsyncMQTTClient.h"
|
||||
#include "LittleFS.h"
|
||||
#include "Ticker.h"
|
||||
#include "ZHNetwork.h"
|
||||
#include "ZHConfig.h"
|
||||
@ -9,7 +10,6 @@
|
||||
#include "ESP8266SSDP.h"
|
||||
#endif
|
||||
#if defined(ESP32)
|
||||
#include "SPIFFS.h"
|
||||
#include "ESP32SSDP.h"
|
||||
#endif
|
||||
|
||||
@ -34,11 +34,16 @@ void setupWebServer(void);
|
||||
|
||||
void connectToMqtt(void);
|
||||
|
||||
const String firmware{"1.01"};
|
||||
const String firmware{"1.26"};
|
||||
|
||||
String espnowNetName{"DEFAULT"};
|
||||
|
||||
String deviceName{"ESP-NOW gateway"};
|
||||
#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 ssid{"SSID"};
|
||||
String password{"PASSWORD"};
|
||||
@ -67,11 +72,12 @@ void attributesMessageTimerCallback(void);
|
||||
|
||||
void setup()
|
||||
{
|
||||
SPIFFS.begin();
|
||||
LittleFS.begin();
|
||||
|
||||
loadConfig();
|
||||
|
||||
WiFi.onEvent(onWifiEvent);
|
||||
|
||||
#if defined(ESP8266)
|
||||
WiFi.setSleepMode(WIFI_NONE_SLEEP);
|
||||
#endif
|
||||
@ -84,11 +90,18 @@ void setup()
|
||||
WiFi.setAutoReconnect(true);
|
||||
|
||||
myNet.begin(espnowNetName.c_str(), true);
|
||||
// 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);
|
||||
|
||||
WiFi.softAP(("ESP-NOW Gateway " + myNet.getNodeMac()).c_str(), "12345678");
|
||||
#if defined(ESP8266)
|
||||
WiFi.softAP(("ESP-NOW gateway " + String(ESP.getChipId(), HEX)).c_str(), "12345678");
|
||||
#endif
|
||||
#if defined(ESP32)
|
||||
WiFi.softAP(("ESP-NOW gateway " + String(ESP.getEfuseMac(), HEX)).c_str(), "12345678");
|
||||
#endif
|
||||
|
||||
uint8_t scan = WiFi.scanNetworks(false, false, 1);
|
||||
String name;
|
||||
int32_t rssi;
|
||||
@ -157,6 +170,7 @@ void onEspnowMessage(const char *data, const uint8_t *sender)
|
||||
if (incomingData.payloadsType == ENPT_STATE)
|
||||
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;
|
||||
@ -164,25 +178,98 @@ void onEspnowMessage(const char *data, const uint8_t *sender)
|
||||
StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json;
|
||||
deserializeJson(json, configData.message);
|
||||
uint8_t unit = json["unit"].as<uint8_t>();
|
||||
String type = json["type"];
|
||||
StaticJsonDocument<1024> jsonConfig;
|
||||
ha_component_type_t type = json["type"].as<ha_component_type_t>();
|
||||
StaticJsonDocument<2048> jsonConfig;
|
||||
jsonConfig["platform"] = "mqtt";
|
||||
jsonConfig["name"] = json["name"];
|
||||
jsonConfig["unique_id"] = myNet.macToString(sender) + "-" + unit;
|
||||
jsonConfig["device_class"] = json["class"];
|
||||
jsonConfig["device_class"] = getValueName(json["class"].as<ha_switch_device_class_t>());
|
||||
jsonConfig["state_topic"] = topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/state";
|
||||
jsonConfig["value_template"] = "{{ value_json.state }}";
|
||||
jsonConfig["value_template"] = "{{ value_json." + json["template"].as<String>() + " }}";
|
||||
jsonConfig["command_topic"] = topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/set";
|
||||
jsonConfig["json_attributes_topic"] = topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/attributes";
|
||||
jsonConfig["availability_topic"] = topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/status";
|
||||
jsonConfig["payload_on"] = json["reverse"] == "true" ? "OFF" : "ON";
|
||||
jsonConfig["payload_off"] = json["reverse"] == "true" ? "ON" : "OFF";
|
||||
jsonConfig["payload_on"] = json["payload_on"];
|
||||
jsonConfig["payload_off"] = json["payload_off"];
|
||||
jsonConfig["optimistic"] = "false";
|
||||
jsonConfig["qos"] = 2;
|
||||
jsonConfig["retain"] = "true";
|
||||
char buffer[1024]{0};
|
||||
char buffer[2048]{0};
|
||||
serializeJsonPretty(jsonConfig, buffer);
|
||||
mqttClient.publish((topicPrefix + "/" + type + "/" + myNet.macToString(sender) + "-" + unit + "/config").c_str(), 2, true, buffer);
|
||||
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));
|
||||
StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json;
|
||||
deserializeJson(json, configData.message);
|
||||
uint8_t unit = json["unit"].as<uint8_t>();
|
||||
ha_component_type_t type = json["type"].as<ha_component_type_t>();
|
||||
esp_now_led_type_t ledClass = json["class"];
|
||||
StaticJsonDocument<2048> jsonConfig;
|
||||
jsonConfig["platform"] = "mqtt";
|
||||
jsonConfig["name"] = json["name"];
|
||||
jsonConfig["unique_id"] = myNet.macToString(sender) + "-" + unit;
|
||||
jsonConfig["state_topic"] = topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/state";
|
||||
jsonConfig["state_value_template"] = "{{ value_json.state }}";
|
||||
jsonConfig["command_topic"] = topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/set";
|
||||
jsonConfig["brightness_state_topic"] = topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/state";
|
||||
jsonConfig["brightness_value_template"] = "{{ value_json.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"] = topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/state";
|
||||
jsonConfig["rgb_value_template"] = "{{ value_json.rgb | join(',') }}";
|
||||
jsonConfig["rgb_command_topic"] = topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/rgb";
|
||||
}
|
||||
if (ledClass == ENLT_WW || ledClass == ENLT_RGBWW)
|
||||
{
|
||||
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"] = topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/temperature";
|
||||
}
|
||||
jsonConfig["json_attributes_topic"] = topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/attributes";
|
||||
jsonConfig["availability_topic"] = topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/status";
|
||||
jsonConfig["payload_on"] = json["payload_on"];
|
||||
jsonConfig["payload_off"] = json["payload_off"];
|
||||
jsonConfig["optimistic"] = "false";
|
||||
jsonConfig["qos"] = 2;
|
||||
jsonConfig["retain"] = "true";
|
||||
char buffer[2048]{0};
|
||||
serializeJsonPretty(jsonConfig, buffer);
|
||||
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));
|
||||
StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json;
|
||||
deserializeJson(json, configData.message);
|
||||
uint8_t unit = json["unit"].as<uint8_t>();
|
||||
ha_component_type_t type = json["type"].as<ha_component_type_t>();
|
||||
StaticJsonDocument<2048> jsonConfig;
|
||||
jsonConfig["platform"] = "mqtt";
|
||||
jsonConfig["name"] = json["name"];
|
||||
jsonConfig["unique_id"] = myNet.macToString(sender) + "-" + unit;
|
||||
jsonConfig["state_topic"] = topicPrefix + "/" + getValueName(incomingData.deviceType) + "/" + myNet.macToString(sender) + "/state";
|
||||
jsonConfig["value_template"] = "{{ value_json." + json["template"].as<String>() + " }}";
|
||||
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>());
|
||||
if (type == HACT_BINARY_SENSOR)
|
||||
{
|
||||
jsonConfig["device_class"] = getValueName(json["class"].as<ha_binary_sensor_device_class_t>());
|
||||
jsonConfig["payload_on"] = json["payload_on"];
|
||||
jsonConfig["payload_off"] = json["payload_off"];
|
||||
}
|
||||
char buffer[2048]{0};
|
||||
serializeJsonPretty(jsonConfig, buffer);
|
||||
mqttClient.publish((topicPrefix + "/" + getValueName(type) + "/" + myNet.macToString(sender) + "-" + unit + "/config").c_str(), 2, true, buffer);
|
||||
}
|
||||
}
|
||||
if (incomingData.payloadsType == ENPT_FORWARD)
|
||||
{
|
||||
@ -251,7 +338,7 @@ void onMqttMessage(char *topic, char *payload, AsyncMqttClientMessageProperties
|
||||
if (String(topic) == topicPrefix + "/espnow_switch/" + mac + "/set" || String(topic) == topicPrefix + "/espnow_led/" + mac + "/set")
|
||||
{
|
||||
flag = true;
|
||||
json["set"] = message == "ON" ? "ON" : "OFF";
|
||||
json["set"] = message;
|
||||
}
|
||||
if (String(topic) == topicPrefix + "/espnow_led/" + mac + "/brightness")
|
||||
{
|
||||
@ -295,6 +382,7 @@ void sendKeepAliveMessage()
|
||||
outgoingData.payloadsType = ENPT_KEEP_ALIVE;
|
||||
StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json;
|
||||
json["MQTT"] = mqttClient.connected() ? "online" : "offline";
|
||||
json["frequency"] = 10; // For compatibility with the previous version. Will be removed in future releases.
|
||||
char buffer[sizeof(esp_now_payload_data_t::message)]{0};
|
||||
serializeJsonPretty(json, buffer);
|
||||
memcpy(&outgoingData.message, &buffer, sizeof(esp_now_payload_data_t::message));
|
||||
@ -311,7 +399,7 @@ void sendAttributesMessage()
|
||||
uint32_t hours = mins / 60;
|
||||
uint32_t days = hours / 24;
|
||||
StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json;
|
||||
json["Type"] = "ESP-NOW Gateway";
|
||||
json["Type"] = "ESP-NOW gateway";
|
||||
#if defined(ESP8266)
|
||||
json["MCU"] = "ESP8266";
|
||||
#endif
|
||||
@ -345,9 +433,9 @@ String getValue(String data, char separator, uint8_t index)
|
||||
|
||||
void loadConfig()
|
||||
{
|
||||
if (!SPIFFS.exists("/config.json"))
|
||||
if (!LittleFS.exists("/config.json"))
|
||||
saveConfig();
|
||||
File file = SPIFFS.open("/config.json", "r");
|
||||
File file = LittleFS.open("/config.json", "r");
|
||||
String jsonFile = file.readString();
|
||||
StaticJsonDocument<1024> json;
|
||||
deserializeJson(json, jsonFile);
|
||||
@ -377,7 +465,7 @@ void saveConfig()
|
||||
json["mqttUserPassword"] = mqttUserPassword;
|
||||
json["topicPrefix"] = topicPrefix;
|
||||
json["system"] = "empty";
|
||||
File file = SPIFFS.open("/config.json", "w");
|
||||
File file = LittleFS.open("/config.json", "w");
|
||||
serializeJsonPretty(json, file);
|
||||
file.close();
|
||||
}
|
||||
@ -404,7 +492,7 @@ void setupWebServer()
|
||||
ssdpDescription += xmlNode("friendlyName", deviceName);
|
||||
ssdpDescription += xmlNode("presentationURL", "/");
|
||||
ssdpDescription += xmlNode("serialNumber", "0000000" + String(random(1000)));
|
||||
ssdpDescription += xmlNode("modelName", "ESP-NOW Gateway");
|
||||
ssdpDescription += xmlNode("modelName", "ESP-NOW gateway");
|
||||
ssdpDescription += xmlNode("modelNumber", firmware);
|
||||
ssdpDescription += xmlNode("modelURL", "https://github.com/aZholtikov/ESP-NOW-Gateway");
|
||||
ssdpDescription += xmlNode("manufacturer", "Alexey Zholtikov");
|
||||
@ -417,7 +505,7 @@ void setupWebServer()
|
||||
request->send(200, "text/xml", ssdpSend); });
|
||||
|
||||
webServer.on("/", HTTP_GET, [](AsyncWebServerRequest *request)
|
||||
{ request->send(SPIFFS, "/index.htm"); });
|
||||
{ request->send(LittleFS, "/index.htm"); });
|
||||
|
||||
webServer.on("/setting", HTTP_GET, [](AsyncWebServerRequest *request)
|
||||
{
|
||||
@ -440,8 +528,8 @@ void setupWebServer()
|
||||
|
||||
webServer.onNotFound([](AsyncWebServerRequest *request)
|
||||
{
|
||||
if (SPIFFS.exists(request->url()))
|
||||
request->send(SPIFFS, request->url());
|
||||
if (LittleFS.exists(request->url()))
|
||||
request->send(LittleFS, request->url());
|
||||
else
|
||||
{
|
||||
request->send(404, "text/plain", "File Not Found");
|
||||
|
Reference in New Issue
Block a user