andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 16:29:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixes for publish ha

Browse Source
This commit is contained in:
MichaelDvP
2021-03-06 18:52:45 +01:00
parent 6c07085d94
commit c120268409
3 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/emsesp.cpp
View File

@@ -392,7 +392,11 @@ void EMSESP::publish_all_loop() {
publish_sensor_values(true, true); publish_sensor_values(true, true);
break; break;
case 7: case 7:
if (Mqtt::ha_enabled()) {
Mqtt::ha_status();
}
system_.send_heartbeat(); system_.send_heartbeat();
shower_.send_mqtt_stat(false, true);
break; break;
default: default:
// all finished // all finished
@@ -409,6 +413,7 @@ void EMSESP::reset_mqtt_ha() {
for (const auto & emsdevice : emsdevices) { for (const auto & emsdevice : emsdevices) {
emsdevice->ha_config_done(false); emsdevice->ha_config_done(false);
} }
dallassensor_.reload();
} }
// create json doc for the devices values and add to MQTT publish queue // create json doc for the devices values and add to MQTT publish queue

23
src/shower.cpp
View File

@@ -93,7 +93,7 @@ void Shower::loop() {
} }
// send status of shower to MQTT // send status of shower to MQTT
void Shower::send_mqtt_stat(bool state) { void Shower::send_mqtt_stat(bool state, bool force) {
if (!shower_timer_ && !shower_alert_) { if (!shower_timer_ && !shower_alert_) {
return; return;
} }
@@ -102,7 +102,7 @@ void Shower::send_mqtt_stat(bool state) {
Mqtt::publish(F("shower_active"), Helpers::render_boolean(s, state)); // https://github.com/proddy/EMS-ESP/issues/369 Mqtt::publish(F("shower_active"), Helpers::render_boolean(s, state)); // https://github.com/proddy/EMS-ESP/issues/369
// if we're in HA mode make sure we've first sent out the HA MQTT Discovery config topic // if we're in HA mode make sure we've first sent out the HA MQTT Discovery config topic
if ((Mqtt::ha_enabled()) && (!ha_configdone_)) { if ((Mqtt::ha_enabled()) && (!ha_configdone_ || force)) {
ha_configdone_ = true; ha_configdone_ = true;
StaticJsonDocument<EMSESP_JSON_SIZE_HA_CONFIG> doc; StaticJsonDocument<EMSESP_JSON_SIZE_HA_CONFIG> doc;
@@ -115,7 +115,7 @@ void Shower::send_mqtt_stat(bool state) {
ids.add("ems-esp"); ids.add("ems-esp");
char topic[100]; char topic[100];
snprintf_P(topic, sizeof(topic), PSTR("homeassistant/binary_sensor/%s/shower_active/config"), EMSESP::system_.hostname().c_str()); snprintf_P(topic, sizeof(topic), PSTR("homeassistant/binary_sensor/%s/shower_active/config"), Mqtt::base().c_str());
Mqtt::publish_ha(topic, doc.as<JsonObject>()); // publish the config payload with retain flag Mqtt::publish_ha(topic, doc.as<JsonObject>()); // publish the config payload with retain flag
} }
} }
@@ -146,12 +146,23 @@ void Shower::shower_alert_start() {
void Shower::publish_values() { void Shower::publish_values() {
StaticJsonDocument<EMSESP_JSON_SIZE_SMALL> doc; StaticJsonDocument<EMSESP_JSON_SIZE_SMALL> doc;
char s[50]; if (Mqtt::bool_format() == BOOL_FORMAT_ONOFF) {
doc["shower_timer"] = Helpers::render_boolean(s, shower_timer_); doc["shower_timer"] = shower_timer_ ? "on" : "off";
doc["shower_alert"] = Helpers::render_boolean(s, shower_alert_); doc["shower_alert"] = shower_alert_ ? "on" : "off";
} else if (Mqtt::bool_format() == BOOL_FORMAT_ONOFF_CAP) {
doc["shower_timer"] = shower_timer_ ? "ON" : "OFF";
doc["shower_alert"] = shower_alert_ ? "ON" : "OFF";
} else if (Mqtt::bool_format() == BOOL_FORMAT_TRUEFALSE) {
doc["shower_timer"] = shower_timer_;
doc["shower_alert"] = shower_alert_;
} else {
doc["shower_timer"] = shower_timer_ ? 1 : 0;
doc["shower_alert"] = shower_alert_ ? 1 : 0;
}
// only publish shower duration if there is a value // only publish shower duration if there is a value
if (duration_ > SHOWER_MIN_DURATION) { if (duration_ > SHOWER_MIN_DURATION) {
char s[50];
snprintf_P(s, 50, PSTR("%d minutes and %d seconds"), (uint8_t)(duration_ / 60000), (uint8_t)((duration_ / 1000) % 60)); snprintf_P(s, 50, PSTR("%d minutes and %d seconds"), (uint8_t)(duration_ / 60000), (uint8_t)((duration_ / 1000) % 60));
doc["duration"] = s; doc["duration"] = s;
} }

2
src/shower.h
View File

@@ -28,7 +28,7 @@ class Shower {
void start(); void start();
void loop(); void loop();
void send_mqtt_stat(bool state); void send_mqtt_stat(bool state, bool force = false);
bool shower_alert() const { bool shower_alert() const {
return shower_alert_; return shower_alert_;