Merge branch 'master' into Exp_Desync_C

CapnBry · web-flow · commit e6181fffc762 · 2025-09-22T16:36:47.000-04:00
diff --git a/src/lib/FHSS/FHSS.cpp b/src/lib/FHSS/FHSS.cpp
@@ -14,7 +14,7 @@
 const fhss_config_t domains[] = {
     {"AU915",  FREQ_HZ_TO_REG_VAL(915500000), FREQ_HZ_TO_REG_VAL(926900000), 20, 921000000},
     {"FCC915", FREQ_HZ_TO_REG_VAL(903500000), FREQ_HZ_TO_REG_VAL(926900000), 40, 915000000},
-    {"EU868",  FREQ_HZ_TO_REG_VAL(865275000), FREQ_HZ_TO_REG_VAL(869575000), 13, 868000000},
+    {"EU868",  FREQ_HZ_TO_REG_VAL(863275000), FREQ_HZ_TO_REG_VAL(869575000), 13, 868000000},
     {"IN866",  FREQ_HZ_TO_REG_VAL(865375000), FREQ_HZ_TO_REG_VAL(866950000), 4, 866000000},
     {"AU433",  FREQ_HZ_TO_REG_VAL(433420000), FREQ_HZ_TO_REG_VAL(434420000), 3, 434000000},
     {"EU433",  FREQ_HZ_TO_REG_VAL(433100000), FREQ_HZ_TO_REG_VAL(434450000), 3, 434000000},
diff --git a/src/lib/LR1121Driver/LR1121.cpp b/src/lib/LR1121Driver/LR1121.cpp
@@ -635,7 +635,7 @@ void ICACHE_RAM_ATTR LR1121Driver::TXnb(uint8_t *data, const uint8_t size, const
     }
 
     WORD_ALIGNED_ATTR uint8_t outBuffer[32] = {0};
-    const uint8_t length = size+3;
+    const uint8_t length = PayloadLength+3;
     if (useFEC)
     {
         FECEncode(data, outBuffer);

Original file line number	Diff line number	Diff line change
`@@ -635,7 +635,7 @@ void ICACHE_RAM_ATTR LR1121Driver::TXnb(uint8_t *data, const uint8_t size, const`
`635`	`635`	`}`
`636`	`636`
`637`	`637`	`WORD_ALIGNED_ATTR uint8_t outBuffer[32] = {0};`
`638`		`- const uint8_t length = size+3;`
	`638`	`+ const uint8_t length = PayloadLength+3;`
`639`	`639`	`if (useFEC)`
`640`	`640`	`{`
`641`	`641`	`FECEncode(data, outBuffer);`