Simplify the code.

DMRDefines.h

@@ -21,13 +21,15 @@
 
 #include "Defines.h"		// For TAG_DATA
 
-const unsigned int DMR_FRAME_LENGTH_BITS  = 264U;
-const unsigned int DMR_FRAME_LENGTH_BYTES = 33U;
+const unsigned int DMR_FRAME_LENGTH_BYTES   = 33U;
+const unsigned int DMR_FRAME_LENGTH_BITS    = DMR_FRAME_LENGTH_BYTES * 8U;
+const unsigned int DMR_FRAME_LENGTH_SYMBOLS = DMR_FRAME_LENGTH_BYTES * 4U;
 
-const unsigned int DMR_SYNC_LENGTH_BITS  = 48U;
-const unsigned int DMR_SYNC_LENGTH_BYTES = 6U;
+const unsigned int DMR_SYNC_LENGTH_BYTES   = 6U;
+const unsigned int DMR_SYNC_LENGTH_BITS    = DMR_SYNC_LENGTH_BYTES * 8U;
+const unsigned int DMR_SYNC_LENGTH_SYMBOLS = DMR_SYNC_LENGTH_BYTES * 4U;
 
-const unsigned int DMR_EMB_LENGTH_BITS  = 8U;
+const unsigned int DMR_EMB_LENGTH_BITS = 8U;
 const unsigned int DMR_EMB_LENGTH_BYTES = 1U;
 
 const unsigned int DMR_SLOT_TYPE_LENGTH_BITS  = 8U;

Modem.h

@@ -19,18 +19,12 @@
 #ifndef	MODEM_H
 #define	MODEM_H
 
-#include "SerialController.h"
 #include "RingBuffer.h"
 #include "Defines.h"
 #include "Timer.h"
 
 #include <string>
-
-enum RESP_TYPE_MMDVM {
-	RTM_OK,
-	RTM_TIMEOUT,
-	RTM_ERROR
-};
+#include <cstdint>
 
 class CModem {
 public:
@@ -87,66 +81,36 @@ public:
 	void close();
 
 private:
-	std::string                m_port;
-	unsigned int               m_colorCode;
-	bool                       m_duplex;
-	bool                       m_rxInvert;
-	bool                       m_txInvert;
-	bool                       m_pttInvert;
-	unsigned int               m_txDelay;
-	unsigned int               m_dmrDelay;
-	unsigned int               m_rxLevel;
-	unsigned int               m_cwIdTXLevel;
-	unsigned int               m_dstarTXLevel;
-	unsigned int               m_dmrTXLevel;
-	unsigned int               m_ysfTXLevel;
-	unsigned int               m_p25TXLevel;
-	int                        m_oscOffset;
 	std::string                m_samplesDir;
 	bool                       m_debug;
-	unsigned int               m_rxFrequency;
-	unsigned int               m_txFrequency;
-	bool                       m_dstarEnabled;
-	bool                       m_dmrEnabled;
-	bool                       m_ysfEnabled;
-	bool                       m_p25Enabled;
-	CSerialController          m_serial;
-	unsigned char*             m_buffer;
-	unsigned int               m_length;
-	unsigned int               m_offset;
 	CRingBuffer<unsigned char> m_rxDStarData;
-	CRingBuffer<unsigned char> m_txDStarData;
-	CRingBuffer<unsigned char> m_rxDMRData1;
 	CRingBuffer<unsigned char> m_rxDMRData2;
-	CRingBuffer<unsigned char> m_txDMRData1;
-	CRingBuffer<unsigned char> m_txDMRData2;
 	CRingBuffer<unsigned char> m_rxYSFData;
-	CRingBuffer<unsigned char> m_txYSFData;
 	CRingBuffer<unsigned char> m_rxP25Data;
-	CRingBuffer<unsigned char> m_txP25Data;
-	CTimer                     m_statusTimer;
-	CTimer                     m_inactivityTimer;
-	CTimer                     m_playoutTimer;
-	unsigned int               m_dstarSpace;
-	unsigned int               m_dmrSpace1;
-	unsigned int               m_dmrSpace2;
-	unsigned int               m_ysfSpace;
-	unsigned int               m_p25Space;
-	bool                       m_tx;
-	bool                       m_cd;
-	bool                       m_lockout;
-	bool                       m_error;
-	HW_TYPE                    m_hwType;
+	CTimer                     m_dmrTimer;
+	CTimer                     m_ysfTimer;
+	CTimer                     m_p25Timer;
+	FILE*                      m_dmrFP;
+	FILE*                      m_ysfFP;
+	FILE*                      m_p25FP;
+	int16_t                    m_thresholdVal;
+	int16_t                    m_centreVal;
+	int16_t                    m_threshold[16U];
+	int16_t                    m_centre[16U];
+	uint16_t                   m_averagePtr;
 
-	bool readVersion();
-	bool readStatus();
-	bool setConfig();
-	bool setFrequency();
+	void processYSF();
+	void processP25();
+	void processDMR();
 
-	void printDebug();
-	void dumpSamples();
+	void dmrCalculateLevels(const int16_t* symbols);
+	void dmrSamplesToBits(const int16_t* symbols, unsigned char* buffer);
 
-	RESP_TYPE_MMDVM getResponse();
+	void ysfCalculateLevels(const int16_t* symbols);
+	void ysfSamplesToBits(const int16_t* symbols, unsigned char* buffer);
+
+	void p25CalculateLevels(const int16_t* symbols);
+	void p25SamplesToBits(const int16_t* symbols, unsigned char* buffer);
 };
 
 #endif

P25Defines.h

@@ -19,22 +19,29 @@
 #if !defined(P25DEFINES_H)
 #define  P25DEFINES_H
 
-const unsigned int P25_HDR_FRAME_LENGTH_BYTES = 99U;
-const unsigned int P25_HDR_FRAME_LENGTH_BITS  = P25_HDR_FRAME_LENGTH_BYTES * 8U;
+const unsigned int P25_HDR_FRAME_LENGTH_BYTES   = 99U;
+const unsigned int P25_HDR_FRAME_LENGTH_BITS    = P25_HDR_FRAME_LENGTH_BYTES * 8U;
+const unsigned int P25_HDR_FRAME_LENGTH_SYMBOLS = P25_HDR_FRAME_LENGTH_BYTES * 4U;
 
-const unsigned int P25_LDU_FRAME_LENGTH_BYTES = 216U;
-const unsigned int P25_LDU_FRAME_LENGTH_BITS  = P25_LDU_FRAME_LENGTH_BYTES * 8U;
+const unsigned int P25_LDU_FRAME_LENGTH_BYTES   = 216U;
+const unsigned int P25_LDU_FRAME_LENGTH_BITS    = P25_LDU_FRAME_LENGTH_BYTES * 8U;
+const unsigned int P25_LDU_FRAME_LENGTH_SYMBOLS = P25_LDU_FRAME_LENGTH_BYTES * 4U;
 
-const unsigned int P25_TERM_FRAME_LENGTH_BYTES = 18U;
-const unsigned int P25_TERM_FRAME_LENGTH_BITS  = P25_TERM_FRAME_LENGTH_BYTES * 8U;
+const unsigned int P25_TERMLC_FRAME_LENGTH_BYTES   = 54U;
+const unsigned int P25_TERMLC_FRAME_LENGTH_BITS    = P25_TERMLC_FRAME_LENGTH_BYTES * 8U;
+const unsigned int P25_TERMLC_FRAME_LENGTH_SYMBOLS = P25_TERMLC_FRAME_LENGTH_BYTES * 4U;
 
-const unsigned int P25_TERMLC_FRAME_LENGTH_BYTES = 54U;
-const unsigned int P25_TERMLC_FRAME_LENGTH_BITS  = P25_TERMLC_FRAME_LENGTH_BYTES * 8U;
+const unsigned int P25_TERM_FRAME_LENGTH_BYTES   = 18U;
+const unsigned int P25_TERM_FRAME_LENGTH_BITS    = P25_TERM_FRAME_LENGTH_BYTES * 8U;
+const unsigned int P25_TERM_FRAME_LENGTH_SYMBOLS = P25_TERM_FRAME_LENGTH_BYTES * 4U;
 
-const unsigned int P25_SYNC_LENGTH_BYTES = 6U;
+const unsigned int P25_SYNC_LENGTH_BYTES   = 6U;
+const unsigned int P25_SYNC_LENGTH_BITS    = P25_SYNC_LENGTH_BYTES * 8U;
+const unsigned int P25_SYNC_LENGTH_SYMBOLS = P25_SYNC_LENGTH_BYTES * 4U;
 
-const unsigned int P25_NID_LENGTH_BYTES  = 8U;
-const unsigned int P25_NID_LENGTH_BITS   = P25_NID_LENGTH_BYTES * 8U;
+const unsigned int P25_NID_LENGTH_BYTES   = 8U;
+const unsigned int P25_NID_LENGTH_BITS    = P25_NID_LENGTH_BYTES * 8U;
+const unsigned int P25_NID_LENGTH_SYMBOLS = P25_NID_LENGTH_BYTES * 4U;
 
 const unsigned char P25_SYNC_BYTES[]      = {0x55U, 0x75U, 0xF5U, 0xFFU, 0x77U, 0xFFU};
 const unsigned char P25_SYNC_BYTES_LENGTH = 6U;

YSFDefines.h

@@ -19,14 +19,21 @@
 #if !defined(YSFDefines_H)
 #define	YSFDefines_H
 
-const unsigned int YSF_FRAME_LENGTH_BYTES = 120U;
+const unsigned int YSF_FRAME_LENGTH_BYTES   = 120U;
+const unsigned int YSF_FRAME_LENGTH_BITS    = YSF_FRAME_LENGTH_BYTES * 8U;
+const unsigned int YSF_FRAME_LENGTH_SYMBOLS = YSF_FRAME_LENGTH_BYTES * 4U;
 
-const unsigned char YSF_SYNC_BYTES[] = {0xD4U, 0x71U, 0xC9U, 0x63U, 0x4DU};
-const unsigned int YSF_SYNC_LENGTH_BYTES  = 5U;
+const unsigned int YSF_SYNC_LENGTH_BYTES   = 5U;
+const unsigned int YSF_SYNC_LENGTH_BITS    = YSF_SYNC_LENGTH_BYTES * 8U;
+const unsigned int YSF_SYNC_LENGTH_SYMBOLS = YSF_SYNC_LENGTH_BYTES * 4U;
 
-const unsigned int YSF_FICH_LENGTH_BYTES  = 25U;
+const unsigned int YSF_FICH_LENGTH_BYTES   = 25U;
+const unsigned int YSF_FICH_LENGTH_BITS    = YSF_FICH_LENGTH_BYTES * 8U;
+const unsigned int YSF_FICH_LENGTH_SYMBOLS = YSF_FICH_LENGTH_BYTES * 4U;
 
-const unsigned char YSF_SYNC_OK           = 0x01U;
+const unsigned char YSF_SYNC_BYTES[] = {0xD4U, 0x71U, 0xC9U, 0x63U, 0x4DU}; 
+
+const unsigned char YSF_SYNC_OK = 0x01U;
 
 const unsigned int  YSF_CALLSIGN_LENGTH   = 10U;