Commit: c08321812daa81a14d7c85d36b0b55ea7a938d98 - LoRa_Farm_IOT (git)

Commit MetaInfo

• Revisión: c08321812daa81a14d7c85d36b0b55ea7a938d98 (tree)
• Tiempo: 2020-11-18 23:05:43
• Autor: kazuhiro_kondow <simauma.circus@gmai...>
• Commiter: kazuhiro_kondow

Log Message

コンソールログをFマクロに置き換え

Cambiar Resumen

• modified: LoRa_farme/server_lg01/server_lg01.ino

Diferencia incremental

--- a/LoRa_farme/server_lg01/server_lg01.ino
+++ b/LoRa_farme/server_lg01/server_lg01.ino
@@ -78,7 +78,7 @@ void setup()
 
 void loop()
 {
-    Console.println(F("Start Listening "));
+    Console.println("Start Listening ");
     //receive data buffer
     uint8_t buf[MAX_DATA_SIZE];
     //data buffer length
@@ -98,23 +98,11 @@ void loop()
     // Listen Data from LoRa Node
     if (rf95.waitAvailableTimeout(2000))
     {
-        Console.println(F("Receive LoRa Message"));
+        Console.println("Receive LoRa Message");
         // Check and Store Recive Sensor Data
         if (rcvSensorData(buf,&len))
         {
-            Console.println(F("Recive success"));
-
-            // for debug
-            //  Console.println(F("recevi data "));
-            //  Console.print(F("len:"));
-            //  Console.println(len);
-            //  Console.println(F("buf:"));
-            //  for (int i = 0; i < len; i++)
-            //  {
-            //      Console.print(buf[i], HEX);
-            //      Console.print(",");
-            //  }
-            //  Console.println("");
+            Console.println("Recive success");
 
             // set MQTT Topics
             int topics_type = 0;
@@ -147,32 +135,32 @@ void loop()
             switch(topics_type)
             {
                 case 0:
-                    Console.println(F("None matching MQTT Topics!! Stop MQTT Publish."));
+                    Console.println("None matching MQTT Topics!! Stop MQTT Publish.");
                     break;
                 case 1:
-                    Console.println(F("send MQTT_TOPICS_STANDBY."));
+                    Console.println("send MQTT_TOPICS_STANDBY.");
                     runMQTTPub(postdata,F(MQTT_TOPICS_STANDBY));
                     break;
                 case 2:
-                    Console.println(F("send MQTT_TOPICS_ENV."));
+                    Console.println("send MQTT_TOPICS_ENV.");
                     runMQTTPub(postdata,F(MQTT_TOPICS_ENV));
                     break;
                 case 3:
-                    Console.println(F("send MQTT_TOPICS_TRAP."));
+                    Console.println("send MQTT_TOPICS_TRAP.");
                     runMQTTPub(postdata,F(MQTT_TOPICS_TRAP));
                     break;
                 case 4:
-                    Console.println(F("send MQTT_TOPICS_BOILER."));
+                    Console.println("send MQTT_TOPICS_BOILER.");
                     runMQTTPub(postdata,F(MQTT_TOPICS_BOILER));
                     break;
                 default:
-                    Console.println(F("Switch Topics is None matching..."));
+                    Console.println("Switch Topics is None matching...");
                     break;
             }
         }
         else
         {
-            Console.println(F("Recive Failure"));
+            Console.println("Recive Failure");
         }
     }
 }
@@ -239,8 +227,8 @@ boolean rcvSensorData(uint8_t *buf,uint8_t *len)
         }
         else
         {
-            Console.println(F("Bat CRC"));
-            Console.println(F("Send Reply NAK"));
+            Console.println("Bat CRC");
+            Console.println("Send Reply NAK");
             result = false;
         }
 
@@ -286,18 +274,18 @@ void runMQTTPub(const char*param,const String & topics)
     // Console.println(F("Called runMQTTPub."));
     
     Process process;
-    process.begin(F("mosquitto_pub"));
-    process.addParameter(F("-h"));
-    process.addParameter(F(MQTT_BROKER_URL));
-    process.addParameter(F("-p"));
-    process.addParameter(F(MQTT_BROKER_PORT));
-    process.addParameter(F("-u"));
-    process.addParameter(F(MQTT_USERNAME));
-    process.addParameter(F("-P"));
-    process.addParameter(F(MQTT_PASSWORD));
-    process.addParameter(F("-t"));
+    process.begin("mosquitto_pub");
+    process.addParameter("-h");
+    process.addParameter(MQTT_BROKER_URL);
+    process.addParameter("-p");
+    process.addParameter(MQTT_BROKER_PORT);
+    process.addParameter("-u");
+    process.addParameter(MQTT_USERNAME);
+    process.addParameter("-P");
+    process.addParameter(MQTT_PASSWORD);
+    process.addParameter("-t");
     process.addParameter(topics);
-    process.addParameter(F("-m"));
+    process.addParameter("-m");
     process.addParameter(param);
     process.run();
 
@@ -307,18 +295,18 @@ void runMQTTPub(const char*param,const String & topics)
         Console.print(c);
     }
     Console.println("");
-    Console.println(F("Process is not available!"));
+    Console.println("Process is not available!");
 
     Console.flush();
 }
 
 void runCurl()
 {
-    Console.println(F("Called runCurl."));
+    Console.println("Called runCurl.");
     
     Process process;
     
-    process.begin(F("curl"));
+    process.begin("curl");
     process.addParameter(F(KickUrl));
     process.run();
 
@@ -328,7 +316,7 @@ void runCurl()
         Console.print(c);
     }
     Console.println("");
-    Console.println(F("Process is not available!"));
+    Console.println("Process is not available!");
 
     Console.flush();
 }
@@ -338,7 +326,7 @@ unsigned long runUnixTimeStamp()
 {
     Process process;
     unsigned long unix_time_stamp_val = 0;
-    process.begin(F("date"));
+    process.begin("date");
     process.addParameter("+%s");
     process.run();