Fix #43: LinkAdrReq ChMaskCntl=[6,7]; add ChMaskCntl=5

mcci-catena · Jan 1, 2018 · 17b57ca · 17b57ca
1 parent 1d7f28d
commit 17b57ca
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 25 deletions.
diff --git a/src/lmic/lmic_us_like.c b/src/lmic/lmic_us_like.c
@@ -86,30 +86,63 @@ void LMICuslike_initDefaultChannels(bit_t fJoin) {
 }
 
 u1_t LMICuslike_mapChannels(u1_t chpage, u2_t chmap) {
-        if (chpage == MCMD_LADR_CHP_125ON || chpage == MCMD_LADR_CHP_125OFF) {
-                u2_t en125 = chpage == MCMD_LADR_CHP_125ON ? 0xFFFF : 0x0000;
-                for (u1_t u = 0; u<4; u++)
-                        LMIC.channelMap[u] = en125;
-                LMIC.channelMap[64 / 16] = chmap & 0x00FF;
-                if (en125 == 0) {
-                        LMIC.activeChannels125khz = 0;
-                        LMIC.activeChannels500khz = 0;
-                }
-                else {
-                        LMIC.activeChannels125khz = 64;
-                        LMIC.activeChannels500khz = 8;
-                }
-        }
-        else {
-                if (chpage >= (72 + MAX_XCHANNELS + 15) / 16)
-                        return 0;
-                // Use enable/disable channel to keep activeChannel counts in sync.
-                for (uint base = chpage << 4, chnl = chpage << 4; chnl<(base + 16); ++chnl, chmap >>= 1) {
-                        if (chmap & 0x0001)
-                                LMIC_enableChannel(chnl);
-                        else
-                                LMIC_disableChannel(chnl);
-                }
+	/*
+	|| MCMD_LADR_CHP_125ON and MCMD_LADR_CHP_125OFF are special. The
+	|| channel map appllies to 500kHz (ch 64..71) and in addition
+	*/
+	u1_t base, top;
+
+	if (chpage < MCMD_LADR_CHP_USLIKE_SPECIAL) {
+		// operate on channels 0..15, 16..31, 32..47, 48..63
+		base = chpage << 4;
+		top = base + 16;
+		if (base == 64) {
+			if (chmap && 0xFF00) {
+				return 0;
+			}
+			top = 72;
+		}
+	} else if (chpage == MCMD_LADR_CHP_BANK) {
+		if (chmap & 0xFF00) {
+			// those are resreved bits, fail.
+			return 0;
+		}
+		// each bit enables a bank of channels
+		for (u1_t subband = 0; subband < 8; ++subband, chmap >>= 1) {
+			if (chmap & 1) {
+				LMIC_enableSubBand(subband);
+			} else {
+				LMIC_disableSubBand(subband);
+			}
+
+		// don't change any channels below
+		base = top = 0;
+		}
+	} else if (chpage == MCMD_LADR_CHP_125ON || chpage == MCMD_LADR_CHP_125OFF) {
+                u1_t const en125 = chpage == MCMD_LADR_CHP_125ON;
+
+		// enable or disable all 125kHz channels
+		for (u1_t chnl = 0; chnl < 64; ++chnl) {
+			if (en125)
+				LMIC_enableChannel(chnl);
+			else
+				LMIC_disableChannel(chnl);
+		}
+
+		// then apply mask to top 8 channels.
+		base = 64;
+		top = 72;
+	} else {
+		return 0;
+	}
+
+	// apply chmap to channels in [base..top-1].
+	// Use enable/disable channel to keep activeChannel counts in sync.
+	for (u1_t chnl = base; chnl < top; ++chnl, chmap >>= 1) {
+		if (chmap & 0x0001)
+			LMIC_enableChannel(chnl);
+		else
+			LMIC_disableChannel(chnl);
         }
         return 1;
 }

diff --git a/src/lmic/lorabase.h b/src/lmic/lorabase.h
@@ -506,8 +506,10 @@ enum {
 
 // Bit fields byte#3 of MCMD_LADR_REQ payload
 enum {
+    MCMD_LADR_CHP_USLIKE_SPECIAL = 0x50,  // first special for us-like
+    MCMD_LADR_CHP_BANK    = 0x50,  // special: bits are banks.
     MCMD_LADR_CHP_125ON   = 0x60,  // special channel page enable, bits applied to 64..71
-    MCMD_LADR_CHP_125OFF  = 0x70,  //  ditto
+    MCMD_LADR_CHP_125OFF  = 0x70,  // special channel page: disble 125K, bits apply to 64..71
     MCMD_LADR_N3RFU_MASK  = 0x80,
     MCMD_LADR_CHPAGE_MASK = 0xF0,
     MCMD_LADR_REPEAT_MASK = 0x0F,