Code size reduction for UNO

main/ZactuatorONOFF.ino

@@ -66,7 +66,7 @@ void setupONOFF(){
         // we acknowledge the sending by publishing the value to an acknowledgement topic
         pub(subjectGTWONOFFtoMQTT, ONOFFdata);
       }else{
-        trc(F("MQTTtoONOFF Fail reading from json"));
+        trc(F("MQTTtoONOFF failed json read"));
       }
     }
   }

main/Zgateway2G.ino

@@ -154,7 +154,7 @@ bool _2GtoMQTT(){
           pub(subjectGTW2GtoMQTT, "SMS KO");// we acknowledge the sending by publishing the value to an acknowledgement topic, for the moment even if it is a signal repetition we acknowledge also
         }
       }else{
-        trc(F("MQTTto2G Fail reading from json"));
+        trc(F("MQTTto2G failed json read"));
       }
     }
     

main/ZgatewayIR.ino

@@ -75,9 +75,7 @@
   #define WHYNTER_BITS                32U
 #endif
 
-void setupIR()
+void setupIR(){
-{
- 
   //IR init parameters
   #if defined(ESP8266) || defined(ESP32)
     irsend.begin();
@@ -90,8 +88,8 @@ trc(IR_EMITTER_PIN);
   trc(F("IR_RECEIVER_PIN "));
   trc(IR_RECEIVER_PIN);
   trc(F("ZgatewayIR setup done "));
-
 }
+
 void IRtoMQTT(){
   decode_results results;
 
@@ -127,7 +125,7 @@ void IRtoMQTT(){
     trc(rawCode);
     IRdata.set("raw", rawCode);
     // if needed we directly resend the raw code
-    if (RawDirectForward){
+    #ifdef RawDirectForward
       #if defined(ESP8266) || defined(ESP32)
         uint16_t rawsend[results.rawlen];
         for (uint16_t i = 1;  i < results.rawlen;  i++) {
@@ -139,19 +137,19 @@ void IRtoMQTT(){
           rawsend[i] = results.rawbuf[i];
       }
       irsend.sendRaw(rawsend, results.rawlen, RawFrequency);
-      trc(F("raw signal redirected"));
+      trc(F("raw redirected"));
-    }
+    #endif
     irrecv.resume(); // Receive the next value
     unsigned long MQTTvalue = IRdata.get<unsigned long>("value");
     if (pubIRunknownPrtcl == false && IRdata.get<int>("protocol") == -1){ // don't publish unknown IR protocol
-      trc(F("--no pub. unknown protocol--"));
+      trc(F("--no pub unknown prt--"));
-    } else if (!isAduplicate(MQTTvalue) && MQTTvalue!=0) {// conditions to avoid duplications of RF -->MQTT
+    } else if (!isAduplicate(MQTTvalue) && MQTTvalue!=0) {// conditions to avoid duplications of IR -->MQTT
         trc(F("Adv data IRtoMQTT"));
         pub(subjectIRtoMQTT,IRdata);
-        trc(F("Store to avoid duplicate"));
+        trc(F("Store val"));
         storeValue(MQTTvalue);
         if (repeatIRwMQTT){
-            trc(F("Pub. IR for repeat"));
+            trc(F("Pub. IR for rpt"));
             pub(subjectMQTTtoIR,MQTTvalue);
         }
     }
@@ -369,7 +367,7 @@ void IRtoMQTT(){
           }
           irrecv.enableIRIn(); // ReStart the IR receiver (if not restarted it is not able to receive data)
         }else{
-          trc(F("MQTTtoIR Fail reading from json"));
+          trc(F("MQTTtoIR failed json read"));
         }
      }
   }

main/ZgatewayPilight.ino

@@ -110,7 +110,7 @@ void MQTTtoPilight(char * topicOri, JsonObject& Pilightdata) {
       trc(F("MQTTtoPilight msg & protocol ok"));
       result = rf.send(protocol, message);
     }else{
-      trc(F("MQTTtoPilight fail reading from json"));
+      trc(F("MQTTtoPilight failed json read"));
     }
 
     if (result > 0) {

main/ZgatewayRF.ino

@@ -88,7 +88,7 @@ void RFtoMQTT(){
             RFtoMQTTdiscovery(MQTTvalue);
         #endif
         pub(subjectRFtoMQTT,RFdata);
-        trc(F("Store to avoid duplicate"));
+        trc(F("Store val"));
         storeValue(MQTTvalue);
         if (repeatRFwMQTT){
             trc(F("Pub RF for rpt"));

main/ZgatewayRF2.ino

@@ -263,7 +263,7 @@ void rf2Callback(unsigned int period, unsigned long address, unsigned long group
           pub(subjectGTWRF2toMQTT,RF2data);
         }
       }else{
-        trc(F("MQTTtoRF2 Fail reading from json"));
+        trc(F("MQTTtoRF2 failed json read"));
       }
     }
   }

main/ZgatewayRFM69.ino

@@ -231,7 +231,7 @@ bool RFM69toMQTT(void) {
           trc(F("MQTTtoRFM69 sending failed"));
         }
       }else{
-        trc(F("MQTTtoRFM69 Fail reading from json"));
+        trc(F("MQTTtoRFM69 failed json read"));
       }
     }
   }

main/ZgatewaySRFB.ino

@@ -131,10 +131,10 @@ void _rfbDecode() {
         if (!isAduplicate(MQTTvalue) && MQTTvalue!=0) {// conditions to avoid duplications of RF -->MQTT
             trc(F("Adv data SRFBtoMQTT")); 
             pub(subjectSRFBtoMQTT,SRFBdata);
-            trc(F("Store to avoid duplicate"));
+            trc(F("Store val"));
             storeValue(MQTTvalue);
             if (repeatSRFBwMQTT){
-                trc(F("Publish SRFB for repeat"));
+                trc(F("Publish SRFB for rpt"));
                 pub(subjectMQTTtoSRFB,SRFBdata);
             }
         } 

main/main.ino

@@ -317,6 +317,18 @@ void pub(char * topic, char * payload){
     client.publish(topic, payload);
 }
 
+void pub(String topic, char *  payload){
+    client.publish((char *)topic.c_str(),payload);
+}
+
+void pub(char * topic, unsigned long payload){
+    char val[11];
+    sprintf(val, "%lu", payload);
+    client.publish(topic,val);
+}
+
+#ifdef simplePublishing
+
   void pub(char * topic, String payload){
       client.publish(topic,(char *)payload.c_str());
   }
@@ -325,10 +337,6 @@ void pub(String topic, String payload){
       client.publish((char *)topic.c_str(),(char *)payload.c_str());
   }
 
-void pub(String topic, char *  payload){
-    client.publish((char *)topic.c_str(),payload);
-}
-
   void pub(String topic, int payload){
       char val[12];
       sprintf(val, "%d", payload);
@@ -359,12 +367,6 @@ void pub(char * topic, unsigned int payload){
       client.publish(topic,val);
   }
 
-void pub(char * topic, unsigned long payload){
-    char val[11];
-    sprintf(val, "%lu", payload);
-    client.publish(topic,val);
-}
-
   void pub(char * topic, long payload){
       char val[11];
       sprintf(val, "%l", payload);
@@ -382,6 +384,7 @@ void pub(String topic, unsigned long payload){
       sprintf(val, "%lu", payload);
       client.publish((char *)topic.c_str(),val);
   }
+#endif
 
 bool reconnect() {
 
@@ -762,15 +765,15 @@ void setup_wifimanager(bool reset_settings){
 void setup_ethernet() {
   if (gateway[0] != 0 || Dns[0]!=0)
   {
-    trc(F("Advanced ethernet config"));
+    trc(F("Adv eth cfg"));
     Ethernet.begin(mac, ip, Dns, gateway, subnet);
   }else{
-    trc(F("Simple ethernet config"));
+    trc(F("Spl eth cfg"));
     Ethernet.begin(mac, ip); 
   }
-  trc(F("OpenMQTTGateway ip: "));
+  trc(F("ip: "));
   Serial.println(Ethernet.localIP());
-  trc(F("Ethernet ok"));
+  trc(F("Eth ok"));
 }
 #endif
 
@@ -1045,13 +1048,13 @@ int getMin(){
 }
 
 bool isAduplicate(unsigned long value){
-trc(F("isAduplicate?"));
+  trc(F("isAdupl?"));
   // check if the value has been already sent during the last time_avoid_duplicate
   for (int i = 0; i < array_size;i++){
   if (ReceivedSignal[i][0] == value){
         unsigned long now = millis();
         if (now - ReceivedSignal[i][1] < time_avoid_duplicate){ // change
-      trc(F("--don't pub. duplicate--"));
+        trc(F("no pub. dupl"));
         return true;
       }
     }
@@ -1066,7 +1069,7 @@ void receivingMQTT(char * topicOri, char * datacallback) {
   
   if (strstr(topicOri, subjectMultiGTWKey) != NULL) // storing received value so as to avoid publishing this value if it has been already sent by this or another OpenMQTTGateway
   {
-    trc(F("Store signal"));
+    trc(F("Store str"));
     unsigned long data = 0;
     #ifdef jsonPublishing
       if (jsondata.success())  data =  jsondata["value"];
@@ -1078,7 +1081,7 @@ void receivingMQTT(char * topicOri, char * datacallback) {
     
     if (data != 0) {
       storeValue(data);
-      trc(F("Data JSON stored"));
+      trc(F("JSON str"));
     }
   }