Senet Network Coverage Program

Diff: main.cpp

Revision:

1:fbf2fb2c2718

Parent:

0:46990814dc89

Child:

2:b9b2840d0d8b

--- a/main.cpp	Fri Mar 18 13:42:03 2016 +0000
+++ b/main.cpp	Thu Apr 21 11:13:49 2016 -0400
@@ -8,16 +8,17 @@
 #include "GeoPosition.h"
 #include "senet_packet.h"
 
-#define NORAM_MOTE_DEVICE_TYPE  0x1272 
-#define MAJOR                   1
-#define MINOR                   2
-#define POINT                   3
-#define BUILD_NUMBER            0
-#define DEVELOPER_ID            0
+#define NORAM_MOTE_DEVICE_TYPE  0x786531
 
+// Automatically generated by the program_device script
+#include "Commissioning.h"
+NORAM_MOTE_DEVICE_TYPE 0x786532 
+#define MAJOR          1
+#define MINOR          1
+#define POINT          1
+#define BUILD_NUMBER   0
+#define DEVELOPER_ID   0
 
-// Defines the Application EUI, Device EUI and Application Key 
-#include "Commissioning.h"
 
 
 // provide application router ID (8 bytes, LSBF)
@@ -37,7 +38,6 @@
     memcpy(buf, DEVKEY, 16);
 }
 
-
 typedef enum {
     MOTE_NONE = 0,
     MOTE_V2,
@@ -88,7 +88,7 @@
     uint8_t level = 0;
 
     if(bat != NULL)
-        level = (bat->read_u16() >> 8) + (bat->read_u16() >> 9);
+        level = ((bat->read_u16() >> 8) + (bat->read_u16() >> 9))>>5;
 
     debug("Battery level: %d\r\n", level);
     return level;
@@ -175,7 +175,7 @@
                 return true;
             }
             else
-            wait(.1);
+                wait(.1);
         }
     } 
     return false;
@@ -210,7 +210,7 @@
         {
             // Self Id packet type serialized to the LMIC frame buffer
             SelfIdPacket packet(LMIC.frame, MAX_LEN_FRAME);
-            
+           
             // Device Type
             packet.setDeviceType(NORAM_MOTE_DEVICE_TYPE, get_mote_version());
 
@@ -228,32 +228,17 @@
         case GPS_PACKET:
         default:
         { 
-            uint32_t latitude  = 0;
-            uint32_t longitude = 0;
-            uint16_t altitude  = 0;
-            
             // Gps packet type serialized to the LMIC frame buffer
             GpsPacket packet(LMIC.frame, MAX_LEN_FRAME);
-
-            // Get coordindats from GPS with retries
-            for(int32_t i=0; i<3; i++)
-            {
-                if(gps_service() == true)
-                {
-                    altitude  = atoi(gps.NmeaGpsData.NmeaAltitude);
-                    latitude  = gps.LatitudeBinary;
-                    longitude = gps.LongitudeBinary;
-
-                    lastTxPos.set(gps.Latitude,gps.Longitude);
-                    break;
-                }
-            }
-            // Set packet coordinates 
-            packet.setCoordinates(latitude, longitude, altitude);
-
+            
             // set packet transmit power
             packet.setTxPower(pw);
 
+            // Set packet coordinates 
+            uint16_t altitudeGps = atoi(gps.NmeaGpsData.NmeaAltitude);
+            packet.setCoordinates(gps.LatitudeBinary, gps.LongitudeBinary, altitudeGps); 
+            lastTxPos.set(gps.Latitude,gps.Longitude);
+           
             // Serialize  packet 
             pktLen = packet.serialize();
             break;
@@ -396,7 +381,7 @@
 
 static void onSendFrame(osjob_t* j)
 {
-    u1_t pktSize;
+    u1_t pktSize = 0;
 
     // Return if still transmitting. Next transmit will be scheduled by onEvent() when tx finishes  
     if (LMIC.opmode & OP_TXRXPEND) 
@@ -478,9 +463,21 @@
         }
         os_setTimedCallback( &txLedJob, os_getTime() + 1, txLedCb); 
     }
+
+    // Send GPS data 
+    for(int32_t i=0; i<3; i++)
+    {
+        if(gps_service() == true)
+        {
+            pktSize = PrepareDataFrame(GPS_PACKET); 
+            break;
+        }
+    }
+    
+    // if unable to get GPS, send self-id
+    if(0 == pktSize)
+        pktSize = PrepareDataFrame(SELF_ID_PACKET); 
    
-    // Build frame
-    pktSize = PrepareDataFrame(GPS_PACKET); 
 
     // Set next dr and tx power 
     LMIC_setDrTxpow(dr,pw);      
@@ -581,24 +578,14 @@
     {
     // network joined, session established
     case EV_JOINED:
-    {
+    { 
+        displayBuildInfo();
+        //
         // Disable link check validation
         LMIC_setLinkCheckMode(false);
 
-        // If upside down send a self-id packet
-        mma8451q.service();
-        MMA_orientation orientation = mma8451q.getOrientation(); 
-        if(orientation.right && (orientation.back || orientation.front))
-        {
-            debug("Tx self-id packet\r\n");
-            LMIC_setDrTxpow(0,30);      
-            u1_t pktSize = PrepareDataFrame(SELF_ID_PACKET); 
-            LMIC_setTxData2(1, LMIC.frame, pktSize, false); 
-            txMode = SELF_ID;
-        }
-        // Start test if mode determined. 
-        else if(operMode != IDLE)
-            os_setCallback( &sendFrameJob, onSendFrame);
+        // Start transmitting
+        os_setCallback( &sendFrameJob, onSendFrame);
 
         break;
     }