Diff: serial_cmds.cpp

Revision:

67:17addc7bf8c2

Parent:

66:f40f985a6b97

Child:

68:fc357095c8ef

--- a/serial_cmds.cpp	Wed Mar 10 13:40:55 2021 +0000
+++ b/serial_cmds.cpp	Fri Mar 12 13:33:06 2021 +0000
@@ -1,5 +1,6 @@
 #include "serial.h"
 
+gps_navPVT gps_data;
 
 bool SerialCommandRun(const char *msg)
 {
@@ -12,7 +13,11 @@
         {int local_lat, local_log;
         //gps_get_lat_lon(&local_lat, &local_log);
         //get_latitude
-        pc.printf("<g%d,%d\n>", get_latitude(), get_longitude());
+        //pc.printf("<g%d,%d\n>", get_latitude(), get_longitude());
+        pc.printf("<g%d,%d\n>", (int)gps_data.lat, (int)gps_data.lon);
+        
+        pc.printf("<t%d/%d/%d-%d:%d:%d\n>", (int)gps_data.year, (int)gps_data.month,(int)gps_data.day, (int)gps_data.hour, (int)gps_data.min, (int)gps_data.sec);
+        
         break;}
         
     case CMD_SEND_HELLO:
@@ -34,7 +39,7 @@
         break;}
     case CMD_SEND_LORAWAN_NO_RETRANS:
         {pc.printf("<w %s>", msg[+2]);
-        char msg_lora [32]; 
+        char msg_lora [256]; 
         strncpy(msg_lora, msg+2, strlen(msg)); //original string, begin index (2), substring length
         int ret1;
         ret1 = lora_send_message((uint8_t*)msg_lora, (uint16_t)strlen(msg_lora));
@@ -50,6 +55,28 @@
             pc.printf("Fail to Send\n");
         }
         break;}
+        
+        case CMD_SEND_LORAWAN_RETRANS:
+        {pc.printf("<w %s>", msg[+2]);
+        char msg_lora_retrans [256]; 
+        strncpy(msg_lora_retrans, msg+2, strlen(msg)); //original string, begin index (2), substring length
+        int ret2;
+        ret2 = lora_send_message((uint8_t*)msg_lora_retrans, (uint16_t)strlen(msg_lora_retrans));
+        if(ret2 > 0){
+            pc.printf("Send OK\n");
+        }
+        else{
+            ret2 == LORAWAN_STATUS_WOULD_BLOCK ? pc.printf("send - WOULD BLOCK\r\n") : pc.printf("\r\n send() Error  \r\n");
+            if (ret2 == LORAWAN_STATUS_WOULD_BLOCK) {
+            //retry in 3 seconds
+                if (MBED_CONF_LORA_DUTY_CYCLE_ON) {
+                    //ev_queue.call_in(10000, lora_send_message);
+                    wait_ms(3000);
+                    ret2 = lora_send_message((uint8_t*)msg_lora_retrans, (uint16_t)strlen(msg_lora_retrans));
+                    }
+            pc.printf("Fail to Send\n");}
+        }
+        break;}
     }
     
     return true;