Revision 5:6ffeac53b7cb, committed 2016-06-08

Comitter:

ubhat

Date:

Wed Jun 08 01:40:42 2016 +0000

Parent:

4:7a3ceb1ce02c

Child:

6:f8194e691dd4

Commit message:

Change state machine flow in main.cpp

Changed in this revision

--- a/app/Common.h	Thu May 19 18:40:59 2016 +0000
+++ b/app/Common.h	Wed Jun 08 01:40:42 2016 +0000
@@ -52,6 +52,8 @@
 
 extern uint8_t IsTxConfirmed; // Indicates if the node is sending confirmed or unconfirmed messages
 
+extern bool IsTxIntUpdate; // Indicates if a new transmit interrupt can be set
+
 extern bool NextTx; // Indicates if a new packet can be sent
 
 extern bool IsNetworkJoinedStatusUpdate; // Indicates if the MAC layer network join status has changed.

--- a/app/Config.h	Thu May 19 18:40:59 2016 +0000
+++ b/app/Config.h	Wed Jun 08 01:40:42 2016 +0000
@@ -36,17 +36,6 @@
 #define OVER_THE_AIR_ACTIVATION_DUTYCYCLE           5000000  // value in us
 
 /*!
- * Defines the application data transmission periodicity. It is the time between RX1/RX2 and next TX
- */
-#define APP_TX_DUTYCYCLE                            5000000  // value in us
-
-/*!
- * Default mote datarate
- * \remark DR_0 : 980 bps; DR_1 : 1760 bps; DR_2 : 3125 bps; DR_3 : 5470 bps; DR_4 : 12500 bps
- */
-#define LORAWAN_DEFAULT_DATARATE                    DR_0
-
-/*!
  * LoRaWAN confirmed messages
  * \remark 1 : Confirmed messages enabled. Must receive ACK from network server
            0 : Confirmed messages disabled. 
@@ -63,12 +52,7 @@
 /*!
  * LoRaWAN application port
  */
-#define LORAWAN_APP_PORT                            5
-
-/*!
- * User application data buffer size
- */
-#define LORAWAN_APP_DATA_SIZE                       11
+#define LORAWAN_APP_PORT                            7
 
 /*!
  * LoRaWAN User defined Tx Power
@@ -77,4 +61,73 @@
  */
 #define LORAWAN_TX_POWER                            TX_POWER_20_DBM
 
-#endif //  __LORA_CONFIG_H__
\ No newline at end of file
+#if ( LORAWAN_APP_PORT == 5)
+/*====================================================
+            US01 GPS APPLICATION DEMO (PORT 5)
+====================================================*/
+
+/*!
+ * Defines the application data transmission periodicity. It is the time between RX1/RX2 and next TX
+ */
+#define APP_TX_DUTYCYCLE                            5000000  // value in us
+
+/*!
+ * Default mote datarate
+ * \remark DR_0 : 980 bps; DR_1 : 1760 bps; DR_2 : 3125 bps; DR_3 : 5470 bps; DR_4 : 12500 bps
+ */
+#define LORAWAN_DEFAULT_DATARATE                    DR_0
+
+/*!
+ * User application data buffer size
+ */
+#define LORAWAN_APP_DATA_SIZE                       11
+
+/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
+
+#elif ( LORAWAN_APP_PORT == 6)
+/*====================================================
+                SENET M2X DEMO (PORT 6)
+====================================================*/
+
+/*!
+ * Defines the application data transmission periodicity. It is the time between RX1/RX2 and next TX
+ */
+#define APP_TX_DUTYCYCLE                            10000000  // value in us
+
+/*!
+ * Default mote datarate
+ * \remark DR_0 : 980 bps; DR_1 : 1760 bps; DR_2 : 3125 bps; DR_3 : 5470 bps; DR_4 : 12500 bps
+ */
+#define LORAWAN_DEFAULT_DATARATE                    DR_0
+
+/*!
+ * User application data buffer size
+ */
+#define LORAWAN_APP_DATA_SIZE                       2
+
+/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
+
+#elif ( LORAWAN_APP_PORT == 7)
+/*====================================================
+                SENET GPS DEMO (PORT 7)
+====================================================*/
+
+/*!
+ * Defines the application data transmission periodicity. It is the time between RX1/RX2 and next TX
+ */
+#define APP_TX_DUTYCYCLE                            5000000  // value in us
+
+/*!
+ * Default mote datarate
+ * \remark DR_0 : 980 bps; DR_1 : 1760 bps; DR_2 : 3125 bps; DR_3 : 5470 bps; DR_4 : 12500 bps
+ */
+#define LORAWAN_DEFAULT_DATARATE                    DR_0
+
+/*!
+ * User application data buffer size
+ */
+#define LORAWAN_APP_DATA_SIZE                       11
+
+#endif
+
+#endif //  __LORA_CONFIG_H__

--- a/app/LoRaDeviceStateProc.h	Thu May 19 18:40:59 2016 +0000
+++ b/app/LoRaDeviceStateProc.h	Wed Jun 08 01:40:42 2016 +0000
@@ -64,7 +64,6 @@
     DEVICE_STATE_INIT,
     DEVICE_STATE_JOIN,
     DEVICE_STATE_SEND,
-    DEVICE_STATE_CYCLE,
     DEVICE_STATE_SLEEP
 };
 

--- a/app/LoRaEventProc.cpp	Thu May 19 18:40:59 2016 +0000
+++ b/app/LoRaEventProc.cpp	Wed Jun 08 01:40:42 2016 +0000
@@ -16,6 +16,11 @@
 
 #include "LoRaEventProc.h"
 
+/*!
+ * Defines the application data transmission duty cycle
+ */
+uint32_t TxDutyCycleTime = APP_TX_DUTYCYCLE;
+
 bool AppLed = 0;
 
 /*!
@@ -120,6 +125,73 @@
     }
 }
 
+
+/*!
+ * \brief   Sets Interrupt for next payload transmission
+ */
+void InitNextTxInterrupt( uint8_t port )
+{   
+    switch( port )
+    {  
+    /* GPS Application Demo
+        Set Timer interrupt for next uplink
+    */
+    case 5:
+        { 
+        }
+
+    /* Senet + M2X demo
+    Set Timer interrupt for next uplink
+    */
+    case 6: 
+        { 
+            
+        }
+        
+    /* Senet GPS Demo 
+       Set Timer interrupt for next uplink
+    */  
+    case 7: 
+        { 
+            // Schedule next packet transmission
+            TxDutyCycleTime = APP_TX_DUTYCYCLE + randr( -APP_TX_DUTYCYCLE_RND, APP_TX_DUTYCYCLE_RND );
+            TimerSetValue( &TxNextPacketTimer, TxDutyCycleTime );
+            TimerStart( &TxNextPacketTimer );
+            break;
+        }
+
+    /* Push Button Demo 
+       Send Packet Immedietly
+    */  
+    case 11: 
+        { 
+            DeviceState = DEVICE_STATE_SEND;
+            NextTx = true;
+            break;
+        }   
+
+    /* Compliance Test 
+       Set Timer interrupt for next uplink
+    */
+    case 224:
+        {               
+            // Schedule next packet transmission
+            TimerSetValue( &TxNextPacketTimer, COMPLIANCE_TX_DUTYCYCLE );
+            TimerStart( &TxNextPacketTimer );
+            break;
+        }
+
+    default:
+        {
+            // Schedule next packet transmission
+            TimerSetValue( &TxNextPacketTimer, TxDutyCycleTime );
+            TimerStart( &TxNextPacketTimer );
+            break;
+        }
+    }
+
+}
+
 /*!
  * \brief   What to do during JOIN process ? blink/toggle LED etc.
  */

--- a/app/LoRaEventProc.h	Thu May 19 18:40:59 2016 +0000
+++ b/app/LoRaEventProc.h	Wed Jun 08 01:40:42 2016 +0000
@@ -21,6 +21,8 @@
 #include "LoRaApp.h"
 #include "LoRaDeviceStateProc.h"
 
+#define APP_TX_DUTYCYCLE_RND                        1000000
+
 /*!
  * \brief   Prepares the payload of the frame specific to the application port
  *
@@ -29,6 +31,11 @@
 void PrepareLoRaFrame( uint8_t port );
 
 /*!
+ * \brief   Prepares the payload of the frame based on application port
+ */
+void InitNextTxInterrupt( uint8_t port );
+
+/*!
  * \brief  Define action during the Network Join process: Blink, Toggle or Set LED ON
  */
 void JoinEvent( void );

--- a/app/LoRaMacLayerService.cpp	Thu May 19 18:40:59 2016 +0000
+++ b/app/LoRaMacLayerService.cpp	Wed Jun 08 01:40:42 2016 +0000
@@ -55,9 +55,7 @@
     LoRaMacUplinkStatus.UplinkCounter = McpsConfirm->UpLinkCounter;
     LoRaMacUplinkStatus.TxPower = McpsConfirm->TxPower;
 
-    DeviceState = DEVICE_STATE_CYCLE;
-
-    IsTxUpdate = true;
+    IsTxIntUpdate = true;
 }
 
 /*!
@@ -191,5 +189,9 @@
         }
     }
 
-    DeviceState = DEVICE_STATE_CYCLE;    
+    // Schedule next packet transmission
+    TimerSetValue( &TxNextPacketTimer, OVER_THE_AIR_ACTIVATION_DUTYCYCLE );
+    TimerStart( &TxNextPacketTimer );
+
+    DeviceState = DEVICE_STATE_SLEEP;
 }
\ No newline at end of file

--- a/app/main.cpp	Thu May 19 18:40:59 2016 +0000
+++ b/app/main.cpp	Wed Jun 08 01:40:42 2016 +0000
@@ -28,7 +28,6 @@
  * Defines a random delay for application data transmission duty cycle. 1s,
  * value in [us].
  */
-#define APP_TX_DUTYCYCLE_RND                        1000000
 
 
 #if( OVER_THE_AIR_ACTIVATION != 0 )
@@ -75,16 +74,16 @@
 uint8_t IsTxConfirmed = LORAWAN_CONFIRMED_MSG_ON;
 
 /*!
- * Defines the application data transmission duty cycle
- */
-static uint32_t TxDutyCycleTime;
-
-/*!
  * Timer to handle the application data transmission duty cycle
  */
 TimerEvent_t TxNextPacketTimer;
 
 /*!
+ * Indicates if a new transmit interrupt can be set
+ */
+bool IsTxIntUpdate = false;
+
+/*!
  * Indicates if a new packet can be sent
  */
 bool NextTx = true;
@@ -136,8 +135,17 @@
         {
             // If downlink received then update Serial Terminal and execute Rx event
             IsTxUpdate = false;
+            
             // Update serial terminal
-            SerialDisplayTxUpdate( );       
+            SerialDisplayTxUpdate( );           
+        }
+
+        if( IsTxIntUpdate == true )
+        {
+            IsTxIntUpdate = false;
+            
+            // Initialize next Tx Interrupt
+            InitNextTxInterrupt( AppPort );
         }
 
         if( IsRxUpdate == true )
@@ -175,8 +183,6 @@
                 // Execute Join event
                 JoinEvent( );
 
-                // Schedule next packet transmission
-                TxDutyCycleTime = OVER_THE_AIR_ACTIVATION_DUTYCYCLE;
                 DeviceState = DEVICE_STATE_SLEEP;
 
 #else                                           // ABP
@@ -198,30 +204,17 @@
                     NextTx = SendFrame( );
 
                     // Execute transmit event
-                    TxEvent( );
+                    TxEvent( );                 
                 }
-                if( ComplianceTest.Running == true )
+
+                if( NextTx == false )
                 {
-                    // Schedule next packet transmission as soon as possible
-                    TxDutyCycleTime = COMPLIANCE_TX_DUTYCYCLE;
+                    IsTxUpdate = true;
                 }
-                else
-                {
-                    // Schedule next packet transmission
-                    TxDutyCycleTime = APP_TX_DUTYCYCLE + randr( -APP_TX_DUTYCYCLE_RND, APP_TX_DUTYCYCLE_RND );
-                }
+                
                 DeviceState = DEVICE_STATE_SLEEP;
                 break;
-            }
-            case DEVICE_STATE_CYCLE:
-            {
-                // Schedule next packet transmission
-                TimerSetValue( &TxNextPacketTimer, TxDutyCycleTime );
-                TimerStart( &TxNextPacketTimer );
-
-                DeviceState = DEVICE_STATE_SLEEP;
-                break;
-            }
+            }            
             case DEVICE_STATE_SLEEP:
             {
                 // Wake up through events