Merge pull request #406 from mcci-catena/issue397

Improve EU868 compliance

Author: terrillmoore

src/lmic/lmic.c

@@ -832,7 +832,8 @@ scan_mac_cmds_link_adr(
 
         // can we advance?
         if (olen - oidx < kAdrReqSize) {
-            // ignore the malformed one at the end
+            // ignore the malformed one at the end; but fail it.
+            adrAns = 0;
             break;
         }
         u1_t p1     = opts[oidx+1];            // txpow + DR
@@ -841,8 +842,10 @@ scan_mac_cmds_link_adr(
         // u1_t uprpt  = opts[oidx+4] & MCMD_LinkADRReq_Redundancy_NbTrans_MASK;     // up repeat count
         dr_t dr = (dr_t)(p1>>MCMD_LinkADRReq_DR_SHIFT);
 
-        if( !LMICbandplan_canMapChannels(chpage, chmap) )
+        if( !LMICbandplan_canMapChannels(chpage, chmap) ) {
             adrAns &= ~MCMD_LinkADRAns_ChannelACK;
+            LMICOS_logEventUint32("scan_mac_cmds_link_adr: failed canMapChannels", (chpage << UINT32_C(16))|(chmap << UINT32_C(0)));
+        }
 
         if( !validDR(dr) ) {
             adrAns &= ~MCMD_LinkADRAns_DataRateACK;
@@ -970,9 +973,6 @@ scan_mac_cmds(
         case MCMD_DutyCycleReq: {
 #if !defined(DISABLE_MCMD_DutyCycleReq)
             u1_t cap = opts[oidx+1];
-            // A value cap=0xFF means device is OFF unless enabled again manually.
-            if( cap==0xFF )
-                LMIC.opmode |= OP_SHUTDOWN;  // stop any sending
             LMIC.globalDutyRate  = cap & 0xF;
             LMIC.globalDutyAvail = os_getTime();
             DO_DEVDB(cap,dutyCap);

src/lmic/lmic.h

@@ -105,7 +105,7 @@ extern "C"{
 #define ARDUINO_LMIC_VERSION_CALC(major, minor, patch, local)	\
 	(((major) << 24u) | ((minor) << 16u) | ((patch) << 8u) | (local))
 
-#define	ARDUINO_LMIC_VERSION	ARDUINO_LMIC_VERSION_CALC(2, 3, 2, 71)	/* v2.3.2.71 */
+#define	ARDUINO_LMIC_VERSION	ARDUINO_LMIC_VERSION_CALC(2, 3, 2, 73)	/* v2.3.2.73 */
 
 #define	ARDUINO_LMIC_VERSION_GET_MAJOR(v)	\
 	(((v) >> 24u) & 0xFFu)

src/lmic/lmic_as923.c

@@ -224,6 +224,9 @@ bit_t LMIC_setupBand(u1_t bandidx, s1_t txpow, u2_t txcap) {
 }
 
 bit_t LMIC_setupChannel(u1_t chidx, u4_t freq, u2_t drmap, s1_t band) {
+        // zero the band bits in freq, just in case.
+        freq &= ~3;
+
         if (chidx < NUM_DEFAULT_CHANNELS) {
                 // can't disable a default channel.
                 if (freq == 0)

src/lmic/lmic_eu868.c

@@ -138,6 +138,9 @@ bit_t LMIC_setupBand(u1_t bandidx, s1_t txpow, u2_t txcap) {
 }
 
 bit_t LMIC_setupChannel(u1_t chidx, u4_t freq, u2_t drmap, s1_t band) {
+        // zero the band bits in freq, just in case.
+        freq &= ~3;
+
         if (chidx < NUM_DEFAULT_CHANNELS) {
                 // can't disable a default channel.
                 if (freq == 0)
@@ -149,13 +152,17 @@ bit_t LMIC_setupChannel(u1_t chidx, u4_t freq, u2_t drmap, s1_t band) {
         bit_t fEnable = (freq != 0);
         if (chidx >= MAX_CHANNELS)
                 return 0;
+
         if (band == -1) {
                 if (freq >= 869400000 && freq <= 869650000)
+                        // this is the g2 band
                         freq |= BAND_DECI;   // 10% 27dBm
-                else if ((freq >= 868000000 && freq <= 868600000) ||
-                        (freq >= 869700000 && freq <= 870000000))
+                else if ((865000000 <= freq && freq <= 868600000) ||    // note 9
+                         (freq >= 869700000 && freq <= 870000000))      // g4
+                        // this is the special g, g1 or g4 band
                         freq |= BAND_CENTI;  // 1% 14dBm
                 else
+                        // this is elsewhere in the g band
                         freq |= BAND_MILLI;  // 0.1% 14dBm
         }
         else {

src/lmic/lmic_eu_like.c

@@ -63,9 +63,7 @@ bit_t LMIC_enableChannel(u1_t channel) {
 bit_t LMICeulike_canMapChannels(u1_t chpage, u2_t chmap) {
     switch (chpage) {
         case MCMD_LinkADRReq_ChMaskCntl_EULIKE_DIRECT:
-            if ((chmap & ~LMIC.channelMap) != 0 ) {
-                return 0;
-            }
+            // we don't allow any channel to be turned on if its frequency is zero.
             for (u1_t chnl = 0; chnl<MAX_CHANNELS; chnl++) {
                     if ((chmap & (1 << chnl)) != 0 && (LMIC.channelFreq[chnl]&~3) == 0)
                             return 0; // fail - channel is not defined
@@ -93,7 +91,7 @@ bit_t LMICeulike_mapChannels(u1_t chpage, u2_t chmap) {
         case MCMD_LinkADRReq_ChMaskCntl_EULIKE_ALL_ON: {
             u2_t new_chmap = 0;
             for (u1_t chnl = 0; chnl<MAX_CHANNELS; chnl++) {
-                    if (LMIC.channelFreq[chnl] != 0) {
+                    if ((LMIC.channelFreq[chnl]&~3) != 0) {
                         new_chmap |= (1 << chnl);
                     }
             }

src/lmic/lmic_in866.c

@@ -133,6 +133,9 @@ bit_t LMIC_setupBand(u1_t bandidx, s1_t txpow, u2_t txcap) {
 }
 
 bit_t LMIC_setupChannel(u1_t chidx, u4_t freq, u2_t drmap, s1_t band) {
+        // zero the band bits in freq, just in case.
+        freq &= ~3;
+
         if (chidx < NUM_DEFAULT_CHANNELS) {
                 // can't disable a default channel.
                 if (freq == 0)

src/lmic/lmic_kr920.c

@@ -144,6 +144,9 @@ bit_t LMIC_setupBand(u1_t bandidx, s1_t txpow, u2_t txcap) {
 }
 
 bit_t LMIC_setupChannel(u1_t chidx, u4_t freq, u2_t drmap, s1_t band) {
+        // zero the band bits in freq, just in case.
+        freq &= ~3;
+
         if (chidx < NUM_DEFAULT_CHANNELS) {
                 // can't disable a default channel.
                 if (freq == 0)