mirror/OpenBK7231T_App
3
0
Fork 0
mirror of https://github.com/openshwprojects/OpenBK7231T_App.git synced 2026-02-07 10:25:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

A few fixes for HASS MQTT for Energy (#1398)

Browse Source 
* HASS MQTT json update

* HASS MQTT json update

* HASS MQTT json update

* HASS MQTT json update strlen
This commit is contained in:
xjikka
2024-10-31 12:18:49 +01:00
committed by GitHub
parent 5906d536eb
commit 87a2da9e81
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/httpserver/hass.c
View File

@ -471,8 +471,8 @@ HassDeviceInfo* hass_init_energy_sensor_device_info(int index) {
info = hass_init_device_info(ENERGY_METER_SENSOR, index, NULL, NULL);
cJSON_AddStringToObject(info->root, "dev_cla", DRV_GetEnergySensorNames(index)->hass_dev_class); //device_class=voltage,current,power, energy, timestamp
cJSON_AddStringToObject(info->root, "unit_of_meas", DRV_GetEnergySensorNames(index)->units); //unit_of_measurement. Sets as empty string if not present. HA doesn't seem to mind
//20241024 XJIKKA unit_of_meas is set bellow (was set twice)
//cJSON_AddStringToObject(info->root, "unit_of_meas", DRV_GetEnergySensorNames(index)->units); //unit_of_measurement. Sets as empty string if not present. HA doesn't seem to mind
sprintf(g_hassBuffer, "~/%s/get", DRV_GetEnergySensorNames(index)->name_mqtt);
cJSON_AddStringToObject(info->root, "stat_t", g_hassBuffer);
@ -481,8 +481,19 @@ HassDeviceInfo* hass_init_energy_sensor_device_info(int index) {
cJSON_AddStringToObject(info->root, "stat_cla", "total_increasing");
cJSON_AddStringToObject(info->root, "unit_of_meas", CFG_HasFlag(OBK_FLAG_MQTT_ENERGY_IN_KWH) ? "kWh" : "Wh");
} else {
cJSON_AddStringToObject(info->root, "stat_cla", "measurement");
cJSON_AddStringToObject(info->root, "unit_of_meas", DRV_GetEnergySensorNames(index)->units);
//20241024 XJIKKA skip measurement for timestamp - HASS log:
//HASS: energy_clear_date (<class 'homeassistant.components.mqtt.sensor.MqttSensor'>) is using state class 'measurement'
// which is impossible considering device class ('timestamp') it is using; expected None;
if (!strcmp(DRV_GetEnergySensorNames(index)->hass_dev_class,"timestamp")) {
cJSON_AddStringToObject(info->root, "stat_cla", "measurement");
}
//20241024 XJIKKA if unit is not set (drv_bl_shared.c @ "power_factor"), mqtt value unit_of_meas was empty - HASS log:
//HASS: sensor...power_factor is using native unit of measurement '' which is not a valid unit
// for the device class ('power_factor') it is using; expected one of ['no unit of measurement', '%'];
//solution is to skip empty
if (strlen(DRV_GetEnergySensorNames(index)->units)>0) {
cJSON_AddStringToObject(info->root, "unit_of_meas", DRV_GetEnergySensorNames(index)->units);
}
}
// if (index == OBK_CONSUMPTION_STATS) { //hide this as its not working anyway at present
// cJSON_AddStringToObject(info->root, "enabled_by_default ", "false");