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

Cleanup compiler warnings in strict environment. (#945)

Browse Source
This commit is contained in:
h2zero authored and GitHub committed 2021-05-16 19:47:50 -05:00
1 parent 5ccd10abb3
commit e3731bdccf
4 files changed
+129 -123
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

main/ZgatewayBT.ino
+86 -80
View File
@@ -277,15 +277,15 @@ void dumpDevices() {
} }
void strupp(char* beg) { void strupp(char* beg) {
while (*beg = toupper(*beg)) while ((*beg = toupper(*beg)))
++beg; ++beg;
} }
# ifdef ZmqttDiscovery # ifdef ZmqttDiscovery
void MiFloraDiscovery(char* mac, char* sensorModel) { void MiFloraDiscovery(const char* mac, const char* sensorModel) {
# define MiFloraparametersCount 4 # define MiFloraparametersCount 4
Log.trace(F("MiFloraDiscovery" CR)); Log.trace(F("MiFloraDiscovery" CR));
char* MiFlorasensor[MiFloraparametersCount][8] = { const char* MiFlorasensor[MiFloraparametersCount][8] = {
{"sensor", "MiFlora-lux", mac, "illuminance", jsonLux, "", "", "lx"}, {"sensor", "MiFlora-lux", mac, "illuminance", jsonLux, "", "", "lx"},
{"sensor", "MiFlora-temp", mac, "temperature", jsonTempc, "", "", "°C"}, {"sensor", "MiFlora-temp", mac, "temperature", jsonTempc, "", "", "°C"},
{"sensor", "MiFlora-fer", mac, "", jsonFer, "", "", "µS/cm"}, {"sensor", "MiFlora-fer", mac, "", jsonFer, "", "", "µS/cm"},
@@ -296,10 +296,10 @@ void MiFloraDiscovery(char* mac, char* sensorModel) {
createDiscoveryFromList(mac, MiFlorasensor, MiFloraparametersCount, "Mi-Flora", "Xiaomi", sensorModel); createDiscoveryFromList(mac, MiFlorasensor, MiFloraparametersCount, "Mi-Flora", "Xiaomi", sensorModel);
} }
void VegTrugDiscovery(char* mac, char* sensorModel) { void VegTrugDiscovery(const char* mac, const char* sensorModel) {
# define VegTrugparametersCount 4 # define VegTrugparametersCount 4
Log.trace(F("VegTrugDiscovery" CR)); Log.trace(F("VegTrugDiscovery" CR));
char* VegTrugsensor[VegTrugparametersCount][8] = { const char* VegTrugsensor[VegTrugparametersCount][8] = {
{"sensor", "VegTrug-lux", mac, "illuminance", jsonLux, "", "", "lx"}, {"sensor", "VegTrug-lux", mac, "illuminance", jsonLux, "", "", "lx"},
{"sensor", "VegTrug-temp", mac, "temperature", jsonTempc, "", "", "°C"}, {"sensor", "VegTrug-temp", mac, "temperature", jsonTempc, "", "", "°C"},
{"sensor", "VegTrug-fer", mac, "", jsonFer, "", "", "µS/cm"}, {"sensor", "VegTrug-fer", mac, "", jsonFer, "", "", "µS/cm"},
@@ -310,10 +310,10 @@ void VegTrugDiscovery(char* mac, char* sensorModel) {
createDiscoveryFromList(mac, VegTrugsensor, VegTrugparametersCount, "VegTrug", "VEGTRUG", sensorModel); createDiscoveryFromList(mac, VegTrugsensor, VegTrugparametersCount, "VegTrug", "VEGTRUG", sensorModel);
} }
void MiJiaDiscovery(char* mac, char* sensorModel) { void MiJiaDiscovery(const char* mac, const char* sensorModel) {
# define MiJiaparametersCount 3 # define MiJiaparametersCount 3
Log.trace(F("MiJiaDiscovery" CR)); Log.trace(F("MiJiaDiscovery" CR));
char* MiJiasensor[MiJiaparametersCount][8] = { const char* MiJiasensor[MiJiaparametersCount][8] = {
{"sensor", "MiJia-batt", mac, "battery", jsonBatt, "", "", "%"}, {"sensor", "MiJia-batt", mac, "battery", jsonBatt, "", "", "%"},
{"sensor", "MiJia-temp", mac, "temperature", jsonTempc, "", "", "°C"}, {"sensor", "MiJia-temp", mac, "temperature", jsonTempc, "", "", "°C"},
{"sensor", "MiJia-hum", mac, "humidity", jsonHum, "", "", "%"} {"sensor", "MiJia-hum", mac, "humidity", jsonHum, "", "", "%"}
@@ -323,10 +323,10 @@ void MiJiaDiscovery(char* mac, char* sensorModel) {
createDiscoveryFromList(mac, MiJiasensor, MiJiaparametersCount, "MiJia", "", sensorModel); createDiscoveryFromList(mac, MiJiasensor, MiJiaparametersCount, "MiJia", "", sensorModel);
} }
void FormalDiscovery(char* mac, char* sensorModel) { void FormalDiscovery(const char* mac, const char* sensorModel) {
# define FormalparametersCount 4 # define FormalparametersCount 4
Log.trace(F("FormalDiscovery" CR)); Log.trace(F("FormalDiscovery" CR));
char* Formalsensor[FormalparametersCount][8] = { const char* Formalsensor[FormalparametersCount][8] = {
{"sensor", "Formal-batt", mac, "battery", jsonBatt, "", "", "%"}, {"sensor", "Formal-batt", mac, "battery", jsonBatt, "", "", "%"},
{"sensor", "Formal-temp", mac, "temperature", jsonTempc, "", "", "°C"}, {"sensor", "Formal-temp", mac, "temperature", jsonTempc, "", "", "°C"},
{"sensor", "Formal-hum", mac, "humidity", jsonHum, "", "", "%"}, {"sensor", "Formal-hum", mac, "humidity", jsonHum, "", "", "%"},
@@ -337,10 +337,10 @@ void FormalDiscovery(char* mac, char* sensorModel) {
createDiscoveryFromList(mac, Formalsensor, FormalparametersCount, "Formal", "", sensorModel); createDiscoveryFromList(mac, Formalsensor, FormalparametersCount, "Formal", "", sensorModel);
} }
void LYWSD02Discovery(char* mac, char* sensorModel) { void LYWSD02Discovery(const char* mac, const char* sensorModel) {
# define LYWSD02parametersCount 3 # define LYWSD02parametersCount 3
Log.trace(F("LYWSD02Discovery" CR)); Log.trace(F("LYWSD02Discovery" CR));
char* LYWSD02sensor[LYWSD02parametersCount][8] = { const char* LYWSD02sensor[LYWSD02parametersCount][8] = {
{"sensor", "LYWSD02-batt", mac, "battery", jsonBatt, "", "", "V"}, {"sensor", "LYWSD02-batt", mac, "battery", jsonBatt, "", "", "V"},
{"sensor", "LYWSD02-temp", mac, "temperature", jsonTempc, "", "", "°C"}, {"sensor", "LYWSD02-temp", mac, "temperature", jsonTempc, "", "", "°C"},
{"sensor", "LYWSD02-hum", mac, "humidity", jsonHum, "", "", "%"} {"sensor", "LYWSD02-hum", mac, "humidity", jsonHum, "", "", "%"}
@@ -350,10 +350,10 @@ void LYWSD02Discovery(char* mac, char* sensorModel) {
createDiscoveryFromList(mac, LYWSD02sensor, LYWSD02parametersCount, "LYWSD02", "Xiaomi", sensorModel); createDiscoveryFromList(mac, LYWSD02sensor, LYWSD02parametersCount, "LYWSD02", "Xiaomi", sensorModel);
} }
void CLEARGRASSTRHDiscovery(char* mac, char* sensorModel) { void CLEARGRASSTRHDiscovery(const char* mac, const char* sensorModel) {
# define CLEARGRASSTRHparametersCount 3 # define CLEARGRASSTRHparametersCount 3
Log.trace(F("CLEARGRASSTRHDiscovery" CR)); Log.trace(F("CLEARGRASSTRHDiscovery" CR));
char* CLEARGRASSTRHsensor[CLEARGRASSTRHparametersCount][8] = { const char* CLEARGRASSTRHsensor[CLEARGRASSTRHparametersCount][8] = {
{"sensor", "CLEARGRASSTRH-batt", mac, "battery", jsonBatt, "", "", "V"}, {"sensor", "CLEARGRASSTRH-batt", mac, "battery", jsonBatt, "", "", "V"},
{"sensor", "CLEARGRASSTRH-temp", mac, "temperature", jsonTempc, "", "", "°C"}, {"sensor", "CLEARGRASSTRH-temp", mac, "temperature", jsonTempc, "", "", "°C"},
{"sensor", "CLEARGRASSTRH-hum", mac, "humidity", jsonHum, "", "", "%"} {"sensor", "CLEARGRASSTRH-hum", mac, "humidity", jsonHum, "", "", "%"}
@@ -363,10 +363,10 @@ void CLEARGRASSTRHDiscovery(char* mac, char* sensorModel) {
createDiscoveryFromList(mac, CLEARGRASSTRHsensor, CLEARGRASSTRHparametersCount, "CLEARGRASSTRH", "ClearGrass", sensorModel); createDiscoveryFromList(mac, CLEARGRASSTRHsensor, CLEARGRASSTRHparametersCount, "CLEARGRASSTRH", "ClearGrass", sensorModel);
} }
void CLEARGRASSCGD1Discovery(char* mac, char* sensorModel) { void CLEARGRASSCGD1Discovery(const char* mac, const char* sensorModel) {
# define CLEARGRASSCGD1parametersCount 2 # define CLEARGRASSCGD1parametersCount 2
Log.trace(F("CLEARGRASSCGD1Discovery" CR)); Log.trace(F("CLEARGRASSCGD1Discovery" CR));
char* CLEARGRASSCGD1sensor[CLEARGRASSCGD1parametersCount][8] = { const char* CLEARGRASSCGD1sensor[CLEARGRASSCGD1parametersCount][8] = {
{"sensor", "CLEARGRASSCGD1-temp", mac, "temperature", jsonTempc, "", "", "°C"}, {"sensor", "CLEARGRASSCGD1-temp", mac, "temperature", jsonTempc, "", "", "°C"},
{"sensor", "CLEARGRASSCGD1-hum", mac, "humidity", jsonHum, "", "", "%"} {"sensor", "CLEARGRASSCGD1-hum", mac, "humidity", jsonHum, "", "", "%"}
//component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement //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) {
createDiscoveryFromList(mac, CLEARGRASSCGD1sensor, CLEARGRASSCGD1parametersCount, "CLEARGRASSCGD1", "ClearGrass", sensorModel); createDiscoveryFromList(mac, CLEARGRASSCGD1sensor, CLEARGRASSCGD1parametersCount, "CLEARGRASSCGD1", "ClearGrass", sensorModel);
} }
void CLEARGRASSCGDK2Discovery(char* mac, char* sensorModel) { void CLEARGRASSCGDK2Discovery(const char* mac, const char* sensorModel) {
# define CLEARGRASSCGDK2parametersCount 2 # define CLEARGRASSCGDK2parametersCount 2
Log.trace(F("CLEARGRASSCGDK2Discovery" CR)); Log.trace(F("CLEARGRASSCGDK2Discovery" CR));
char* CLEARGRASSCGDK2sensor[CLEARGRASSCGDK2parametersCount][8] = { const char* CLEARGRASSCGDK2sensor[CLEARGRASSCGDK2parametersCount][8] = {
{"sensor", "CLEARGRASSCGDK2-temp", mac, "temperature", jsonTempc, "", "", "°C"}, {"sensor", "CLEARGRASSCGDK2-temp", mac, "temperature", jsonTempc, "", "", "°C"},
{"sensor", "CLEARGRASSCGDK2-hum", mac, "humidity", jsonHum, "", "", "%"} {"sensor", "CLEARGRASSCGDK2-hum", mac, "humidity", jsonHum, "", "", "%"}
//component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement //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) {
createDiscoveryFromList(mac, CLEARGRASSCGDK2sensor, CLEARGRASSCGDK2parametersCount, "CLEARGRASSCGDK2", "ClearGrass", sensorModel); createDiscoveryFromList(mac, CLEARGRASSCGDK2sensor, CLEARGRASSCGDK2parametersCount, "CLEARGRASSCGDK2", "ClearGrass", sensorModel);
} }
void CLEARGRASSCGPR1Discovery(char* mac, char* sensorModel) { void CLEARGRASSCGPR1Discovery(const char* mac, const char* sensorModel) {
# define CLEARGRASSCGPR1parametersCount 2 # define CLEARGRASSCGPR1parametersCount 2
Log.trace(F("CLEARGRASSCGPR1Discovery" CR)); Log.trace(F("CLEARGRASSCGPR1Discovery" CR));
char* CLEARGRASSCGPR1sensor[CLEARGRASSCGPR1parametersCount][8] = { const char* CLEARGRASSCGPR1sensor[CLEARGRASSCGPR1parametersCount][8] = {
{"sensor", "CLEARGRASSCGPR1-pres", mac, "", jsonPres, "", "", ""}, {"sensor", "CLEARGRASSCGPR1-pres", mac, "", jsonPres, "", "", ""},
{"sensor", "CLEARGRASSCGPR1-lux", mac, "illuminance", jsonLux, "", "", "lx"} {"sensor", "CLEARGRASSCGPR1-lux", mac, "illuminance", jsonLux, "", "", "lx"}
//component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
@@ -399,10 +399,10 @@ void CLEARGRASSCGPR1Discovery(char* mac, char* sensorModel) {
createDiscoveryFromList(mac, CLEARGRASSCGPR1sensor, CLEARGRASSCGPR1parametersCount, "CLEARGRASSCGPR1", "ClearGrass", sensorModel); createDiscoveryFromList(mac, CLEARGRASSCGPR1sensor, CLEARGRASSCGPR1parametersCount, "CLEARGRASSCGPR1", "ClearGrass", sensorModel);
} }
void CLEARGRASSCGH1Discovery(char* mac, char* sensorModel) { void CLEARGRASSCGH1Discovery(const char* mac, const char* sensorModel) {
# define CLEARGRASSCGH1parametersCount 1 # define CLEARGRASSCGH1parametersCount 1
Log.trace(F("CLEARGRASSCGH1Discovery" CR)); Log.trace(F("CLEARGRASSCGH1Discovery" CR));
char* CLEARGRASSCGH1sensor[CLEARGRASSCGH1parametersCount][8] = { const char* CLEARGRASSCGH1sensor[CLEARGRASSCGH1parametersCount][8] = {
{"binary_sensor", "CLEARGRASSCGH1-open", mac, "door", jsonOpen, "True", "False", ""}, {"binary_sensor", "CLEARGRASSCGH1-open", mac, "door", jsonOpen, "True", "False", ""},
//component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
}; };
@@ -410,10 +410,10 @@ void CLEARGRASSCGH1Discovery(char* mac, char* sensorModel) {
createDiscoveryFromList(mac, CLEARGRASSCGH1sensor, CLEARGRASSCGH1parametersCount, "CLEARGRASSCGH1", "ClearGrass", sensorModel); createDiscoveryFromList(mac, CLEARGRASSCGH1sensor, CLEARGRASSCGH1parametersCount, "CLEARGRASSCGH1", "ClearGrass", sensorModel);
} }
void CLEARGRASSTRHKPADiscovery(char* mac, char* sensorModel) { void CLEARGRASSTRHKPADiscovery(const char* mac, const char* sensorModel) {
# define CLEARGRASSTRHKPAparametersCount 3 # define CLEARGRASSTRHKPAparametersCount 3
Log.trace(F("CLEARGRASSTRHKPADiscovery" CR)); Log.trace(F("CLEARGRASSTRHKPADiscovery" CR));
char* CLEARGRASSTRHKPAsensor[CLEARGRASSTRHKPAparametersCount][8] = { const char* CLEARGRASSTRHKPAsensor[CLEARGRASSTRHKPAparametersCount][8] = {
{"sensor", "CLEARGRASSTRHKPA-pres", mac, "pressure", jsonPres, "", "", "kPa"}, {"sensor", "CLEARGRASSTRHKPA-pres", mac, "pressure", jsonPres, "", "", "kPa"},
{"sensor", "CLEARGRASSTRHKPA-temp", mac, "temperature", jsonTempc, "", "", "°C"}, {"sensor", "CLEARGRASSTRHKPA-temp", mac, "temperature", jsonTempc, "", "", "°C"},
{"sensor", "CLEARGRASSTRHKPA-hum", mac, "humidity", jsonHum, "", "", "%"} {"sensor", "CLEARGRASSTRHKPA-hum", mac, "humidity", jsonHum, "", "", "%"}
@@ -424,10 +424,10 @@ void CLEARGRASSTRHKPADiscovery(char* mac, char* sensorModel) {
createDiscoveryFromList(mac, CLEARGRASSTRHKPAsensor, CLEARGRASSTRHKPAparametersCount, "CLEARGRASSTRHKPA", "ClearGrass", sensorModel); createDiscoveryFromList(mac, CLEARGRASSTRHKPAsensor, CLEARGRASSTRHKPAparametersCount, "CLEARGRASSTRHKPA", "ClearGrass", sensorModel);
} }
void MiScaleDiscovery(char* mac, char* sensorModel) { void MiScaleDiscovery(const char* mac, const char* sensorModel) {
# define MiScaleparametersCount 1 # define MiScaleparametersCount 1
Log.trace(F("MiScaleDiscovery" CR)); Log.trace(F("MiScaleDiscovery" CR));
char* MiScalesensor[MiScaleparametersCount][8] = { const char* MiScalesensor[MiScaleparametersCount][8] = {
{"sensor", "MiScale-weight", mac, "", jsonWeight, "", "", "kg"}, {"sensor", "MiScale-weight", mac, "", jsonWeight, "", "", "kg"},
//component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
}; };
@@ -435,10 +435,10 @@ void MiScaleDiscovery(char* mac, char* sensorModel) {
createDiscoveryFromList(mac, MiScalesensor, MiScaleparametersCount, "MiScale", "Xiaomi", sensorModel); createDiscoveryFromList(mac, MiScalesensor, MiScaleparametersCount, "MiScale", "Xiaomi", sensorModel);
} }
void MiLampDiscovery(char* mac, char* sensorModel) { void MiLampDiscovery(const char* mac, const char* sensorModel) {
# define MiLampparametersCount 1 # define MiLampparametersCount 1
Log.trace(F("MiLampDiscovery" CR)); Log.trace(F("MiLampDiscovery" CR));
char* MiLampsensor[MiLampparametersCount][8] = { const char* MiLampsensor[MiLampparametersCount][8] = {
{"sensor", "MiLamp-presence", mac, "", jsonPresence, "", "", "d"}, {"sensor", "MiLamp-presence", mac, "", jsonPresence, "", "", "d"},
//component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
}; };
@@ -446,10 +446,10 @@ void MiLampDiscovery(char* mac, char* sensorModel) {
createDiscoveryFromList(mac, MiLampsensor, MiLampparametersCount, "MiLamp", "Xiaomi", sensorModel); createDiscoveryFromList(mac, MiLampsensor, MiLampparametersCount, "MiLamp", "Xiaomi", sensorModel);
} }
void MiBandDiscovery(char* mac, char* sensorModel) { void MiBandDiscovery(const char* mac, const char* sensorModel) {
# define MiBandparametersCount 1 # define MiBandparametersCount 1
Log.trace(F("MiBandDiscovery" CR)); Log.trace(F("MiBandDiscovery" CR));
char* MiBandsensor[MiBandparametersCount][8] = { const char* MiBandsensor[MiBandparametersCount][8] = {
{"sensor", "MiBand-steps", mac, "", jsonStep, "", "", "nb"}, {"sensor", "MiBand-steps", mac, "", jsonStep, "", "", "nb"},
//component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
}; };
@@ -457,10 +457,10 @@ void MiBandDiscovery(char* mac, char* sensorModel) {
createDiscoveryFromList(mac, MiBandsensor, MiBandparametersCount, "MiBand", "Xiaomi", sensorModel); createDiscoveryFromList(mac, MiBandsensor, MiBandparametersCount, "MiBand", "Xiaomi", sensorModel);
} }
void InkBirdDiscovery(char* mac, char* sensorModel) { void InkBirdDiscovery(const char* mac, const char* sensorModel) {
# define InkBirdparametersCount 3 # define InkBirdparametersCount 3
Log.trace(F("InkBirdDiscovery" CR)); Log.trace(F("InkBirdDiscovery" CR));
char* InkBirdsensor[InkBirdparametersCount][8] = { const char* InkBirdsensor[InkBirdparametersCount][8] = {
{"sensor", "InkBird-batt", mac, "battery", jsonBatt, "", "", "%"}, {"sensor", "InkBird-batt", mac, "battery", jsonBatt, "", "", "%"},
{"sensor", "InkBird-temp", mac, "temperature", jsonTempc, "", "", "°C"}, {"sensor", "InkBird-temp", mac, "temperature", jsonTempc, "", "", "°C"},
{"sensor", "InkBird-hum", mac, "humidity", jsonHum, "", "", "%"} {"sensor", "InkBird-hum", mac, "humidity", jsonHum, "", "", "%"}
@@ -470,10 +470,10 @@ void InkBirdDiscovery(char* mac, char* sensorModel) {
createDiscoveryFromList(mac, InkBirdsensor, InkBirdparametersCount, "", "InkBird", sensorModel); createDiscoveryFromList(mac, InkBirdsensor, InkBirdparametersCount, "", "InkBird", sensorModel);
} }
void LYWSD03MMCDiscovery(char* mac, char* sensorModel) { void LYWSD03MMCDiscovery(const char* mac, const char* sensorModel) {
# define LYWSD03MMCparametersCount 4 # define LYWSD03MMCparametersCount 4
Log.trace(F("LYWSD03MMCDiscovery" CR)); Log.trace(F("LYWSD03MMCDiscovery" CR));
char* LYWSD03MMCsensor[LYWSD03MMCparametersCount][8] = { const char* LYWSD03MMCsensor[LYWSD03MMCparametersCount][8] = {
{"sensor", "LYWSD03MMC-batt", mac, "battery", jsonBatt, "", "", "%"}, {"sensor", "LYWSD03MMC-batt", mac, "battery", jsonBatt, "", "", "%"},
{"sensor", "LYWSD03MMC-volt", mac, "", jsonVolt, "", "", "V"}, {"sensor", "LYWSD03MMC-volt", mac, "", jsonVolt, "", "", "V"},
{"sensor", "LYWSD03MMC-temp", mac, "temperature", jsonTempc, "", "", "°C"}, {"sensor", "LYWSD03MMC-temp", mac, "temperature", jsonTempc, "", "", "°C"},
@@ -484,10 +484,10 @@ void LYWSD03MMCDiscovery(char* mac, char* sensorModel) {
createDiscoveryFromList(mac, LYWSD03MMCsensor, LYWSD03MMCparametersCount, "LYWSD03MMC", "Xiaomi", sensorModel); createDiscoveryFromList(mac, LYWSD03MMCsensor, LYWSD03MMCparametersCount, "LYWSD03MMC", "Xiaomi", sensorModel);
} }
void MHO_C401Discovery(char* mac, char* sensorModel) { void MHO_C401Discovery(const char* mac, const char* sensorModel) {
# define MHO_C401parametersCount 4 # define MHO_C401parametersCount 4
Log.trace(F("MHO_C401Discovery" CR)); Log.trace(F("MHO_C401Discovery" CR));
char* MHO_C401sensor[MHO_C401parametersCount][8] = { const char* MHO_C401sensor[MHO_C401parametersCount][8] = {
{"sensor", "MHO_C401-batt", mac, "battery", jsonBatt, "", "", "%"}, {"sensor", "MHO_C401-batt", mac, "battery", jsonBatt, "", "", "%"},
{"sensor", "MHO_C401-volt", mac, "", jsonVolt, "", "", "V"}, {"sensor", "MHO_C401-volt", mac, "", jsonVolt, "", "", "V"},
{"sensor", "MHO_C401-temp", mac, "temperature", jsonTempc, "", "", "°C"}, {"sensor", "MHO_C401-temp", mac, "temperature", jsonTempc, "", "", "°C"},
@@ -498,10 +498,10 @@ void MHO_C401Discovery(char* mac, char* sensorModel) {
createDiscoveryFromList(mac, MHO_C401sensor, MHO_C401parametersCount, "MHO_C401", "Xiaomi", sensorModel); createDiscoveryFromList(mac, MHO_C401sensor, MHO_C401parametersCount, "MHO_C401", "Xiaomi", sensorModel);
} }
void INodeEMDiscovery(char* mac, char* sensorModel) { void INodeEMDiscovery(const char* mac, const char* sensorModel) {
# define INodeEMparametersCount 3 # define INodeEMparametersCount 3
Log.trace(F("INodeEMDiscovery" CR)); Log.trace(F("INodeEMDiscovery" CR));
char* INodeEMsensor[INodeEMparametersCount][8] = { const char* INodeEMsensor[INodeEMparametersCount][8] = {
{"sensor", "iNodeEM-power", mac, "power", jsonPower, "", "", "W"}, {"sensor", "iNodeEM-power", mac, "power", jsonPower, "", "", "W"},
{"sensor", "iNodeEM-energy", mac, "", jsonEnergy, "", "", "kWh"}, {"sensor", "iNodeEM-energy", mac, "", jsonEnergy, "", "", "kWh"},
{"sensor", "iNodeEM-batt", mac, "battery", jsonBatt, "", "", "%"} {"sensor", "iNodeEM-batt", mac, "battery", jsonBatt, "", "", "%"}
@@ -511,10 +511,10 @@ void INodeEMDiscovery(char* mac, char* sensorModel) {
createDiscoveryFromList(mac, INodeEMsensor, INodeEMparametersCount, "INode-Energy-Meter", "INode", sensorModel); createDiscoveryFromList(mac, INodeEMsensor, INodeEMparametersCount, "INode-Energy-Meter", "INode", sensorModel);
} }
void WS02Discovery(char* mac, char* sensorModel) { void WS02Discovery(const char* mac, const char* sensorModel) {
# define WS02parametersCount 3 # define WS02parametersCount 3
Log.trace(F("WS02Discovery" CR)); Log.trace(F("WS02Discovery" CR));
char* WS02sensor[WS02parametersCount][8] = { const char* WS02sensor[WS02parametersCount][8] = {
{"sensor", "WS02-volt", mac, "", jsonVolt, "", "", "V"}, {"sensor", "WS02-volt", mac, "", jsonVolt, "", "", "V"},
{"sensor", "WS02-temp", mac, "temperature", jsonTempc, "", "", "°C"}, {"sensor", "WS02-temp", mac, "temperature", jsonTempc, "", "", "°C"},
{"sensor", "WS02-hum", mac, "humidity", jsonHum, "", "", "%"} {"sensor", "WS02-hum", mac, "humidity", jsonHum, "", "", "%"}
@@ -525,25 +525,25 @@ void WS02Discovery(char* mac, char* sensorModel) {
} }
# else # else
void MiFloraDiscovery(char* mac, char* sensorModel) {} void MiFloraDiscovery(const char* mac, const char* sensorModel) {}
void VegTrugDiscovery(char* mac, char* sensorModel) {} void VegTrugDiscovery(const char* mac, const char* sensorModel) {}
void MiJiaDiscovery(char* mac, char* sensorModel) {} void MiJiaDiscovery(const char* mac, const char* sensorModel) {}
void FormalDiscovery(char* mac, char* sensorModel) {} void FormalDiscovery(const char* mac, const char* sensorModel) {}
void LYWSD02Discovery(char* mac, char* sensorModel) {} void LYWSD02Discovery(const char* mac, const char* sensorModel) {}
void CLEARGRASSTRHDiscovery(char* mac, char* sensorModel) {} void CLEARGRASSTRHDiscovery(const char* mac, const char* sensorModel) {}
void CLEARGRASSCGD1Discovery(char* mac, char* sensorModel) {} void CLEARGRASSCGD1Discovery(const char* mac, const char* sensorModel) {}
void CLEARGRASSCGDK2Discovery(char* mac, char* sensorModel) {} void CLEARGRASSCGDK2Discovery(const char* mac, const char* sensorModel) {}
void CLEARGRASSCGPR1Discovery(char* mac, char* sensorModel) {} void CLEARGRASSCGPR1Discovery(const char* mac, const char* sensorModel) {}
void CLEARGRASSCGH1Discovery(char* mac, char* sensorModel) {} void CLEARGRASSCGH1Discovery(const char* mac, const char* sensorModel) {}
void CLEARGRASSTRHKPADiscovery(char* mac, char* sensorModel) {} void CLEARGRASSTRHKPADiscovery(const char* mac, const char* sensorModel) {}
void MiScaleDiscovery(char* mac, char* sensorModel) {} void MiScaleDiscovery(const char* mac, const char* sensorModel) {}
void MiLampDiscovery(char* mac, char* sensorModel) {} void MiLampDiscovery(const char* mac, const char* sensorModel) {}
void MiBandDiscovery(char* mac, char* sensorModel) {} void MiBandDiscovery(const char* mac, const char* sensorModel) {}
void InkBirdDiscovery(char* mac, char* sensorModel) {} void InkBirdDiscovery(const char* mac, const char* sensorModel) {}
void LYWSD03MMCDiscovery(char* mac, char* sensorModel) {} void LYWSD03MMCDiscovery(const char* mac, const char* sensorModel) {}
void MHO_C401Discovery(char* mac, char* sensorModel) {} void MHO_C401Discovery(const char* mac, const char* sensorModel) {}
void INodeEMDiscovery(char* mac, char* sensorModel) {} void INodeEMDiscovery(const char* mac, const char* sensorModel) {}
void WS02Discovery(char* mac, char* sensorModel) {} void WS02Discovery(const char* mac, const char* sensorModel) {}
# endif # endif
# ifdef ESP32 # ifdef ESP32
@@ -704,6 +704,7 @@ void notifyCB(
} else { } else {
Log.trace(F("Callback process canceled by processLock" CR)); Log.trace(F("Callback process canceled by processLock" CR));
} }
pBLERemoteCharacteristic->unsubscribe(); pBLERemoteCharacteristic->unsubscribe();
} }
@@ -823,7 +824,11 @@ void deepSleep(uint64_t time_in_us) {
esp_bt_controller_disable(); esp_bt_controller_disable();
esp_bt_controller_deinit(); esp_bt_controller_deinit();
esp_bt_mem_release(ESP_BT_MODE_BTDM); esp_bt_mem_release(ESP_BT_MODE_BTDM);
// Ignore the deprecated warning, this call is necessary here.
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
adc_power_off(); adc_power_off();
# pragma GCC diagnostic pop
esp_wifi_stop(); esp_wifi_stop();
esp_deep_sleep(time_in_us); esp_deep_sleep(time_in_us);
} }
@@ -875,6 +880,7 @@ void setupBT() {
bool BTtoMQTT() { // for on demand BLE scans bool BTtoMQTT() { // for on demand BLE scans
BLEscan(); BLEscan();
return true;
} }
# else // arduino or ESP8266 working with HM10/11 # else // arduino or ESP8266 working with HM10/11
@@ -994,7 +1000,7 @@ bool BTtoMQTT() {
} }
# endif # endif
void RemoveJsonPropertyIf(JsonObject& obj, char* key, bool condition) { void RemoveJsonPropertyIf(JsonObject& obj, const char* key, bool condition) {
if (condition) { if (condition) {
Log.trace(F("Removing %s" CR), key); Log.trace(F("Removing %s" CR), key);
obj.remove(key); obj.remove(key);
@@ -1029,26 +1035,26 @@ void launchBTDiscovery() {
String macWOdots = String(p->macAdr); String macWOdots = String(p->macAdr);
macWOdots.replace(":", ""); macWOdots.replace(":", "");
Log.trace(F("Launching discovery of %s" CR), p->macAdr); Log.trace(F("Launching discovery of %s" CR), p->macAdr);
if (p->sensorModel == HHCCJCY01HHCC) MiFloraDiscovery((char*)macWOdots.c_str(), "HHCCJCY01HHCC"); if (p->sensorModel == HHCCJCY01HHCC) MiFloraDiscovery(macWOdots.c_str(), "HHCCJCY01HHCC");
if (p->sensorModel == VEGTRUG) VegTrugDiscovery((char*)macWOdots.c_str(), "VEGTRUG"); if (p->sensorModel == VEGTRUG) VegTrugDiscovery(macWOdots.c_str(), "VEGTRUG");
if (p->sensorModel == LYWSDCGQ) MiJiaDiscovery((char*)macWOdots.c_str(), "LYWSDCGQ"); if (p->sensorModel == LYWSDCGQ) MiJiaDiscovery(macWOdots.c_str(), "LYWSDCGQ");
if (p->sensorModel == JQJCY01YM) FormalDiscovery((char*)macWOdots.c_str(), "JQJCY01YM"); if (p->sensorModel == JQJCY01YM) FormalDiscovery(macWOdots.c_str(), "JQJCY01YM");
if (p->sensorModel == LYWSD02) LYWSD02Discovery((char*)macWOdots.c_str(), "LYWSD02"); if (p->sensorModel == LYWSD02) LYWSD02Discovery(macWOdots.c_str(), "LYWSD02");
if (p->sensorModel == CGG1) CLEARGRASSTRHDiscovery((char*)macWOdots.c_str(), "CGG1"); if (p->sensorModel == CGG1) CLEARGRASSTRHDiscovery(macWOdots.c_str(), "CGG1");
if (p->sensorModel == CGP1W) CLEARGRASSTRHKPADiscovery((char*)macWOdots.c_str(), "CGP1W"); if (p->sensorModel == CGP1W) CLEARGRASSTRHKPADiscovery(macWOdots.c_str(), "CGP1W");
if (p->sensorModel == MUE4094RT) MiLampDiscovery((char*)macWOdots.c_str(), "MUE4094RT"); if (p->sensorModel == MUE4094RT) MiLampDiscovery(macWOdots.c_str(), "MUE4094RT");
if (p->sensorModel == CGDK2) CLEARGRASSCGDK2Discovery((char*)macWOdots.c_str(), "CGDK2"); if (p->sensorModel == CGDK2) CLEARGRASSCGDK2Discovery(macWOdots.c_str(), "CGDK2");
if (p->sensorModel == CGPR1) CLEARGRASSCGPR1Discovery((char*)macWOdots.c_str(), "CGPR1"); if (p->sensorModel == CGPR1) CLEARGRASSCGPR1Discovery(macWOdots.c_str(), "CGPR1");
if (p->sensorModel == CGH1) CLEARGRASSCGH1Discovery((char*)macWOdots.c_str(), "CGH1"); if (p->sensorModel == CGH1) CLEARGRASSCGH1Discovery(macWOdots.c_str(), "CGH1");
if (p->sensorModel == CGD1) CLEARGRASSCGD1Discovery((char*)macWOdots.c_str(), "CGD1"); if (p->sensorModel == CGD1) CLEARGRASSCGD1Discovery(macWOdots.c_str(), "CGD1");
if (p->sensorModel == WS02) WS02Discovery((char*)macWOdots.c_str(), "WS02"); if (p->sensorModel == WS02) WS02Discovery(macWOdots.c_str(), "WS02");
if (p->sensorModel == MIBAND) MiBandDiscovery((char*)macWOdots.c_str(), "MIBAND"); if (p->sensorModel == MIBAND) MiBandDiscovery(macWOdots.c_str(), "MIBAND");
if ((p->sensorModel == XMTZC04HM) || if ((p->sensorModel == XMTZC04HM) ||
(p->sensorModel == XMTZC05HM)) MiScaleDiscovery((char*)macWOdots.c_str(), "XMTZC0xHM"); (p->sensorModel == XMTZC05HM)) MiScaleDiscovery(macWOdots.c_str(), "XMTZC0xHM");
if (p->sensorModel == INKBIRD) InkBirdDiscovery((char*)macWOdots.c_str(), "INKBIRD"); if (p->sensorModel == INKBIRD) InkBirdDiscovery(macWOdots.c_str(), "INKBIRD");
if (p->sensorModel == LYWSD03MMC || p->sensorModel == LYWSD03MMC_ATC || p->sensorModel == LYWSD03MMC_PVVX) LYWSD03MMCDiscovery((char*)macWOdots.c_str(), "LYWSD03MMC"); if (p->sensorModel == LYWSD03MMC || p->sensorModel == LYWSD03MMC_ATC || p->sensorModel == LYWSD03MMC_PVVX) LYWSD03MMCDiscovery(macWOdots.c_str(), "LYWSD03MMC");
if (p->sensorModel == MHO_C401) MHO_C401Discovery((char*)macWOdots.c_str(), "MHO_C401"); if (p->sensorModel == MHO_C401) MHO_C401Discovery(macWOdots.c_str(), "MHO_C401");
if (p->sensorModel == INODE_EM) INodeEMDiscovery((char*)macWOdots.c_str(), "INODE_EM"); if (p->sensorModel == INODE_EM) INodeEMDiscovery(macWOdots.c_str(), "INODE_EM");
p->isDisc = true; // we don't need the semaphore and all the search magic via createOrUpdateDevice p->isDisc = true; // we don't need the semaphore and all the search magic via createOrUpdateDevice
} else { } else {
if (!isDiscovered(p)) { if (!isDiscovered(p)) {
@@ -1172,7 +1178,7 @@ JsonObject& process_bledata(JsonObject& BLEdata) {
return process_cleargrass(BLEdata, false); return process_cleargrass(BLEdata, false);
} }
Log.trace(F("Is it a CGPR1?" CR)); Log.trace(F("Is it a CGPR1?" CR));
if (service_len > ServicedataMinLength && strncmp(&service_data[0], "4812", 4) == 0 || strncmp(&service_data[0], "0812", 4) == 0) { if ((service_len > ServicedataMinLength) && (strncmp(&service_data[0], "4812", 4) == 0 || strncmp(&service_data[0], "0812", 4) == 0)) {
Log.trace(F("CGPR1 data reading" CR)); Log.trace(F("CGPR1 data reading" CR));
BLEdata.set("model", "CGPR1"); BLEdata.set("model", "CGPR1");
if (device->sensorModel == -1) if (device->sensorModel == -1)
@@ -1589,7 +1595,7 @@ void MQTTtoBT(char* topicOri, JsonObject& BTdata) { // json object decoding
// Black list & white list set // Black list & white list set
bool WorBupdated; bool WorBupdated;
WorBupdated |= updateWorB(BTdata, true); WorBupdated = updateWorB(BTdata, true);
WorBupdated |= updateWorB(BTdata, false); WorBupdated |= updateWorB(BTdata, false);
if (WorBupdated) { if (WorBupdated) {
main/ZmqttDiscovery.ino
+9 -9
View File
@@ -48,14 +48,14 @@ String getUniqueId(String name, String sufix) {
} }
# ifdef ZgatewayBT # ifdef ZgatewayBT
void createDiscoveryFromList(char* mac, char* sensorList[][8], int sensorCount, void createDiscoveryFromList(const char* mac, const char* sensorList[][8], int sensorCount,
char* device_name, char* device_manufacturer, char* device_model) { const char* device_name, const char* device_manufacturer, const char* device_model) {
for (int i = 0; i < sensorCount; i++) { for (int i = 0; i < sensorCount; i++) {
Log.trace(F("CreateDiscoverySensor %s" CR), sensorList[i][1]); Log.trace(F("CreateDiscoverySensor %s" CR), sensorList[i][1]);
String discovery_topic = String(subjectBTtoMQTT) + "/" + String(mac); String discovery_topic = String(subjectBTtoMQTT) + "/" + String(mac);
String unique_id = String(mac) + "-" + sensorList[i][1]; String unique_id = String(mac) + "-" + sensorList[i][1];
createDiscovery(sensorList[i][0], createDiscovery(sensorList[i][0],
(char*)discovery_topic.c_str(), sensorList[i][1], (char*)unique_id.c_str(), discovery_topic.c_str(), sensorList[i][1], unique_id.c_str(),
will_Topic, sensorList[i][3], sensorList[i][4], will_Topic, sensorList[i][3], sensorList[i][4],
sensorList[i][5], sensorList[i][6], sensorList[i][7], sensorList[i][5], sensorList[i][6], sensorList[i][7],
0, "", "", false, "", 0, "", "", false, "",
@@ -64,13 +64,13 @@ void createDiscoveryFromList(char* mac, char* sensorList[][8], int sensorCount,
} }
# endif # endif
void createDiscovery(char* sensor_type, void createDiscovery(const char* sensor_type,
char* st_topic, char* s_name, char* unique_id, const char* st_topic, const char* s_name, const char* unique_id,
char* availability_topic, char* device_class, char* value_template, const char* availability_topic, const char* device_class, const char* value_template,
char* payload_on, char* payload_off, char* unit_of_meas, const char* payload_on, const char* payload_off, const char* unit_of_meas,
int off_delay, int off_delay,
char* payload_available, char* payload_not_avalaible, bool gateway_entity, char* cmd_topic, const char* payload_available, const char* payload_not_avalaible, bool gateway_entity, const char* cmd_topic,
char* device_name, char* device_manufacturer, char* device_model, char* device_mac, bool retainCmd) { const char* device_name, const char* device_manufacturer, const char* device_model, const char* device_mac, bool retainCmd) {
const int JSON_MSG_CALC_BUFFER = JSON_OBJECT_SIZE(14) + JSON_OBJECT_SIZE(5) + JSON_ARRAY_SIZE(1); const int JSON_MSG_CALC_BUFFER = JSON_OBJECT_SIZE(14) + JSON_OBJECT_SIZE(5) + JSON_ARRAY_SIZE(1);
StaticJsonBuffer<JSON_MSG_CALC_BUFFER> jsonBuffer; StaticJsonBuffer<JSON_MSG_CALC_BUFFER> jsonBuffer;
JsonObject& sensor = jsonBuffer.createObject(); JsonObject& sensor = jsonBuffer.createObject();
main/config_mqttDiscovery.h
+8 -8
View File
@@ -29,15 +29,15 @@
extern String getUniqueId(String name, String sufix); extern String getUniqueId(String name, String sufix);
extern void pubMqttDiscovery(); extern void pubMqttDiscovery();
extern void createDiscoveryFromList(char* mac, char* sensorList[][8], int sensorCount, extern void createDiscoveryFromList(const char* mac, const char* sensorList[][8], int sensorCount,
char* device_name, char* device_manufacturer, char* device_model); const char* device_name, const char* device_manufacturer, const char* device_model);
extern void createDiscovery(char* sensor_type, extern void createDiscovery(const char* sensor_type,
char* state_topic, char* s_name, char* unique_id, const char* state_topic, const char* s_name, const char* unique_id,
char* availability_topic, char* device_class, char* value_template, const char* availability_topic, const char* device_class, const char* value_template,
char* payload_on, char* payload_off, char* unit_of_meas, const char* payload_on, const char* payload_off, const char* unit_of_meas,
int off_delay, int off_delay,
char* payload_available, char* payload_not_avalaible, bool gateway_entity, char* command_topic, const char* payload_available, const char* payload_not_avalaible, bool gateway_entity, const char* command_topic,
char* device_name, char* device_manufacturer, char* device_model, char* device_mac, bool retainCmd); const char* device_name, const char* device_manufacturer, const char* device_model, const char* device_mac, bool retainCmd);
#define discovery_Topic "homeassistant" #define discovery_Topic "homeassistant"
main/main.ino
+26 -26
View File
@@ -277,12 +277,12 @@ bool to_bool(String const& s) { // thanks Chris Jester-Young from stackoverflow
return s != "0"; return s != "0";
} }
void pub(char* topicori, char* payload, bool retainFlag) { void pub(const char* topicori, const char* payload, bool retainFlag) {
String topic = String(mqtt_topic) + String(topicori); String topic = String(mqtt_topic) + String(topicori);
pubMQTT((char*)topic.c_str(), payload, retainFlag); pubMQTT(topic.c_str(), payload, retainFlag);
} }
void pub(char* topicori, JsonObject& data) { void pub(const char* topicori, JsonObject& data) {
Log.notice(F("Subject: %s" CR), topicori); Log.notice(F("Subject: %s" CR), topicori);
digitalWrite(LED_RECEIVE, LED_RECEIVE_ON); digitalWrite(LED_RECEIVE, LED_RECEIVE_ON);
logJson(data); logJson(data);
@@ -341,7 +341,7 @@ void pub(char* topicori, JsonObject& data) {
} }
} }
void pub(char* topicori, char* payload) { void pub(const char* topicori, const char* payload) {
if (client.connected()) { if (client.connected()) {
String topic = String(mqtt_topic) + String(topicori); String topic = String(mqtt_topic) + String(topicori);
Log.trace(F("Pub ack %s into: %s" CR), payload, topic.c_str()); Log.trace(F("Pub ack %s into: %s" CR), payload, topic.c_str());
@@ -351,7 +351,7 @@ void pub(char* topicori, char* payload) {
} }
} }
void pub_custom_topic(char* topicori, JsonObject& data, boolean retain) { void pub_custom_topic(const char* topicori, JsonObject& data, boolean retain) {
if (client.connected()) { if (client.connected()) {
#if defined(ESP8266) || defined(ESP32) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega1280__) #if defined(ESP8266) || defined(ESP32) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega1280__)
char JSONmessageBuffer[data.measureLength() + 1]; char JSONmessageBuffer[data.measureLength() + 1];
@@ -367,90 +367,90 @@ void pub_custom_topic(char* topicori, JsonObject& data, boolean retain) {
} }
// Low level MQTT functions // Low level MQTT functions
void pubMQTT(char* topic, char* payload) { void pubMQTT(const char* topic, const char* payload) {
client.publish(topic, payload); client.publish(topic, payload);
} }
void pubMQTT(char* topicori, char* payload, bool retainFlag) { void pubMQTT(const char* topicori, const char* payload, bool retainFlag) {
client.publish(topicori, payload, retainFlag); client.publish(topicori, payload, retainFlag);
} }
void pubMQTT(String topic, char* payload) { void pubMQTT(String topic, const char* payload) {
client.publish((char*)topic.c_str(), payload); client.publish(topic.c_str(), payload);
} }
void pubMQTT(char* topic, unsigned long payload) { void pubMQTT(const char* topic, unsigned long payload) {
char val[11]; char val[11];
sprintf(val, "%lu", payload); sprintf(val, "%lu", payload);
client.publish(topic, val); client.publish(topic, val);
} }
void pubMQTT(char* topic, unsigned long long payload) { void pubMQTT(const char* topic, unsigned long long payload) {
char val[21]; char val[21];
sprintf(val, "%llu", payload); sprintf(val, "%llu", payload);
client.publish(topic, val); client.publish(topic, val);
} }
void pubMQTT(char* topic, String payload) { void pubMQTT(const char* topic, String payload) {
client.publish(topic, (char*)payload.c_str()); client.publish(topic, payload.c_str());
} }
void pubMQTT(String topic, String payload) { void pubMQTT(String topic, String payload) {
client.publish((char*)topic.c_str(), (char*)payload.c_str()); client.publish(topic.c_str(), payload.c_str());
} }
void pubMQTT(String topic, int payload) { void pubMQTT(String topic, int payload) {
char val[12]; char val[12];
sprintf(val, "%d", payload); sprintf(val, "%d", payload);
client.publish((char*)topic.c_str(), val); client.publish(topic.c_str(), val);
} }
void pubMQTT(String topic, unsigned long long payload) { void pubMQTT(String topic, unsigned long long payload) {
char val[21]; char val[21];
sprintf(val, "%llu", payload); sprintf(val, "%llu", payload);
client.publish((char*)topic.c_str(), val); client.publish(topic.c_str(), val);
} }
void pubMQTT(String topic, float payload) { void pubMQTT(String topic, float payload) {
char val[12]; char val[12];
dtostrf(payload, 3, 1, val); dtostrf(payload, 3, 1, val);
client.publish((char*)topic.c_str(), val); client.publish(topic.c_str(), val);
} }
void pubMQTT(char* topic, float payload) { void pubMQTT(const char* topic, float payload) {
char val[12]; char val[12];
dtostrf(payload, 3, 1, val); dtostrf(payload, 3, 1, val);
client.publish(topic, val); client.publish(topic, val);
} }
void pubMQTT(char* topic, int payload) { void pubMQTT(const char* topic, int payload) {
char val[6]; char val[6];
sprintf(val, "%d", payload); sprintf(val, "%d", payload);
client.publish(topic, val); client.publish(topic, val);
} }
void pubMQTT(char* topic, unsigned int payload) { void pubMQTT(const char* topic, unsigned int payload) {
char val[6]; char val[6];
sprintf(val, "%u", payload); sprintf(val, "%u", payload);
client.publish(topic, val); client.publish(topic, val);
} }
void pubMQTT(char* topic, long payload) { void pubMQTT(const char* topic, long payload) {
char val[11]; char val[11];
sprintf(val, "%l", payload); sprintf(val, "%ld", payload);
client.publish(topic, val); client.publish(topic, val);
} }
void pubMQTT(char* topic, double payload) { void pubMQTT(const char* topic, double payload) {
char val[16]; char val[16];
sprintf(val, "%d", payload); sprintf(val, "%f", payload);
client.publish(topic, val); client.publish(topic, val);
} }
void pubMQTT(String topic, unsigned long payload) { void pubMQTT(String topic, unsigned long payload) {
char val[11]; char val[11];
sprintf(val, "%lu", payload); sprintf(val, "%lu", payload);
client.publish((char*)topic.c_str(), val); client.publish(topic.c_str(), val);
} }
void logJson(JsonObject& jsondata) { void logJson(JsonObject& jsondata) {
@@ -463,7 +463,7 @@ void logJson(JsonObject& jsondata) {
Log.notice(F("Received json : %s" CR), JSONmessageBuffer); Log.notice(F("Received json : %s" CR), JSONmessageBuffer);
} }
bool cmpToMainTopic(char* topicOri, char* toAdd) { bool cmpToMainTopic(const char* topicOri, const char* toAdd) {
char topic[mqtt_topic_max_size]; char topic[mqtt_topic_max_size];
strcpy(topic, mqtt_topic); strcpy(topic, mqtt_topic);
strcat(topic, toAdd); strcat(topic, toAdd);