Compare commits

..

No commits in common. "71ec165aca9c13f448f788eff86669a1d3bc6012" and "551866b040267a83a231169a6b1c2f707ae9f645" have entirely different histories.

2 changed files with 15 additions and 19 deletions

View File

@ -3,7 +3,7 @@ platform = espressif8266
board = esp12e
framework = arduino
board_build.filesystem = littlefs
board_build.ldscript = eagle.flash.4m1m.ld
board_build.ldscript = eagle.flash.4m2m.ld
lib_deps =
https://github.com/aZholtikov/ZHNetwork
https://github.com/aZholtikov/ZHConfig
@ -17,7 +17,7 @@ platform = espressif8266
board = esp12e
framework = arduino
board_build.filesystem = littlefs
board_build.ldscript = eagle.flash.4m1m.ld
board_build.ldscript = eagle.flash.4m2m.ld
upload_port = 192.168.4.1
upload_protocol = espota
lib_deps =
@ -33,7 +33,7 @@ platform = espressif8266
board = esp8285
framework = arduino
board_build.filesystem = littlefs
board_build.ldscript = eagle.flash.2m64.ld
board_build.ldscript = eagle.flash.2m256.ld
lib_deps =
https://github.com/aZholtikov/ZHNetwork
https://github.com/aZholtikov/ZHConfig
@ -47,7 +47,7 @@ platform = espressif8266
board = esp8285
framework = arduino
board_build.filesystem = littlefs
board_build.ldscript = eagle.flash.2m64.ld
board_build.ldscript = eagle.flash.2m256.ld
upload_port = 192.168.4.1
upload_protocol = espota
lib_deps =

View File

@ -32,7 +32,7 @@ typedef struct
std::vector<espnow_message_t> espnowMessage;
const String firmware{"1.32"};
const String firmware{"1.31"};
String espnowNetName{"DEFAULT"};
@ -343,7 +343,7 @@ void setupWebServer()
void IRAM_ATTR buttonInterrupt()
{
ETS_GPIO_INTR_DISABLE();
buttonInterruptTimer.once_ms(500, switchingRelay); // For prevent contact chatter.
buttonInterruptTimer.once_ms(100, switchingRelay); // For prevent contact chatter.
}
void switchingRelay()
@ -423,9 +423,9 @@ void sendConfigMessage(const uint8_t type)
{
json["name"] = deviceName;
json["unit"] = 1;
json["type"] = HACT_SWITCH; // ha_component_type_t
json["class"] = HASWDC_SWITCH; // ha_switch_device_class_t
json["template"] = "state"; // value_template
json["type"] = HACT_SWITCH;
json["class"] = HASWDC_SWITCH;
json["template"] = "state";
json["payload_on"] = payloadOn;
json["payload_off"] = payloadOff;
}
@ -434,11 +434,9 @@ void sendConfigMessage(const uint8_t type)
outgoingData.deviceType = ENDT_SENSOR;
json["name"] = deviceName + " temperature";
json["unit"] = 2;
json["type"] = HACT_SENSOR; // ha_component_type_t
json["class"] = HASDC_TEMPERATURE; // ha_sensor_device_class_t
json["template"] = "temperature"; // value_template
json["meas"] = "°C"; // unit_of_measurement
json["time"] = 180; // expire_after
json["type"] = HACT_SENSOR;
json["class"] = HASDC_TEMPERATURE;
json["template"] = "temperature";
}
serializeJsonPretty(json, outgoingData.message);
memcpy(&message.message, &outgoingData, sizeof(esp_now_payload_data_t));
@ -451,11 +449,9 @@ void sendConfigMessage(const uint8_t type)
outgoingData.deviceType = ENDT_SENSOR;
json["name"] = deviceName + " humidity";
json["unit"] = 3;
json["type"] = HACT_SENSOR; // ha_component_type_t
json["class"] = HASDC_HUMIDITY; // ha_sensor_device_class_t
json["template"] = "humidity"; // value_template
json["meas"] = "%"; // unit_of_measurement
json["time"] = 180; // expire_after
json["type"] = HACT_SENSOR;
json["class"] = HASDC_HUMIDITY;
json["template"] = "humidity";
serializeJsonPretty(json, outgoingData.message);
memcpy(&message.message, &outgoingData, sizeof(esp_now_payload_data_t));