From 1c0019ad1896a6a1979abddc86cc43148b3225ae Mon Sep 17 00:00:00 2001 From: jgromes Date: Mon, 28 Oct 2024 14:01:26 +0100 Subject: [PATCH 1/4] [SX126x] Fix signed comparison warning --- src/modules/SX126x/SX126x_LR_FHSS.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/SX126x/SX126x_LR_FHSS.cpp b/src/modules/SX126x/SX126x_LR_FHSS.cpp index b0e8a2b8..0f491f91 100644 --- a/src/modules/SX126x/SX126x_LR_FHSS.cpp +++ b/src/modules/SX126x/SX126x_LR_FHSS.cpp @@ -123,7 +123,7 @@ int16_t SX126x::buildLRFHSSPacket(const uint8_t* in, size_t in_len, uint8_t* out // interleave the payload into output buffer uint16_t step = 0; - while(step * step < nb_bits) { + while((size_t)(step * step) < nb_bits) { // probably the silliest sqrt() I ever saw step++; } From f8b66b1cb5936b12b0a5212a041a67b653636471 Mon Sep 17 00:00:00 2001 From: jgromes Date: Mon, 28 Oct 2024 14:04:48 +0100 Subject: [PATCH 2/4] [LR11x0] Added setDatarate for LR-FHSS --- src/modules/LR11x0/LR11x0.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/modules/LR11x0/LR11x0.cpp b/src/modules/LR11x0/LR11x0.cpp index 6d41e3e2..f87a7f88 100644 --- a/src/modules/LR11x0/LR11x0.cpp +++ b/src/modules/LR11x0/LR11x0.cpp @@ -1078,7 +1078,12 @@ int16_t LR11x0::setDataRate(DataRate_t dr) { state = this->setCodingRate(dr.lora.codingRate); } else if(type == RADIOLIB_LR11X0_PACKET_TYPE_LR_FHSS) { + // set the basic config + state = this->setLrFhssConfig(dr.lrFhss.bw, dr.lrFhss.cr); + RADIOLIB_ASSERT(state); + // set hopping grid + this->lrFhssGrid = dr.lrFhss.narrowGrid ? RADIOLIB_LR11X0_LR_FHSS_GRID_STEP_NON_FCC : RADIOLIB_LR11X0_LR_FHSS_GRID_STEP_FCC; } From e2fd3f7532e199082e6ec4fa9c5bee7f8054a2cc Mon Sep 17 00:00:00 2001 From: jgromes Date: Mon, 28 Oct 2024 14:04:56 +0100 Subject: [PATCH 3/4] [SX126x] Added setDatarate for LR-FHSS --- src/modules/SX126x/SX126x.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/modules/SX126x/SX126x.cpp b/src/modules/SX126x/SX126x.cpp index 8f8878c2..23f5e38f 100644 --- a/src/modules/SX126x/SX126x.cpp +++ b/src/modules/SX126x/SX126x.cpp @@ -1048,6 +1048,15 @@ int16_t SX126x::setDataRate(DataRate_t dr) { // set the coding rate state = this->setCodingRate(dr.lora.codingRate); + + } else if(modem == RADIOLIB_SX126X_PACKET_TYPE_LR_FHSS) { + // set the basic config + state = this->setLrFhssConfig(dr.lrFhss.bw, dr.lrFhss.cr); + RADIOLIB_ASSERT(state); + + // set hopping grid + this->lrFhssGrid = dr.lrFhss.narrowGrid ? RADIOLIB_SX126X_LR_FHSS_GRID_STEP_NON_FCC : RADIOLIB_SX126X_LR_FHSS_GRID_STEP_FCC; + } return(state); From 4bd05dee3d88c452c1e100c49d63152e589ca122 Mon Sep 17 00:00:00 2001 From: jgromes Date: Mon, 28 Oct 2024 14:06:36 +0100 Subject: [PATCH 4/4] [SX126x] Fix member variable --- src/modules/SX126x/SX126x.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/SX126x/SX126x.cpp b/src/modules/SX126x/SX126x.cpp index 23f5e38f..16062db1 100644 --- a/src/modules/SX126x/SX126x.cpp +++ b/src/modules/SX126x/SX126x.cpp @@ -1055,7 +1055,7 @@ int16_t SX126x::setDataRate(DataRate_t dr) { RADIOLIB_ASSERT(state); // set hopping grid - this->lrFhssGrid = dr.lrFhss.narrowGrid ? RADIOLIB_SX126X_LR_FHSS_GRID_STEP_NON_FCC : RADIOLIB_SX126X_LR_FHSS_GRID_STEP_FCC; + this->lrFhssGridNonFcc = dr.lrFhss.narrowGrid ? RADIOLIB_SX126X_LR_FHSS_GRID_STEP_NON_FCC : RADIOLIB_SX126X_LR_FHSS_GRID_STEP_FCC; }