Diff: main.cpp

Revision:

12:f28b629d8a6e

Parent:

11:59c160a8926d

Child:

13:9de42df1d3d8

--- a/main.cpp	Tue Jan 19 14:22:28 2016 +0000
+++ b/main.cpp	Mon Feb 08 10:39:15 2016 +0000
@@ -93,7 +93,10 @@
 /*!
  * Defines the application data transmission duty cycle
  */
-#define APP_TX_DUTYCYCLE                            5000 // 5 [s] value in ms
+//#define APP_TX_DUTYCYCLE                            5000 // 5 [s] value in ms
+//PANY
+#define APP_TX_DUTYCYCLE                            1000 // 1 [s] value in ms
+//PANY
 #define APP_TX_DUTYCYCLE_RND                        1000 // 1 [s] value in ms
 
 /*!
@@ -466,12 +469,12 @@
 
 static void onRxLed( osjob_t* j )
 {
-    debug_val("LED2 = ", 0 );
+//    debug_val("LED2 = ", 0 );
 }
 
 static void onTxLed( osjob_t* j )
 {
-    debug_val("LED1 = ", 0 );
+//    debug_val("LED1 = ", 0 );
 }
 
 static void prepareTxCoapFrame( void )
@@ -735,7 +738,7 @@
                 debug_hex(LMIC.frame[LMIC.dataBeg]);
                 debug_str("\r\n");
                 AppLedStateOn = LMIC.frame[LMIC.dataBeg] & 0x01;
-                debug_val( "LED3 = ", AppLedStateOn );
+                //debug_val( "LED3 = ", AppLedStateOn );
             }
             break;
         default:
@@ -753,8 +756,11 @@
     LMIC_setTxData2( LORAWAN_APP_PORT, LMIC.frame, LoRaWAN_data_size, LORAWAN_CONFIRMED_MSG_ON );
 
     // Blink Tx LED
-    debug_val( "LED1 = ", 1 );
+    //debug_val( "LED1 = ", 1 );
     os_setTimedCallback( &txLedJob, os_getTime( ) + ms2osticks( 25 ), onTxLed );
+    /*    os_setTimedCallback( &sendFrameJob,
+                             os_getTime( ) + ms2osticks( APP_TX_DUTYCYCLE + randr( -APP_TX_DUTYCYCLE_RND, APP_TX_DUTYCYCLE_RND ) ),
+                             onSendFrame );*/
 }
 
 // Initialization job
@@ -832,7 +838,7 @@
         // Check if we have a downlink on either Rx1 or Rx2 windows
         if( ( LMIC.txrxFlags & ( TXRX_DNW1 | TXRX_DNW2 ) ) != 0 )
         {
-            debug_val( "LED2 = ", 1 );
+//            debug_val( "LED2 = ", 1 );
             os_setTimedCallback( &rxLedJob, os_getTime( ) + ms2osticks( 25 ), onRxLed );
 
             if( LMIC.dataLen != 0 )
@@ -852,7 +858,7 @@
         os_setTimedCallback( &sendFrameJob,
                              os_getTime( ) + ms2osticks( APP_TX_DUTYCYCLE + randr( -APP_TX_DUTYCYCLE_RND, APP_TX_DUTYCYCLE_RND ) ),
                              onSendFrame );
-        
+        //os_setCallback( &sendFrameJob, onSendFrame );
         ////Sends frame as soon as possible (duty cylce limitations)
         //onSendFrame( NULL );
     }