Commit: c919edccde5350aeacbee1bff00e6911641fd2b6 - LoRa_Farm_IOT (git)

Commit MetaInfo

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

Log Message

Merge branch 'master' of git.pf.osdn.net:/gitroot/k/ka/kazuhiro_kondow/LoRa_Farm_IOT

Cambiar Resumen

• modified: LoRaAgricultureSupportProject/.vscode/c_cpp_properties.json
• modified: LoRaAgricultureSupportProject/UserLoRaCommon.h
• modified: LoRaAgricultureSupportProject/UserLoRaInterface.h

Diferencia incremental

--- a/LoRaAgricultureSupportProject/.vscode/c_cpp_properties.json
+++ b/LoRaAgricultureSupportProject/.vscode/c_cpp_properties.json
@@ -4,7 +4,7 @@
             "name": "Win32",
             "browse": {
                 "path": [
-                    "C:\\Users\\user1\\AppData\\Local\\Arduino15\\packages\\arduino\\hardware\\avr\\1.6.21\\cores\\arduino",
+                    "C:\\Users\\user1\\AppData\\Local\\Arduino15\\packages\\arduino\\hardware\\megaavr\\1.8.1\\cores\\arduino",
                     "C:\\Program Files (x86)\\Arduino\\libraries",
                     "C:\\Program Files (x86)\\Arduino\\hardware\\arduino\\avr\\libraries",
                     "C:\\Users\\user1\\Documents\\Arduino\\libraries",
@@ -18,7 +18,7 @@
                 "${workspaceFolder}"
             ],
             "forcedInclude": [],
-            "intelliSenseMode": "msvc-x64",
+            "intelliSenseMode": "${default}",
             "compilerPath": "C:\\MinGW\\bin\\gcc.exe",
             "cStandard": "c11",
             "cppStandard": "c++17"

--- a/LoRaAgricultureSupportProject/UserLoRaCommon.h
+++ b/LoRaAgricultureSupportProject/UserLoRaCommon.h
@@ -52,6 +52,7 @@ typedef struct _st_standby_data
 {
     unsigned char msg_type;
     unsigned char unit_uuid[16];
+    unsigned char node_type;
     float lon;
     float lat;
 } st_standby_data;
@@ -62,7 +63,7 @@ typedef struct _st_boiler_data
     unsigned char unit_uuid[16];
     unsigned char node_type;
     unsigned char node_status;
-    float temperature_val[4];
+    float temperature_val[5];
 } st_boiler_data;
 
 typedef struct _st_environ_data

--- a/LoRaAgricultureSupportProject/UserLoRaInterface.h
+++ b/LoRaAgricultureSupportProject/UserLoRaInterface.h
@@ -1,3 +1,4 @@
+// 20200813  Serial.printの後にdelayを入れてコンソールへの送信時間を調整する事、蓄積するとデバイス側でResetが発生する
 #ifndef UserLoRaInterface_h
 #define UserLoRaInterface_h
 
@@ -17,7 +18,8 @@ bool sendUnitMsg(uint8_t *pBuffer, uint32_t length, unsigned char *pUuid, unsign
 // WAIT_RESPONSE_TIME unit:millis sec
 {
     //Send LoRa Data
-    Serial.println("sendUnitMsg");
+    // Serial.println(F("SRT sendUnitMsg"));
+    // delay(200);
     //Reply data array
     uni_respons_data buf;
     //reply data length
@@ -27,22 +29,26 @@ bool sendUnitMsg(uint8_t *pBuffer, uint32_t length, unsigned char *pUuid, unsign
     int retry_cnt= 0;
 
     // for debug
-    Serial.println("Send LoRa Data : ");
-    delay(100);
-    for (int i = 0; i < length + 2; i++)
-    {
-        Serial.print(pBuffer[i], HEX);
-        Serial.print(",");
-    }
-    Serial.println("");
+    // Serial.print(F("Data length : "));
+    // Serial.println(length);
+    // Serial.println(F("Send LoRa Data : "));
+    // delay(100);
+    // for (int i = 0; i < length + 2; i++)
+    // {
+    //     Serial.print(pBuffer[i], HEX);
+    //     Serial.print(",");
+    // }
+    // Serial.println("");
+    // delay(100);
 
     unsigned long send_time = millis();
 
     do{
         if(bRetryFlag)
         {
-            Serial.println("do send message"); // for debug
-            delay(100);
+            // Serial.println(F("do send message")); // for debug
+            // delay(150);
+
             rf95.send(pBuffer, length + 2);
             // rf95 changing mode it idle 
             rf95.waitPacketSent();
@@ -59,49 +65,65 @@ bool sendUnitMsg(uint8_t *pBuffer, uint32_t length, unsigned char *pUuid, unsign
             {
                 if(buf.val.msg_type != (uint8_t)MSG_TYPE_RESPONSE)
                 {
-                    Serial.println("Check MSG_TYPE_RESPONSE :continue"); // for debug
+                    // Serial.println(F("Check MSG_TYPE_RESPONSE :continue")); // for debug
+                    // delay(100);
                     continue;
                 }
+
                 // Check receved reply UUID
-                if (memcmp(buf.val.unit_uuid, pUuid, (size_t)16) != 0)
+                if (memcmp(buf.val.unit_uuid, pUuid, sizeof(*pUuid)) != 0)
                 {
-                    Serial.println("Check receved reply UUID :continue"); // for debug
+                    // Serial.println(F("Check receved reply UUID :continue")); // for debug
+                    // delay(100);
                     continue;
                 }
                 else
                 {
                     if (buf.val.respons == 0x06)
                     {
-                        Serial.println("Replay ACK");
+                        // Serial.println(F("Replay ACK"));
+                        // Serial.print("u time:");
+                        // Serial.println(buf.val.unix_time_stamp_val);
+                        // delay(200);
                         *rtime = buf.val.unix_time_stamp_val;
                         break;
                     }
                     else if (buf.val.respons == 0x21)
                     {
-                        Serial.println("Replay NAK");
+                        Serial.println(F("Replay NAK"));
+                        delay(200);
                         bRetryFlag = true;
                     }
                     else
                     {
-                        Serial.println("Replay Unkown");
+                        Serial.println(F("Replay Unkown"));
+                        delay(200);
                         bRetryFlag = true;
                     }
                 }
             }
             else
             {
-                Serial.println("recv failed");
+                Serial.println(F("Recv failed"));
+                delay(100);
                 bRetryFlag = true;
             }
         }
         else
         {
-            Serial.println("No reply, is rf95_server running?"); //No signal reply
+            Serial.println(F("No Replay")); //No signal reply
+            delay(200);
             bRetryFlag = true;
         }
-        bResultFlag = (((millis() - send_time) < WAIT_RESPONSE_TIME ) && (retry_cnt < SEND_RETRY_MAX));
+
+        unsigned long send_time2 = millis();
+        bResultFlag = (((send_time2 - send_time) < WAIT_RESPONSE_TIME ) && (retry_cnt < SEND_RETRY_MAX));
+
     }while(bResultFlag);
 
+    // Serial.println(F("END sendUnitMsg"));
+    // delay(200);
+
     return bResultFlag;
 }