From 21259457281a9caaa5f146878a3b0f54796c6f54 Mon Sep 17 00:00:00 2001 From: Daniel Ekman Date: Tue, 22 Mar 2022 11:24:38 +0100 Subject: [PATCH] ha discvovery, handle unset values --- src/mqtt/HomeAssistantMqttHandler.cpp | 2 +- web/hadiscover.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mqtt/HomeAssistantMqttHandler.cpp b/src/mqtt/HomeAssistantMqttHandler.cpp index c0dce5a8..2d4a89c2 100644 --- a/src/mqtt/HomeAssistantMqttHandler.cpp +++ b/src/mqtt/HomeAssistantMqttHandler.cpp @@ -220,7 +220,7 @@ bool HomeAssistantMqttHandler::publishSystem(HwTools* hw) { haUID.c_str(), FPSTR(HA_PARAMS[i]), haUID.c_str(), FPSTR(HA_PARAMS[i]), FPSTR(HA_UOM[i]), - FPSTR(HA_PARAMS[i]), FPSTR(HA_PARAMS[i]), haUID.c_str(), FPSTR(HA_PARAMS[i]), + FPSTR(HA_PARAMS[i]), FPSTR(HA_DEVCL[i]), haUID.c_str(), haName.c_str(), diff --git a/web/hadiscover.json b/web/hadiscover.json index 0a25d11b..67b1add4 100644 --- a/web/hadiscover.json +++ b/web/hadiscover.json @@ -4,7 +4,7 @@ "uniq_id" : "%s_%s", "obj_id" : "%s_%s", "unit_of_meas" : "%s", - "val_tpl" : "{%% if value_json.%s is defined %%} {{ value_json.%s }} {%% else %%} {{(states.sensor.%s_%s|float)}} {%% endif %%}", + "val_tpl" : "{{ value_json.%s | is_defined }}", "dev_cla" : "%s", "dev" : { "ids" : [ "%s" ],