Skip to content

Commit e23eb1b

Browse files
orrpanorrpan
committed
use only one temperature sensor for HA
1 parent 4d891ad commit e23eb1b

File tree

3 files changed

+16
-48
lines changed

3 files changed

+16
-48
lines changed

‎main/ZgatewayBT.ino‎

Lines changed: 11 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,7 @@ void MiFloraDiscovery(char* mac) {
187187
Log.trace(F("MiFloraDiscovery" CR));
188188
char* MiFlorasensor[MiFloraparametersCount][8] = {
189189
{"sensor", "MiFlora-lux", mac, "illuminance", jsonLux, "", "", "lx"},
190-
{"sensor", "MiFlora-tem", mac, "temperature", jsonTempc, "", "", "°C"}, // remove for 0.9.6 release
191-
{"sensor", "MiFlora-tempc", mac, "temperature", jsonTempc, "", "", "°C"},
192-
{"sensor", "MiFlora-tempf", mac, "temperature", jsonTempf, "", "", "°F"},
190+
{"sensor", "MiFlora-temp", mac, "temperature", jsonTempc, "", "", "°C"},
193191
{"sensor", "MiFlora-fer", mac, "", jsonFer, "", "", "µS/cm"},
194192
{"sensor", "MiFlora-moi", mac, "", jsonMoi, "", "", "%"}
195193
//component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
@@ -203,9 +201,7 @@ void VegTrugDiscovery(char* mac) {
203201
Log.trace(F("VegTrugDiscovery" CR));
204202
char* VegTrugsensor[VegTrugparametersCount][8] = {
205203
{"sensor", "VegTrug-lux", mac, "illuminance", jsonLux, "", "", "lx"},
206-
{"sensor", "VegTrug-tem", mac, "temperature", jsonTempc, "", "", "°C"}, // remove for 0.9.6 release
207-
{"sensor", "VegTrug-tempc", mac, "temperature", jsonTempc, "", "", "°C"},
208-
{"sensor", "VegTrug-tempf", mac, "temperature", jsonTempf, "", "", "°F"},
204+
{"sensor", "VegTrug-temp", mac, "temperature", jsonTempc, "", "", "°C"},
209205
{"sensor", "VegTrug-fer", mac, "", jsonFer, "", "", "µS/cm"},
210206
{"sensor", "VegTrug-moi", mac, "", jsonMoi, "", "", "%"}
211207
//component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
@@ -219,9 +215,7 @@ void MiJiaDiscovery(char* mac) {
219215
Log.trace(F("MiJiaDiscovery" CR));
220216
char* MiJiasensor[MiJiaparametersCount][8] = {
221217
{"sensor", "MiJia-batt", mac, "battery", jsonBatt, "", "", "%"},
222-
{"sensor", "MiJia-tem", mac, "temperature", jsonTempc, "", "", "°C"}, // remove for 0.9.6 release
223-
{"sensor", "MiJia-tempc", mac, "temperature", jsonTempc, "", "", "°C"},
224-
{"sensor", "MiJia-tempf", mac, "temperature", jsonTempf, "", "", "°F"},
218+
{"sensor", "MiJia-temp", mac, "temperature", jsonTempc, "", "", "°C"},
225219
{"sensor", "MiJia-hum", mac, "humidity", jsonHum, "", "", "%"}
226220
//component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
227221
};
@@ -234,8 +228,7 @@ void FormalDiscovery(char* mac) {
234228
Log.trace(F("FormalDiscovery" CR));
235229
char* Formalsensor[FormalparametersCount][8] = {
236230
{"sensor", "Formal-batt", mac, "battery", jsonBatt, "", "", "%"},
237-
{"sensor", "Formal-tempc", mac, "temperature", jsonTempc, "", "", "°C"},
238-
{"sensor", "Formal-tempf", mac, "temperature", jsonTempf, "", "", "°F"},
231+
{"sensor", "Formal-temp", mac, "temperature", jsonTempc, "", "", "°C"},
239232
{"sensor", "Formal-hum", mac, "humidity", jsonHum, "", "", "%"},
240233
{"sensor", "Formal-for", mac, "formaldehyde", jsonFor, "", "", "%"}
241234
//component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
@@ -249,9 +242,7 @@ void LYWSD02Discovery(char* mac) {
249242
Log.trace(F("LYWSD02Discovery" CR));
250243
char* LYWSD02sensor[LYWSD02parametersCount][8] = {
251244
{"sensor", "LYWSD02-batt", mac, "battery", jsonBatt, "", "", "V"},
252-
{"sensor", "LYWSD02-tem", mac, "temperature", jsonTempc, "", "", "°C"}, // remove for 0.9.6 release
253-
{"sensor", "LYWSD02-tempc", mac, "temperature", jsonTempc, "", "", "°C"},
254-
{"sensor", "LYWSD02-tempf", mac, "temperature", jsonTempf, "", "", "°F"},
245+
{"sensor", "LYWSD02-temp", mac, "temperature", jsonTempc, "", "", "°C"},
255246
{"sensor", "LYWSD02-hum", mac, "humidity", jsonHum, "", "", "%"}
256247
//component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
257248
};
@@ -264,9 +255,7 @@ void CLEARGRASSTRHDiscovery(char* mac) {
264255
Log.trace(F("CLEARGRASSTRHDiscovery" CR));
265256
char* CLEARGRASSTRHsensor[CLEARGRASSTRHparametersCount][8] = {
266257
{"sensor", "CLEARGRASSTRH-batt", mac, "battery", jsonBatt, "", "", "V"},
267-
{"sensor", "CLEARGRASSTRH-tem", mac, "temperature", jsonTempc, "", "", "°C"}, // remove for 0.9.6 release
268-
{"sensor", "CLEARGRASSTRH-tempc", mac, "temperature", jsonTempc, "", "", "°C"},
269-
{"sensor", "CLEARGRASSTRH-tempf", mac, "temperature", jsonTempf, "", "", "°F"},
258+
{"sensor", "CLEARGRASSTRH-temp", mac, "temperature", jsonTempc, "", "", "°C"},
270259
{"sensor", "CLEARGRASSTRH-hum", mac, "humidity", jsonHum, "", "", "%"}
271260
//component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
272261
};
@@ -279,9 +268,7 @@ void CLEARGRASSCGD1Discovery(char* mac) {
279268
Log.trace(F("CLEARGRASSCGD1Discovery" CR));
280269
char* CLEARGRASSCGD1sensor[CLEARGRASSCGD1parametersCount][8] = {
281270
{"sensor", "CLEARGRASSCGD1-batt", mac, "battery", jsonBatt, "", "", "V"},
282-
{"sensor", "CLEARGRASSCGD1-tem", mac, "temperature", jsonTempc, "", "", "°C"}, // remove for 0.9.6 release
283-
{"sensor", "CLEARGRASSCGD1-tempc", mac, "temperature", jsonTempc, "", "", "°C"},
284-
{"sensor", "CLEARGRASSCGD1-tempf", mac, "temperature", jsonTempf, "", "", "°F"},
271+
{"sensor", "CLEARGRASSCGD1-temp", mac, "temperature", jsonTempc, "", "", "°C"},
285272
{"sensor", "CLEARGRASSCGD1-hum", mac, "humidity", jsonHum, "", "", "%"}
286273
//component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
287274
};
@@ -294,9 +281,7 @@ void CLEARGRASSTRHKPADiscovery(char* mac) {
294281
Log.trace(F("CLEARGRASSTRHKPADiscovery" CR));
295282
char* CLEARGRASSTRHKPAsensor[CLEARGRASSTRHKPAparametersCount][8] = {
296283
{"sensor", "CLEARGRASSTRHKPA-pres", mac, "pressure", jsonPres, "", "", "kPa"},
297-
{"sensor", "CLEARGRASSTRHKPA-tem", mac, "temperature", jsonTempc, "", "", "°C"}, // remove for 0.9.6 release
298-
{"sensor", "CLEARGRASSTRHKPA-tempc", mac, "temperature", jsonTempc, "", "", "°C"},
299-
{"sensor", "CLEARGRASSTRHKPA-tempf", mac, "temperature", jsonTempf, "", "", "°F"},
284+
{"sensor", "CLEARGRASSTRHKPA-temp", mac, "temperature", jsonTempc, "", "", "°C"},
300285
{"sensor", "CLEARGRASSTRHKPA-hum", mac, "humidity", jsonHum, "", "", "%"}
301286
//component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
302287
};
@@ -342,9 +327,7 @@ void InkBirdDiscovery(char* mac) {
342327
Log.trace(F("InkBirdDiscovery" CR));
343328
char* InkBirdsensor[InkBirdparametersCount][8] = {
344329
{"sensor", "InkBird-batt", mac, "battery", jsonBatt, "", "", "%"},
345-
{"sensor", "InkBird-tem", mac, "temperature", jsonTempc, "", "", "°C"}, // remove for 0.9.6 release
346-
{"sensor", "InkBird-tempc", mac, "temperature", jsonTempc, "", "", "°C"},
347-
{"sensor", "InkBird-tempf", mac, "temperature", jsonTempf, "", "", "°F"},
330+
{"sensor", "InkBird-temp", mac, "temperature", jsonTempc, "", "", "°C"},
348331
{"sensor", "InkBird-hum", mac, "humidity", jsonHum, "", "", "%"}
349332
//component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
350333
};
@@ -358,8 +341,7 @@ void LYWSD03MMCDiscovery(char* mac) {
358341
char* LYWSD03MMCsensor[LYWSD03MMCparametersCount][8] = {
359342
{"sensor", "LYWSD03MMC-batt", mac, "battery", jsonBatt, "", "", "%"},
360343
{"sensor", "LYWSD03MMC-volt", mac, "", jsonVolt, "", "", "V"},
361-
{"sensor", "LYWSD03MMC-tempc", mac, "temperature", jsonTempc, "", "", "°C"},
362-
{"sensor", "LYWSD03MMC-tempf", mac, "temperature", jsonTempf, "", "", "°F"},
344+
{"sensor", "LYWSD03MMC-temp", mac, "temperature", jsonTempc, "", "", "°C"},
363345
{"sensor", "LYWSD03MMC-hum", mac, "humidity", jsonHum, "", "", "%"}
364346
//component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
365347
};
@@ -373,8 +355,7 @@ void MHO_C401Discovery(char* mac) {
373355
char* MHO_C401sensor[MHO_C401parametersCount][8] = {
374356
{"sensor", "MHO_C401-batt", mac, "battery", jsonBatt, "", "", "%"},
375357
{"sensor", "MHO_C401-volt", mac, "", jsonVolt, "", "", "V"},
376-
{"sensor", "MHO_C401-tempc", mac, "temperature", jsonTempc, "", "", "°C"},
377-
{"sensor", "MHO_C401-tempf", mac, "temperature", jsonTempf, "", "", "°F"},
358+
{"sensor", "MHO_C401-temp", mac, "temperature", jsonTempc, "", "", "°C"},
378359
{"sensor", "MHO_C401-hum", mac, "humidity", jsonHum, "", "", "%"}
379360
//component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
380361
};

‎main/ZmqttDiscovery.ino‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,7 @@ void pubMqttDiscovery() {
145145
# define BMEparametersCount 6
146146
Log.trace(F("bme280Discovery" CR));
147147
char* BMEsensor[BMEparametersCount][8] = {
148-
{"sensor", "tempc", "bme", "temperature", jsonTempc, "", "", "°C"},
149-
{"sensor", "tempf", "bme", "temperature", jsonTempf, "", "", "°F"},
148+
{"sensor", "temp", "bme", "temperature", jsonTempc, "", "", "°C"},
150149
{"sensor", "pa", "bme", "", jsonPa, "", "", "hPa"},
151150
{"sensor", "hum", "bme", "humidity", jsonHum, "", "", "%"},
152151
{"sensor", "altim", "bme", "", jsonAltim, "", "", "m"},
@@ -169,8 +168,7 @@ void pubMqttDiscovery() {
169168
# define HTUparametersCount 3
170169
Log.trace(F("htu21Discovery" CR));
171170
char* HTUsensor[HTUparametersCount][8] = {
172-
{"sensor", "tempc", "htu", "temperature", jsonTempc, "", "", "°C"},
173-
{"sensor", "tempf", "htu", "temperature", jsonTempf, "", "", "°F"},
171+
{"sensor", "temp", "htu", "temperature", jsonTempc, "", "", "°C"},
174172
{"sensor", "hum", "htu", "humidity", jsonHum, "", "", "%"}
175173
//component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
176174
};
@@ -190,8 +188,7 @@ void pubMqttDiscovery() {
190188
# define AHTparametersCount 3
191189
Log.trace(F("AHTx0Discovery" CR));
192190
char* AHTsensor[AHTparametersCount][8] = {
193-
{"sensor", "tempc", "aht", "temperature", jsonTempc, "", "", "°C"},
194-
{"sensor", "tempf", "aht", "temperature", jsonTempf, "", "", "°F"},
191+
{"sensor", "temp", "aht", "temperature", jsonTempc, "", "", "°C"},
195192
{"sensor", "hum", "aht", "humidity", jsonHum, "", "", "%"}
196193
//component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
197194
};
@@ -210,8 +207,7 @@ void pubMqttDiscovery() {
210207
# define DHTparametersCount 3
211208
Log.trace(F("DHTDiscovery" CR));
212209
char* DHTsensor[DHTparametersCount][8] = {
213-
{"sensor", "tempc", "dht", "temperature", jsonTempc, "", "", "°C"},
214-
{"sensor", "tempf", "dht", "temperature", jsonTempf, "", "", "°F"},
210+
{"sensor", "temp", "dht", "temperature", jsonTempc, "", "", "°C"},
215211
{"sensor", "hum", "dht", "humidity", jsonHum, "", "", "%"}
216212
//component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
217213
};

‎main/ZsensorDS1820.ino‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -102,23 +102,14 @@ void pubOneWire_HADiscovery() {
102102
# ifdef ZmqttDiscovery
103103
Log.notice(F("CreateDiscoverySensor - Found %d" CR), ds1820_count);
104104
for (int index = 0; index < ds1820_count; index++) {
105-
createDiscovery("sensor",
106-
(char*)(String(OW_TOPIC) + "/" + ds1820_addr[index]).c_str(),
107-
(char*)("DS12B20_" + String(index + 1) + "_f").c_str(),
108-
(char*)(ds1820_addr[index] + "_f").c_str(),
109-
will_Topic,
110-
"temperature",
111-
jsonTempf,
112-
"", "", "F",
113-
0, "", "", true, "");
114105
createDiscovery("sensor",
115106
(char*)(String(OW_TOPIC) + "/" + ds1820_addr[index]).c_str(),
116107
(char*)("DS12B20_" + String(index + 1) + "_c").c_str(),
117108
(char*)(ds1820_addr[index] + "_c").c_str(),
118109
will_Topic,
119110
"temperature",
120111
jsonTempc,
121-
"", "", "C",
112+
"", "", "°C",
122113
0, "", "", true, "");
123114
}
124115
# endif

0 commit comments

Comments
 (0)