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

Home Assistant discovery - add energy counters today/yesterday, add clear date, add friendly names (#1092)

Browse Source 
* HASS discovery energy stats fixed except energycounter_clear_date

* HASS: add friendly entity names, remove timestamp class from energycounter_clear_date as workaround for hass-incompatible date format

* HA energycounter_clear_date fixed for correct interpreting as home assistant timestamp sensor

* fix compile on OpenW800 due to OBK_DISABLE_ALL_DRIVERS on that platform

---------

Co-authored-by: Stefan Smith <stefan064>
This commit is contained in:
stefan064
2024-02-22 21:26:13 +11:00
committed by GitHub
parent 701fa42d18
commit 8eaf72e2ea
5 changed files with 63 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/httpserver/hass.c
View File

@ -52,6 +52,8 @@ void hass_populate_unique_id(ENTITY_TYPE type, int index, char* uniq_id) {
case VCP_SENSOR:
case POWER_SENSOR:
case ENERGY_SENSOR:
case TIMESTAMP_SENSOR:
sprintf(uniq_id, "%s_%s_%d", longDeviceName, "sensor", index);
break;
@ -140,6 +142,8 @@ void hass_populate_device_config_channel(ENTITY_TYPE type, char* uniq_id, HassDe
case TVOC_SENSOR:
case POWER_SENSOR:
case VCP_SENSOR:
case ENERGY_SENSOR:
case TIMESTAMP_SENSOR:
case BATTERY_SENSOR:
case BATTERY_VOLTAGE_SENSOR:
case TEMPERATURE_SENSOR:
@ -218,12 +222,9 @@ HassDeviceInfo* hass_init_device_info(ENTITY_TYPE type, int index, const char* p
isSensor = true;
#ifndef OBK_DISABLE_ALL_DRIVERS
if ((index >= OBK_VOLTAGE) && (index <= OBK_POWER))
sprintf(g_hassBuffer, "%s", sensor_mqttNames[index]);
else if ((index >= OBK_CONSUMPTION_TOTAL) && (index <= OBK_CONSUMPTION_STATS))
sprintf(g_hassBuffer, "%s", counter_mqttNames[index - OBK_CONSUMPTION_TOTAL]);
sprintf(g_hassBuffer, "%s", sensor_hassNames[index]);
else
sprintf(g_hassBuffer, "Power");
sprintf(g_hassBuffer, "Voltage or Current or Power");
#endif
break;
case POWER_SENSOR:
@ -270,6 +271,23 @@ HassDeviceInfo* hass_init_device_info(ENTITY_TYPE type, int index, const char* p
case HASS_RSSI:
sprintf(g_hassBuffer, "RSSI");
break;
case ENERGY_SENSOR:
isSensor = true;
#ifndef OBK_DISABLE_ALL_DRIVERS
if ((index >= OBK_CONSUMPTION_TOTAL) && (index <= OBK_CONSUMPTION_TODAY))
sprintf(g_hassBuffer, "%s", sensor_hassNames[index]);
else
sprintf(g_hassBuffer, "Energy");
#endif
break;
case TIMESTAMP_SENSOR:
#ifndef OBK_DISABLE_ALL_DRIVERS
if (index == OBK_CONSUMPTION_CLEAR_DATE)
sprintf(g_hassBuffer, "%s", sensor_hassNames[index]);
else
sprintf(g_hassBuffer, "Timestamp");
#endif
break;
default:
sprintf(g_hassBuffer, "%s", CHANNEL_GetLabel(index));
break;
@ -430,21 +448,24 @@ HassDeviceInfo* hass_init_power_sensor_device_info(int index) {
cJSON_AddStringToObject(info->root, "stat_cla", "measurement");
}
else if ((index >= OBK_CONSUMPTION_TOTAL) && (index <= OBK_CONSUMPTION_STATS))
else if ((index >= OBK_CONSUMPTION_TOTAL) && (index <= OBK_NUM_EMUNS_MAX))
{
info = hass_init_device_info(VCP_SENSOR, index, NULL, NULL);
if (index >= OBK_CONSUMPTION_YESTERDAY && !DRV_IsRunning("NTP")) return info; //include daily stats only when time is valid
info = hass_init_device_info(index == OBK_CONSUMPTION_CLEAR_DATE ? TIMESTAMP_SENSOR : ENERGY_SENSOR, index, NULL, NULL);
const char* device_class_value = counter_devClasses[index - OBK_CONSUMPTION_TOTAL];
if (strlen(device_class_value) > 0) {
cJSON_AddStringToObject(info->root, "dev_cla", device_class_value); //device_class=energy
if (CFG_HasFlag(OBK_FLAG_MQTT_ENERGY_IN_KWH)) {
cJSON_AddStringToObject(info->root, "unit_of_meas", "kWh"); //unit_of_measurement
cJSON_AddStringToObject(info->root, "dev_cla", device_class_value); //device_class=energy,timestamp
if (!strcmp(device_class_value, "energy")) {
if (CFG_HasFlag(OBK_FLAG_MQTT_ENERGY_IN_KWH)) {
cJSON_AddStringToObject(info->root, "unit_of_meas", "kWh"); //unit_of_measurement
}
else {
cJSON_AddStringToObject(info->root, "unit_of_meas", "Wh"); //unit_of_measurement
}
//state_class can be measurement, total or total_increasing. Energy values should be total_increasing.
cJSON_AddStringToObject(info->root, "stat_cla", "total_increasing");
}
else {
cJSON_AddStringToObject(info->root, "unit_of_meas", "Wh"); //unit_of_measurement
}
//state_class can be measurement, total or total_increasing. Energy values should be total_increasing.
cJSON_AddStringToObject(info->root, "stat_cla", "total_increasing");
}
sprintf(g_hassBuffer, "~/%s/get", counter_mqttNames[index - OBK_CONSUMPTION_TOTAL]);

3
src/httpserver/hass.h
View File

@ -67,9 +67,12 @@ typedef enum {
ILLUMINANCE_SENSOR,
// dBm unit
HASS_RSSI,
/// @brief Wh, kWh
ENERGY_SENSOR,
// hPa
PRESSURE_SENSOR,
/// @Brief Timestamp Sensor
TIMESTAMP_SENSOR,
} ENTITY_TYPE;