Diff: lmic.h

Revision:

10:894167ed3d77

Parent:

8:34cb24e0b061

diff -r c5820ce68bd6 -r 894167ed3d77 lmic.h
--- a/lmic.h	Tue Feb 23 08:41:36 2016 +0000
+++ b/lmic.h	Fri Sep 23 09:09:37 2016 +0000
@@ -44,18 +44,20 @@
        LINK_CHECK_INIT    = -12 ,    // UP frame count until we inc datarate
        LINK_CHECK_OFF     =-128 };   // link check disabled
 
-/*enum { TIME_RESYNC        =  6*128 }; // secs
+enum { TIME_RESYNC        =  6*128 }; // secs
 enum { TXRX_GUARD_ms      =  6000 };  // msecs - don't start TX-RX transaction before beacon
 enum { JOIN_GUARD_ms      =  9000 };  // msecs - don't start Join Req/Acc transaction before beacon
 enum { TXRX_BCNEXT_secs   =     2 };  // secs - earliest start after beacon time
-enum { RETRY_PERIOD_secs  =     3 };  // secs - random period for retrying a confirmed send*/
+enum { RETRY_PERIOD_secs  =     3 };  // secs - random period for retrying a confirmed send
 
 //PANY
+/*
 enum { TIME_RESYNC        =  6*128 }; // secs
 enum { TXRX_GUARD_ms      =  1000 };  // msecs - don't start TX-RX transaction before beacon
 enum { JOIN_GUARD_ms      =  1000 };  // msecs - don't start Join Req/Acc transaction before beacon
 enum { TXRX_BCNEXT_secs   =     1 };  // secs - earliest start after beacon time
 enum { RETRY_PERIOD_secs  =     1 };  // secs - random period for retrying a confirmed send
+*/
 //PANY
 #if defined(CFG_eu868) // EU868 spectrum ====================================================
 
@@ -263,7 +265,7 @@
 void  LMIC_reset        (void);
 void  LMIC_clrTxData    (void);
 void  LMIC_setTxData    (void);
-int   LMIC_setTxData2   (u1_t port, xref2u1_t data, u1_t dlen, u1_t confirmed);
+int   LMIC_setTxData2   (u1_t port, xref2u1_t data, u1_t dlen, u1_t confirmed, int encrypted);
 void  LMIC_sendAlive    (void);
 
 bit_t LMIC_enableTracking  (u1_t tryBcnInfo);