lexa/AHome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change int to bool

Browse Source
This commit is contained in:
lexa
2020-11-28 11:12:16 +03:00
parent 364d581d2f
commit 2e9434202e
6 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Sw_MidlRoom/src/main.cpp
View File

@@ -117,7 +117,7 @@ bool switchLight(uint8_t nLamp, int state, bool pub)
EEPROM.commit();
String topic = "/home/midroom/lamp";
char n = nLamp == R_LED1 ? '1' : '2';
if (pub) mqttClient.publish(String(topic + n).c_str(), 1, false, state ? "1" : "0");
if (pub) mqttClient.publish(String(topic + n).c_str(), 1, false, state ? "true" : "false");
return state;
}
@@ -141,8 +141,8 @@ void onWifiDisconnect(const WiFiEventStationModeDisconnected& event) {
void onMqttConnect(bool sessionPresent) {
mqttClient.subscribe("/home/midroom/lamp1", 1);
mqttClient.subscribe("/home/midroom/lamp2", 1);
mqttClient.publish("/home/midroom/lamp1", 1, false, digitalRead(R_LED1) == 1 ? "1" : "0");
mqttClient.publish("/home/midroom/lamp2", 1, false, digitalRead(R_LED2) == 1 ? "1" : "0");
mqttClient.publish("/home/midroom/lamp1", 1, false, digitalRead(R_LED1) == 1 ? "true" : "false");
mqttClient.publish("/home/midroom/lamp2", 1, false, digitalRead(R_LED2) == 1 ? "true" : "false");
digitalWrite(B_LED, LOW);
}
@@ -155,11 +155,11 @@ void onMqttDisconnect(AsyncMqttClientDisconnectReason reason) {
void onMqttMessage(char* topic, char* payload, AsyncMqttClientMessageProperties properties, size_t len, size_t index, size_t total) {
if(strcmp(topic, "/home/midroom/lamp1") == 0){
if (atoi(payload) == 1) switchLight(R_LED1, 1, false);//lStat1 = true;
if (strcmp("true", payload) == 0) switchLight(R_LED1, 1, false);//lStat1 = true;
else switchLight(R_LED1, 0, false);//lStat1 = false;
}
if(strcmp(topic, "/home/midroom/lamp2") == 0){
if (atoi(payload) == 1) switchLight(R_LED2, 1, false);//lStat2 = true;
if (strcmp("true", payload) == 0) switchLight(R_LED2, 1, false);//lStat2 = true;
else switchLight(R_LED2, 0, false);//lStat2 = false;
}
}