alexey.zholtikov/ESP-NOW-Light-Led-Strip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 9 Wiki Activity

Compare commits

base: alexey.zholtikov:v1.2
Branches Tags
alexey.zholtikov:main
alexey.zholtikov:v1.21
alexey.zholtikov:v1.2
alexey.zholtikov:v1.15
alexey.zholtikov:v1.14
alexey.zholtikov:v1.13
alexey.zholtikov:v1.12
alexey.zholtikov:v1.11
alexey.zholtikov:v1.1
alexey.zholtikov:v1.0
...
compare: alexey.zholtikov:main
Branches Tags
alexey.zholtikov:main
alexey.zholtikov:v1.21
alexey.zholtikov:v1.2
alexey.zholtikov:v1.15
alexey.zholtikov:v1.14
alexey.zholtikov:v1.13
alexey.zholtikov:v1.12
alexey.zholtikov:v1.11
alexey.zholtikov:v1.1
alexey.zholtikov:v1.0

4 Commits
v1.2 ... main

Author SHA1 Message Date
Alexey Zholtikov
fda640e713 Minor changes 2023-03-07 11:58:34 +03:00
Alexey Zholtikov
648a19775e Fixed one bug 2023-03-06 00:44:59 +03:00
Alexey Zholtikov
b500582cb8 Version 1.21 
Changed config data storage location to EEPROM.
 2023-03-05 07:53:22 +03:00
Alexey Zholtikov
ed9cba4bff Minor changes 2023-03-04 08:13:12 +03:00
4 changed files with 141 additions and 108 deletions
Show Stats Expand all files Collapse all files

2
README.md
View File

@ -1,4 +1,4 @@
# Light/led strip controller for ESP8266 # ESP-NOW light/led strip controller for ESP8266
ESP-NOW based light/led strip controller for ESP8266. Alternate firmware for Tuya/SmartLife WiFi light/led strip controllers. ESP-NOW based light/led strip controller for ESP8266. Alternate firmware for Tuya/SmartLife WiFi light/led strip controllers.

2
data/function.js
View File

@ -10,7 +10,7 @@ function createXmlHttpObject() {
function load() { function load() {
if (xmlHttp.readyState == 0 || xmlHttp.readyState == 4) { if (xmlHttp.readyState == 0 || xmlHttp.readyState == 4) {
xmlHttp.open('PUT', '/config.json', true); xmlHttp.open('GET', '/config', true);
xmlHttp.send(null); xmlHttp.send(null);
xmlHttp.onload = function () { xmlHttp.onload = function () {
jsonResponse = JSON.parse(xmlHttp.responseText); jsonResponse = JSON.parse(xmlHttp.responseText);

2
data/index.htm
View File

@ -10,7 +10,7 @@
<body onload="load();"> <body onload="load();">
<form class="box"> <form class="box">
<h1>ESP-NOW Light </h1> <h1>ESP-NOW Light</h1>
<div class="wrapper"> <div class="wrapper">
<p class="text">Firmware:</p> <p class="text">Firmware:</p>
<p class="text" id="version"></p> <p class="text" id="version"></p>

243
src/main.cpp
View File

@ -2,6 +2,7 @@
#include "ArduinoOTA.h" #include "ArduinoOTA.h"
#include "ESPAsyncWebServer.h" // https://github.com/aZholtikov/Async-Web-Server #include "ESPAsyncWebServer.h" // https://github.com/aZholtikov/Async-Web-Server
#include "LittleFS.h" #include "LittleFS.h"
#include "EEPROM.h"
#include "Ticker.h" #include "Ticker.h"
#include "ZHNetwork.h" #include "ZHNetwork.h"
#include "ZHConfig.h" #include "ZHConfig.h"
@ -12,6 +13,8 @@ void onConfirmReceiving(const uint8_t *target, const uint16_t id, const bool sta
void loadConfig(void); void loadConfig(void);
void saveConfig(void); void saveConfig(void);
void loadStatus(void);
void saveStatus(void);
void setupWebServer(void); void setupWebServer(void);
void sendAttributesMessage(void); void sendAttributesMessage(void);
@ -29,20 +32,21 @@ typedef struct
char message[200]{0}; char message[200]{0};
} espnow_message_t; } espnow_message_t;
struct deviceConfig
{
String espnowNetName{"DEFAULT"};
String deviceName = "ESP-NOW light " + String(ESP.getChipId(), HEX);
uint8_t ledType{ENLT_NONE};
uint8_t coldWhitePin{0};
uint8_t warmWhitePin{0};
uint8_t redPin{0};
uint8_t greenPin{0};
uint8_t bluePin{0};
} config;
std::vector<espnow_message_t> espnowMessage; std::vector<espnow_message_t> espnowMessage;
const String firmware{"1.2"}; const String firmware{"1.21"};
String espnowNetName{"DEFAULT"};
String deviceName = "ESP-NOW light " + String(ESP.getChipId(), HEX);
uint8_t ledType{ENLT_NONE};
uint8_t coldWhitePin{0};
uint8_t warmWhitePin{0};
uint8_t redPin{0};
uint8_t greenPin{0};
uint8_t bluePin{0};
bool ledStatus{false}; bool ledStatus{false};
uint8_t brightness{255}; uint8_t brightness{255};
@ -84,22 +88,23 @@ void setup()
LittleFS.begin(); LittleFS.begin();
loadConfig(); loadConfig();
loadStatus();
if (coldWhitePin) if (config.coldWhitePin)
pinMode(coldWhitePin, OUTPUT); pinMode(config.coldWhitePin, OUTPUT);
if (warmWhitePin) if (config.warmWhitePin)
pinMode(warmWhitePin, OUTPUT); pinMode(config.warmWhitePin, OUTPUT);
if (redPin) if (config.redPin)
pinMode(redPin, OUTPUT); pinMode(config.redPin, OUTPUT);
if (greenPin) if (config.greenPin)
pinMode(greenPin, OUTPUT); pinMode(config.greenPin, OUTPUT);
if (bluePin) if (config.bluePin)
pinMode(bluePin, OUTPUT); pinMode(config.bluePin, OUTPUT);
changeLedState(); changeLedState();
WiFi.setSleepMode(WIFI_NONE_SLEEP); WiFi.setSleepMode(WIFI_NONE_SLEEP);
myNet.begin(espnowNetName.c_str()); myNet.begin(config.espnowNetName.c_str());
// 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.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(onBroadcastReceiving); myNet.setOnBroadcastReceivingCallback(onBroadcastReceiving);
@ -142,7 +147,7 @@ void onBroadcastReceiving(const char *data, const uint8_t *sender)
if (myNet.macToString(gatewayMAC) == myNet.macToString(sender) && incomingData.payloadsType == ENPT_KEEP_ALIVE) if (myNet.macToString(gatewayMAC) == myNet.macToString(sender) && incomingData.payloadsType == ENPT_KEEP_ALIVE)
{ {
isGatewayAvailable = true; isGatewayAvailable = true;
StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json; DynamicJsonDocument json(sizeof(esp_now_payload_data_t::message));
deserializeJson(json, incomingData.message); deserializeJson(json, incomingData.message);
bool temp = json["MQTT"] == "online" ? true : false; bool temp = json["MQTT"] == "online" ? true : false;
if (wasMqttAvailable != temp) if (wasMqttAvailable != temp)
@ -165,7 +170,7 @@ void onUnicastReceiving(const char *data, const uint8_t *sender)
memcpy(&incomingData, data, sizeof(esp_now_payload_data_t)); memcpy(&incomingData, data, sizeof(esp_now_payload_data_t));
if (incomingData.deviceType != ENDT_GATEWAY || myNet.macToString(gatewayMAC) != myNet.macToString(sender)) if (incomingData.deviceType != ENDT_GATEWAY || myNet.macToString(gatewayMAC) != myNet.macToString(sender))
return; return;
StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json; DynamicJsonDocument json(sizeof(esp_now_payload_data_t::message));
if (incomingData.payloadsType == ENPT_SET) if (incomingData.payloadsType == ENPT_SET)
{ {
deserializeJson(json, incomingData.message); deserializeJson(json, incomingData.message);
@ -215,21 +220,42 @@ void onConfirmReceiving(const uint8_t *target, const uint16_t id, const bool sta
void loadConfig() void loadConfig()
{ {
ETS_GPIO_INTR_DISABLE(); ETS_GPIO_INTR_DISABLE();
if (!LittleFS.exists("/config.json")) EEPROM.begin(4096);
if (EEPROM.read(4095) == 254)
{
EEPROM.get(0, config);
EEPROM.end();
}
else
{
EEPROM.end();
saveConfig(); saveConfig();
File file = LittleFS.open("/config.json", "r"); }
delay(50);
ETS_GPIO_INTR_ENABLE();
}
void saveConfig()
{
ETS_GPIO_INTR_DISABLE();
EEPROM.begin(4096);
EEPROM.write(4095, 254);
EEPROM.put(0, config);
EEPROM.end();
delay(50);
ETS_GPIO_INTR_ENABLE();
}
void loadStatus()
{
ETS_GPIO_INTR_DISABLE();
if (!LittleFS.exists("/status.json"))
saveStatus();
File file = LittleFS.open("/status.json", "r");
String jsonFile = file.readString(); String jsonFile = file.readString();
StaticJsonDocument<512> json; DynamicJsonDocument json(192); // To calculate the buffer size uses https://arduinojson.org/v6/assistant.
deserializeJson(json, jsonFile); deserializeJson(json, jsonFile);
espnowNetName = json["espnowNetName"].as<String>(); ledStatus = json["status"];
deviceName = json["deviceName"].as<String>();
ledType = json["ledType"];
ledStatus = json["ledStatus"];
coldWhitePin = json["coldWhitePin"];
warmWhitePin = json["warmWhitePin"];
redPin = json["redPin"];
greenPin = json["greenPin"];
bluePin = json["bluePin"];
brightness = json["brightness"]; brightness = json["brightness"];
temperature = json["temperature"]; temperature = json["temperature"];
red = json["red"]; red = json["red"];
@ -240,27 +266,18 @@ void loadConfig()
ETS_GPIO_INTR_ENABLE(); ETS_GPIO_INTR_ENABLE();
} }
void saveConfig() void saveStatus()
{ {
ETS_GPIO_INTR_DISABLE(); ETS_GPIO_INTR_DISABLE();
StaticJsonDocument<512> json; DynamicJsonDocument json(128); // To calculate the buffer size uses https://arduinojson.org/v6/assistant.
json["firmware"] = firmware; json["status"] = ledStatus;
json["espnowNetName"] = espnowNetName;
json["deviceName"] = deviceName;
json["ledType"] = ledType;
json["ledStatus"] = ledStatus;
json["coldWhitePin"] = coldWhitePin;
json["warmWhitePin"] = warmWhitePin;
json["redPin"] = redPin;
json["greenPin"] = greenPin;
json["bluePin"] = bluePin;
json["brightness"] = brightness; json["brightness"] = brightness;
json["temperature"] = temperature; json["temperature"] = temperature;
json["red"] = red; json["red"] = red;
json["green"] = green; json["green"] = green;
json["blue"] = blue; json["blue"] = blue;
json["system"] = "empty"; json["system"] = "empty";
File file = LittleFS.open("/config.json", "w"); File file = LittleFS.open("/status.json", "w");
serializeJsonPretty(json, file); serializeJsonPretty(json, file);
file.close(); file.close();
delay(50); delay(50);
@ -272,32 +289,48 @@ void setupWebServer()
webServer.on("/", HTTP_GET, [](AsyncWebServerRequest *request) webServer.on("/", HTTP_GET, [](AsyncWebServerRequest *request)
{ request->send(LittleFS, "/index.htm"); }); { request->send(LittleFS, "/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) webServer.on("/setting", HTTP_GET, [](AsyncWebServerRequest *request)
{ {
ledType = request->getParam("ledType")->value().toInt(); config.ledType = request->getParam("ledType")->value().toInt();
coldWhitePin = request->getParam("coldWhitePin")->value().toInt(); config.coldWhitePin = request->getParam("coldWhitePin")->value().toInt();
warmWhitePin = request->getParam("warmWhitePin")->value().toInt(); config.warmWhitePin = request->getParam("warmWhitePin")->value().toInt();
redPin = request->getParam("redPin")->value().toInt(); config.redPin = request->getParam("redPin")->value().toInt();
greenPin = request->getParam("greenPin")->value().toInt(); config.greenPin = request->getParam("greenPin")->value().toInt();
bluePin = request->getParam("bluePin")->value().toInt(); config.bluePin = request->getParam("bluePin")->value().toInt();
deviceName = request->getParam("deviceName")->value(); config.deviceName = request->getParam("deviceName")->value();
espnowNetName = request->getParam("espnowNetName")->value(); config.espnowNetName = request->getParam("espnowNetName")->value();
request->send(200); request->send(200);
saveConfig(); }); saveConfig(); });
webServer.on("/config", HTTP_GET, [](AsyncWebServerRequest *request)
{
String configJson;
DynamicJsonDocument json(384); // To calculate the buffer size uses https://arduinojson.org/v6/assistant.
json["firmware"] = firmware;
json["espnowNetName"] = config.espnowNetName;
json["deviceName"] = config.deviceName;
json["ledType"] = config.ledType;
json["coldWhitePin"] = config.coldWhitePin;
json["warmWhitePin"] = config.warmWhitePin;
json["redPin"] = config.redPin;
json["greenPin"] = config.greenPin;
json["bluePin"] = config.bluePin;
serializeJsonPretty(json, configJson);
request->send(200, "application/json", configJson); });
webServer.on("/restart", HTTP_GET, [](AsyncWebServerRequest *request) webServer.on("/restart", HTTP_GET, [](AsyncWebServerRequest *request)
{ {
request->send(200); request->send(200);
ESP.restart(); }); ESP.restart(); });
webServer.onNotFound([](AsyncWebServerRequest *request) webServer.onNotFound([](AsyncWebServerRequest *request)
{ { request->send(404, "text/plain", "File Not Found"); });
if (LittleFS.exists(request->url()))
request->send(LittleFS, request->url());
else
{
request->send(404, "text/plain", "File Not Found");
} });
webServer.begin(); webServer.begin();
} }
@ -313,7 +346,7 @@ void sendAttributesMessage()
uint32_t days = hours / 24; uint32_t days = hours / 24;
esp_now_payload_data_t outgoingData{ENDT_LED, ENPT_ATTRIBUTES}; esp_now_payload_data_t outgoingData{ENDT_LED, ENPT_ATTRIBUTES};
espnow_message_t message; espnow_message_t message;
StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json; DynamicJsonDocument json(sizeof(esp_now_payload_data_t::message));
json["Type"] = "ESP-NOW light"; json["Type"] = "ESP-NOW light";
json["MCU"] = "ESP8266"; json["MCU"] = "ESP8266";
json["MAC"] = myNet.getNodeMac(); json["MAC"] = myNet.getNodeMac();
@ -346,11 +379,11 @@ void sendConfigMessage()
return; return;
esp_now_payload_data_t outgoingData{ENDT_LED, ENPT_CONFIG}; esp_now_payload_data_t outgoingData{ENDT_LED, ENPT_CONFIG};
espnow_message_t message; espnow_message_t message;
StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json; DynamicJsonDocument json(sizeof(esp_now_payload_data_t::message));
json[MCMT_DEVICE_NAME] = deviceName; json[MCMT_DEVICE_NAME] = config.deviceName;
json[MCMT_DEVICE_UNIT] = 1; json[MCMT_DEVICE_UNIT] = 1;
json[MCMT_COMPONENT_TYPE] = HACT_LIGHT; json[MCMT_COMPONENT_TYPE] = HACT_LIGHT;
json[MCMT_DEVICE_CLASS] = ledType; json[MCMT_DEVICE_CLASS] = config.ledType;
serializeJsonPretty(json, outgoingData.message); serializeJsonPretty(json, outgoingData.message);
memcpy(&message.message, &outgoingData, sizeof(esp_now_payload_data_t)); memcpy(&message.message, &outgoingData, sizeof(esp_now_payload_data_t));
message.id = myNet.sendUnicastMessage(message.message, gatewayMAC, true); message.id = myNet.sendUnicastMessage(message.message, gatewayMAC, true);
@ -365,7 +398,7 @@ void sendStatusMessage()
statusMessageTimerSemaphore = false; statusMessageTimerSemaphore = false;
esp_now_payload_data_t outgoingData{ENDT_LED, ENPT_STATE}; esp_now_payload_data_t outgoingData{ENDT_LED, ENPT_STATE};
espnow_message_t message; espnow_message_t message;
StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json; DynamicJsonDocument json(sizeof(esp_now_payload_data_t::message));
json["state"] = ledStatus ? "ON" : "OFF"; json["state"] = ledStatus ? "ON" : "OFF";
json["brightness"] = brightness; json["brightness"] = brightness;
json["temperature"] = temperature; json["temperature"] = temperature;
@ -398,61 +431,61 @@ void changeLedState(void)
{ {
if (red == 255 && green == 255 && blue == 255) if (red == 255 && green == 255 && blue == 255)
{ {
if (ledType == ENLT_W || ledType == ENLT_RGBW) if (config.ledType == ENLT_W || config.ledType == ENLT_RGBW)
analogWrite(coldWhitePin, brightness); analogWrite(config.coldWhitePin, brightness);
if (ledType == ENLT_WW || ledType == ENLT_RGBWW) if (config.ledType == ENLT_WW || config.ledType == ENLT_RGBWW)
{ {
analogWrite(coldWhitePin, map(brightness, 0, 255, 0, map(temperature, 500, 153, 0, 255))); analogWrite(config.coldWhitePin, map(brightness, 0, 255, 0, map(temperature, 500, 153, 0, 255)));
analogWrite(warmWhitePin, map(brightness, 0, 255, 0, map(temperature, 153, 500, 0, 255))); analogWrite(config.warmWhitePin, map(brightness, 0, 255, 0, map(temperature, 153, 500, 0, 255)));
} }
if (ledType == ENLT_RGB) if (config.ledType == ENLT_RGB)
{ {
analogWrite(redPin, map(red, 0, 255, 0, brightness)); analogWrite(config.redPin, map(red, 0, 255, 0, brightness));
analogWrite(greenPin, map(green, 0, 255, 0, brightness)); analogWrite(config.greenPin, map(green, 0, 255, 0, brightness));
analogWrite(bluePin, map(blue, 0, 255, 0, brightness)); analogWrite(config.bluePin, map(blue, 0, 255, 0, brightness));
} }
if (ledType == ENLT_RGBW || ledType == ENLT_RGBWW) if (config.ledType == ENLT_RGBW || config.ledType == ENLT_RGBWW)
{ {
digitalWrite(redPin, LOW); digitalWrite(config.redPin, LOW);
digitalWrite(greenPin, LOW); digitalWrite(config.greenPin, LOW);
digitalWrite(bluePin, LOW); digitalWrite(config.bluePin, LOW);
} }
} }
else else
{ {
if (ledType == ENLT_W) if (config.ledType == ENLT_W)
analogWrite(coldWhitePin, brightness); analogWrite(config.coldWhitePin, brightness);
if (ledType == ENLT_WW) if (config.ledType == ENLT_WW)
{ {
analogWrite(coldWhitePin, map(brightness, 0, 255, 0, map(temperature, 500, 153, 0, 255))); analogWrite(config.coldWhitePin, map(brightness, 0, 255, 0, map(temperature, 500, 153, 0, 255)));
analogWrite(warmWhitePin, map(brightness, 0, 255, 0, map(temperature, 153, 500, 0, 255))); analogWrite(config.warmWhitePin, map(brightness, 0, 255, 0, map(temperature, 153, 500, 0, 255)));
} }
if (ledType == ENLT_RGBW || ledType == ENLT_RGBWW) if (config.ledType == ENLT_RGBW || config.ledType == ENLT_RGBWW)
digitalWrite(coldWhitePin, LOW); digitalWrite(config.coldWhitePin, LOW);
if (ledType == ENLT_RGBWW) if (config.ledType == ENLT_RGBWW)
digitalWrite(warmWhitePin, LOW); digitalWrite(config.warmWhitePin, LOW);
if (ledType == ENLT_RGB || ledType == ENLT_RGBW || ledType == ENLT_RGBWW) if (config.ledType == ENLT_RGB || config.ledType == ENLT_RGBW || config.ledType == ENLT_RGBWW)
{ {
analogWrite(redPin, map(red, 0, 255, 0, brightness)); analogWrite(config.redPin, map(red, 0, 255, 0, brightness));
analogWrite(greenPin, map(green, 0, 255, 0, brightness)); analogWrite(config.greenPin, map(green, 0, 255, 0, brightness));
analogWrite(bluePin, map(blue, 0, 255, 0, brightness)); analogWrite(config.bluePin, map(blue, 0, 255, 0, brightness));
} }
} }
} }
else else
{ {
if (ledType == ENLT_W || ledType == ENLT_WW || ledType == ENLT_RGBW || ledType == ENLT_RGBWW) if (config.ledType == ENLT_W || config.ledType == ENLT_WW || config.ledType == ENLT_RGBW || config.ledType == ENLT_RGBWW)
digitalWrite(coldWhitePin, LOW); digitalWrite(config.coldWhitePin, LOW);
if (ledType == ENLT_WW || ledType == ENLT_RGBWW) if (config.ledType == ENLT_WW || config.ledType == ENLT_RGBWW)
digitalWrite(warmWhitePin, LOW); digitalWrite(config.warmWhitePin, LOW);
if (ledType == ENLT_RGB || ledType == ENLT_RGBW || ledType == ENLT_RGBWW) if (config.ledType == ENLT_RGB || config.ledType == ENLT_RGBW || config.ledType == ENLT_RGBWW)
{ {
digitalWrite(redPin, LOW); digitalWrite(config.redPin, LOW);
digitalWrite(greenPin, LOW); digitalWrite(config.greenPin, LOW);
digitalWrite(bluePin, LOW); digitalWrite(config.bluePin, LOW);
} }
} }
saveConfig(); saveStatus();
} }
void gatewayAvailabilityCheckTimerCallback() void gatewayAvailabilityCheckTimerCallback()