Fix DR reset with ADR enabled

beegee-tokyo · Jul 1, 2024 · 7554799 · 7554799
1 parent 98ef65b
commit 7554799
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,9 @@ Arduino library for LoRa communication with Semtech SX126x chips. It is based on
 
 # Release Notes
 
+# V2.0.25 Fix DR reset with ADR enabled
+  - With ADR enabled, fix the DR reset to default when confirmed/unconfirmed packets are sent.
+
 ## V2.0.24 Fix P2P RX timeout callback fails
   - Fix callbacks for P2P RX and TX timeout not being called
 

diff --git a/README.md b/README.md
@@ -88,6 +88,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ----
 ## Changelog
 [Code releases](CHANGELOG.md)
+- 2024-06-26 
+  - With ADR enabled, fix the DR reset to default when confirmed/unconfirmed packets are sent.
 - 2024-02-24
   - Fix callbacks for P2P RX and TX timeout not being called
 - 2023-12-14

diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
 	"name": "SX126x-Arduino",
-	"version": "2.0.24",
+	"version": "2.0.25",
 	"keywords": [
 		"lora",
 		"Semtech",

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=SX126x-Arduino
-version=2.0.24
+version=2.0.25
 author=Bernd Giesecke <[email protected]>
 maintainer=Bernd Giesecke <[email protected]>
 sentence=Arduino library to use Semtech SX126x LoRa chips and modules to communicate

diff --git a/src/mac/LoRaMacHelper.cpp b/src/mac/LoRaMacHelper.cpp
@@ -403,7 +403,10 @@ static void McpsConfirm(McpsConfirm_t *mcpsConfirm)
 		{
 			m_callbacks->lmh_conf_result(mcpsConfirm->AckReceived);
 			// Workaround, reset MAC state
+			// Workaround for DR reset when ADR is active
+			int8_t preserve_dr = LoRaMacParams.ChannelsDatarate;
 			lmh_reset_mac();
+			LoRaMacParams.ChannelsDatarate = preserve_dr;
 		}
 		break;
 	}