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

update temperature unit to work in HA (#768)

Browse Source 
* update temperature unit to work in HA
* use only one temperature sensor for HA
This commit is contained in:
orrpan authored and GitHub committed 2020-10-04 14:56:34 -05:00
1 parent 7cd1e9a1ab
commit 03ab7f7d0e
3 files changed
+31 -63
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

main/ZmqttDiscovery.ino
+8 -12
View File
@@ -142,11 +142,10 @@ void pubMqttDiscovery() {
);
# ifdef ZsensorBME280
# define BMEparametersCount 6
# define BMEparametersCount 5
Log.trace(F("bme280Discovery" CR));
char* BMEsensor[BMEparametersCount][8] = {
{"sensor", "tempc", "bme", "temperature", jsonTempc, "", "", "C"},
{"sensor", "tempf", "bme", "temperature", jsonTempf, "", "", "F"},
{"sensor", "temp", "bme", "temperature", jsonTempc, "", "", "°C"},
{"sensor", "pa", "bme", "", jsonPa, "", "", "hPa"},
{"sensor", "hum", "bme", "humidity", jsonHum, "", "", "%"},
{"sensor", "altim", "bme", "", jsonAltim, "", "", "m"},
@@ -166,11 +165,10 @@ void pubMqttDiscovery() {
# endif
# ifdef ZsensorHTU21
# define HTUparametersCount 3
# define HTUparametersCount 2
Log.trace(F("htu21Discovery" CR));
char* HTUsensor[HTUparametersCount][8] = {
{"sensor", "tempc", "htu", "temperature", jsonTempc, "", "", "C"},
{"sensor", "tempf", "htu", "temperature", jsonTempf, "", "", "F"},
{"sensor", "temp", "htu", "temperature", jsonTempc, "", "", "°C"},
{"sensor", "hum", "htu", "humidity", jsonHum, "", "", "%"}
//component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
};
@@ -187,11 +185,10 @@ void pubMqttDiscovery() {
# endif
# ifdef ZsensorAHTx0
# define AHTparametersCount 3
# define AHTparametersCount 2
Log.trace(F("AHTx0Discovery" CR));
char* AHTsensor[AHTparametersCount][8] = {
{"sensor", "tempc", "aht", "temperature", jsonTempc, "", "", "C"},
{"sensor", "tempf", "aht", "temperature", jsonTempf, "", "", "F"},
{"sensor", "temp", "aht", "temperature", jsonTempc, "", "", "°C"},
{"sensor", "hum", "aht", "humidity", jsonHum, "", "", "%"}
//component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
};
@@ -207,11 +204,10 @@ void pubMqttDiscovery() {
# endif
# ifdef ZsensorDHT
# define DHTparametersCount 3
# define DHTparametersCount 2
Log.trace(F("DHTDiscovery" CR));
char* DHTsensor[DHTparametersCount][8] = {
{"sensor", "tempc", "dht", "temperature", jsonTempc, "", "", "C"},
{"sensor", "tempf", "dht", "temperature", jsonTempf, "", "", "F"},
{"sensor", "temp", "dht", "temperature", jsonTempc, "", "", "°C"},
{"sensor", "hum", "dht", "humidity", jsonHum, "", "", "%"}
//component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
};