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: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
..
compare: 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

No commits in common. "main" and "v1.2" have entirely different histories.
main ... v1.2

4 changed files with 108 additions and 141 deletions
Show Stats Expand all files Collapse all files

2
README.md
View File

@ -1,4 +1,4 @@
# ESP-NOW light/led strip controller for ESP8266 # 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('GET', '/config', true); xmlHttp.open('PUT', '/config.json', 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,7 +2,6 @@
#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"
@ -13,8 +12,6 @@ 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);
@ -32,21 +29,20 @@ 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.21"}; const String firmware{"1.2"};
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};
@ -88,23 +84,22 @@ void setup()
LittleFS.begin(); LittleFS.begin();
loadConfig(); loadConfig();
loadStatus();
if (config.coldWhitePin) if (coldWhitePin)
pinMode(config.coldWhitePin, OUTPUT); pinMode(coldWhitePin, OUTPUT);
if (config.warmWhitePin) if (warmWhitePin)
pinMode(config.warmWhitePin, OUTPUT); pinMode(warmWhitePin, OUTPUT);
if (config.redPin) if (redPin)
pinMode(config.redPin, OUTPUT); pinMode(redPin, OUTPUT);
if (config.greenPin) if (greenPin)
pinMode(config.greenPin, OUTPUT); pinMode(greenPin, OUTPUT);
if (config.bluePin) if (bluePin)
pinMode(config.bluePin, OUTPUT); pinMode(bluePin, OUTPUT);
changeLedState(); changeLedState();
WiFi.setSleepMode(WIFI_NONE_SLEEP); WiFi.setSleepMode(WIFI_NONE_SLEEP);
myNet.begin(config.espnowNetName.c_str()); myNet.begin(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);
@ -147,7 +142,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;
DynamicJsonDocument json(sizeof(esp_now_payload_data_t::message)); StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json;
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)
@ -170,7 +165,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;
DynamicJsonDocument json(sizeof(esp_now_payload_data_t::message)); StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json;
if (incomingData.payloadsType == ENPT_SET) if (incomingData.payloadsType == ENPT_SET)
{ {
deserializeJson(json, incomingData.message); deserializeJson(json, incomingData.message);
@ -220,42 +215,21 @@ 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();
EEPROM.begin(4096); if (!LittleFS.exists("/config.json"))
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();
DynamicJsonDocument json(192); // To calculate the buffer size uses https://arduinojson.org/v6/assistant. StaticJsonDocument<512> json;
deserializeJson(json, jsonFile); deserializeJson(json, jsonFile);
ledStatus = json["status"]; espnowNetName = json["espnowNetName"].as<String>();
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"];
@ -266,18 +240,27 @@ void loadStatus()
ETS_GPIO_INTR_ENABLE(); ETS_GPIO_INTR_ENABLE();
} }
void saveStatus() void saveConfig()
{ {
ETS_GPIO_INTR_DISABLE(); ETS_GPIO_INTR_DISABLE();
DynamicJsonDocument json(128); // To calculate the buffer size uses https://arduinojson.org/v6/assistant. StaticJsonDocument<512> json;
json["status"] = ledStatus; json["firmware"] = firmware;
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("/status.json", "w"); File file = LittleFS.open("/config.json", "w");
serializeJsonPretty(json, file); serializeJsonPretty(json, file);
file.close(); file.close();
delay(50); delay(50);
@ -289,48 +272,32 @@ 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)
{ {
config.ledType = request->getParam("ledType")->value().toInt(); ledType = request->getParam("ledType")->value().toInt();
config.coldWhitePin = request->getParam("coldWhitePin")->value().toInt(); coldWhitePin = request->getParam("coldWhitePin")->value().toInt();
config.warmWhitePin = request->getParam("warmWhitePin")->value().toInt(); warmWhitePin = request->getParam("warmWhitePin")->value().toInt();
config.redPin = request->getParam("redPin")->value().toInt(); redPin = request->getParam("redPin")->value().toInt();
config.greenPin = request->getParam("greenPin")->value().toInt(); greenPin = request->getParam("greenPin")->value().toInt();
config.bluePin = request->getParam("bluePin")->value().toInt(); bluePin = request->getParam("bluePin")->value().toInt();
config.deviceName = request->getParam("deviceName")->value(); deviceName = request->getParam("deviceName")->value();
config.espnowNetName = request->getParam("espnowNetName")->value(); 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();
} }
@ -346,7 +313,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;
DynamicJsonDocument json(sizeof(esp_now_payload_data_t::message)); StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json;
json["Type"] = "ESP-NOW light"; json["Type"] = "ESP-NOW light";
json["MCU"] = "ESP8266"; json["MCU"] = "ESP8266";
json["MAC"] = myNet.getNodeMac(); json["MAC"] = myNet.getNodeMac();
@ -379,11 +346,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;
DynamicJsonDocument json(sizeof(esp_now_payload_data_t::message)); StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json;
json[MCMT_DEVICE_NAME] = config.deviceName; json[MCMT_DEVICE_NAME] = 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] = config.ledType; json[MCMT_DEVICE_CLASS] = 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);
@ -398,7 +365,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;
DynamicJsonDocument json(sizeof(esp_now_payload_data_t::message)); StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json;
json["state"] = ledStatus ? "ON" : "OFF"; json["state"] = ledStatus ? "ON" : "OFF";
json["brightness"] = brightness; json["brightness"] = brightness;
json["temperature"] = temperature; json["temperature"] = temperature;
@ -431,61 +398,61 @@ void changeLedState(void)
{ {
if (red == 255 && green == 255 && blue == 255) if (red == 255 && green == 255 && blue == 255)
{ {
if (config.ledType == ENLT_W || config.ledType == ENLT_RGBW) if (ledType == ENLT_W || ledType == ENLT_RGBW)
analogWrite(config.coldWhitePin, brightness); analogWrite(coldWhitePin, brightness);
if (config.ledType == ENLT_WW || config.ledType == ENLT_RGBWW) if (ledType == ENLT_WW || ledType == ENLT_RGBWW)
{ {
analogWrite(config.coldWhitePin, map(brightness, 0, 255, 0, map(temperature, 500, 153, 0, 255))); analogWrite(coldWhitePin, map(brightness, 0, 255, 0, map(temperature, 500, 153, 0, 255)));
analogWrite(config.warmWhitePin, map(brightness, 0, 255, 0, map(temperature, 153, 500, 0, 255))); analogWrite(warmWhitePin, map(brightness, 0, 255, 0, map(temperature, 153, 500, 0, 255)));
} }
if (config.ledType == ENLT_RGB) if (ledType == ENLT_RGB)
{ {
analogWrite(config.redPin, map(red, 0, 255, 0, brightness)); analogWrite(redPin, map(red, 0, 255, 0, brightness));
analogWrite(config.greenPin, map(green, 0, 255, 0, brightness)); analogWrite(greenPin, map(green, 0, 255, 0, brightness));
analogWrite(config.bluePin, map(blue, 0, 255, 0, brightness)); analogWrite(bluePin, map(blue, 0, 255, 0, brightness));
} }
if (config.ledType == ENLT_RGBW || config.ledType == ENLT_RGBWW) if (ledType == ENLT_RGBW || ledType == ENLT_RGBWW)
{ {
digitalWrite(config.redPin, LOW); digitalWrite(redPin, LOW);
digitalWrite(config.greenPin, LOW); digitalWrite(greenPin, LOW);
digitalWrite(config.bluePin, LOW); digitalWrite(bluePin, LOW);
} }
} }
else else
{ {
if (config.ledType == ENLT_W) if (ledType == ENLT_W)
analogWrite(config.coldWhitePin, brightness); analogWrite(coldWhitePin, brightness);
if (config.ledType == ENLT_WW) if (ledType == ENLT_WW)
{ {
analogWrite(config.coldWhitePin, map(brightness, 0, 255, 0, map(temperature, 500, 153, 0, 255))); analogWrite(coldWhitePin, map(brightness, 0, 255, 0, map(temperature, 500, 153, 0, 255)));
analogWrite(config.warmWhitePin, map(brightness, 0, 255, 0, map(temperature, 153, 500, 0, 255))); analogWrite(warmWhitePin, map(brightness, 0, 255, 0, map(temperature, 153, 500, 0, 255)));
} }
if (config.ledType == ENLT_RGBW || config.ledType == ENLT_RGBWW) if (ledType == ENLT_RGBW || ledType == ENLT_RGBWW)
digitalWrite(config.coldWhitePin, LOW); digitalWrite(coldWhitePin, LOW);
if (config.ledType == ENLT_RGBWW) if (ledType == ENLT_RGBWW)
digitalWrite(config.warmWhitePin, LOW); digitalWrite(warmWhitePin, LOW);
if (config.ledType == ENLT_RGB || config.ledType == ENLT_RGBW || config.ledType == ENLT_RGBWW) if (ledType == ENLT_RGB || ledType == ENLT_RGBW || ledType == ENLT_RGBWW)
{ {
analogWrite(config.redPin, map(red, 0, 255, 0, brightness)); analogWrite(redPin, map(red, 0, 255, 0, brightness));
analogWrite(config.greenPin, map(green, 0, 255, 0, brightness)); analogWrite(greenPin, map(green, 0, 255, 0, brightness));
analogWrite(config.bluePin, map(blue, 0, 255, 0, brightness)); analogWrite(bluePin, map(blue, 0, 255, 0, brightness));
} }
} }
} }
else else
{ {
if (config.ledType == ENLT_W || config.ledType == ENLT_WW || config.ledType == ENLT_RGBW || config.ledType == ENLT_RGBWW) if (ledType == ENLT_W || ledType == ENLT_WW || ledType == ENLT_RGBW || ledType == ENLT_RGBWW)
digitalWrite(config.coldWhitePin, LOW); digitalWrite(coldWhitePin, LOW);
if (config.ledType == ENLT_WW || config.ledType == ENLT_RGBWW) if (ledType == ENLT_WW || ledType == ENLT_RGBWW)
digitalWrite(config.warmWhitePin, LOW); digitalWrite(warmWhitePin, LOW);
if (config.ledType == ENLT_RGB || config.ledType == ENLT_RGBW || config.ledType == ENLT_RGBWW) if (ledType == ENLT_RGB || ledType == ENLT_RGBW || ledType == ENLT_RGBWW)
{ {
digitalWrite(config.redPin, LOW); digitalWrite(redPin, LOW);
digitalWrite(config.greenPin, LOW); digitalWrite(greenPin, LOW);
digitalWrite(config.bluePin, LOW); digitalWrite(bluePin, LOW);
} }
} }
saveStatus(); saveConfig();
} }
void gatewayAvailabilityCheckTimerCallback() void gatewayAvailabilityCheckTimerCallback()