Skip to content

Commit eb5f7c2

Browse files
h2zeroh2zero
committed
Cleanup compiler warnings in strict environment.
1 parent f699068 commit eb5f7c2

File tree

4 files changed

+112
-106
lines changed

4 files changed

+112
-106
lines changed

‎main/ZgatewayBT.ino‎

Lines changed: 68 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -277,15 +277,15 @@ void dumpDevices() {
277277
}
278278

279279
void strupp(char* beg) {
280-
while (*beg = toupper(*beg))
280+
while ((*beg = toupper(*beg)))
281281
++beg;
282282
}
283283

284284
# ifdef ZmqttDiscovery
285-
void MiFloraDiscovery(char* mac, char* sensorModel) {
285+
void MiFloraDiscovery(const char* mac, const char* sensorModel) {
286286
# define MiFloraparametersCount 4
287287
Log.trace(F("MiFloraDiscovery" CR));
288-
char* MiFlorasensor[MiFloraparametersCount][8] = {
288+
const char* MiFlorasensor[MiFloraparametersCount][8] = {
289289
{"sensor", "MiFlora-lux", mac, "illuminance", jsonLux, "", "", "lx"},
290290
{"sensor", "MiFlora-temp", mac, "temperature", jsonTempc, "", "", "°C"},
291291
{"sensor", "MiFlora-fer", mac, "", jsonFer, "", "", "µS/cm"},
@@ -296,10 +296,10 @@ void MiFloraDiscovery(char* mac, char* sensorModel) {
296296
createDiscoveryFromList(mac, MiFlorasensor, MiFloraparametersCount, "Mi-Flora", "Xiaomi", sensorModel);
297297
}
298298

299-
void VegTrugDiscovery(char* mac, char* sensorModel) {
299+
void VegTrugDiscovery(const char* mac, const char* sensorModel) {
300300
# define VegTrugparametersCount 4
301301
Log.trace(F("VegTrugDiscovery" CR));
302-
char* VegTrugsensor[VegTrugparametersCount][8] = {
302+
const char* VegTrugsensor[VegTrugparametersCount][8] = {
303303
{"sensor", "VegTrug-lux", mac, "illuminance", jsonLux, "", "", "lx"},
304304
{"sensor", "VegTrug-temp", mac, "temperature", jsonTempc, "", "", "°C"},
305305
{"sensor", "VegTrug-fer", mac, "", jsonFer, "", "", "µS/cm"},
@@ -310,10 +310,10 @@ void VegTrugDiscovery(char* mac, char* sensorModel) {
310310
createDiscoveryFromList(mac, VegTrugsensor, VegTrugparametersCount, "VegTrug", "VEGTRUG", sensorModel);
311311
}
312312

313-
void MiJiaDiscovery(char* mac, char* sensorModel) {
313+
void MiJiaDiscovery(const char* mac, const char* sensorModel) {
314314
# define MiJiaparametersCount 3
315315
Log.trace(F("MiJiaDiscovery" CR));
316-
char* MiJiasensor[MiJiaparametersCount][8] = {
316+
const char* MiJiasensor[MiJiaparametersCount][8] = {
317317
{"sensor", "MiJia-batt", mac, "battery", jsonBatt, "", "", "%"},
318318
{"sensor", "MiJia-temp", mac, "temperature", jsonTempc, "", "", "°C"},
319319
{"sensor", "MiJia-hum", mac, "humidity", jsonHum, "", "", "%"}
@@ -323,10 +323,10 @@ void MiJiaDiscovery(char* mac, char* sensorModel) {
323323
createDiscoveryFromList(mac, MiJiasensor, MiJiaparametersCount, "MiJia", "", sensorModel);
324324
}
325325

326-
void FormalDiscovery(char* mac, char* sensorModel) {
326+
void FormalDiscovery(const char* mac, const char* sensorModel) {
327327
# define FormalparametersCount 4
328328
Log.trace(F("FormalDiscovery" CR));
329-
char* Formalsensor[FormalparametersCount][8] = {
329+
const char* Formalsensor[FormalparametersCount][8] = {
330330
{"sensor", "Formal-batt", mac, "battery", jsonBatt, "", "", "%"},
331331
{"sensor", "Formal-temp", mac, "temperature", jsonTempc, "", "", "°C"},
332332
{"sensor", "Formal-hum", mac, "humidity", jsonHum, "", "", "%"},
@@ -337,10 +337,10 @@ void FormalDiscovery(char* mac, char* sensorModel) {
337337
createDiscoveryFromList(mac, Formalsensor, FormalparametersCount, "Formal", "", sensorModel);
338338
}
339339

340-
void LYWSD02Discovery(char* mac, char* sensorModel) {
340+
void LYWSD02Discovery(const char* mac, const char* sensorModel) {
341341
# define LYWSD02parametersCount 3
342342
Log.trace(F("LYWSD02Discovery" CR));
343-
char* LYWSD02sensor[LYWSD02parametersCount][8] = {
343+
const char* LYWSD02sensor[LYWSD02parametersCount][8] = {
344344
{"sensor", "LYWSD02-batt", mac, "battery", jsonBatt, "", "", "V"},
345345
{"sensor", "LYWSD02-temp", mac, "temperature", jsonTempc, "", "", "°C"},
346346
{"sensor", "LYWSD02-hum", mac, "humidity", jsonHum, "", "", "%"}
@@ -350,10 +350,10 @@ void LYWSD02Discovery(char* mac, char* sensorModel) {
350350
createDiscoveryFromList(mac, LYWSD02sensor, LYWSD02parametersCount, "LYWSD02", "Xiaomi", sensorModel);
351351
}
352352

353-
void CLEARGRASSTRHDiscovery(char* mac, char* sensorModel) {
353+
void CLEARGRASSTRHDiscovery(const char* mac, const char* sensorModel) {
354354
# define CLEARGRASSTRHparametersCount 3
355355
Log.trace(F("CLEARGRASSTRHDiscovery" CR));
356-
char* CLEARGRASSTRHsensor[CLEARGRASSTRHparametersCount][8] = {
356+
const char* CLEARGRASSTRHsensor[CLEARGRASSTRHparametersCount][8] = {
357357
{"sensor", "CLEARGRASSTRH-batt", mac, "battery", jsonBatt, "", "", "V"},
358358
{"sensor", "CLEARGRASSTRH-temp", mac, "temperature", jsonTempc, "", "", "°C"},
359359
{"sensor", "CLEARGRASSTRH-hum", mac, "humidity", jsonHum, "", "", "%"}
@@ -363,10 +363,10 @@ void CLEARGRASSTRHDiscovery(char* mac, char* sensorModel) {
363363
createDiscoveryFromList(mac, CLEARGRASSTRHsensor, CLEARGRASSTRHparametersCount, "CLEARGRASSTRH", "ClearGrass", sensorModel);
364364
}
365365

366-
void CLEARGRASSCGD1Discovery(char* mac, char* sensorModel) {
366+
void CLEARGRASSCGD1Discovery(const char* mac, const char* sensorModel) {
367367
# define CLEARGRASSCGD1parametersCount 2
368368
Log.trace(F("CLEARGRASSCGD1Discovery" CR));
369-
char* CLEARGRASSCGD1sensor[CLEARGRASSCGD1parametersCount][8] = {
369+
const char* CLEARGRASSCGD1sensor[CLEARGRASSCGD1parametersCount][8] = {
370370
{"sensor", "CLEARGRASSCGD1-temp", mac, "temperature", jsonTempc, "", "", "°C"},
371371
{"sensor", "CLEARGRASSCGD1-hum", mac, "humidity", jsonHum, "", "", "%"}
372372
//component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
@@ -375,10 +375,10 @@ void CLEARGRASSCGD1Discovery(char* mac, char* sensorModel) {
375375
createDiscoveryFromList(mac, CLEARGRASSCGD1sensor, CLEARGRASSCGD1parametersCount, "CLEARGRASSCGD1", "ClearGrass", sensorModel);
376376
}
377377

378-
void CLEARGRASSCGDK2Discovery(char* mac, char* sensorModel) {
378+
void CLEARGRASSCGDK2Discovery(const char* mac, const char* sensorModel) {
379379
# define CLEARGRASSCGDK2parametersCount 2
380380
Log.trace(F("CLEARGRASSCGDK2Discovery" CR));
381-
char* CLEARGRASSCGDK2sensor[CLEARGRASSCGDK2parametersCount][8] = {
381+
const char* CLEARGRASSCGDK2sensor[CLEARGRASSCGDK2parametersCount][8] = {
382382
{"sensor", "CLEARGRASSCGDK2-temp", mac, "temperature", jsonTempc, "", "", "°C"},
383383
{"sensor", "CLEARGRASSCGDK2-hum", mac, "humidity", jsonHum, "", "", "%"}
384384
//component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
@@ -387,10 +387,10 @@ void CLEARGRASSCGDK2Discovery(char* mac, char* sensorModel) {
387387
createDiscoveryFromList(mac, CLEARGRASSCGDK2sensor, CLEARGRASSCGDK2parametersCount, "CLEARGRASSCGDK2", "ClearGrass", sensorModel);
388388
}
389389

390-
void CLEARGRASSCGPR1Discovery(char* mac, char* sensorModel) {
390+
void CLEARGRASSCGPR1Discovery(const char* mac, const char* sensorModel) {
391391
# define CLEARGRASSCGPR1parametersCount 2
392392
Log.trace(F("CLEARGRASSCGPR1Discovery" CR));
393-
char* CLEARGRASSCGPR1sensor[CLEARGRASSCGPR1parametersCount][8] = {
393+
const char* CLEARGRASSCGPR1sensor[CLEARGRASSCGPR1parametersCount][8] = {
394394
{"sensor", "CLEARGRASSCGPR1-pres", mac, "", jsonPres, "", "", ""},
395395
{"sensor", "CLEARGRASSCGPR1-lux", mac, "illuminance", jsonLux, "", "", "lx"}
396396
//component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
@@ -399,21 +399,21 @@ void CLEARGRASSCGPR1Discovery(char* mac, char* sensorModel) {
399399
createDiscoveryFromList(mac, CLEARGRASSCGPR1sensor, CLEARGRASSCGPR1parametersCount, "CLEARGRASSCGPR1", "ClearGrass", sensorModel);
400400
}
401401

402-
void CLEARGRASSCGH1Discovery(char* mac, char* sensorModel) {
402+
void CLEARGRASSCGH1Discovery(const char* mac, const char* sensorModel) {
403403
# define CLEARGRASSCGH1parametersCount 1
404404
Log.trace(F("CLEARGRASSCGH1Discovery" CR));
405-
char* CLEARGRASSCGH1sensor[CLEARGRASSCGH1parametersCount][8] = {
405+
const char* CLEARGRASSCGH1sensor[CLEARGRASSCGH1parametersCount][8] = {
406406
{"binary_sensor", "CLEARGRASSCGH1-open", mac, "door", jsonOpen, "True", "False", ""},
407407
//component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
408408
};
409409

410410
createDiscoveryFromList(mac, CLEARGRASSCGH1sensor, CLEARGRASSCGH1parametersCount, "CLEARGRASSCGH1", "ClearGrass", sensorModel);
411411
}
412412

413-
void CLEARGRASSTRHKPADiscovery(char* mac, char* sensorModel) {
413+
void CLEARGRASSTRHKPADiscovery(const char* mac, const char* sensorModel) {
414414
# define CLEARGRASSTRHKPAparametersCount 3
415415
Log.trace(F("CLEARGRASSTRHKPADiscovery" CR));
416-
char* CLEARGRASSTRHKPAsensor[CLEARGRASSTRHKPAparametersCount][8] = {
416+
const char* CLEARGRASSTRHKPAsensor[CLEARGRASSTRHKPAparametersCount][8] = {
417417
{"sensor", "CLEARGRASSTRHKPA-pres", mac, "pressure", jsonPres, "", "", "kPa"},
418418
{"sensor", "CLEARGRASSTRHKPA-temp", mac, "temperature", jsonTempc, "", "", "°C"},
419419
{"sensor", "CLEARGRASSTRHKPA-hum", mac, "humidity", jsonHum, "", "", "%"}
@@ -424,43 +424,43 @@ void CLEARGRASSTRHKPADiscovery(char* mac, char* sensorModel) {
424424
createDiscoveryFromList(mac, CLEARGRASSTRHKPAsensor, CLEARGRASSTRHKPAparametersCount, "CLEARGRASSTRHKPA", "ClearGrass", sensorModel);
425425
}
426426

427-
void MiScaleDiscovery(char* mac, char* sensorModel) {
427+
void MiScaleDiscovery(const char* mac, const char* sensorModel) {
428428
# define MiScaleparametersCount 1
429429
Log.trace(F("MiScaleDiscovery" CR));
430-
char* MiScalesensor[MiScaleparametersCount][8] = {
430+
const char* MiScalesensor[MiScaleparametersCount][8] = {
431431
{"sensor", "MiScale-weight", mac, "", jsonWeight, "", "", "kg"},
432432
//component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
433433
};
434434

435435
createDiscoveryFromList(mac, MiScalesensor, MiScaleparametersCount, "MiScale", "Xiaomi", sensorModel);
436436
}
437437

438-
void MiLampDiscovery(char* mac, char* sensorModel) {
438+
void MiLampDiscovery(const char* mac, const char* sensorModel) {
439439
# define MiLampparametersCount 1
440440
Log.trace(F("MiLampDiscovery" CR));
441-
char* MiLampsensor[MiLampparametersCount][8] = {
441+
const char* MiLampsensor[MiLampparametersCount][8] = {
442442
{"sensor", "MiLamp-presence", mac, "", jsonPresence, "", "", "d"},
443443
//component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
444444
};
445445

446446
createDiscoveryFromList(mac, MiLampsensor, MiLampparametersCount, "MiLamp", "Xiaomi", sensorModel);
447447
}
448448

449-
void MiBandDiscovery(char* mac, char* sensorModel) {
449+
void MiBandDiscovery(const char* mac, const char* sensorModel) {
450450
# define MiBandparametersCount 1
451451
Log.trace(F("MiBandDiscovery" CR));
452-
char* MiBandsensor[MiBandparametersCount][8] = {
452+
const char* MiBandsensor[MiBandparametersCount][8] = {
453453
{"sensor", "MiBand-steps", mac, "", jsonStep, "", "", "nb"},
454454
//component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
455455
};
456456

457457
createDiscoveryFromList(mac, MiBandsensor, MiBandparametersCount, "MiBand", "Xiaomi", sensorModel);
458458
}
459459

460-
void InkBirdDiscovery(char* mac, char* sensorModel) {
460+
void InkBirdDiscovery(const char* mac, const char* sensorModel) {
461461
# define InkBirdparametersCount 3
462462
Log.trace(F("InkBirdDiscovery" CR));
463-
char* InkBirdsensor[InkBirdparametersCount][8] = {
463+
const char* InkBirdsensor[InkBirdparametersCount][8] = {
464464
{"sensor", "InkBird-batt", mac, "battery", jsonBatt, "", "", "%"},
465465
{"sensor", "InkBird-temp", mac, "temperature", jsonTempc, "", "", "°C"},
466466
{"sensor", "InkBird-hum", mac, "humidity", jsonHum, "", "", "%"}
@@ -470,10 +470,10 @@ void InkBirdDiscovery(char* mac, char* sensorModel) {
470470
createDiscoveryFromList(mac, InkBirdsensor, InkBirdparametersCount, "", "InkBird", sensorModel);
471471
}
472472

473-
void LYWSD03MMCDiscovery(char* mac, char* sensorModel) {
473+
void LYWSD03MMCDiscovery(const char* mac, const char* sensorModel) {
474474
# define LYWSD03MMCparametersCount 4
475475
Log.trace(F("LYWSD03MMCDiscovery" CR));
476-
char* LYWSD03MMCsensor[LYWSD03MMCparametersCount][8] = {
476+
const char* LYWSD03MMCsensor[LYWSD03MMCparametersCount][8] = {
477477
{"sensor", "LYWSD03MMC-batt", mac, "battery", jsonBatt, "", "", "%"},
478478
{"sensor", "LYWSD03MMC-volt", mac, "", jsonVolt, "", "", "V"},
479479
{"sensor", "LYWSD03MMC-temp", mac, "temperature", jsonTempc, "", "", "°C"},
@@ -484,10 +484,10 @@ void LYWSD03MMCDiscovery(char* mac, char* sensorModel) {
484484
createDiscoveryFromList(mac, LYWSD03MMCsensor, LYWSD03MMCparametersCount, "LYWSD03MMC", "Xiaomi", sensorModel);
485485
}
486486

487-
void MHO_C401Discovery(char* mac, char* sensorModel) {
487+
void MHO_C401Discovery(const char* mac, const char* sensorModel) {
488488
# define MHO_C401parametersCount 4
489489
Log.trace(F("MHO_C401Discovery" CR));
490-
char* MHO_C401sensor[MHO_C401parametersCount][8] = {
490+
const char* MHO_C401sensor[MHO_C401parametersCount][8] = {
491491
{"sensor", "MHO_C401-batt", mac, "battery", jsonBatt, "", "", "%"},
492492
{"sensor", "MHO_C401-volt", mac, "", jsonVolt, "", "", "V"},
493493
{"sensor", "MHO_C401-temp", mac, "temperature", jsonTempc, "", "", "°C"},
@@ -498,10 +498,10 @@ void MHO_C401Discovery(char* mac, char* sensorModel) {
498498
createDiscoveryFromList(mac, MHO_C401sensor, MHO_C401parametersCount, "MHO_C401", "Xiaomi", sensorModel);
499499
}
500500

501-
void INodeEMDiscovery(char* mac, char* sensorModel) {
501+
void INodeEMDiscovery(const char* mac, const char* sensorModel) {
502502
# define INodeEMparametersCount 3
503503
Log.trace(F("INodeEMDiscovery" CR));
504-
char* INodeEMsensor[INodeEMparametersCount][8] = {
504+
const char* INodeEMsensor[INodeEMparametersCount][8] = {
505505
{"sensor", "iNodeEM-power", mac, "power", jsonPower, "", "", "W"},
506506
{"sensor", "iNodeEM-energy", mac, "", jsonEnergy, "", "", "kWh"},
507507
{"sensor", "iNodeEM-batt", mac, "battery", jsonBatt, "", "", "%"}
@@ -511,10 +511,10 @@ void INodeEMDiscovery(char* mac, char* sensorModel) {
511511
createDiscoveryFromList(mac, INodeEMsensor, INodeEMparametersCount, "INode-Energy-Meter", "INode", sensorModel);
512512
}
513513

514-
void WS02Discovery(char* mac, char* sensorModel) {
514+
void WS02Discovery(const char* mac, const char* sensorModel) {
515515
# define WS02parametersCount 3
516516
Log.trace(F("WS02Discovery" CR));
517-
char* WS02sensor[WS02parametersCount][8] = {
517+
const char* WS02sensor[WS02parametersCount][8] = {
518518
{"sensor", "WS02-volt", mac, "", jsonVolt, "", "", "V"},
519519
{"sensor", "WS02-temp", mac, "temperature", jsonTempc, "", "", "°C"},
520520
{"sensor", "WS02-hum", mac, "humidity", jsonHum, "", "", "%"}
@@ -525,25 +525,25 @@ void WS02Discovery(char* mac, char* sensorModel) {
525525
}
526526

527527
# else
528-
void MiFloraDiscovery(char* mac, char* sensorModel) {}
529-
void VegTrugDiscovery(char* mac, char* sensorModel) {}
530-
void MiJiaDiscovery(char* mac, char* sensorModel) {}
531-
void FormalDiscovery(char* mac, char* sensorModel) {}
532-
void LYWSD02Discovery(char* mac, char* sensorModel) {}
533-
void CLEARGRASSTRHDiscovery(char* mac, char* sensorModel) {}
534-
void CLEARGRASSCGD1Discovery(char* mac, char* sensorModel) {}
535-
void CLEARGRASSCGDK2Discovery(char* mac, char* sensorModel) {}
536-
void CLEARGRASSCGPR1Discovery(char* mac, char* sensorModel) {}
537-
void CLEARGRASSCGH1Discovery(char* mac, char* sensorModel) {}
538-
void CLEARGRASSTRHKPADiscovery(char* mac, char* sensorModel) {}
539-
void MiScaleDiscovery(char* mac, char* sensorModel) {}
540-
void MiLampDiscovery(char* mac, char* sensorModel) {}
541-
void MiBandDiscovery(char* mac, char* sensorModel) {}
542-
void InkBirdDiscovery(char* mac, char* sensorModel) {}
543-
void LYWSD03MMCDiscovery(char* mac, char* sensorModel) {}
544-
void MHO_C401Discovery(char* mac, char* sensorModel) {}
545-
void INodeEMDiscovery(char* mac, char* sensorModel) {}
546-
void WS02Discovery(char* mac, char* sensorModel) {}
528+
void MiFloraDiscovery(const char* mac, const char* sensorModel) {}
529+
void VegTrugDiscovery(const char* mac, const char* sensorModel) {}
530+
void MiJiaDiscovery(const char* mac, const char* sensorModel) {}
531+
void FormalDiscovery(const char* mac, const char* sensorModel) {}
532+
void LYWSD02Discovery(const char* mac, const char* sensorModel) {}
533+
void CLEARGRASSTRHDiscovery(const char* mac, const char* sensorModel) {}
534+
void CLEARGRASSCGD1Discovery(const char* mac, const char* sensorModel) {}
535+
void CLEARGRASSCGDK2Discovery(const char* mac, const char* sensorModel) {}
536+
void CLEARGRASSCGPR1Discovery(const char* mac, const char* sensorModel) {}
537+
void CLEARGRASSCGH1Discovery(const char* mac, const char* sensorModel) {}
538+
void CLEARGRASSTRHKPADiscovery(const char* mac, const char* sensorModel) {}
539+
void MiScaleDiscovery(const char* mac, const char* sensorModel) {}
540+
void MiLampDiscovery(const char* mac, const char* sensorModel) {}
541+
void MiBandDiscovery(const char* mac, const char* sensorModel) {}
542+
void InkBirdDiscovery(const char* mac, const char* sensorModel) {}
543+
void LYWSD03MMCDiscovery(const char* mac, const char* sensorModel) {}
544+
void MHO_C401Discovery(const char* mac, const char* sensorModel) {}
545+
void INodeEMDiscovery(const char* mac, const char* sensorModel) {}
546+
void WS02Discovery(const char* mac, const char* sensorModel) {}
547547
# endif
548548

549549
# ifdef ESP32
@@ -704,6 +704,7 @@ void notifyCB(
704704
} else {
705705
Log.trace(F("Callback process canceled by processLock" CR));
706706
}
707+
707708
pBLERemoteCharacteristic->unsubscribe();
708709
}
709710

@@ -823,7 +824,11 @@ void deepSleep(uint64_t time_in_us) {
823824
esp_bt_controller_disable();
824825
esp_bt_controller_deinit();
825826
esp_bt_mem_release(ESP_BT_MODE_BTDM);
827+
// Ignore the deprecated warning, this call is necessary here.
828+
#pragma GCC diagnostic push
829+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
826830
adc_power_off();
831+
#pragma GCC diagnostic pop
827832
esp_wifi_stop();
828833
esp_deep_sleep(time_in_us);
829834
}
@@ -875,6 +880,7 @@ void setupBT() {
875880

876881
bool BTtoMQTT() { // for on demand BLE scans
877882
BLEscan();
883+
return true;
878884
}
879885
# else // arduino or ESP8266 working with HM10/11
880886

@@ -994,7 +1000,7 @@ bool BTtoMQTT() {
9941000
}
9951001
# endif
9961002

997-
void RemoveJsonPropertyIf(JsonObject& obj, char* key, bool condition) {
1003+
void RemoveJsonPropertyIf(JsonObject& obj, const char* key, bool condition) {
9981004
if (condition) {
9991005
Log.trace(F("Removing %s" CR), key);
10001006
obj.remove(key);
@@ -1029,7 +1035,7 @@ void launchBTDiscovery() {
10291035
String macWOdots = String(p->macAdr);
10301036
macWOdots.replace(":", "");
10311037
Log.trace(F("Launching discovery of %s" CR), p->macAdr);
1032-
if (p->sensorModel == HHCCJCY01HHCC) MiFloraDiscovery((char*)macWOdots.c_str(), "HHCCJCY01HHCC");
1038+
if (p->sensorModel == HHCCJCY01HHCC) MiFloraDiscovery(macWOdots.c_str(), "HHCCJCY01HHCC");
10331039
if (p->sensorModel == VEGTRUG) VegTrugDiscovery((char*)macWOdots.c_str(), "VEGTRUG");
10341040
if (p->sensorModel == LYWSDCGQ) MiJiaDiscovery((char*)macWOdots.c_str(), "LYWSDCGQ");
10351041
if (p->sensorModel == JQJCY01YM) FormalDiscovery((char*)macWOdots.c_str(), "JQJCY01YM");
@@ -1172,7 +1178,7 @@ JsonObject& process_bledata(JsonObject& BLEdata) {
11721178
return process_cleargrass(BLEdata, false);
11731179
}
11741180
Log.trace(F("Is it a CGPR1?" CR));
1175-
if (service_len > ServicedataMinLength && strncmp(&service_data[0], "4812", 4) == 0 || strncmp(&service_data[0], "0812", 4) == 0) {
1181+
if ((service_len > ServicedataMinLength) && (strncmp(&service_data[0], "4812", 4) == 0 || strncmp(&service_data[0], "0812", 4) == 0)) {
11761182
Log.trace(F("CGPR1 data reading" CR));
11771183
BLEdata.set("model", "CGPR1");
11781184
if (device->sensorModel == -1)
@@ -1589,7 +1595,7 @@ void MQTTtoBT(char* topicOri, JsonObject& BTdata) { // json object decoding
15891595

15901596
// Black list & white list set
15911597
bool WorBupdated;
1592-
WorBupdated |= updateWorB(BTdata, true);
1598+
WorBupdated = updateWorB(BTdata, true);
15931599
WorBupdated |= updateWorB(BTdata, false);
15941600

15951601
if (WorBupdated) {

0 commit comments

Comments
 (0)