From dfdaf596bc38d806ed5cd4348d25a9609371f092 Mon Sep 17 00:00:00 2001
From: MichaelDvP <github@mdvp.de>
Date: Sun, 5 Mar 2023 12:03:47 +0100
Subject: [PATCH] domoticz setting, analog boolformat, dallas discovery

---
 .../src/framework/mqtt/MqttSettingsForm.tsx   |  2 +-
 src/analogsensor.cpp                          | 33 ++++++++++++++++---
 src/dallassensor.cpp                          |  4 +--
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/interface/src/framework/mqtt/MqttSettingsForm.tsx b/interface/src/framework/mqtt/MqttSettingsForm.tsx
index ff649b19d..00d4920c5 100644
--- a/interface/src/framework/mqtt/MqttSettingsForm.tsx
+++ b/interface/src/framework/mqtt/MqttSettingsForm.tsx
@@ -229,7 +229,7 @@ const MqttSettingsForm: FC = () => {
                 <Grid container spacing={1} direction="row" justifyContent="flex-start" alignItems="flex-start">
                   <Grid item>
                     <ValidatedTextField
-                      name="entity_format"
+                      name="discovery_type"
                       label={LL.MQTT_PUBLISH_TEXT_5()}
                       value={data.discovery_type}
                       fullWidth
diff --git a/src/analogsensor.cpp b/src/analogsensor.cpp
index 09ac15728..ce6116a53 100644
--- a/src/analogsensor.cpp
+++ b/src/analogsensor.cpp
@@ -443,13 +443,32 @@ void AnalogSensor::publish_values(const bool force) {
                 case AnalogType::PWM_2:
                     dataSensor["value"] = serialized(Helpers::render_value(s, sensor.value(), 2)); // double
                     break;
+                case AnalogType::DIGITAL_IN:
+                case AnalogType::DIGITAL_OUT:
+                    if (EMSESP::system_.bool_format() == BOOL_FORMAT_TRUEFALSE) {
+                        dataSensor["value"] = sensor.value() != 0;
+                    } else if (EMSESP::system_.bool_format() == BOOL_FORMAT_10) {
+                        dataSensor["value"] = sensor.value() != 0 ? 1 : 0;
+                    } else {
+                        char result[12];
+                        dataSensor["value"] = Helpers::render_boolean(result, sensor.value() != 0);
+                    }
+                    break;
                 default:
-                    dataSensor["value"] = (uint8_t)sensor.value(); // convert to char for 1 or 0
                     break;
                 }
+            } else if (sensor.type() == AnalogType::DIGITAL_IN || sensor.type() == AnalogType::DIGITAL_OUT) {
+                if (EMSESP::system_.bool_format() == BOOL_FORMAT_TRUEFALSE) {
+                    doc[sensor.name()] = sensor.value() != 0;
+                } else if (EMSESP::system_.bool_format() == BOOL_FORMAT_10) {
+                    doc[sensor.name()] = sensor.value() != 0 ? 1 : 0;
+                } else {
+                    char result[12];
+                    doc[sensor.name()] = Helpers::render_boolean(result, sensor.value() != 0);
+                }
             } else {
-                // not nested
-                doc[sensor.name()] = sensor.value();
+                char s[10];
+                doc[sensor.name()] = serialized(Helpers::render_value(s, sensor.value(), 2));
             }
 
             // create HA config
@@ -466,12 +485,16 @@ void AnalogSensor::publish_values(const bool force) {
                 char val_cond[65];
                 if (Mqtt::is_nested()) {
                     snprintf(val_obj, sizeof(val_obj), "value_json['%02d'].value", sensor.gpio());
-                    snprintf(val_cond, sizeof(val_cond), "value_json['%02d'] is defined", sensor.gpio());
+                    snprintf(val_cond, sizeof(val_cond), "value_json['%02d'] is defined and %s is defined", sensor.gpio(), val_obj);
                 } else {
                     snprintf(val_obj, sizeof(val_obj), "value_json['%s']", sensor.name().c_str());
                     snprintf(val_cond, sizeof(val_cond), "%s is defined", val_obj);
                 }
-                config["val_tpl"] = (std::string) "{{" + val_obj + " if " + val_cond + "}}";
+                char sample_val[12] = "0";
+                if (sensor.type() == AnalogType::DIGITAL_IN || sensor.type() == AnalogType::DIGITAL_OUT) {
+                    Helpers::render_boolean(sample_val, false);
+                }
+                config["val_tpl"] = (std::string) "{{" + val_obj + " if " + val_cond + " else " + sample_val + "}}";
 
                 char uniq_s[70];
                 if (Mqtt::entity_format() == 2) {
diff --git a/src/dallassensor.cpp b/src/dallassensor.cpp
index 4e3815c83..bc3576511 100644
--- a/src/dallassensor.cpp
+++ b/src/dallassensor.cpp
@@ -520,12 +520,12 @@ void DallasSensor::publish_values(const bool force) {
                 char val_cond[65];
                 if (Mqtt::is_nested()) {
                     snprintf(val_obj, sizeof(val_obj), "value_json['%s'].temp", sensor.id().c_str());
-                    snprintf(val_cond, sizeof(val_cond), "value_json['%s'] is defined", sensor.id().c_str());
+                    snprintf(val_cond, sizeof(val_cond), "%s is defined and %s is defined", sensor.id().c_str(), val_obj);
                 } else {
                     snprintf(val_obj, sizeof(val_obj), "value_json['%s']", sensor.name().c_str());
                     snprintf(val_cond, sizeof(val_cond), "%s is defined", val_obj);
                 }
-                config["val_tpl"] = (std::string) "{{" + val_obj + " if " + val_cond + "}}";
+                config["val_tpl"] = (std::string) "{{" + val_obj + " if " + val_cond + " else -55}}";
 
                 char uniq_s[70];
                 if (Mqtt::entity_format() == 2) {