Diff: app/LoRaEventProc.cpp

Revision:

2:78df92a365c2

Parent:

1:80c1daf19aa4

Child:

3:4bca7f8f731a

--- a/app/LoRaEventProc.cpp	Fri Aug 26 20:51:07 2016 +0000
+++ b/app/LoRaEventProc.cpp	Sat Aug 27 04:03:02 2016 +0000
@@ -46,22 +46,38 @@
             LoRaApp.ApplicationAppendData( &tmp, tmpLength ); // Populate lower nibble of 0th Byte with LED state            
 
             /*!
+            *  Generate Ramp data bytes
+            *  Appends incremental values of 1 Byte each to TX buffer until Full
+            */
+            LoRaApp.ApplicationCall( AppRamp );
+
+            break;
+        }   
+
+    case 8: 
+        { 
+            uint8_t ptrIndex = 0;
+                        
+            //Point the pointer to position index of Tx Buffer
+            LoRaApp.ApplicationPtrPos( ptrIndex );                         
+                        
+            /*!
+            *  Read Pressure
+            *  Appends 2 Bytes to TX buffer
+            */
+            LoRaApp.ApplicationCall( AppPressr );
+            
+            /*!
             *  Read Temperature
             *  Appends 1 Byte to TX buffer
             */
             LoRaApp.ApplicationCall( AppTemp );
-
+            
             /*!
-            *  Read Battery
+            *  Read Humidity
             *  Appends 1 Byte to TX buffer
             */
-            LoRaApp.ApplicationCall( AppBat );
-
-            /*!
-            *  Read GPS coordinates
-            *  Appends 8 Bytes (3 bytes longitude, 3 bytes latitude, 2 bytes altitude) to TX buffer
-            */
-            LoRaApp.ApplicationCall( AppGps );            
+            LoRaApp.ApplicationCall( AppHumid );
 
             /*!
             *  Read Accelerometer
@@ -73,49 +89,6 @@
             */
             LoRaApp.ApplicationCall( AppAccl ); // Generate Accelerometer data bytes    
 
-            /*!
-            *  Generate Ramp data bytes
-            *  Appends incremental values of 1 Byte each to TX buffer until Full
-            */
-            LoRaApp.ApplicationCall( AppRamp );
-
-            break;
-        }   
-
-    // Senet M2X ORIENTATION Demo 
-    // Set LORAWAN_APP_DATA_SIZE to 2
-    case 6: 
-        { 
-            uint8_t ptrIndex = 1;
-            
-            //Point the pointer to position index of Tx Buffer
-            LoRaApp.ApplicationPtrPos( ptrIndex );
-            
-            LoRaApp.ApplicationCall( AppAcclSenet ); // Generate Accelerometer data bytes    
-            
-            
-
-            break;
-        }
-        
-    /* Senet GPS Demo 
-       Data Format (in Hex):
-            [01, 02, Lattitude (3 bytes), Longitude (3 Bytes), Elevation (2 bytes), Tx Power (1 byte)]
-    */  
-    case 7: 
-        { 
-            uint8_t ptrIndex = 0;
-            uint8_t tmp[] = {0x01, 0x02};
-            
-            //Point the pointer to position index of Tx Buffer
-            LoRaApp.ApplicationPtrPos( ptrIndex );
-            
-            LoRaApp.ApplicationAppendData( tmp, 2 );  
-            
-            LoRaApp.ApplicationCall( AppGps ); // Generate Accelerometer data bytes  
-            
-            uint8_t pow = 30 - 2*(( uint8_t ) LoRaMacUplinkStatus.TxPower);
-            LoRaApp.ApplicationAppendData( &pow, 1 );  
 
             break;
         }
@@ -132,20 +105,7 @@
             
             break;
         }
-
-    // Transmit on Vertical Orientation Demo     
-    case 12: 
-        { 
-            uint8_t ptrIndex = 0;
-            
-            //Point the pointer to position index of Tx Buffer
-            LoRaApp.ApplicationPtrPos( ptrIndex );
-            
-            LoRaApp.ApplicationCall( AppPushButton ); // Transmit uplink counter      
-            
-            break;
-        }
-        
+    
     default:
         break;
     }
@@ -300,12 +260,12 @@
     if( AppLed != 0 )
     {
         // Turn  USR_LED ON
-        //CtrlLED( Usr, LED_ON );
+        //UsrLED = 3.3;
     }
     else
     {
         // Turn  USR_LED OFF
-        //CtrlLED( Usr, LED_OFF );
+        //UsrLED = 0;
     }
 }