Adapt patch from #481 b7bee3f @sualko

terrillmoore · terrillmoore · commit 9960bf39e980 · 2022-02-28T08:56:22.000-05:00
diff --git a/src/lmic/lmic_as923.c b/src/lmic/lmic_as923.c
@@ -448,7 +448,7 @@ ostime_t LMICas923_nextTx(ostime_t now) {
 #if !defined(DISABLE_BEACONS)
 void LMICas923_setBcnRxParams(void) {
         LMIC.dataLen = 0;
-        LMIC.freq = LMIC.channelFreq[LMIC.bcnChnl] & ~(u4_t)3;
+        LMIC.freq = AS923_FBCN;
         LMIC.rps = setIh(setNocrc(dndr2rps((dr_t)DR_BCN), 1), LEN_BCN);
 }
 #endif // !DISABLE_BEACONS
diff --git a/src/lmic/lmic_eu868.c b/src/lmic/lmic_eu868.c
@@ -334,7 +334,7 @@ ostime_t LMICeu868_nextTx(ostime_t now) {
 #if !defined(DISABLE_BEACONS)
 void LMICeu868_setBcnRxParams(void) {
         LMIC.dataLen = 0;
-        LMIC.freq = LMIC.channelFreq[LMIC.bcnChnl] & ~(u4_t)3;
+        LMIC.freq = FREQ_BCN;
         LMIC.rps = setIh(setNocrc(dndr2rps((dr_t)DR_BCN), 1), LEN_BCN);
 }
 #endif // !DISABLE_BEACONS
diff --git a/src/lmic/lmic_in866.c b/src/lmic/lmic_in866.c
@@ -235,7 +235,7 @@ ostime_t LMICin866_nextTx(ostime_t now) {
 #if !defined(DISABLE_BEACONS)
 void LMICin866_setBcnRxParams(void) {
         LMIC.dataLen = 0;
-        LMIC.freq = LMIC.channelFreq[LMIC.bcnChnl] & ~(u4_t)3;
+        LMIC.freq = IN866_FB;
         LMIC.rps = setIh(setNocrc(dndr2rps((dr_t)DR_BCN), 1), LEN_BCN);
 }
 #endif // !DISABLE_BEACONS
diff --git a/src/lmic/lmic_kr920.c b/src/lmic/lmic_kr920.c
@@ -247,7 +247,7 @@ ostime_t LMICkr920_nextTx(ostime_t now) {
 #if !defined(DISABLE_BEACONS)
 void LMICkr920_setBcnRxParams(void) {
         LMIC.dataLen = 0;
-        LMIC.freq = LMIC.channelFreq[LMIC.bcnChnl] & ~(u4_t)3;
+        LMIC.freq = KR920_FBCN;
         LMIC.rps = setIh(setNocrc(dndr2rps((dr_t)DR_BCN), 1), LEN_BCN);
 }
 #endif // !DISABLE_BEACONS

Original file line number	Diff line number	Diff line change
`@@ -448,7 +448,7 @@ ostime_t LMICas923_nextTx(ostime_t now) {`
`448`	`448`	`#if !defined(DISABLE_BEACONS)`
`449`	`449`	`void LMICas923_setBcnRxParams(void) {`
`450`	`450`	`LMIC.dataLen = 0;`
`451`		`- LMIC.freq = LMIC.channelFreq[LMIC.bcnChnl] & ~(u4_t)3;`
	`451`	`+ LMIC.freq = AS923_FBCN;`
`452`	`452`	`LMIC.rps = setIh(setNocrc(dndr2rps((dr_t)DR_BCN), 1), LEN_BCN);`
`453`	`453`	`}`
`454`	`454`	`#endif // !DISABLE_BEACONS`
Original file line number	Diff line number	Diff line change
`@@ -334,7 +334,7 @@ ostime_t LMICeu868_nextTx(ostime_t now) {`
`334`	`334`	`#if !defined(DISABLE_BEACONS)`
`335`	`335`	`void LMICeu868_setBcnRxParams(void) {`
`336`	`336`	`LMIC.dataLen = 0;`
`337`		`- LMIC.freq = LMIC.channelFreq[LMIC.bcnChnl] & ~(u4_t)3;`
	`337`	`+ LMIC.freq = FREQ_BCN;`
`338`	`338`	`LMIC.rps = setIh(setNocrc(dndr2rps((dr_t)DR_BCN), 1), LEN_BCN);`
`339`	`339`	`}`
`340`	`340`	`#endif // !DISABLE_BEACONS`
Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ ostime_t LMICin866_nextTx(ostime_t now) {`
`235`	`235`	`#if !defined(DISABLE_BEACONS)`
`236`	`236`	`void LMICin866_setBcnRxParams(void) {`
`237`	`237`	`LMIC.dataLen = 0;`
`238`		`- LMIC.freq = LMIC.channelFreq[LMIC.bcnChnl] & ~(u4_t)3;`
	`238`	`+ LMIC.freq = IN866_FB;`
`239`	`239`	`LMIC.rps = setIh(setNocrc(dndr2rps((dr_t)DR_BCN), 1), LEN_BCN);`
`240`	`240`	`}`
`241`	`241`	`#endif // !DISABLE_BEACONS`
Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ ostime_t LMICkr920_nextTx(ostime_t now) {`
`247`	`247`	`#if !defined(DISABLE_BEACONS)`
`248`	`248`	`void LMICkr920_setBcnRxParams(void) {`
`249`	`249`	`LMIC.dataLen = 0;`
`250`		`- LMIC.freq = LMIC.channelFreq[LMIC.bcnChnl] & ~(u4_t)3;`
	`250`	`+ LMIC.freq = KR920_FBCN;`
`251`	`251`	`LMIC.rps = setIh(setNocrc(dndr2rps((dr_t)DR_BCN), 1), LEN_BCN);`
`252`	`252`	`}`
`253`	`253`	`#endif // !DISABLE_BEACONS`