Version 1.12
Main code refactoring.
This commit is contained in:
parent
dfabdd080a
commit
7f51f05eb8
119
src/main.cpp
119
src/main.cpp
@ -7,7 +7,7 @@
|
||||
|
||||
void onBroadcastReceiving(const char *data, const uint8_t *sender);
|
||||
void onUnicastReceiving(const char *data, const uint8_t *sender);
|
||||
void onConfirmReceiving(const uint8_t *target, const bool status);
|
||||
void onConfirmReceiving(const uint8_t *target, const uint16_t id, const bool status);
|
||||
|
||||
void loadConfig(void);
|
||||
void saveConfig(void);
|
||||
@ -18,11 +18,19 @@ void sendKeepAliveMessage(void);
|
||||
void sendConfigMessage(void);
|
||||
void sendStatusMessage(void);
|
||||
|
||||
String getValue(String data, char separator, byte index);
|
||||
String getValue(String data, char separator, uint8_t index);
|
||||
|
||||
void changeLedState(void);
|
||||
|
||||
const String firmware{"1.11"};
|
||||
typedef struct
|
||||
{
|
||||
uint16_t id{0};
|
||||
char message[200]{0};
|
||||
} espnow_message_t;
|
||||
|
||||
std::vector<espnow_message_t> espnowMessage;
|
||||
|
||||
const String firmware{"1.12"};
|
||||
|
||||
String espnowNetName{"DEFAULT"};
|
||||
|
||||
@ -62,23 +70,14 @@ void apModeHideTimerCallback(void);
|
||||
Ticker attributesMessageTimer;
|
||||
bool attributesMessageTimerSemaphore{true};
|
||||
void attributesMessageTimerCallback(void);
|
||||
Ticker attributesMessageResendTimer;
|
||||
bool attributesMessageResendTimerSemaphore{false};
|
||||
|
||||
Ticker keepAliveMessageTimer;
|
||||
bool keepAliveMessageTimerSemaphore{true};
|
||||
void keepAliveMessageTimerCallback(void);
|
||||
Ticker keepAliveMessageResendTimer;
|
||||
bool keepAliveMessageResendTimerSemaphore{false};
|
||||
|
||||
Ticker configMessageResendTimer;
|
||||
bool configMessageResendTimerSemaphore{false};
|
||||
|
||||
Ticker statusMessageTimer;
|
||||
bool statusMessageTimerSemaphore{true};
|
||||
void statusMessageTimerCallback(void);
|
||||
Ticker statusMessageResendTimer;
|
||||
bool statusMessageResendTimerSemaphore{false};
|
||||
|
||||
void setup()
|
||||
{
|
||||
@ -133,14 +132,14 @@ void loop()
|
||||
ArduinoOTA.handle();
|
||||
}
|
||||
|
||||
void onBroadcastReceiving(const char *data, const byte *sender)
|
||||
void onBroadcastReceiving(const char *data, const uint8_t *sender)
|
||||
{
|
||||
esp_now_payload_data_t incomingData;
|
||||
memcpy(&incomingData, data, sizeof(esp_now_payload_data_t));
|
||||
if (incomingData.deviceType != ENDT_GATEWAY)
|
||||
return;
|
||||
if (myNet.macToString(gatewayMAC) != myNet.macToString(sender) && incomingData.payloadsType == ENPT_KEEP_ALIVE)
|
||||
memcpy(gatewayMAC, sender, 6);
|
||||
memcpy(&gatewayMAC, sender, 6);
|
||||
if (myNet.macToString(gatewayMAC) == myNet.macToString(sender) && incomingData.payloadsType == ENPT_KEEP_ALIVE)
|
||||
{
|
||||
isGatewayAvailable = true;
|
||||
@ -157,7 +156,7 @@ void onBroadcastReceiving(const char *data, const byte *sender)
|
||||
}
|
||||
}
|
||||
|
||||
void onUnicastReceiving(const char *data, const byte *sender)
|
||||
void onUnicastReceiving(const char *data, const uint8_t *sender)
|
||||
{
|
||||
esp_now_payload_data_t incomingData;
|
||||
memcpy(&incomingData, data, sizeof(esp_now_payload_data_t));
|
||||
@ -192,30 +191,19 @@ void onUnicastReceiving(const char *data, const byte *sender)
|
||||
ESP.restart();
|
||||
}
|
||||
|
||||
void onConfirmReceiving(const uint8_t *target, const bool status)
|
||||
void onConfirmReceiving(const uint8_t *target, const uint16_t id, const bool status)
|
||||
{
|
||||
if (status)
|
||||
for (uint16_t i{0}; i < espnowMessage.size(); ++i)
|
||||
{
|
||||
if (attributesMessageResendTimerSemaphore)
|
||||
{
|
||||
attributesMessageResendTimerSemaphore = false;
|
||||
attributesMessageResendTimer.detach();
|
||||
}
|
||||
if (keepAliveMessageResendTimerSemaphore)
|
||||
{
|
||||
keepAliveMessageResendTimerSemaphore = false;
|
||||
keepAliveMessageResendTimer.detach();
|
||||
}
|
||||
if (configMessageResendTimerSemaphore)
|
||||
{
|
||||
configMessageResendTimerSemaphore = false;
|
||||
configMessageResendTimer.detach();
|
||||
}
|
||||
if (statusMessageResendTimerSemaphore)
|
||||
{
|
||||
statusMessageResendTimerSemaphore = false;
|
||||
statusMessageResendTimer.detach();
|
||||
}
|
||||
espnow_message_t message = espnowMessage[i];
|
||||
if (message.id == id)
|
||||
if (status)
|
||||
espnowMessage.erase(espnowMessage.begin() + i);
|
||||
else
|
||||
{
|
||||
message.id = myNet.sendUnicastMessage(message.message, gatewayMAC, true);
|
||||
espnowMessage.at(i) = message;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -313,6 +301,7 @@ void sendAttributesMessage()
|
||||
uint32_t hours = mins / 60;
|
||||
uint32_t days = hours / 24;
|
||||
esp_now_payload_data_t outgoingData{ENDT_LED, ENPT_ATTRIBUTES};
|
||||
espnow_message_t message;
|
||||
StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json;
|
||||
json["Type"] = "ESP-NOW light";
|
||||
json["MCU"] = "ESP8266";
|
||||
@ -320,15 +309,11 @@ void sendAttributesMessage()
|
||||
json["Firmware"] = firmware;
|
||||
json["Library"] = myNet.getFirmwareVersion();
|
||||
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);
|
||||
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));
|
||||
myNet.sendUnicastMessage(temp, gatewayMAC, true);
|
||||
serializeJsonPretty(json, outgoingData.message);
|
||||
memcpy(&message.message, &outgoingData, sizeof(esp_now_payload_data_t));
|
||||
message.id = myNet.sendUnicastMessage(message.message, gatewayMAC, true);
|
||||
|
||||
attributesMessageResendTimerSemaphore = true;
|
||||
attributesMessageResendTimer.once(1, sendAttributesMessage);
|
||||
espnowMessage.push_back(message);
|
||||
}
|
||||
|
||||
void sendKeepAliveMessage()
|
||||
@ -337,12 +322,11 @@ void sendKeepAliveMessage()
|
||||
return;
|
||||
keepAliveMessageTimerSemaphore = false;
|
||||
esp_now_payload_data_t outgoingData{ENDT_LED, ENPT_KEEP_ALIVE};
|
||||
char temp[sizeof(esp_now_payload_data_t)]{0};
|
||||
memcpy(&temp, &outgoingData, sizeof(esp_now_payload_data_t));
|
||||
myNet.sendUnicastMessage(temp, gatewayMAC, true);
|
||||
espnow_message_t message;
|
||||
memcpy(&message.message, &outgoingData, sizeof(esp_now_payload_data_t));
|
||||
message.id = myNet.sendUnicastMessage(message.message, gatewayMAC, true);
|
||||
|
||||
keepAliveMessageResendTimerSemaphore = true;
|
||||
keepAliveMessageResendTimer.once(1, sendKeepAliveMessage);
|
||||
espnowMessage.push_back(message);
|
||||
}
|
||||
|
||||
void sendConfigMessage()
|
||||
@ -350,6 +334,7 @@ void sendConfigMessage()
|
||||
if (!isGatewayAvailable)
|
||||
return;
|
||||
esp_now_payload_data_t outgoingData{ENDT_LED, ENPT_CONFIG};
|
||||
espnow_message_t message;
|
||||
StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json;
|
||||
json["name"] = deviceName;
|
||||
json["unit"] = 1;
|
||||
@ -357,15 +342,11 @@ void sendConfigMessage()
|
||||
json["class"] = ledType;
|
||||
json["payload_on"] = payloadOn;
|
||||
json["payload_off"] = payloadOff;
|
||||
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));
|
||||
myNet.sendUnicastMessage(temp, gatewayMAC, true);
|
||||
serializeJsonPretty(json, outgoingData.message);
|
||||
memcpy(&message.message, &outgoingData, sizeof(esp_now_payload_data_t));
|
||||
message.id = myNet.sendUnicastMessage(message.message, gatewayMAC, true);
|
||||
|
||||
configMessageResendTimerSemaphore = true;
|
||||
configMessageResendTimer.once(1, sendConfigMessage);
|
||||
espnowMessage.push_back(message);
|
||||
}
|
||||
|
||||
void sendStatusMessage()
|
||||
@ -374,28 +355,25 @@ void sendStatusMessage()
|
||||
return;
|
||||
statusMessageTimerSemaphore = false;
|
||||
esp_now_payload_data_t outgoingData{ENDT_LED, ENPT_STATE};
|
||||
espnow_message_t message;
|
||||
StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json;
|
||||
json["state"] = ledStatus ? payloadOn : payloadOff;
|
||||
json["brightness"] = brightness;
|
||||
json["temperature"] = temperature;
|
||||
json["rgb"] = String(red) + "," + String(green) + "," + String(blue);
|
||||
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));
|
||||
myNet.sendUnicastMessage(temp, gatewayMAC, true);
|
||||
serializeJsonPretty(json, outgoingData.message);
|
||||
memcpy(&message.message, &outgoingData, sizeof(esp_now_payload_data_t));
|
||||
message.id = myNet.sendUnicastMessage(message.message, gatewayMAC, true);
|
||||
|
||||
statusMessageResendTimerSemaphore = true;
|
||||
statusMessageResendTimer.once(1, sendStatusMessage);
|
||||
espnowMessage.push_back(message);
|
||||
}
|
||||
|
||||
String getValue(String data, char separator, byte index)
|
||||
String getValue(String data, char separator, uint8_t index)
|
||||
{
|
||||
byte found{0};
|
||||
uint8_t found{0};
|
||||
int strIndex[]{0, -1};
|
||||
int maxIndex = data.length() - 1;
|
||||
for (byte i{0}; i <= maxIndex && found <= index; i++)
|
||||
for (uint8_t i{0}; i <= maxIndex && found <= index; i++)
|
||||
if (data.charAt(i) == separator || i == maxIndex)
|
||||
{
|
||||
found++;
|
||||
@ -471,7 +449,8 @@ void changeLedState(void)
|
||||
void gatewayAvailabilityCheckTimerCallback()
|
||||
{
|
||||
isGatewayAvailable = false;
|
||||
memset(gatewayMAC, 0, 6);
|
||||
memset(&gatewayMAC, 0, 6);
|
||||
espnowMessage.clear();
|
||||
}
|
||||
|
||||
void apModeHideTimerCallback()
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user