From 939a893dfb6b9f11e3995475e3da0ff5bbc4a577 Mon Sep 17 00:00:00 2001
From: Doug McLain <doug@nostar.net>
Date: Fri, 3 Feb 2023 21:10:33 -0500
Subject: [PATCH 1/2] Fix M17 -> DMR (using dongle) transcoding

---
 Controller.cpp | 3 +--
 Makefile       | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Controller.cpp b/Controller.cpp
index 10f8bb3..e39bd92 100644
--- a/Controller.cpp
+++ b/Controller.cpp
@@ -377,11 +377,10 @@ void CController::Codec2toAudio(std::shared_ptr<CTranscoderPacket> packet)
 
 #ifdef USE_SW_AMBE2
 	md380_encode_fec(ambe2, packet->GetAudioSamples());
+	packet->SetDMRData(ambe2);
 #else
 	dmrsf_device->AddPacket(packet);
 #endif
-	
-	packet->SetDMRData(ambe2);
 	p25vocoder.encode_4400((int16_t*)packet->GetAudioSamples(), imbe);
 	packet->SetP25Data(imbe);
 	packet->SetUSRPData((int16_t*)packet->GetAudioSamples());
diff --git a/Makefile b/Makefile
index a616efb..9ae6c79 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ include configure.mk
 # need to update the systemd service script
 BINDIR = /usr/local/bin
 
-swambe2 = false
+swambe2 = true
 
 GCC = g++
 

From a78bc45282efc8eb97f887ce422ccd35cf612bdb Mon Sep 17 00:00:00 2001
From: Doug McLain <doug@nostar.net>
Date: Fri, 3 Feb 2023 21:22:29 -0500
Subject: [PATCH 2/2] Set sw vocoder back to false as default

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 9ae6c79..a616efb 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ include configure.mk
 # need to update the systemd service script
 BINDIR = /usr/local/bin
 
-swambe2 = true
+swambe2 = false
 
 GCC = g++