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.21
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

2 Commits
v1.21 ... 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
2 changed files with 5 additions and 4 deletions
Expand all files Collapse all files

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>

7
src/main.cpp
View File

@ -34,7 +34,6 @@ typedef struct
struct deviceConfig struct deviceConfig
{ {
const String firmware{"1.21"};
String espnowNetName{"DEFAULT"}; String espnowNetName{"DEFAULT"};
String deviceName = "ESP-NOW light " + String(ESP.getChipId(), HEX); String deviceName = "ESP-NOW light " + String(ESP.getChipId(), HEX);
uint8_t ledType{ENLT_NONE}; uint8_t ledType{ENLT_NONE};
@ -47,6 +46,8 @@ struct deviceConfig
std::vector<espnow_message_t> espnowMessage; std::vector<espnow_message_t> espnowMessage;
const String firmware{"1.21"};
bool ledStatus{false}; bool ledStatus{false};
uint8_t brightness{255}; uint8_t brightness{255};
uint16_t temperature{255}; uint16_t temperature{255};
@ -311,7 +312,7 @@ void setupWebServer()
{ {
String configJson; String configJson;
DynamicJsonDocument json(384); // To calculate the buffer size uses https://arduinojson.org/v6/assistant. DynamicJsonDocument json(384); // To calculate the buffer size uses https://arduinojson.org/v6/assistant.
json["firmware"] = config.firmware; json["firmware"] = firmware;
json["espnowNetName"] = config.espnowNetName; json["espnowNetName"] = config.espnowNetName;
json["deviceName"] = config.deviceName; json["deviceName"] = config.deviceName;
json["ledType"] = config.ledType; json["ledType"] = config.ledType;
@ -349,7 +350,7 @@ void sendAttributesMessage()
json["Type"] = "ESP-NOW light"; json["Type"] = "ESP-NOW light";
json["MCU"] = "ESP8266"; json["MCU"] = "ESP8266";
json["MAC"] = myNet.getNodeMac(); json["MAC"] = myNet.getNodeMac();
json["Firmware"] = config.firmware; json["Firmware"] = firmware;
json["Library"] = myNet.getFirmwareVersion(); json["Library"] = myNet.getFirmwareVersion();
json["Uptime"] = "Days:" + String(days) + " Hours:" + String(hours - (days * 24)) + " Mins:" + String(mins - (hours * 60)); json["Uptime"] = "Days:" + String(days) + " Hours:" + String(hours - (days * 24)) + " Mins:" + String(mins - (hours * 60));
serializeJsonPretty(json, outgoingData.message); serializeJsonPretty(json, outgoingData.message);