Version 1.4
Minimized of config message size. Changed SDK version for 3.0.5
This commit is contained in:
parent
1aa5465687
commit
98a082dd67
@ -2,6 +2,7 @@
|
|||||||
platform = espressif8266
|
platform = espressif8266
|
||||||
board = esp12e
|
board = esp12e
|
||||||
framework = arduino
|
framework = arduino
|
||||||
|
build_flags = -D PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK305
|
||||||
board_build.filesystem = littlefs
|
board_build.filesystem = littlefs
|
||||||
board_build.ldscript = eagle.flash.4m1m.ld
|
board_build.ldscript = eagle.flash.4m1m.ld
|
||||||
lib_deps =
|
lib_deps =
|
||||||
@ -16,6 +17,7 @@ lib_deps =
|
|||||||
platform = espressif8266
|
platform = espressif8266
|
||||||
board = esp12e
|
board = esp12e
|
||||||
framework = arduino
|
framework = arduino
|
||||||
|
build_flags = -D PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK305
|
||||||
board_build.filesystem = littlefs
|
board_build.filesystem = littlefs
|
||||||
board_build.ldscript = eagle.flash.4m1m.ld
|
board_build.ldscript = eagle.flash.4m1m.ld
|
||||||
upload_port = 192.168.4.1
|
upload_port = 192.168.4.1
|
||||||
@ -32,6 +34,7 @@ lib_deps =
|
|||||||
platform = espressif8266
|
platform = espressif8266
|
||||||
board = esp8285
|
board = esp8285
|
||||||
framework = arduino
|
framework = arduino
|
||||||
|
build_flags = -D PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK305
|
||||||
board_build.filesystem = littlefs
|
board_build.filesystem = littlefs
|
||||||
board_build.ldscript = eagle.flash.2m64.ld
|
board_build.ldscript = eagle.flash.2m64.ld
|
||||||
lib_deps =
|
lib_deps =
|
||||||
@ -46,6 +49,7 @@ lib_deps =
|
|||||||
platform = espressif8266
|
platform = espressif8266
|
||||||
board = esp8285
|
board = esp8285
|
||||||
framework = arduino
|
framework = arduino
|
||||||
|
build_flags = -D PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK305
|
||||||
board_build.filesystem = littlefs
|
board_build.filesystem = littlefs
|
||||||
board_build.ldscript = eagle.flash.2m64.ld
|
board_build.ldscript = eagle.flash.2m64.ld
|
||||||
upload_port = 192.168.4.1
|
upload_port = 192.168.4.1
|
||||||
@ -62,6 +66,7 @@ lib_deps =
|
|||||||
platform = espressif8266
|
platform = espressif8266
|
||||||
board = esp8285
|
board = esp8285
|
||||||
framework = arduino
|
framework = arduino
|
||||||
|
build_flags = -D PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK305
|
||||||
board_build.filesystem = littlefs
|
board_build.filesystem = littlefs
|
||||||
board_build.ldscript = eagle.flash.1m64.ld
|
board_build.ldscript = eagle.flash.1m64.ld
|
||||||
lib_deps =
|
lib_deps =
|
||||||
|
52
src/main.cpp
52
src/main.cpp
@ -32,7 +32,7 @@ typedef struct
|
|||||||
|
|
||||||
std::vector<espnow_message_t> espnowMessage;
|
std::vector<espnow_message_t> espnowMessage;
|
||||||
|
|
||||||
const String firmware{"1.32"};
|
const String firmware{"1.4"};
|
||||||
|
|
||||||
String espnowNetName{"DEFAULT"};
|
String espnowNetName{"DEFAULT"};
|
||||||
|
|
||||||
@ -40,7 +40,6 @@ uint8_t workMode{0};
|
|||||||
|
|
||||||
String deviceName = "ESP-NOW switch " + String(ESP.getChipId(), HEX);
|
String deviceName = "ESP-NOW switch " + String(ESP.getChipId(), HEX);
|
||||||
|
|
||||||
bool relayStatus{false};
|
|
||||||
uint8_t relayPin{0};
|
uint8_t relayPin{0};
|
||||||
uint8_t relayPinType{1};
|
uint8_t relayPinType{1};
|
||||||
uint8_t buttonPin{0};
|
uint8_t buttonPin{0};
|
||||||
@ -53,13 +52,12 @@ uint8_t ledPinType{0};
|
|||||||
uint8_t sensorPin{0};
|
uint8_t sensorPin{0};
|
||||||
uint8_t sensorType{0};
|
uint8_t sensorType{0};
|
||||||
|
|
||||||
|
bool relayStatus{false};
|
||||||
|
|
||||||
bool wasMqttAvailable{false};
|
bool wasMqttAvailable{false};
|
||||||
|
|
||||||
uint8_t gatewayMAC[6]{0};
|
uint8_t gatewayMAC[6]{0};
|
||||||
|
|
||||||
const String payloadOn{"ON"};
|
|
||||||
const String payloadOff{"OFF"};
|
|
||||||
|
|
||||||
ZHNetwork myNet;
|
ZHNetwork myNet;
|
||||||
AsyncWebServer webServer(80);
|
AsyncWebServer webServer(80);
|
||||||
|
|
||||||
@ -205,7 +203,7 @@ void onUnicastReceiving(const char *data, const uint8_t *sender)
|
|||||||
if (incomingData.payloadsType == ENPT_SET)
|
if (incomingData.payloadsType == ENPT_SET)
|
||||||
{
|
{
|
||||||
deserializeJson(json, incomingData.message);
|
deserializeJson(json, incomingData.message);
|
||||||
relayStatus = json["set"] == payloadOn ? true : false;
|
relayStatus = json["set"] == "ON" ? true : false;
|
||||||
if (relayPin)
|
if (relayPin)
|
||||||
{
|
{
|
||||||
if (workMode)
|
if (workMode)
|
||||||
@ -421,24 +419,22 @@ void sendConfigMessage(const uint8_t type)
|
|||||||
StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json;
|
StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json;
|
||||||
if (type == ENST_NONE)
|
if (type == ENST_NONE)
|
||||||
{
|
{
|
||||||
json["name"] = deviceName;
|
json[MCMT_DEVICE_NAME] = deviceName;
|
||||||
json["unit"] = 1;
|
json[MCMT_DEVICE_UNIT] = 1;
|
||||||
json["type"] = HACT_SWITCH; // ha_component_type_t
|
json[MCMT_COMPONENT_TYPE] = HACT_SWITCH;
|
||||||
json["class"] = HASWDC_SWITCH; // ha_switch_device_class_t
|
json[MCMT_DEVICE_CLASS] = HASWDC_SWITCH;
|
||||||
json["template"] = "state"; // value_template
|
json[MCMT_VALUE_TEMPLATE] = "state";
|
||||||
json["payload_on"] = payloadOn;
|
|
||||||
json["payload_off"] = payloadOff;
|
|
||||||
}
|
}
|
||||||
if (type == ENST_DS18B20 || type == ENST_DHT11 || type == ENST_DHT22)
|
if (type == ENST_DS18B20 || type == ENST_DHT11 || type == ENST_DHT22)
|
||||||
{
|
{
|
||||||
outgoingData.deviceType = ENDT_SENSOR;
|
outgoingData.deviceType = ENDT_SENSOR;
|
||||||
json["name"] = deviceName + " temperature";
|
json[MCMT_DEVICE_NAME] = deviceName + " temperature";
|
||||||
json["unit"] = 2;
|
json[MCMT_DEVICE_UNIT] = 2;
|
||||||
json["type"] = HACT_SENSOR; // ha_component_type_t
|
json[MCMT_COMPONENT_TYPE] = HACT_SENSOR;
|
||||||
json["class"] = HASDC_TEMPERATURE; // ha_sensor_device_class_t
|
json[MCMT_DEVICE_CLASS] = HASDC_TEMPERATURE;
|
||||||
json["template"] = "temperature"; // value_template
|
json[MCMT_VALUE_TEMPLATE] = "temperature";
|
||||||
json["meas"] = "°C"; // unit_of_measurement
|
json[MCMT_UNIT_OF_MEASUREMENT] = "°C";
|
||||||
json["time"] = 900; // expire_after
|
json[MCMT_EXPIRE_AFTER] = 900;
|
||||||
}
|
}
|
||||||
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));
|
||||||
@ -449,13 +445,13 @@ void sendConfigMessage(const uint8_t type)
|
|||||||
if (type == ENST_DHT11 || type == ENST_DHT22)
|
if (type == ENST_DHT11 || type == ENST_DHT22)
|
||||||
{
|
{
|
||||||
outgoingData.deviceType = ENDT_SENSOR;
|
outgoingData.deviceType = ENDT_SENSOR;
|
||||||
json["name"] = deviceName + " humidity";
|
json[MCMT_DEVICE_NAME] = deviceName + " humidity";
|
||||||
json["unit"] = 3;
|
json[MCMT_DEVICE_UNIT] = 3;
|
||||||
json["type"] = HACT_SENSOR; // ha_component_type_t
|
json[MCMT_COMPONENT_TYPE] = HACT_SENSOR;
|
||||||
json["class"] = HASDC_HUMIDITY; // ha_sensor_device_class_t
|
json[MCMT_DEVICE_CLASS] = HASDC_HUMIDITY;
|
||||||
json["template"] = "humidity"; // value_template
|
json[MCMT_VALUE_TEMPLATE] = "humidity";
|
||||||
json["meas"] = "%"; // unit_of_measurement
|
json[MCMT_UNIT_OF_MEASUREMENT] = "%";
|
||||||
json["time"] = 900; // expire_after
|
json[MCMT_EXPIRE_AFTER] = 900;
|
||||||
|
|
||||||
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));
|
||||||
@ -474,7 +470,7 @@ void sendStatusMessage(const uint8_t type)
|
|||||||
espnow_message_t message;
|
espnow_message_t message;
|
||||||
StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json;
|
StaticJsonDocument<sizeof(esp_now_payload_data_t::message)> json;
|
||||||
if (type == ENST_NONE)
|
if (type == ENST_NONE)
|
||||||
json["state"] = relayStatus ? payloadOn : payloadOff;
|
json["state"] = relayStatus ? "ON" : "OFF";
|
||||||
if (type == ENST_DS18B20)
|
if (type == ENST_DS18B20)
|
||||||
{
|
{
|
||||||
outgoingData.deviceType = ENDT_SENSOR;
|
outgoingData.deviceType = ENDT_SENSOR;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user