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

dallassensor HA-Format also with ID

Browse Source
This commit is contained in:
MichaelDvP
2021-03-04 16:07:14 +01:00
parent 173174fa87
commit e86df03b66
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/dallassensor.cpp
View File

@@ -326,7 +326,8 @@ void DallasSensor::publish_values(const bool force) {
uint8_t sensor_no = 1; uint8_t sensor_no = 1;
// dallas format is overriden when using Home Assistant // dallas format is overriden when using Home Assistant
uint8_t dallas_format = Mqtt::ha_enabled() ? Mqtt::Dallas_Format::NUMBER : Mqtt::dallas_format(); // uint8_t dallas_format = Mqtt::ha_enabled() ? Mqtt::Dallas_Format::NUMBER : Mqtt::dallas_format();
uint8_t dallas_format = Mqtt::dallas_format();
for (const auto & sensor : sensors_) { for (const auto & sensor : sensors_) {
char sensorID[10]; // sensor{1-n} char sensorID[10]; // sensor{1-n}
@@ -359,11 +360,19 @@ void DallasSensor::publish_values(const bool force) {
config["unit_of_meas"] = FJSON("°C"); config["unit_of_meas"] = FJSON("°C");
char str[50]; char str[50];
snprintf_P(str, sizeof(str), PSTR("{{value_json.sensor%d.temp}}"), sensor_no); if (dallas_format == Mqtt::Dallas_Format::SENSORID) {
snprintf_P(str, sizeof(str), PSTR("{{value_json.%s}}"), sensor.to_string().c_str());
} else {
snprintf_P(str, sizeof(str), PSTR("{{value_json.sensor%d.temp}}"), sensor_no);
}
config["val_tpl"] = str; config["val_tpl"] = str;
// name as sensor number not the long unique ID // name as sensor number not the long unique ID
snprintf_P(str, sizeof(str), PSTR("Dallas Sensor %d"), sensor_no); if (dallas_format == Mqtt::Dallas_Format::SENSORID) {
snprintf_P(str, sizeof(str), PSTR("Dallas Sensor %s"), sensor.to_string().c_str());
} else {
snprintf_P(str, sizeof(str), PSTR("Dallas Sensor %d"), sensor_no);
}
config["name"] = str; config["name"] = str;
snprintf_P(str, sizeof(str), PSTR("dallas_%s"), sensor.to_string().c_str()); snprintf_P(str, sizeof(str), PSTR("dallas_%s"), sensor.to_string().c_str());