alexey.zholtikov/ESP-NOW-Switch
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 14 Wiki Activity

Version 1.3

Browse Source 
Added relay work modes.
This commit is contained in:
Alexey Zholtikov
2023-02-17 09:28:23 +03:00
parent dc17e39ff6
commit 0b603489fd
4 changed files with 43 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/main.cpp
View File

@ -32,10 +32,12 @@ typedef struct
std::vector<espnow_message_t> espnowMessage;
const String firmware{"1.21"};
const String firmware{"1.3"};
String espnowNetName{"DEFAULT"};
uint8_t workMode{0};
String deviceName = "ESP-NOW switch " + String(ESP.getChipId(), HEX);
bool relayStatus{false};
@ -203,9 +205,19 @@ void onUnicastReceiving(const char *data, const uint8_t *sender)
deserializeJson(json, incomingData.message);
relayStatus = json["set"] == payloadOn ? true : false;
if (relayPin)
digitalWrite(relayPin, relayPinType ? relayStatus : !relayStatus);
{
if (workMode)
digitalWrite(relayPin, relayPinType ? !relayStatus : relayStatus);
else
digitalWrite(relayPin, relayPinType ? relayStatus : !relayStatus);
}
if (ledPin)
digitalWrite(ledPin, ledPinType ? relayStatus : !relayStatus);
{
if (workMode)
digitalWrite(ledPin, ledPinType ? !relayStatus : relayStatus);
else
digitalWrite(ledPin, ledPinType ? relayStatus : !relayStatus);
}
saveConfig();
sendStatusMessage();
}
@ -258,6 +270,7 @@ void loadConfig()
ledPinType = json["ledPinType"];
sensorPin = json["sensorPin"];
sensorType = json["sensorType"];
workMode = json["workMode"];
file.close();
}
@ -278,6 +291,7 @@ void saveConfig()
json["ledPinType"] = ledPinType;
json["sensorPin"] = sensorPin;
json["sensorType"] = sensorType;
json["workMode"] = workMode;
json["system"] = "empty";
File file = LittleFS.open("/config.json", "w");
serializeJsonPretty(json, file);
@ -301,6 +315,7 @@ void setupWebServer()
ledPinType = request->getParam("ledPinType")->value().toInt();
sensorPin = request->getParam("sensorPin")->value().toInt();
sensorType = request->getParam("sensorType")->value().toInt();
workMode = request->getParam("workMode")->value().toInt();
deviceName = request->getParam("deviceName")->value();
espnowNetName = request->getParam("espnowNetName")->value();
request->send(200);
@ -333,9 +348,19 @@ void switchingRelay()
{
relayStatus = !relayStatus;
if (relayPin)
digitalWrite(relayPin, relayPinType ? relayStatus : !relayStatus);
{
if (workMode)
digitalWrite(relayPin, relayPinType ? !relayStatus : relayStatus);
else
digitalWrite(relayPin, relayPinType ? relayStatus : !relayStatus);
}
if (ledPin)
digitalWrite(ledPin, ledPinType ? relayStatus : !relayStatus);
{
if (workMode)
digitalWrite(ledPin, ledPinType ? !relayStatus : relayStatus);
else
digitalWrite(ledPin, ledPinType ? relayStatus : !relayStatus);
}
saveConfig();
sendStatusMessage();
ETS_GPIO_INTR_ENABLE();