A semi-working P25 repeater without much FEC.

AMBEFEC.cpp

@@ -596,7 +596,7 @@ unsigned int CAMBEFEC::regenerateDStar(unsigned char* bytes) const
 	return errors;
 }
 
-unsigned int CAMBEFEC::regenerateYSF1(unsigned char* bytes) const
+unsigned int CAMBEFEC::regenerateYSFDN(unsigned char* bytes) const
 {
 	assert(bytes != NULL);
 
@@ -638,7 +638,7 @@ unsigned int CAMBEFEC::regenerateYSF1(unsigned char* bytes) const
 	return errors;
 }
 
-unsigned int CAMBEFEC::regenerateYSF3(unsigned char* bytes) const
+unsigned int CAMBEFEC::regenerateIMBE(unsigned char* bytes) const
 {
 	assert(bytes != NULL);
 

AMBEFEC.h

@@ -28,9 +28,9 @@ class CAMBEFEC {
 
 	unsigned int regenerateDStar(unsigned char* bytes) const;
 
-	unsigned int regenerateYSF1(unsigned char* bytes) const;
+	unsigned int regenerateYSFDN(unsigned char* bytes) const;
 
-	unsigned int regenerateYSF3(unsigned char* bytes) const;
+	unsigned int regenerateIMBE(unsigned char* bytes) const;
 
 private:
 	unsigned int regenerate(unsigned int& a, unsigned int& b, unsigned int& c, bool b23) const;

Conf.cpp

@@ -111,7 +111,7 @@ m_dmrCallHang(3U),
 m_dmrTXHang(4U),
 m_fusionEnabled(true),
 m_p25Enabled(true),
-m_p25Id(0U),
+m_p25NAC(0x293U),
 m_dstarNetworkEnabled(true),
 m_dstarGatewayAddress(),
 m_dstarGatewayPort(0U),
@@ -438,8 +438,8 @@ bool CConf::read()
 	} else if (section == SECTION_P25) {
 		if (::strcmp(key, "Enable") == 0)
 			m_p25Enabled = ::atoi(value) == 1;
-		else if (::strcmp(key, "Id") == 0)
-			m_p25Id = (unsigned int)::atoi(value);
+		else if (::strcmp(key, "NAC") == 0)
+			m_p25NAC = (unsigned int)::strtoul(value, NULL, 16);
 	} else if (section == SECTION_DSTAR_NETWORK) {
 		if (::strcmp(key, "Enable") == 0)
 			m_dstarNetworkEnabled = ::atoi(value) == 1;
@@ -849,9 +849,9 @@ bool CConf::getP25Enabled() const
 	return m_p25Enabled;
 }
 
-unsigned int CConf::getP25Id() const
+unsigned int CConf::getP25NAC() const
 {
-	return m_p25Id;
+	return m_p25NAC;
 }
 
 bool CConf::getDStarNetworkEnabled() const

Conf.h

@@ -108,7 +108,7 @@ class CConf
 
   // The P25 section
   bool         getP25Enabled() const;
-  unsigned int getP25Id() const;
+  unsigned int getP25NAC() const;
 
   // The D-Star Network section
   bool         getDStarNetworkEnabled() const;
@@ -243,7 +243,7 @@ class CConf
   bool         m_fusionEnabled;
 
   bool         m_p25Enabled;
-  unsigned int m_p25Id;
+  unsigned int m_p25NAC;
 
   bool         m_dstarNetworkEnabled;
   std::string  m_dstarGatewayAddress;

DMRControl.cpp

@@ -20,7 +20,7 @@
 #include <cassert>
 #include <algorithm>
 
-CDMRControl::CDMRControl(unsigned int id, unsigned int colorCode, unsigned int callHang, bool selfOnly, const std::vector<unsigned int>& prefixes, const std::vector<unsigned int>& blackList, const std::vector<unsigned int>& DstIdBlacklistSlot1RF, const std::vector<unsigned int>& DstIdWhitelistSlot1RF, const std::vector<unsigned int>& DstIdBlacklistSlot2RF, const std::vector<unsigned int>& DstIdWhitelistSlot2RF, const std::vector<unsigned int>& DstIdBlacklistSlot1NET, const std::vector<unsigned int>& DstIdWhitelistSlot1NET, const std::vector<unsigned int>& DstIdBlacklistSlot2NET, const std::vector<unsigned int>& DstIdWhitelistSlot2NET, unsigned int timeout, CModem* modem, CDMRIPSC* network, CDisplay* display, bool duplex, const std::string& lookupFile, int rssiMultiplier, int rssiOffset, unsigned int jitter) :
+CDMRControl::CDMRControl(unsigned int id, unsigned int colorCode, unsigned int callHang, bool selfOnly, const std::vector<unsigned int>& prefixes, const std::vector<unsigned int>& blackList, const std::vector<unsigned int>& DstIdBlacklistSlot1RF, const std::vector<unsigned int>& DstIdWhitelistSlot1RF, const std::vector<unsigned int>& DstIdBlacklistSlot2RF, const std::vector<unsigned int>& DstIdWhitelistSlot2RF, const std::vector<unsigned int>& DstIdBlacklistSlot1NET, const std::vector<unsigned int>& DstIdWhitelistSlot1NET, const std::vector<unsigned int>& DstIdBlacklistSlot2NET, const std::vector<unsigned int>& DstIdWhitelistSlot2NET, unsigned int timeout, CModem* modem, CDMRIPSC* network, CDisplay* display, bool duplex, CDMRLookup* lookup, int rssiMultiplier, int rssiOffset, unsigned int jitter) :
 m_id(id),
 m_colorCode(colorCode),
 m_selfOnly(selfOnly),
@@ -30,15 +30,13 @@ m_modem(modem),
 m_network(network),
 m_slot1(1U, timeout),
 m_slot2(2U, timeout),
-m_lookup(NULL)
+m_lookup(lookup)
 {
 	assert(modem != NULL);
 	assert(display != NULL);
+	assert(lookup != NULL);
 
-	m_lookup = new CDMRLookup(lookupFile);
-	m_lookup->read();
-
-	CDMRSlot::init(id, colorCode, callHang, selfOnly, prefixes, blackList, DstIdBlacklistSlot1RF, DstIdWhitelistSlot1RF, DstIdBlacklistSlot2RF, DstIdWhitelistSlot2RF, DstIdBlacklistSlot1NET, DstIdWhitelistSlot1NET, DstIdBlacklistSlot2NET, DstIdWhitelistSlot2NET, modem, network, display, duplex, m_lookup, rssiMultiplier, rssiOffset, jitter);
+	CDMRSlot::init(id, colorCode, callHang, selfOnly, prefixes, blackList, DstIdBlacklistSlot1RF, DstIdWhitelistSlot1RF, DstIdBlacklistSlot2RF, DstIdWhitelistSlot2RF, DstIdBlacklistSlot1NET, DstIdWhitelistSlot1NET, DstIdBlacklistSlot2NET, DstIdWhitelistSlot2NET, modem, network, display, duplex, lookup, rssiMultiplier, rssiOffset, jitter);
 }
 
 CDMRControl::~CDMRControl()

DMRControl.h

@@ -30,7 +30,7 @@
 
 class CDMRControl {
 public:
-	CDMRControl(unsigned int id, unsigned int colorCode, unsigned int callHang, bool selfOnly, const std::vector<unsigned int>& prefixes, const std::vector<unsigned int>& blackList, const std::vector<unsigned int>& DstIdBlacklistSlot1RF, const std::vector<unsigned int>& DstIdWhitelistSlot1RF, const std::vector<unsigned int>& DstIdBlacklistSlot2RF, const std::vector<unsigned int>& DstIdWhitelistSlot2RF,const std::vector<unsigned int>& DstIdBlacklistSlot1NET, const std::vector<unsigned int>& DstIdWhitelistSlot1NET, const std::vector<unsigned int>& DstIdBlacklistSlot2NET, const std::vector<unsigned int>& DstIdWhitelistSlot2NET, unsigned int timeout, CModem* modem, CDMRIPSC* network, CDisplay* display, bool duplex, const std::string& lookupFile, int rssiMultiplier, int rssiOffset, unsigned int jitter);
+	CDMRControl(unsigned int id, unsigned int colorCode, unsigned int callHang, bool selfOnly, const std::vector<unsigned int>& prefixes, const std::vector<unsigned int>& blackList, const std::vector<unsigned int>& DstIdBlacklistSlot1RF, const std::vector<unsigned int>& DstIdWhitelistSlot1RF, const std::vector<unsigned int>& DstIdBlacklistSlot2RF, const std::vector<unsigned int>& DstIdWhitelistSlot2RF,const std::vector<unsigned int>& DstIdBlacklistSlot1NET, const std::vector<unsigned int>& DstIdWhitelistSlot1NET, const std::vector<unsigned int>& DstIdBlacklistSlot2NET, const std::vector<unsigned int>& DstIdWhitelistSlot2NET, unsigned int timeout, CModem* modem, CDMRIPSC* network, CDisplay* display, bool duplex, CDMRLookup* lookup, int rssiMultiplier, int rssiOffset, unsigned int jitter);
 	~CDMRControl();
 
 	bool processWakeup(const unsigned char* data);

DMRLookup.cpp

@@ -37,7 +37,7 @@ bool CDMRLookup::read()
 {
 	FILE* fp = ::fopen(m_filename.c_str(), "rt");
 	if (fp == NULL) {
-		LogWarning("Cannot open the DMR Id lookup file - %s", m_filename.c_str());
+		LogWarning("Cannot open the Id lookup file - %s", m_filename.c_str());
 		return false;
 	}
 
@@ -64,7 +64,7 @@ bool CDMRLookup::read()
 	if (size == 0U)
 		return false;
 
-	LogInfo("Loaded %u DMR Ids to the callsign lookup table", size);
+	LogInfo("Loaded %u Ids to the callsign lookup table", size);
 
 	return true;
 }

MMDVM.ini

@@ -47,7 +47,7 @@ TXLevel=50
 OscOffset=0
 RSSIMultiplier=1
 RSSIOffset=10
-Debug=0
+Debug=1
 
 [D-Star]
 Enable=1
@@ -79,7 +79,7 @@ Enable=1
 
 [P25]
 Enable=1
-Id=123456
+NAC=293
 
 [D-Star Network]
 Enable=1

MMDVMHost.cpp

@@ -23,6 +23,7 @@
 #include "Defines.h"
 #include "DStarControl.h"
 #include "DMRControl.h"
+#include "DMRLookup.h"
 #include "TFTSerial.h"
 #include "NullDisplay.h"
 #include "YSFControl.h"
@@ -267,6 +268,16 @@ int CMMDVMHost::run()
 	CTimer dmrBeaconTimer(1000U, 4U);
 	bool dmrBeaconsEnabled = m_dmrEnabled && m_conf.getDMRBeacons();
 
+	// For DMR and P25 we try to map IDs to callsigns
+	CDMRLookup* lookup = NULL;
+	if (m_dmrEnabled || m_p25Enabled) {
+		std::string lookupFile = m_conf.getDMRLookupFile();
+		LogInfo("ID lookup File: %s", lookupFile.length() > 0U ? lookupFile.c_str() : "None");
+
+		lookup = new CDMRLookup(lookupFile);
+		lookup->read();
+	}
+
 	CStopWatch stopWatch;
 	stopWatch.start();
 
@@ -308,7 +319,6 @@ int CMMDVMHost::run()
 		std::vector<unsigned int> dstIDBlackListSlot2NET = m_conf.getDMRDstIdBlacklistSlot2NET();
 		std::vector<unsigned int> dstIDWhiteListSlot1NET = m_conf.getDMRDstIdWhitelistSlot1NET();
 		std::vector<unsigned int> dstIDWhiteListSlot2NET = m_conf.getDMRDstIdWhitelistSlot2NET();
-		std::string lookupFile = m_conf.getDMRLookupFile();
 		unsigned int callHang  = m_conf.getDMRCallHang();
 		unsigned int txHang    = m_conf.getDMRTXHang();
 		int rssiMultiplier     = m_conf.getModemRSSIMultiplier();
@@ -348,7 +358,6 @@ int CMMDVMHost::run()
 		if (dstIDWhiteListSlot2NET.size() > 0U)
 			LogInfo("    Slot 2 NET Destination ID White List: %u entries", dstIDWhiteListSlot2NET.size());
 
-		LogInfo("    Lookup File: %s", lookupFile.length() > 0U ? lookupFile.c_str() : "None");
 		LogInfo("    Call Hang: %us", callHang);
 		LogInfo("    TX Hang: %us", txHang);
 
@@ -357,7 +366,7 @@ int CMMDVMHost::run()
 			LogInfo("    RSSI Offset: %d", rssiOffset);
 		}
 
-		dmr = new CDMRControl(id, colorCode, callHang, selfOnly, prefixes, blackList,dstIDBlackListSlot1RF,dstIDWhiteListSlot1RF, dstIDBlackListSlot2RF, dstIDWhiteListSlot2RF, dstIDBlackListSlot1NET,dstIDWhiteListSlot1NET, dstIDBlackListSlot2NET, dstIDWhiteListSlot2NET, m_timeout, m_modem, m_dmrNetwork, m_display, m_duplex, lookupFile, rssiMultiplier, rssiOffset, jitter);
+		dmr = new CDMRControl(id, colorCode, callHang, selfOnly, prefixes, blackList,dstIDBlackListSlot1RF,dstIDWhiteListSlot1RF, dstIDBlackListSlot2RF, dstIDWhiteListSlot2RF, dstIDBlackListSlot1NET,dstIDWhiteListSlot1NET, dstIDBlackListSlot2NET, dstIDWhiteListSlot2NET, m_timeout, m_modem, m_dmrNetwork, m_display, m_duplex, lookup, rssiMultiplier, rssiOffset, jitter);
 
 		m_dmrTXTimer.setTimeout(txHang);
 	}
@@ -379,19 +388,19 @@ int CMMDVMHost::run()
 
 	CP25Control* p25 = NULL;
 	if (m_p25Enabled) {
-		unsigned int id    = m_conf.getP25Id();
+		unsigned int nac   = m_conf.getP25NAC();
 		int rssiMultiplier = m_conf.getModemRSSIMultiplier();
 		int rssiOffset     = m_conf.getModemRSSIOffset();
 
 		LogInfo("P25 Parameters");
-		LogInfo("    Id: %u", id);
+		LogInfo("    NAC: $%03X", nac);
 
 		if (rssiMultiplier != 0) {
 			LogInfo("    RSSI Multiplier: %d", rssiMultiplier);
 			LogInfo("    RSSI Offset: %d", rssiOffset);
 		}
 
-		p25 = new CP25Control(id, m_display, m_timeout, m_duplex, rssiMultiplier, rssiOffset);
+		p25 = new CP25Control(nac, m_display, m_timeout, m_duplex, lookup, rssiMultiplier, rssiOffset);
 	}
 
 	setMode(MODE_IDLE);

MMDVMHost.vcxproj

@@ -181,8 +181,11 @@
     <ClInclude Include="Modem.h" />
     <ClInclude Include="Nextion.h" />
     <ClInclude Include="NullDisplay.h" />
+    <ClInclude Include="P25Audio.h" />
     <ClInclude Include="P25Control.h" />
     <ClInclude Include="P25Defines.h" />
+    <ClInclude Include="P25Data.h" />
+    <ClInclude Include="P25NID.h" />
     <ClInclude Include="QR1676.h" />
     <ClInclude Include="RingBuffer.h" />
     <ClInclude Include="RS129.h" />
@@ -236,7 +239,10 @@
     <ClCompile Include="Modem.cpp" />
     <ClCompile Include="Nextion.cpp" />
     <ClCompile Include="NullDisplay.cpp" />
+    <ClCompile Include="P25Audio.cpp" />
     <ClCompile Include="P25Control.cpp" />
+    <ClCompile Include="P25Data.cpp" />
+    <ClCompile Include="P25NID.cpp" />
     <ClCompile Include="QR1676.cpp" />
     <ClCompile Include="RS129.cpp" />
     <ClCompile Include="SerialController.cpp" />

MMDVMHost.vcxproj.filters

@@ -179,6 +179,15 @@
     <ClInclude Include="P25Control.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="P25NID.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="P25Audio.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="P25Data.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="BPTC19696.cpp">
@@ -328,5 +337,14 @@
     <ClCompile Include="P25Control.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="P25NID.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="P25Audio.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="P25Data.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

Makefile

@@ -9,8 +9,8 @@ LDFLAGS = -g
 OBJECTS = \
 		AMBEFEC.o BPTC19696.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o DMRDataHeader.o DMREMB.o DMREmbeddedLC.o DMRFullLC.o DMRIPSC.o DMRLookup.o DMRLC.o \
 		DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o DStarSlowData.o Golay2087.o Golay24128.o Hamming.o Log.o MMDVMHost.o \
-		Modem.o Nextion.o NullDisplay.o P25Control.o QR1676.o RS129.o SerialController.o SHA256.o StopWatch.o Sync.o TFTSerial.o Thread.o Timer.o UDPSocket.o Utils.o \
-		YSFControl.o YSFConvolution.o YSFFICH.o YSFNetwork.o YSFPayload.o
+		Modem.o Nextion.o NullDisplay.o P25Audio.o P25Control.o P25Data.o P25NID.o QR1676.o RS129.o SerialController.o SHA256.o StopWatch.o Sync.o TFTSerial.o Thread.o \
+		Timer.o UDPSocket.o Utils.o YSFControl.o YSFConvolution.o YSFFICH.o YSFNetwork.o YSFPayload.o
 
 all:		MMDVMHost
 

Makefile.Pi.Adafruit

@@ -9,8 +9,8 @@ LDFLAGS = -g -L/usr/local/lib
 OBJECTS = \
 		AMBEFEC.o BPTC19696.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o DMRDataHeader.o DMREMB.o DMREmbeddedLC.o DMRFullLC.o DMRIPSC.o DMRLookup.o DMRLC.o \
 		DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o DStarSlowData.o Golay2087.o Golay24128.o Hamming.o HD44780.o Log.o \
-		MMDVMHost.o Modem.o Nextion.o NullDisplay.o P25Control.o QR1676.o RS129.o SerialController.o SHA256.o StopWatch.o Sync.o TFTSerial.o Thread.o Timer.o \
-		UDPSocket.o Utils.o YSFControl.o YSFConvolution.o YSFFICH.o YSFNetwork.o YSFPayload.o
+		MMDVMHost.o Modem.o Nextion.o NullDisplay.o P25Audio.o P25Control.o P25Data.o P25NID.o QR1676.o RS129.o SerialController.o SHA256.o StopWatch.o Sync.o TFTSerial.o \
+		Thread.o Timer.o UDPSocket.o Utils.o YSFControl.o YSFConvolution.o YSFFICH.o YSFNetwork.o YSFPayload.o
 
 all:		MMDVMHost
 

Makefile.Pi.HD44780

@@ -9,8 +9,8 @@ LDFLAGS = -g -L/usr/local/lib
 OBJECTS = \
 		AMBEFEC.o BPTC19696.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o DMRDataHeader.o DMREMB.o DMREmbeddedLC.o DMRFullLC.o DMRIPSC.o DMRLookup.o DMRLC.o \
 		DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o DStarSlowData.o Golay2087.o Golay24128.o Hamming.o HD44780.o Log.o \
-		MMDVMHost.o Modem.o Nextion.o NullDisplay.o P25Control.o QR1676.o RS129.o SerialController.o SHA256.o StopWatch.o Sync.o TFTSerial.o Thread.o Timer.o UDPSocket.o \
-		Utils.o YSFControl.o YSFConvolution.o YSFFICH.o YSFNetwork.o YSFPayload.o
+		MMDVMHost.o Modem.o Nextion.o NullDisplay.o P25Audio.o P25Control.o P25Data.o P25NID.o QR1676.o RS129.o SerialController.o SHA256.o StopWatch.o Sync.o TFTSerial.o \
+		Thread.o Timer.o UDPSocket.o Utils.o YSFControl.o YSFConvolution.o YSFFICH.o YSFNetwork.o YSFPayload.o
 
 all:		MMDVMHost
 

Makefile.Pi.OLED

@@ -9,8 +9,8 @@ LDFLAGS = -g -L/usr/local/lib
 OBJECTS = \
 		AMBEFEC.o BPTC19696.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o DMRDataHeader.o DMREMB.o DMREmbeddedLC.o DMRFullLC.o DMRIPSC.o DMRLookup.o DMRLC.o \
 		DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o DStarSlowData.o Golay2087.o Golay24128.o Hamming.o OLED.o Log.o \
-		MMDVMHost.o Modem.o Nextion.o NullDisplay.o P25Control.o QR1676.o RS129.o SerialController.o SHA256.o StopWatch.o Sync.o TFTSerial.o Thread.o Timer.o \
-		UDPSocket.o Utils.o YSFControl.o YSFConvolution.o YSFFICH.o YSFNetwork.o YSFPayload.o
+		MMDVMHost.o Modem.o Nextion.o NullDisplay.o P25Audio.o P25Control.o P25Data.o P25NID.o QR1676.o RS129.o SerialController.o SHA256.o StopWatch.o Sync.o TFTSerial.o \
+		Thread.o Timer.o UDPSocket.o Utils.o YSFControl.o YSFConvolution.o YSFFICH.o YSFNetwork.o YSFPayload.o
 
 all:		MMDVMHost
 

Makefile.Pi.PCF8574

@@ -9,8 +9,8 @@ LDFLAGS = -g -L/usr/local/lib
 OBJECTS = \
 		AMBEFEC.o BPTC19696.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o DMRDataHeader.o DMREMB.o DMREmbeddedLC.o DMRFullLC.o DMRIPSC.o DMRLookup.o DMRLC.o \
 		DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o DStarSlowData.o Golay2087.o Golay24128.o Hamming.o HD44780.o Log.o \
-		MMDVMHost.o Modem.o Nextion.o NullDisplay.o P25Control.o QR1676.o RS129.o SerialController.o SHA256.o StopWatch.o Sync.o TFTSerial.o Thread.o Timer.o \
-		UDPSocket.o Utils.o YSFControl.o YSFConvolution.o YSFFICH.o YSFNetwork.o YSFPayload.o
+		MMDVMHost.o Modem.o Nextion.o NullDisplay.o P25Audio.o P25Control.o P25Data.o P25NID.o QR1676.o RS129.o SerialController.o SHA256.o StopWatch.o Sync.o TFTSerial.o \
+		Thread.o Timer.o UDPSocket.o Utils.o YSFControl.o YSFConvolution.o YSFFICH.o YSFNetwork.o YSFPayload.o
 
 all:		MMDVMHost
 

Makefile.Solaris

@@ -9,8 +9,8 @@ LDFLAGS = -g
 OBJECTS = \
 		AMBEFEC.o BPTC19696.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o DMRDataHeader.o DMREMB.o DMREmbeddedLC.o DMRFullLC.o DMRIPSC.o DMRLookup.o DMRLC.o \
 		DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o DStarSlowData.o Golay2087.o Golay24128.o Hamming.o Log.o MMDVMHost.o \
-		Modem.o Nextion.o NullDisplay.o P25Control.o QR1676.o RS129.o SerialController.o SHA256.o StopWatch.o Sync.o TFTSerial.o Thread.o Timer.o UDPSocket.o Utils.o \
-		YSFControl.o YSFConvolution.o YSFFICH.o YSFNetwork.o YSFPayload.o
+		Modem.o Nextion.o NullDisplay.o P25Audio.o P25Control.o P25Data.o P25NID.o QR1676.o RS129.o SerialController.o SHA256.o StopWatch.o Sync.o TFTSerial.o Thread.o \
+		Timer.o UDPSocket.o Utils.o YSFControl.o YSFConvolution.o YSFFICH.o YSFNetwork.o YSFPayload.o
 
 all:		MMDVMHost