chriz/OpenMQTT-Gateway
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Standardize MQTTDiscovery Temp Keys [deprecate tem key] (#703)

Browse Source 
* Detect when sensor isn't available or read fails

* Add temperature conversion macros

* Add 'tempc' & 'tempf' keys to published values

* Unique Values for HA Discovery

* Remove degree symbol from temp sensors

Co-authored-by: Jonathan Michael Wells <jonathan-wells@oist.jp>
This commit is contained in:
JonandJonathan Michael Wells authored and GitHub committed 2020-07-24 10:10:44 -05:00
1 parent b7a4591518
commit 4f1b49d135
10 files changed
+97 -52
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

main/ZsensorDS1820.ino
+13 -10
View File
@@ -102,27 +102,24 @@ void pubOneWire_HADiscovery() {
# ifdef ZmqttDiscovery
Log.notice(F("CreateDiscoverySensor - Found %d" CR), ds1820_count);
for (int index = 0; index < ds1820_count; index++) {
# if DS1820_FAHRENHEIT
createDiscovery("sensor",
(char*)(String(OW_TOPIC) + "/" + ds1820_addr[index]).c_str(),
(char*)String("DS12B20_" + String(index + 1)).c_str(),
(char*)ds1820_addr[index].c_str(),
(char*)("DS12B20_" + String(index + 1) + "_f").c_str(),
(char*)(ds1820_addr[index] + "_f").c_str(),
will_Topic,
"temperature",
jsonTempf,
"", "", "°F",
"", "", "F",
0, "", "", true, "");
# else
createDiscovery("sensor",
(char*)(String(OW_TOPIC) + "/" + ds1820_addr[index]).c_str(),
(char*)String("DS12B20_" + String(index + 1)).c_str(),
(char*)ds1820_addr[index].c_str(),
(char*)("DS12B20_" + String(index + 1) + "_c").c_str(),
(char*)(ds1820_addr[index] + "_c").c_str(),
will_Topic,
"temperature",
jsonTemp,
"", "", "°C",
jsonTempc,
"", "", "C",
0, "", "", true, "");
# endif
}
# endif
}
@@ -155,6 +152,7 @@ void MeasureDS1820Temp() {
if (current_temp[i] == -127) {
Log.error(F("DS1820: Device %s currently disconnected!" CR), (char*)ds1820_addr[i].c_str());
} else if (DS1820_ALWAYS || current_temp[i] != persisted_temp[i]) {
// remove for 0.9.6 release -- BEGIN (Additional BREAKING CHANGE - Unit will be removed)
if (DS1820_FAHRENHEIT) {
Log.notice(F("DS1820: Temperature %s %d F" CR),
(char*)ds1820_addr[i].c_str(),
@@ -170,6 +168,11 @@ void MeasureDS1820Temp() {
DS1820data.set("temp", (float)current_temp[i]);
DS1820data.set("unit", "C");
}
// remove for 0.9.6 release -- END
DS1820data.set("tempc", (float)DallasTemperature::toFahrenheit(current_temp[i]));
DS1820data.set("tempf", (float)current_temp[i]);
if (DS1820_DETAILS) {
DS1820data.set("type", ds1820_type[i]);
DS1820data.set("res", ds1820_resolution[i] + String("bit" CR));