jeans/HASPone
jeans/HASPone
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/HASPone.git synced 2025-07-28 05:36:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve issue w/ JSON value return button IDs

Browse Source
This commit is contained in:
aderusha 2021-07-06 12:49:02 -04:00
parent b1d036a160
commit 0da0ef1575
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Arduino_Sketch/HASwitchPlate/HASwitchPlate.ino
View File

@ -119,7 +119,6 @@ bool mqttPingCheck = false; // MQTT broker ping check
bool mqttPortCheck = false; // MQTT broke port check result bool mqttPortCheck = false; // MQTT broke port check result
String mqttClientId; // Auto-generated MQTT ClientID String mqttClientId; // Auto-generated MQTT ClientID
String mqttGetSubtopic; // MQTT subtopic for incoming commands requesting .val String mqttGetSubtopic; // MQTT subtopic for incoming commands requesting .val
String mqttGetSubtopicJSON; // MQTT object buffer for JSON status when requesting .val
String mqttStateTopic; // MQTT topic for outgoing panel interactions String mqttStateTopic; // MQTT topic for outgoing panel interactions
String mqttStateJSONTopic; // MQTT topic for outgoing panel interactions in JSON format String mqttStateJSONTopic; // MQTT topic for outgoing panel interactions in JSON format
String mqttCommandTopic; // MQTT topic for incoming panel commands String mqttCommandTopic; // MQTT topic for incoming panel commands
@ -1133,7 +1132,6 @@ void nextionProcessInput()
// Now see if this object has a .val that might have been updated. Works for sliders, // Now see if this object has a .val that might have been updated. Works for sliders,
// two-state buttons, etc, returns 0 for normal buttons // two-state buttons, etc, returns 0 for normal buttons
mqttGetSubtopic = "/p[" + nextionPage + "].b[" + nextionButtonID + "].val"; mqttGetSubtopic = "/p[" + nextionPage + "].b[" + nextionButtonID + "].val";
mqttGetSubtopicJSON = "p[" + nextionPage + "].b[" + nextionButtonID + "].val";
// This right here is dicey. We're done w/ this command so reset the index allowing this to be kinda-reentrant // This right here is dicey. We're done w/ this command so reset the index allowing this to be kinda-reentrant
// because the call to nextionGetAttr is going to call us back. // because the call to nextionGetAttr is going to call us back.
nextionReturnIndex = 0; nextionReturnIndex = 0;
@ -1243,7 +1241,7 @@ void nextionProcessInput()
String mqttReturnTopic = mqttStateTopic + mqttGetSubtopic; String mqttReturnTopic = mqttStateTopic + mqttGetSubtopic;
mqttClient.publish(mqttReturnTopic, getString); mqttClient.publish(mqttReturnTopic, getString);
debugPrintln(String(F("MQTT OUT: '")) + mqttReturnTopic + String(F("' : '")) + getString + String(F("'"))); debugPrintln(String(F("MQTT OUT: '")) + mqttReturnTopic + String(F("' : '")) + getString + String(F("'")));
String mqttButtonJSONEvent = String(F("{\"event\":\"")) + mqttGetSubtopicJSON + String(F("\",\"value\":\"")) + getString + String(F("\"}")); String mqttButtonJSONEvent = String(F("{\"event\":\"")) + mqttGetSubtopic.substring(1) + String(F("\",\"value\":\"")) + getString + String(F("\"}"));
mqttClient.publish(mqttStateJSONTopic, mqttButtonJSONEvent); mqttClient.publish(mqttStateJSONTopic, mqttButtonJSONEvent);
debugPrintln(String(F("MQTT OUT: '")) + mqttStateJSONTopic + String(F("' : '")) + mqttButtonJSONEvent + String(F("'"))); debugPrintln(String(F("MQTT OUT: '")) + mqttStateJSONTopic + String(F("' : '")) + mqttButtonJSONEvent + String(F("'")));
mqttGetSubtopic = ""; mqttGetSubtopic = "";
@ -1298,7 +1296,7 @@ void nextionProcessInput()
String mqttReturnTopic = mqttStateTopic + mqttGetSubtopic; String mqttReturnTopic = mqttStateTopic + mqttGetSubtopic;
mqttClient.publish(mqttReturnTopic, getString); mqttClient.publish(mqttReturnTopic, getString);
debugPrintln(String(F("MQTT OUT: '")) + mqttReturnTopic + String(F("' : '")) + getString + String(F("'"))); debugPrintln(String(F("MQTT OUT: '")) + mqttReturnTopic + String(F("' : '")) + getString + String(F("'")));
String mqttButtonJSONEvent = String(F("{\"event\":\"")) + mqttGetSubtopicJSON + String(F("\",\"value\":")) + getString + String(F("}")); String mqttButtonJSONEvent = String(F("{\"event\":\"")) + mqttGetSubtopic.substring(1) + String(F("\",\"value\":")) + getString + String(F("}"));
mqttClient.publish(mqttStateJSONTopic, mqttButtonJSONEvent); mqttClient.publish(mqttStateJSONTopic, mqttButtonJSONEvent);
debugPrintln(String(F("MQTT OUT: '")) + mqttStateJSONTopic + String(F("' : '")) + mqttButtonJSONEvent + String(F("'"))); debugPrintln(String(F("MQTT OUT: '")) + mqttStateJSONTopic + String(F("' : '")) + mqttButtonJSONEvent + String(F("'")));
} }