andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-06-15 12:26:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix stat_t bug

Browse Source
This commit is contained in:
proddy
2026-05-26 09:14:58 +02:00
parent 1d6813fe30
commit 96f5510153
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/mqtt.cpp
View File

@@ -586,7 +586,7 @@ void Mqtt::ha_status() {
// These come from the info MQTT topic - and handled in the publish_ha_sensor_config function // These come from the info MQTT topic - and handled in the publish_ha_sensor_config function
publish_system_ha_sensor_config(DeviceValueType::STRING, "Version", "version", DeviceValueUOM::NONE); publish_system_ha_sensor_config(DeviceValueType::STRING, "Version", "version", DeviceValueUOM::NONE);
publish_system_ha_sensor_config(DeviceValueType::STRING, "Uptime", "bootTime", DeviceValueUOM::TIMESTAMP); publish_system_ha_sensor_config(DeviceValueType::STRING, "Boot time", "bootTime", DeviceValueUOM::TIMESTAMP);
} }
// add sub or pub task to the queue. // add sub or pub task to the queue.
@@ -1061,20 +1061,18 @@ bool Mqtt::publish_ha_sensor_config(uint8_t type, // EMSdev
// add state_topic and it's value_template. This is not needed for commands, only sensors // add state_topic and it's value_template. This is not needed for commands, only sensors
if (type != DeviceValueType::CMD || is_sensor) { if (type != DeviceValueType::CMD || is_sensor) {
// state topic, except for commands
char stat_t[MQTT_TOPIC_MAX_SIZE];
// This is where we determine which MQTT topic to pull the data from // This is where we determine which MQTT topic to pull the data from
// There are exceptions for DeviceType::SYSTEM, which uses the heartbeat topic char stat_t[MQTT_TOPIC_MAX_SIZE]; // state topic, except for commands
// and when fetching the version we want to take this from the info topic instead snprintf(stat_t, sizeof(stat_t), "~/%s", tag_to_topic(device_type, tag).c_str());
// Override - there are exceptions for DeviceType::SYSTEM, which uses the heartbeat topic
// and when fetching the version and bootTime we want to take this from the info topic instead
if (device_type == EMSdevice::DeviceType::SYSTEM) { if (device_type == EMSdevice::DeviceType::SYSTEM) {
// handle the exceptions // handle the exceptions
if (strncmp(entity, "version", 7) == 0) { if (strncmp(entity, "version", 7) == 0) {
snprintf(stat_t, sizeof(stat_t), "~/%s", F_(info)); snprintf(stat_t, sizeof(stat_t), "~/%s", F_(info));
} else if (strncmp(entity, "bootTime", 8) == 0) { } else if (strncmp(entity, "bootTime", 8) == 0) {
snprintf(stat_t, sizeof(stat_t), "~/%s", F_(info)); snprintf(stat_t, sizeof(stat_t), "~/%s", F_(info));
} else {
snprintf(stat_t, sizeof(stat_t), "~/%s", tag_to_topic(device_type, tag).c_str());
} }
} }
doc["stat_t"] = stat_t; doc["stat_t"] = stat_t;