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

Merge remote-tracking branch 'emsesp/core3' into core3

Browse Source
This commit is contained in:
MichaelDvP
2026-07-17 10:02:13 +02:00
parent 7989ab5b3f b7aa153f84
commit 0ae46e9382
7 changed files with 111 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/emsdevicevalue.h
View File

@@ -81,6 +81,7 @@ class DeviceValue {
HERTZ, // 27 - Hz - frequency
CONNECTIVITY, // 28 - used in HA - connectivity
TIMESTAMP, // 29 - used in HA - timestamp
UPTIME, // 30 - used in HA - uptime for boot time
};
// TAG mapping - maps to DeviceValueTAG_s in emsdevicevalue.cpp

8
src/core/mqtt.cpp
View File

@@ -587,7 +587,7 @@ void Mqtt::ha_status() {
// 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, "Boot time", "bootTime", DeviceValueUOM::TIMESTAMP);
publish_system_ha_sensor_config(DeviceValueType::STRING, "Boot time", "bootTime", DeviceValueUOM::UPTIME);
}
// add sub or pub task to the queue.
@@ -1178,7 +1178,7 @@ void Mqtt::add_ha_classes(JsonObject doc, const uint8_t device_type, const uint8
doc[uom_ha] = "L/h";
} else if (uom == DeviceValueUOM::L) {
doc[uom_ha] = "L";
} else if (uom == DeviceValueUOM::TIMESTAMP) {
} else if (uom == DeviceValueUOM::TIMESTAMP || uom == DeviceValueUOM::UPTIME) {
// do nothing
} else if (uom != DeviceValueUOM::NONE) {
auto uom_str = EMSdevice::uom_to_string(uom);
@@ -1280,6 +1280,10 @@ void Mqtt::add_ha_classes(JsonObject doc, const uint8_t device_type, const uint8
doc[sc_ha] = sc_ha_measurement;
doc[dc_ha] = "timestamp";
break;
case DeviceValueUOM::UPTIME:
doc[sc_ha] = sc_ha_measurement;
doc[dc_ha] = "uptime";
break;
case DeviceValueUOM::MV:
case DeviceValueUOM::VOLTS:
doc[sc_ha] = sc_ha_measurement;