From b73f547440a91a6af1160f58aaf56b5d5285f117 Mon Sep 17 00:00:00 2001
From: Tom Early <n7tae@tearly.net>
Date: Sat, 15 Jan 2022 11:25:57 -0700
Subject: [PATCH] backup a bit

---
 Controller.cpp | 12 ++++++------
 Controller.h   |  6 ++++--
 DV3003.cpp     | 15 +++++++--------
 DV3003.h       |  2 +-
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/Controller.cpp b/Controller.cpp
index 88007df..2d65327 100644
--- a/Controller.cpp
+++ b/Controller.cpp
@@ -52,7 +52,7 @@ void CController::Stop()
 
 	reader.Close();
 	dstar_device.CloseDevice();
-	dmrsf_device.CloseDevice();
+	dmr_device.CloseDevice();
 }
 
 bool CController::CheckTCModules() const
@@ -157,13 +157,13 @@ bool CController::InitDevices()
 	{
 		dstar_device.OpenDevice(deviceset.front().first, deviceset.front().second, 921600);
 		deviceset.pop_front();
-		dmrsf_device.OpenDevice(deviceset.front().first, deviceset.front().second, 921600);
+		dmr_device.OpenDevice(deviceset.front().first, deviceset.front().second, 921600);
 		deviceset.pop_front();
 	}
 
 	// and start them up!
 	dstar_device.Start();
-	dmrsf_device.Start();
+	dmr_device.Start();
 
 	deviceset.clear();
 
@@ -190,7 +190,7 @@ void CController::ReadReflectorThread()
 				dstar_device.AddPacket(packet);
 				break;
 			case ECodecType::dmr:
-				dmrsf_device.AddPacket(packet);
+				dmr_device.AddPacket(packet);
 				break;
 			case ECodecType::c2_1600:
 			case ECodecType::c2_3200:
@@ -284,7 +284,7 @@ void CController::Codec2toAudio(std::shared_ptr<CTranscoderPacket> packet)
 	}
 	// the only thing left is to encode the two ambe, so push the packet onto both AMBE queues
 	dstar_device.AddPacket(packet);
-	dmrsf_device.AddPacket(packet);
+	dmr_device.AddPacket(packet);
 }
 
 void CController::ProcessC2Thread()
@@ -329,7 +329,7 @@ void CController::RouteDstPacket(std::shared_ptr<CTranscoderPacket> packet)
 	{
 		// codec_in is dstar, the audio has just completed, so now calc the M17 and DMR
 		codec2_queue.push(packet);
-		dmrsf_device.AddPacket(packet);
+		dmr_device.AddPacket(packet);
 	}
 	else if (packet->AllCodecsAreSet())
 	{
diff --git a/Controller.h b/Controller.h
index c4e1d86..e860a04 100644
--- a/Controller.h
+++ b/Controller.h
@@ -29,10 +29,12 @@
 #include "UnixDgramSocket.h"
 #include "configure.h"
 
+enum class EAmbeType { dstar, dmr };
+
 class CController
 {
 public:
-	std::mutex dstar_mux, dmrsf_mux;
+	std::mutex dstar_mux, dmr_mux;
 
 	CController();
 	bool Start();
@@ -50,7 +52,7 @@ protected:
 	CUnixDgramWriter writer;
 	std::unordered_map<char, std::unique_ptr<CCodec2>> c2_16, c2_32;
 	CDV3003 dstar_device{Encoding::dstar};
-	CDV3003 dmrsf_device{Encoding::dmrsf};
+	CDV3003 dmr_device{Encoding::dmr};
 
 	CPacketQueue codec2_queue;
 	std::mutex send_mux;
diff --git a/DV3003.cpp b/DV3003.cpp
index 595c16b..6b0bd32 100644
--- a/DV3003.cpp
+++ b/DV3003.cpp
@@ -201,7 +201,7 @@ bool CDV3003::OpenDevice(const std::string &serialno, const std::string &desc, i
 		}
 	}
 
-	status = FT_SetBaudRate(ftHandle, baudrate);
+	status = FT_SetBaudRate(ftHandle, baudrate );
 	if (status != FT_OK)
 	{
 		FTDI_Error("FT_SetBaudRate", status);
@@ -221,7 +221,7 @@ bool CDV3003::OpenDevice(const std::string &serialno, const std::string &desc, i
 		return true;
 	}
 
-	status = FT_SetTimeouts(ftHandle, 200, 200);
+	status = FT_SetTimeouts(ftHandle, 200, 200 );
 	if (status != FT_OK)
 	{
 		FTDI_Error("FT_SetTimeouts", status);
@@ -229,7 +229,7 @@ bool CDV3003::OpenDevice(const std::string &serialno, const std::string &desc, i
 	}
 
 	description.assign(desc);
-	description.append(":");
+	description.append(": ");
 	description.append(serialno);
 
 	std::cout << "Opened " << description << std::endl;
@@ -445,7 +445,7 @@ bool CDV3003::ConfigureVocoder(uint8_t pkt_ch, Encoding type)
 	if ((ntohs(responsePacket.header.payload_length) != 16) || (responsePacket.field_id != pkt_ch) || (0 != memcmp(responsePacket.payload.ctrl.data.resp, resp, sizeof(resp))))
 	{
 		std::cerr << "Config response packet failed" << std::endl;
-		dump("Configuration Response Packet:", &responsePacket, sizeof(responsePacket));
+		dump("Configuration Response Packet:", &responsePacket, packet_size(responsePacket));
 		return true;
 	};
 
@@ -467,8 +467,7 @@ bool CDV3003::GetResponse(SDV3003_Packet &packet)
 			FTDI_Error("Reading packet start byte", status);
 			return true;
 		}
-		if (0 == bytes_read)
-			return true;	// nothing to read
+
 		if (packet.start_byte == PKT_HEADER)
 			break;
 	}
@@ -610,9 +609,9 @@ void CDV3003::ReadDevice()
 			}
 			else
 			{
-				Controller.dmrsf_mux.lock();
+				Controller.dmr_mux.lock();
 				Controller.RouteDmrPacket(packet);
-				Controller.dmrsf_mux.unlock();
+				Controller.dmr_mux.unlock();
 			}
 		}
 	}
diff --git a/DV3003.h b/DV3003.h
index 9ce586a..7903092 100644
--- a/DV3003.h
+++ b/DV3003.h
@@ -98,7 +98,7 @@ struct dv3003_packet {
 
 using SDV3003_Packet = struct dv3003_packet;
 
-enum class Encoding { dstar, dmrsf };
+enum class Encoding { dstar, dmr };
 
 class CDV3003 {
 public: