Senet Network Coverage Program

Diff: main.cpp

Revision:

16:2e5438977b6c

Parent:

10:72c5e2cfa473

Child:

19:e37b3bd60d5a

--- a/main.cpp	Fri Aug 12 13:54:34 2016 +0000
+++ b/main.cpp	Fri Sep 02 14:09:07 2016 +0000
@@ -17,7 +17,7 @@
 #define BUILD_NUMBER   0
 #define DEVELOPER_ID   0
 
-#define DR_TX_FLOATING
+
 
 // provide application router ID (8 bytes, LSBF)
 void os_getArtEui (u1_t* buf) {
@@ -65,10 +65,6 @@
 u1_t dr = 0;
 // Applicative transmit power
 u1_t pw = 0;
-// x-y-z orientation
-uint16_t orientation_mask = 0x0000;
-// is the device moving or not
-bool stationary = true;
 
 // LEDs
 #define LED_RED         PB_1
@@ -227,25 +223,6 @@
 
             break;
         }
-        case SENSOR_PACKET:
-        {
-            // Read Sensors
-            mpl3115a2.SetModeActive();
-            uint16_t pressure = mpl3115a2.ReadBarometer();
-            uint16_t temperature = mpl3115a2.ReadTemperature();
-            mpl3115a2.SetModeStandby();
-                        
-            // Sensor packet type serialized to the LMIC frame buffer
-            SensorPacket packet(LMIC.frame, MAX_LEN_FRAME);
-            packet.setPrimarySensor(orientation_mask);
-            packet.setTemperature(temperature);
-            packet.setPressure(pressure);
-            
-            // Serialize  packet to LMIC transmit buffer
-            pktLen = packet.serialize();
-
-            break;
-        }
         case GPS_PACKET:
         default:
         { 
@@ -298,9 +275,6 @@
 {
     // reset MAC state
     LMIC_reset(); 
-#ifdef DR_TX_FLOATING
-    LMIC_setAdrMode(true);
-#endif
     // start joining
     LMIC_startJoining();
 }
@@ -487,29 +461,25 @@
         }
         os_setTimedCallback( &txLedJob, os_getTime() + 1, txLedCb); 
     }
-#ifndef DR_TX_FLOATING
-    // Set next dr and tx power 
-    LMIC_setDrTxpow(dr,pw);   
-#else
-    pw = LMIC.txpow;   
-#endif
+
     // Send GPS data 
     for(int32_t i=0; i<3; i++)
     {
         if(gps_service() == true)
         {
-            if(!stationary || (0 != txCount&0x7))
-                pktSize = PrepareDataFrame(GPS_PACKET); 
-                            
+            pktSize = PrepareDataFrame(GPS_PACKET); 
             break;
         }
     }
     
-    // if unable to get GPS or stationary, send sensor packet
+    // if unable to get GPS, send self-id
     if(0 == pktSize)
-        pktSize = PrepareDataFrame(SENSOR_PACKET); 
+        pktSize = PrepareDataFrame(SELF_ID_PACKET); 
    
 
+    // Set next dr and tx power 
+    LMIC_setDrTxpow(dr,pw);      
+
     txCount++;
     txMode = operMode;
 
@@ -524,15 +494,17 @@
 
     debug("%u seconds elapsed since last test\r\n",osticks2ms(os_getTime()-lastTestDoneT)/1000);
 
-    stationary = true;
-    if(gps_service())
+    if(os_getTime() >= startT)
+    {
+        os_setCallback( &sendFrameJob, onSendFrame ); 
+    }
+    else if(gps_service())
     {
         // Do we have last tx coordinates 
         if((lastTxPos.latitude() == 0) && (lastTxPos.longitude() == 0))
         {
             // Set last tx position to current location 
             lastTxPos.set(gps.Latitude,gps.Longitude);
-            stationary = false;
         }
         else
         {
@@ -542,16 +514,11 @@
             if(distance >= RANGE_START_TEST_DISTANCE)
             {
                 debug("position change %f >= %u\r\n",distance, RANGE_START_TEST_DISTANCE);
-                stationary = false;
                 os_setCallback( &sendFrameJob, onSendFrame ); 
                 return;
             }
         }
     }
-    else if(os_getTime() >= startT)
-    {
-        os_setCallback( &sendFrameJob, onSendFrame ); 
-    }
     
     // Schedule next check 
     ostime_t nextChkT = os_getTime() + sec2osticks(RANGE_NEXT_TEST_DISTANCE_T);
@@ -767,90 +734,26 @@
     os_setTimedCallback( &statusLedJob, os_getTime() + sec2osticks(sleep), statusLedCb ); 
 }
 
-bool leds_are_down = false;
 
 static void orientationJobCb(osjob_t *job)
 {
     static MMA_orientation last;
-           MMA_orientation orientation;
+           MMA_orientation current;
            int             sleepTime = ORIENTATION_CHECK_PERIOD;
 
     mma8451q.service();
-    orientation = mma8451q.getOrientation(); 
+    current = mma8451q.getOrientation(); 
 
-    if(orientation != last)
+    if(current != last)
     {
-        last = orientation;
+        last = current;
         sleepTime  = ORIENTATION_DEBOUNCE_TIME;
     }
     else 
-    { 
-    /* Get orientation using the portrait/landscape status
-         * When viewing device from front orientation is: 
-         *  - LED UP    = landscape right
-         *  - LED LEFT  = portrait up
-         *  - LED DOWN  = landscape left
-         *  - LED RIGHT = portrait down
-         *
-         *  NOTE:
-         *    When low is true the device is flat and the orientation will always be portrait up
-         *
-         */
-         
-         bool flat  = false;
-         bool up    = false;
-         bool down  = false;
-         bool right = false;
-         bool left  = false;
+    {
+        const bool currIsVertical = !current.low && current.right;
+        const OperMode mode = currIsVertical ? SITE_TEST : RANGE_TEST; 
 
-        if(orientation.low)
-        {
-            flat = true;
-        }
-        else if(orientation.right)
-        {
-            up  = true;
-        }
-        else if(orientation.up)
-        {
-            left = true;
-        }
-        else if(orientation.left)
-        {
-            down = true;
-        }
-        else if(orientation.down)
-        {
-            right = true;
-        }
-
-        const OperMode mode = up ? SITE_TEST : RANGE_TEST; 
-        
-        uint16_t new_orientation_mask;
-        
-        /* Orientation mask values
-         *  - LED-UP    = 1000
-         *  - LED-LEFT  = 0100
-         *  - LED-DOWN  = 0010
-         *  - LED-RIGHT = 0001
-         * Flat
-         *  - front is up   = 2000
-         *  - front is down = 2100
-         */
-        if(!flat)
-        {
-            new_orientation_mask = (up << 12) | (left << 8) | (down << 4) | right;
-        }
-        else
-        {
-            new_orientation_mask = (2 << 12) | (orientation.back << 8);
-        }
-        
-        leds_are_down = down;
-
-        bool send_now = new_orientation_mask != orientation_mask;
-        orientation_mask = new_orientation_mask;
-        
         if(mode != operMode)
         {
             debug("Change to %s mode\r\n", mode==SITE_TEST?"Site":"Range");
@@ -882,8 +785,6 @@
             sitePw  = 0;
             memset(siteAck, 0, sizeof(siteAck));
         }
-        else if (send_now)
-            os_setCallback( &sendFrameJob, onSendFrame);
     }
 
     os_setTimedCallback( &orientationJob, os_getTime() + sec2osticks(sleepTime), orientationJobCb );