Lean on Arduino log library instead of custom logging methods (#546)

* Lean on Arduino log library instead of custom logging methods

main/ZgatewayRF.ino

@@ -38,12 +38,11 @@ void RFtoMQTTdiscovery(unsigned long MQTTvalue)
 { //on the fly switch creation from received RF values
   char val[11];
   sprintf(val, "%lu", MQTTvalue);
-  trc(F("switchRFDiscovery"));
+  Log.trace(F("switchRFDiscovery" CR));
   char *switchRF[8] = {"switch", val, "", "", "", val, "", ""};
   //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
 
-  trc(F("CreateDiscoverySwitch"));
-  trc(switchRF[1]);
+  Log.trace(F("CreateDiscoverySwitch: %s" CR),switchRF[1]);
   createDiscovery(switchRF[0],
                   subjectRFtoMQTT, switchRF[1], (char *)getUniqueId(switchRF[1], switchRF[2]).c_str(),
                   will_Topic, switchRF[3], switchRF[4],
@@ -56,14 +55,12 @@ void setupRF()
 {
 
   //RF init parameters
+  Log.notice(F("RF_EMITTER_PIN: %d " CR), RF_EMITTER_PIN);
+  Log.notice(F("RF_RECEIVER_PIN: %d " CR), RF_RECEIVER_PIN);
   mySwitch.enableTransmit(RF_EMITTER_PIN);
-  trc(F("RF_EMITTER_PIN "));
-  trc(RF_EMITTER_PIN);
   mySwitch.setRepeatTransmit(RF_EMITTER_REPEAT);
   mySwitch.enableReceive(RF_RECEIVER_PIN);
-  trc(F("RF_RECEIVER_PIN "));
-  trc(RF_RECEIVER_PIN);
-  trc(F("RF setup ok"));
+  Log.trace(F("ZgatewayRF setup done" CR));
 }
 
 void RFtoMQTT()
@@ -74,11 +71,9 @@ void RFtoMQTT()
     const int JSON_MSG_CALC_BUFFER = JSON_OBJECT_SIZE(4);
     StaticJsonBuffer<JSON_MSG_CALC_BUFFER> jsonBuffer;
     JsonObject &RFdata = jsonBuffer.createObject();
-    trc(F("Rcv. RF"));
+    Log.trace(F("Rcv. RF" CR));
 #ifdef ESP32
-    String taskMessage = "RF Task running on core ";
-    taskMessage = taskMessage + xPortGetCoreID();
-    trc(taskMessage);
+    Log.trace(F("RF Task running on core :%d" CR),xPortGetCoreID());
 #endif
     RFdata.set("value", (unsigned long)mySwitch.getReceivedValue());
     RFdata.set("protocol", (int)mySwitch.getReceivedProtocol());
@@ -93,11 +88,11 @@ void RFtoMQTT()
       RFtoMQTTdiscovery(MQTTvalue);
 #endif
       pub(subjectRFtoMQTT, RFdata);
-      trc(F("Store val"));
+      Log.trace(F("Store val: %lu" CR), MQTTvalue);
       storeValue(MQTTvalue);
       if (repeatRFwMQTT)
       {
-        trc(F("Pub RF for rpt"));
+        Log.trace(F("Pub RF for rpt" CR));
         pub(subjectMQTTtoRF, RFdata);
       }
     }
@@ -121,8 +116,6 @@ void MQTTtoRF(char *topicOri, char *datacallback)
   {
     pos = pos + +strlen(RFprotocolKey);
     valuePRT = (topic.substring(pos, pos + 1)).toInt();
-    trc(F("RF Protocol:"));
-    trc(valuePRT);
   }
   //We look into the subject to see if a special RF pulselength is defined
   int pos2 = topic.lastIndexOf(RFpulselengthKey);
@@ -130,21 +123,17 @@ void MQTTtoRF(char *topicOri, char *datacallback)
   {
     pos2 = pos2 + strlen(RFpulselengthKey);
     valuePLSL = (topic.substring(pos2, pos2 + 3)).toInt();
-    trc(F("RF Pulse Lgth:"));
-    trc(valuePLSL);
   }
   int pos3 = topic.lastIndexOf(RFbitsKey);
   if (pos3 != -1)
   {
     pos3 = pos3 + strlen(RFbitsKey);
     valueBITS = (topic.substring(pos3, pos3 + 2)).toInt();
-    trc(F("Bits nb:"));
-    trc(valueBITS);
   }
 
   if ((cmpToMainTopic(topicOri, subjectMQTTtoRF)) && (valuePRT == 0) && (valuePLSL == 0) && (valueBITS == 0))
   {
-    trc(F("MQTTtoRF dflt"));
+    Log.trace(F("MQTTtoRF dflt" CR));
     mySwitch.setProtocol(1, 350);
     mySwitch.send(data, 24);
     // Acknowledgement to the GTWRF topic
@@ -152,16 +141,16 @@ void MQTTtoRF(char *topicOri, char *datacallback)
   }
   else if ((valuePRT != 0) || (valuePLSL != 0) || (valueBITS != 0))
   {
-    trc(F("MQTTtoRF usr par."));
+    Log.trace(F("MQTTtoRF usr par." CR));
     if (valuePRT == 0)
       valuePRT = 1;
     if (valuePLSL == 0)
       valuePLSL = 350;
     if (valueBITS == 0)
       valueBITS = 24;
-    trc(valuePRT);
-    trc(valuePLSL);
-    trc(valueBITS);
+    Log.notice(F("RF Protocol:%d" CR), valuePRT);
+    Log.notice(F("RF Pulse Lgth: %d" CR), valuePLSL);
+    Log.notice(F("Bits nb: %d" CR), valueBITS);
     mySwitch.setProtocol(valuePRT, valuePLSL);
     mySwitch.send(data, valueBITS);
     // Acknowledgement to the GTWRF topic
@@ -175,7 +164,7 @@ void MQTTtoRF(char *topicOri, JsonObject &RFdata)
 { // json object decoding
   if (cmpToMainTopic(topicOri, subjectMQTTtoRF))
   {
-    trc(F("MQTTtoRF json"));
+    Log.trace(F("MQTTtoRF json" CR));
     unsigned long data = RFdata["value"];
     if (data != 0)
     {
@@ -183,16 +172,19 @@ void MQTTtoRF(char *topicOri, JsonObject &RFdata)
       int valuePLSL = RFdata["delay"] | 350;
       int valueBITS = RFdata["length"] | 24;
       int valueRPT = RFdata["repeat"] | RF_EMITTER_REPEAT;
+      Log.notice(F("RF Protocol:%d" CR), valuePRT);
+      Log.notice(F("RF Pulse Lgth: %d" CR), valuePLSL);
+      Log.notice(F("Bits nb: %d" CR), valueBITS);
       mySwitch.setRepeatTransmit(valueRPT);
       mySwitch.setProtocol(valuePRT, valuePLSL);
       mySwitch.send(data, valueBITS);
-      trc(F("MQTTtoRF OK"));
+      Log.notice(F("MQTTtoRF OK" CR));
       pub(subjectGTWRFtoMQTT, RFdata);               // 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
       mySwitch.setRepeatTransmit(RF_EMITTER_REPEAT); // Restore the default value
     }
     else
     {
-      trc(F("MQTTtoRF Fail json"));
+      Log.error(F("MQTTtoRF Fail json" CR));
     }
   }
 }