Diff: app/l86.cpp

Revision:

14:6990bc2f44e9

Parent:

12:7debb1c79a06

diff -r ac84e36985a7 -r 6990bc2f44e9 app/l86.cpp
--- a/app/l86.cpp	Mon Nov 20 12:09:24 2017 +0000
+++ b/app/l86.cpp	Wed Nov 22 21:01:30 2017 +0000
@@ -97,7 +97,7 @@
         strcpy(GPS_parsed.Speed_Over_Ground,"0.00");
         strcpy(GPS_parsed.Course_Over_Ground,"000.00");
         strcpy(GPS_parsed.Date,"000000");
-        strcpy(GPS_parsed.Valid,"V");
+        strcpy(GPS_parsed.Valid,RMC_parsed.Status);
     }
     return GPS_parsed;
 }
@@ -114,32 +114,31 @@
 }
 
 /* Send GPS data using LoRa module */
-void Send_GPS_data(GPS_data GPS_data_parsed){
-    __disable_irq();
+void Send_GPS_data(GPS_data GPS_data_parsed, McpsReq_t *mcpsReqs){//, char *NodeID, char Boat_type){
     char AppData[APPDATA_SIZE];
     
-    // Could do this using a pointer and pointing to the first address of the struct?
+    // Could do this using a pointer and pointing to the address of the struct?
     // fill AppData byte array with GPS_data struct
-    strcat(AppData, GPS_data_parsed.UTC_Time);
+    // strcat(AppData, NodeID);
+    // strcat(AppData, ",");
+    // strcat(AppData, Boat_type);
+    // strcat(AppData, ",");
     strcat(AppData, GPS_data_parsed.Latitude);
+    strcat(AppData, ",");
     strcat(AppData, GPS_data_parsed.Longitude);
+    strcat(AppData, ",");
+    strcat(AppData, GPS_data_parsed.Course_Over_Ground);
+    strcat(AppData, ",");
     strcat(AppData, GPS_data_parsed.Speed_Over_Ground);
-    strcat(AppData, GPS_data_parsed.Course_Over_Ground);
+    strcat(AppData, ",");
     strcat(AppData, GPS_data_parsed.Date);
+    strcat(AppData, ",");
+    strcat(AppData, GPS_data_parsed.UTC_Time);
+    strcat(AppData, ",");
     strcat(AppData, GPS_data_parsed.Valid);
     
-    //pc2.printf(AppData); 
-  //Sendframe
-    
-    McpsReq_t mcpsReq;
-    
-    uint8_t AppPort = 3;
-    mcpsReq.Type = MCPS_UNCONFIRMED;
-    mcpsReq.Req.Unconfirmed.fPort = AppPort;
-    mcpsReq.Req.Unconfirmed.fBuffer = AppData;
-    mcpsReq.Req.Unconfirmed.fBufferSize = APPDATA_SIZE;
-    mcpsReq.Req.Unconfirmed.Datarate = DR_5;
-        
-    LoRaMacMcpsRequest( &mcpsReq );
-    __enable_irq();
+    //Sendframe
+            
+    // LoRaMacMcpsRequest( &mcpsReq );
+    //memset(&AppData[0], 0, sizeof(AppData));
 }