Publish refactoring (#298)

* factoring of the publishing function
* integration of json publishing to MQTT
* receiving and transcode json messages from mqtt
* replace the TRACE runtime condition by a buildtime one so as to decrease program size
* remove retainFlag parameter not necessary for the moment
* Increase the scope of tests for arduino mega and esp32
* Update arduinojson library to 5.13.3
* add macros to choose between simple or json publishing or both
* differentiate build test for ATmega2560
* correct wrong sprintf definition
* change IDE version for continuous integration
* let default warning level in arduino ide
* correct pins for ESP32
* reorganize user_config
This commit is contained in:
Florian authored and GitHub committed 2018-11-05 22:02:27 +01:00
1 parent f77df7347f
commit d8dba15a81
182 files changed
+2701 -20768

No files matched your search

+34 -15
View File
@@ -38,22 +38,41 @@ void setupONOFF(){
trc(F("ZactuatorONOFF setup done "));
}
void MQTTtoONOFF(char * topicOri, char * datacallback){
bool boolSWITCHTYPE;
boolSWITCHTYPE = to_bool(datacallback);
String topic = topicOri;
if ((topic == subjectMQTTtoONOFF)){
trc(F("MQTTtoONOFF"));
trc(boolSWITCHTYPE);
digitalWrite(ACTUATOR_ONOFF_PIN, boolSWITCHTYPE);
boolean result = client.publish(subjectGTWONOFFtoMQTT, datacallback);// we acknowledge the sending by publishing the value to an acknowledgement topic
if (result){
trc(F("MQTTtoONOFF ack pub."));
trc(datacallback);
#ifdef simplePublishing
void MQTTtoONOFF(char * topicOri, char * datacallback){
bool boolSWITCHTYPE;
boolSWITCHTYPE = to_bool(datacallback);
String topic = topicOri;
if (topic == subjectMQTTtoONOFF){
trc(F("MQTTtoONOFF data analysis"));
trc(boolSWITCHTYPE);
digitalWrite(ACTUATOR_ONOFF_PIN, boolSWITCHTYPE);
// we acknowledge the sending by publishing the value to an acknowledgement topic
pub(subjectGTWONOFFtoMQTT, datacallback);
}
}
}
#endif
#ifdef jsonPublishing
void MQTTtoONOFF(char * topicOri, JsonObject& ONOFFdata){
String topic = topicOri;
if (topic == subjectMQTTtoONOFF){
trc(F("MQTTtoONOFF json data analysis"));
int boolSWITCHTYPE = ONOFFdata["switchType"] | 99;
if (boolSWITCHTYPE != 99) {
trc(F("MQTTtoONOFF boolSWITCHTYPE ok"));
trc(boolSWITCHTYPE);
digitalWrite(ACTUATOR_ONOFF_PIN, boolSWITCHTYPE);
// we acknowledge the sending by publishing the value to an acknowledgement topic
pub(subjectGTWONOFFtoMQTT, ONOFFdata);
}else{
trc(F("MQTTtoONOFF Fail reading from json"));
}
}
}
#endif
#endif