alexey.zholtikov/ESP-NOW-Window-Door-Sensor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 5 Wiki Activity

Version 1.2

Browse Source 
Added encrypting messages.
Web interface minor redesign.
Main code minor refactoring.
This commit is contained in:
Alexey Zholtikov 2023-01-22 14:03:34 +03:00
parent 82f7e3c128
commit afaf9b5e8f
5 changed files with 54 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
README.md
View File

@ -6,7 +6,7 @@ ESP-NOW based window/door sensor for ESP8266. Alternate firmware for Tuya/SmartL
1. When triggered transmits system information, battery status (HIGH/MID/LOW) and sensor status (OPEN/CLOSED). 1. When triggered transmits system information, battery status (HIGH/MID/LOW) and sensor status (OPEN/CLOSED).
2. Average response time of 1 second (depends on the MCU of the sensor). 2. Average response time of 1 second (depends on the MCU of the sensor).
3. In setup/update mode creates an access point named "ESP-NOW Window XXXXXXXXXXXX" with password "12345678" (IP 192.168.4.1). 3. In setup/update mode creates an access point named "ESP-NOW window XXXXXXXXXXXX" with password "12345678" (IP 192.168.4.1).
4. Automatically adds sensor and battery configuration to Home Assistan via MQTT discovery as a binary_sensors (2 different binary_sensor). 4. Automatically adds sensor and battery configuration to Home Assistan via MQTT discovery as a binary_sensors (2 different binary_sensor).
5. Possibility firmware update over OTA (if is allows the size of the flash memory). 5. Possibility firmware update over OTA (if is allows the size of the flash memory).
6. Web interface for settings. 6. Web interface for settings.
@ -24,7 +24,8 @@ See [here](https://github.com/aZholtikov/ESP-NOW-Window-Door-Sensor/tree/main/ha
1. A gateway is required. For details see [ESP-NOW Gateway](https://github.com/aZholtikov/ESP-NOW-Gateway). 1. A gateway is required. For details see [ESP-NOW Gateway](https://github.com/aZholtikov/ESP-NOW-Gateway).
2. ESP-NOW network name must be set same of all another ESP-NOW devices in network. 2. ESP-NOW network name must be set same of all another ESP-NOW devices in network.
3. Upload the "data" folder (with web interface) into the filesystem before flashing. 3. If encryption is used, the key must be set same of all another ESP-NOW devices in network.
4. For using this firmware on Tuya/SmartLife WiFi window/door sensors, the WiFi module must be replaced with an ESP8266 compatible module (if necessary). 4. Upload the "data" folder (with web interface) into the filesystem before flashing.
5. Highly recommended connect an external power supply during setup/upgrade. 5. For using this firmware on Tuya/SmartLife WiFi window/door sensors, the WiFi module must be replaced with an ESP8266 compatible module (if necessary).
6. Because this sensor is battery operated, it has an additional controller (MCU) that controls the power of the WiFi module (Module) and transmits data to it for transmission to the network. The communication is done via UART at 9600 speed. Make sure that the protocol is correct before flashing. Details [here](https://github.com/aZholtikov/ESP-NOW-Window-Door-Sensor/tree/main/doc). 6. Highly recommended connect an external power supply during setup/upgrade.
7. Because this sensor is battery operated, it has an additional controller (MCU) that controls the power of the WiFi module (Module) and transmits data to it for transmission to the network. The communication is done via UART at 9600 speed. Make sure that the protocol is correct before flashing. Details [here](https://github.com/aZholtikov/ESP-NOW-Window-Door-Sensor/tree/main/doc).

7
data/function.js
View File

@ -29,7 +29,7 @@ function loadBlock() {
} }
document.getElementsByTagName('body')[0].innerHTML = newString; document.getElementsByTagName('body')[0].innerHTML = newString;
setFirmvareValue('version', 'firmware'); setFirmvareValue('version', 'firmware');
setGpioValue('deviceSensorClassSelect', 'deviceSensorClass'); setGpioValue('deviceClassSelect', 'deviceClass');
handleServerResponse(); handleServerResponse();
} }
@ -51,10 +51,9 @@ function sendRequest(submit, server) {
} }
function saveSetting(submit) { function saveSetting(submit) {
server = "/setting?deviceSensorName=" + getValue('deviceSensorName') server = "/setting?deviceName=" + getValue('deviceName')
+ "&deviceBatteryName=" + getValue('deviceBatteryName')
+ "&espnowNetName=" + getValue('espnowNetName') + "&espnowNetName=" + getValue('espnowNetName')
+ "&deviceSensorClass=" + getSelectValue('deviceSensorClassSelect'); + "&deviceClass=" + getSelectValue('deviceClassSelect');
sendRequest(submit, server); sendRequest(submit, server);
alert("Please restart device for changes apply."); alert("Please restart device for changes apply.");
} }

18
data/index.htm
View File

@ -5,12 +5,12 @@
<meta name="viewport" content="width=device-width, initial-scale=0.9"> <meta name="viewport" content="width=device-width, initial-scale=0.9">
<link rel="stylesheet" href="style.css"> <link rel="stylesheet" href="style.css">
<script type="text/javascript" src="function.js"></script> <script type="text/javascript" src="function.js"></script>
<title>ESP-NOW Window/Door Sensor</title> <title>ESP-NOW Window Sensor</title>
</head> </head>
<body onload="load();"> <body onload="load();">
<form class="box"> <form class="box">
<h1>ESP-NOW Window/Door Sensor </h1> <h1>ESP-NOW Window Sensor </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>
@ -18,14 +18,8 @@
</div> </div>
<div class="wrapper"> <div class="wrapper">
<p class="text">Sensor name:</p> <p class="text">Device name:</p>
<input id="deviceSensorName" value="{{deviceSensorName}}" placeholder="Name" autocomplete="off" label <input id="deviceName" value="{{deviceName}}" placeholder="Name" autocomplete="off" label
title="ESP-NOW device name (up to 150 characters)" />
</div>
<div class="wrapper">
<p class="text">Battery name:</p>
<input id="deviceBatteryName" value="{{deviceBatteryName}}" placeholder="Name" autocomplete="off" label
title="ESP-NOW device name (up to 150 characters)" /> title="ESP-NOW device name (up to 150 characters)" />
</div> </div>
@ -37,8 +31,8 @@
<div class="wrapper"> <div class="wrapper">
<p class="text-select">Sensor type:</p> <p class="text-select">Sensor type:</p>
<input id="deviceSensorClass" value="{{deviceSensorClass}}" hidden /> <input id="deviceClass" value="{{deviceClass}}" hidden />
<p><select id="deviceSensorClassSelect"> <p><select id="deviceClassSelect">
<option value="28">WINDOW</option> <option value="28">WINDOW</option>
<option value="6">DOOR</option> <option value="6">DOOR</option>
</select></p> </select></p>

20
data/style.css
View File

@ -1,3 +1,7 @@
p{
margin: 0 0;
}
body { body {
font-family: "Gill Sans", sans-serif; font-family: "Gill Sans", sans-serif;
background: rgb(255, 255, 255); background: rgb(255, 255, 255);
@ -21,13 +25,15 @@ h1 {
font-weight: 600; font-weight: 600;
flex-shrink: 0; flex-shrink: 0;
margin-right: 10px; margin-right: 10px;
margin-left: 10px;
margin: 10px 0;
} }
.text-select { .text-select {
width: 35%; width: 35%;
font-weight: 600; font-weight: 600;
flex-shrink: 0; flex-shrink: 0;
margin-right: 10px; margin-right: 10px;
} }
.wrapper { .wrapper {
@ -42,6 +48,7 @@ input {
border-radius: 5px; border-radius: 5px;
border: none; border: none;
margin-bottom: 10px; margin-bottom: 10px;
margin-left: 10px;
padding: 0 10px; padding: 0 10px;
color: rgb(0, 0, 0); color: rgb(0, 0, 0);
background: #a3e0f1; background: #a3e0f1;
@ -76,6 +83,8 @@ select:hover {
background: rgb(65, 125, 238); background: rgb(65, 125, 238);
color: white; color: white;
transition: .5s; transition: .5s;
margin-left: 0;
margin-top: 8px;
} }
.btn:hover { .btn:hover {
@ -84,10 +93,13 @@ select:hover {
transform: translatey(-3px); transform: translatey(-3px);
} }
#deviceSensorName, #deviceName,
#deviceBatteryName,
#espnowNetName { #espnowNetName {
width: 73%; width: 100%;
}
#espnowNetName {
margin-bottom: 15px;
} }
.wrapper.wrapper--end { .wrapper.wrapper--end {

50
src/main.cpp
View File

@ -4,7 +4,7 @@
#include "ZHNetwork.h" #include "ZHNetwork.h"
#include "ZHConfig.h" #include "ZHConfig.h"
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 loadConfig(void);
void saveConfig(void); void saveConfig(void);
@ -14,13 +14,12 @@ void sendSensorConfigMessage(void);
void sendBatteryConfigMessage(void); void sendBatteryConfigMessage(void);
void sendAttributesMessage(void); void sendAttributesMessage(void);
const String firmware{"1.1"}; const String firmware{"1.2"};
String espnowNetName{"DEFAULT"}; String espnowNetName{"DEFAULT"};
String deviceSensorName{"ESP-NOW window sensor"}; String deviceName = "ESP-NOW window " + String(ESP.getChipId(), HEX);
uint8_t deviceSensorClass{HABSDC_WINDOW}; uint8_t deviceClass{HABSDC_WINDOW};
String deviceBatteryName{"ESP-NOW window sensor battery"};
String sensorStatus{""}; String sensorStatus{""};
String batteryStatus{""}; String batteryStatus{""};
@ -34,7 +33,6 @@ bool semaphore{false};
esp_now_payload_data_t outgoingData{ENDT_SENSOR, ENPT_STATE}; esp_now_payload_data_t outgoingData{ENDT_SENSOR, ENPT_STATE};
StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json; StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json;
char buffer[sizeof(esp_now_payload_data_t::message)]{0};
char temp[sizeof(esp_now_payload_data_t)]{0}; char temp[sizeof(esp_now_payload_data_t)]{0};
const char initialMessage[] = {0x55, 0xAA, 0x00, 0x01, 0x00, 0x00, 0x00}; const char initialMessage[] = {0x55, 0xAA, 0x00, 0x01, 0x00, 0x00, 0x00};
const char connectedMessage[] = {0x55, 0xAA, 0x00, 0x02, 0x00, 0x01, 0x04, 0x06}; const char connectedMessage[] = {0x55, 0xAA, 0x00, 0x02, 0x00, 0x01, 0x04, 0x06};
@ -56,6 +54,7 @@ void setup()
json["battery"] = batteryStatus; json["battery"] = batteryStatus;
myNet.begin(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.setOnConfirmReceivingCallback(onConfirmReceiving); myNet.setOnConfirmReceivingCallback(onConfirmReceiving);
@ -111,7 +110,7 @@ void loop()
Serial.end(); Serial.end();
dataReceived = false; dataReceived = false;
WiFi.mode(WIFI_AP); WiFi.mode(WIFI_AP);
WiFi.softAP(("ESP-NOW Window " + myNet.getNodeMac()).c_str(), "12345678", 1, 0); WiFi.softAP(("ESP-NOW window " + String(ESP.getChipId(), HEX)).c_str(), "12345678", 1, 0);
setupWebServer(); setupWebServer();
ArduinoOTA.begin(); ArduinoOTA.begin();
} }
@ -136,9 +135,8 @@ void loop()
} }
dataReceived = false; dataReceived = false;
saveConfig(); saveConfig();
serializeJsonPretty(json, buffer); serializeJsonPretty(json, outgoingData.message);
memcpy(outgoingData.message, buffer, sizeof(esp_now_payload_data_t::message)); memcpy(&temp, &outgoingData, sizeof(esp_now_payload_data_t));
memcpy(temp, &outgoingData, sizeof(esp_now_payload_data_t));
myNet.sendBroadcastMessage(temp); myNet.sendBroadcastMessage(temp);
semaphore = true; semaphore = true;
} }
@ -156,9 +154,8 @@ void loop()
} }
dataReceived = false; dataReceived = false;
saveConfig(); saveConfig();
serializeJsonPretty(json, buffer); serializeJsonPretty(json, outgoingData.message);
memcpy(outgoingData.message, buffer, sizeof(esp_now_payload_data_t::message)); memcpy(&temp, &outgoingData, sizeof(esp_now_payload_data_t));
memcpy(temp, &outgoingData, sizeof(esp_now_payload_data_t));
myNet.sendBroadcastMessage(temp); myNet.sendBroadcastMessage(temp);
semaphore = true; semaphore = true;
} }
@ -168,7 +165,7 @@ void loop()
ArduinoOTA.handle(); ArduinoOTA.handle();
} }
void onConfirmReceiving(const uint8_t *target, const bool status) void onConfirmReceiving(const uint8_t *target, const uint16_t id, const bool status)
{ {
if (semaphore) if (semaphore)
{ {
@ -186,9 +183,8 @@ void loadConfig()
StaticJsonDocument<1024> json; StaticJsonDocument<1024> json;
deserializeJson(json, jsonFile); deserializeJson(json, jsonFile);
espnowNetName = json["espnowNetName"].as<String>(); espnowNetName = json["espnowNetName"].as<String>();
deviceSensorName = json["deviceSensorName"].as<String>(); deviceName = json["deviceName"].as<String>();
deviceBatteryName = json["deviceBatteryName"].as<String>(); deviceClass = json["deviceClass"];
deviceSensorClass = json["deviceSensorClass"];
sensorStatus = json["sensorStatus"].as<String>(); sensorStatus = json["sensorStatus"].as<String>();
batteryStatus = json["batteryStatus"].as<String>(); batteryStatus = json["batteryStatus"].as<String>();
file.close(); file.close();
@ -199,9 +195,8 @@ void saveConfig()
StaticJsonDocument<1024> json; StaticJsonDocument<1024> json;
json["firmware"] = firmware; json["firmware"] = firmware;
json["espnowNetName"] = espnowNetName; json["espnowNetName"] = espnowNetName;
json["deviceSensorName"] = deviceSensorName; json["deviceName"] = deviceName;
json["deviceBatteryName"] = deviceBatteryName; json["deviceClass"] = deviceClass;
json["deviceSensorClass"] = deviceSensorClass;
json["sensorStatus"] = sensorStatus; json["sensorStatus"] = sensorStatus;
json["batteryStatus"] = batteryStatus; json["batteryStatus"] = batteryStatus;
json["system"] = "empty"; json["system"] = "empty";
@ -217,9 +212,8 @@ void setupWebServer()
webServer.on("/setting", HTTP_GET, [](AsyncWebServerRequest *request) webServer.on("/setting", HTTP_GET, [](AsyncWebServerRequest *request)
{ {
deviceSensorName = request->getParam("deviceSensorName")->value(); deviceName = request->getParam("deviceName")->value();
deviceBatteryName = request->getParam("deviceBatteryName")->value(); deviceClass = request->getParam("deviceClass")->value().toInt();
deviceSensorClass = request->getParam("deviceSensorClass")->value().toInt();
espnowNetName = request->getParam("espnowNetName")->value(); espnowNetName = request->getParam("espnowNetName")->value();
request->send(200); request->send(200);
saveConfig(); }); saveConfig(); });
@ -245,10 +239,11 @@ void sendSensorConfigMessage()
{ {
esp_now_payload_data_t outgoingData{ENDT_SENSOR, ENPT_CONFIG}; esp_now_payload_data_t outgoingData{ENDT_SENSOR, ENPT_CONFIG};
StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json; StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json;
json["name"] = deviceSensorName; json["name"] = deviceName;
json["unit"] = 1; json["unit"] = 1;
json["type"] = HACT_BINARY_SENSOR; json["type"] = HACT_BINARY_SENSOR;
json["class"] = deviceSensorClass; json["class"] = deviceClass;
json["template"] = "state";
json["payload_on"] = "OPEN"; json["payload_on"] = "OPEN";
json["payload_off"] = "CLOSED"; json["payload_off"] = "CLOSED";
char buffer[sizeof(esp_now_payload_data_t::message)]{0}; char buffer[sizeof(esp_now_payload_data_t::message)]{0};
@ -263,10 +258,11 @@ void sendBatteryConfigMessage()
{ {
esp_now_payload_data_t outgoingData{ENDT_SENSOR, ENPT_CONFIG}; esp_now_payload_data_t outgoingData{ENDT_SENSOR, ENPT_CONFIG};
StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json; StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json;
json["name"] = deviceBatteryName; json["name"] = deviceName + " battery";
json["unit"] = 2; json["unit"] = 2;
json["type"] = HACT_BINARY_SENSOR; json["type"] = HACT_BINARY_SENSOR;
json["class"] = HABSDC_BATTERY; json["class"] = HABSDC_BATTERY;
json["template"] = "battery";
json["payload_on"] = "MID"; json["payload_on"] = "MID";
json["payload_off"] = "HIGH"; json["payload_off"] = "HIGH";
char buffer[sizeof(esp_now_payload_data_t::message)]{0}; char buffer[sizeof(esp_now_payload_data_t::message)]{0};
@ -281,7 +277,7 @@ void sendAttributesMessage()
{ {
esp_now_payload_data_t outgoingData{ENDT_SENSOR, ENPT_ATTRIBUTES}; esp_now_payload_data_t outgoingData{ENDT_SENSOR, ENPT_ATTRIBUTES};
StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json; StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json;
json["Type"] = "ESP-NOW Window Sensor"; json["Type"] = "ESP-NOW window sensor";
json["MCU"] = "ESP8266"; json["MCU"] = "ESP8266";
json["MAC"] = myNet.getNodeMac(); json["MAC"] = myNet.getNodeMac();
json["Firmware"] = firmware; json["Firmware"] = firmware;