Update the P25 Reed-Solomon FEC to be the same as the DVMM project.

g4klx · Sep 30, 2024 · bc43db1 · bc43db1
1 parent b1ac8cc
commit bc43db1
Show file tree

Hide file tree

Showing 14 changed files with 1,249 additions and 312 deletions.
diff --git a/MMDVMHost.vcxproj b/MMDVMHost.vcxproj
@@ -251,8 +251,9 @@
     <ClInclude Include="QR1676.h" />
     <ClInclude Include="RemoteControl.h" />
     <ClInclude Include="RingBuffer.h" />
+    <ClInclude Include="RS.h" />
     <ClInclude Include="RS129.h" />
-    <ClInclude Include="RS241213.h" />
+    <ClInclude Include="RS634717.h" />
     <ClInclude Include="RSSIInterpolator.h" />
     <ClInclude Include="NXDNSACCH.h" />
     <ClInclude Include="UARTController.h" />
@@ -359,7 +360,7 @@
     <ClCompile Include="QR1676.cpp" />
     <ClCompile Include="RemoteControl.cpp" />
     <ClCompile Include="RS129.cpp" />
-    <ClCompile Include="RS241213.cpp" />
+    <ClCompile Include="RS634717.cpp" />
     <ClCompile Include="RSSIInterpolator.cpp" />
     <ClCompile Include="UARTController.cpp" />
     <ClCompile Include="Modem.cpp" />

diff --git a/MMDVMHost.vcxproj.filters b/MMDVMHost.vcxproj.filters
@@ -191,9 +191,6 @@
     <ClInclude Include="BCH.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="RS241213.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="SerialPort.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -350,6 +347,12 @@
     <ClInclude Include="SMeter.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="RS634717.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RS.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="BPTC19696.cpp">
@@ -511,9 +514,6 @@
     <ClCompile Include="BCH.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="RS241213.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="SerialPort.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -658,5 +658,8 @@
     <ClCompile Include="SMeter.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="RS634717.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/Makefile b/Makefile
@@ -16,7 +16,7 @@ OBJECTS = \
 		Modem.o ModemPort.o ModemSerialPort.o Mutex.o NetworkInfo.o Nextion.o NullController.o NullDisplay.o NXDNAudio.o NXDNControl.o \
 		NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNIcomNetwork.o NXDNKenwoodNetwork.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o NXDNNetwork.o NXDNSACCH.o \
 		NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o PseudoTTYController.o POCSAGControl.o \
-		POCSAGNetwork.o QR1676.o RemoteControl.o RS129.o RS241213.o RSSIInterpolator.o SerialPort.o SMeter.o StopWatch.o Sync.o SHA256.o TFTSurenoo.o Thread.o \
+		POCSAGNetwork.o QR1676.o RemoteControl.o RS129.o RS634717.o RSSIInterpolator.o SerialPort.o SMeter.o StopWatch.o Sync.o SHA256.o TFTSurenoo.o Thread.o \
 		Timer.o UARTController.o UDPController.o UDPSocket.o UserDB.o UserDBentry.o Utils.o YSFControl.o YSFConvolution.o YSFFICH.o YSFNetwork.o YSFPayload.o
 
 all:		MMDVMHost RemoteCommand

diff --git a/Makefile.Pi.Adafruit b/Makefile.Pi.Adafruit
@@ -17,7 +17,7 @@ OBJECTS = \
 		MMDVMHost.o Modem.o ModemPort.o ModemSerialPort.o Mutex.o NetworkInfo.o Nextion.o NullController.o NullDisplay.o NXDNAudio.o \
 		NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNIcomNetwork.o NXDNKenwoodNetwork.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o NXDNNetwork.o \
 		NXDNSACCH.o NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o PseudoTTYController.o \
-		POCSAGControl.o POCSAGNetwork.o QR1676.o RemoteControl.o RS129.o RS241213.o RSSIInterpolator.o SerialPort.o SMeter.o StopWatch.o Sync.o SHA256.o \
+		POCSAGControl.o POCSAGNetwork.o QR1676.o RemoteControl.o RS129.o RS634717.o RSSIInterpolator.o SerialPort.o SMeter.o StopWatch.o Sync.o SHA256.o \
 		TFTSurenoo.o Thread.o Timer.o UARTController.o UDPController.o UDPSocket.o UserDB.o UserDBentry.o Utils.o YSFControl.o YSFConvolution.o YSFFICH.o \
 		YSFNetwork.o YSFPayload.o
 

diff --git a/Makefile.Pi.HD44780 b/Makefile.Pi.HD44780
@@ -16,7 +16,7 @@ OBJECTS = \
 		MMDVMHost.o Modem.o ModemPort.o ModemSerialPort.o Mutex.o NetworkInfo.o Nextion.o NullController.o NullDisplay.o NXDNAudio.o \
 		NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNIcomNetwork.o NXDNKenwoodNetwork.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o NXDNNetwork.o \
 		NXDNSACCH.o NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o PseudoTTYController.o \
-		POCSAGControl.o POCSAGNetwork.o QR1676.o RemoteControl.o RS129.o RS241213.o RSSIInterpolator.o SerialPort.o SMeter.o StopWatch.o Sync.o SHA256.o \
+		POCSAGControl.o POCSAGNetwork.o QR1676.o RemoteControl.o RS129.o RS634717.o RSSIInterpolator.o SerialPort.o SMeter.o StopWatch.o Sync.o SHA256.o \
 		TFTSurenoo.o Thread.o Timer.o UARTController.o UDPController.o UDPSocket.o UserDB.o UserDBentry.o Utils.o YSFControl.o YSFConvolution.o YSFFICH.o \
 		YSFNetwork.o YSFPayload.o
 

diff --git a/Makefile.Pi.I2C b/Makefile.Pi.I2C
@@ -16,7 +16,7 @@ OBJECTS = \
 		Modem.o ModemPort.o ModemSerialPort.o Mutex.o NetworkInfo.o Nextion.o NullController.o NullDisplay.o NXDNAudio.o NXDNControl.o \
 		NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNIcomNetwork.o NXDNKenwoodNetwork.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o NXDNNetwork.o NXDNSACCH.o \
 		NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o PseudoTTYController.o POCSAGControl.o \
-		POCSAGNetwork.o QR1676.o RemoteControl.o RS129.o RS241213.o RSSIInterpolator.o SerialPort.o SMeter.o StopWatch.o Sync.o SHA256.o TFTSurenoo.o Thread.o \
+		POCSAGNetwork.o QR1676.o RemoteControl.o RS129.o RS634717.o RSSIInterpolator.o SerialPort.o SMeter.o StopWatch.o Sync.o SHA256.o TFTSurenoo.o Thread.o \
 		Timer.o UARTController.o UDPController.o UDPSocket.o UserDB.o UserDBentry.o Utils.o YSFControl.o YSFConvolution.o YSFFICH.o YSFNetwork.o YSFPayload.o
 
 all:		MMDVMHost RemoteCommand

diff --git a/Makefile.Pi.OLED b/Makefile.Pi.OLED
@@ -20,7 +20,7 @@ OBJECTS = \
 		Modem.o ModemPort.o ModemSerialPort.o Mutex.o NetworkInfo.o Nextion.o NullController.o NullDisplay.o NXDNAudio.o NXDNControl.o \
 		NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNIcomNetwork.o NXDNKenwoodNetwork.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o NXDNNetwork.o NXDNSACCH.o \
 		NXDNUDCH.o OLED.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o PseudoTTYController.o \
-		POCSAGControl.o POCSAGNetwork.o QR1676.o RemoteControl.o RS129.o RS241213.o RSSIInterpolator.o SerialPort.o SMeter.o StopWatch.o Sync.o SHA256.o \
+		POCSAGControl.o POCSAGNetwork.o QR1676.o RemoteControl.o RS129.o RS634717.o RSSIInterpolator.o SerialPort.o SMeter.o StopWatch.o Sync.o SHA256.o \
 		TFTSurenoo.o Thread.o Timer.o UARTController.o UDPController.o UDPSocket.o UserDB.o UserDBentry.o Utils.o YSFControl.o YSFConvolution.o YSFFICH.o \
 		YSFNetwork.o YSFPayload.o
 

diff --git a/Makefile.Pi.PCF8574 b/Makefile.Pi.PCF8574
@@ -17,7 +17,7 @@ OBJECTS = \
 		MMDVMHost.o Modem.o ModemPort.o ModemSerialPort.o Mutex.o NetworkInfo.o Nextion.o NullController.o NullDisplay.o NXDNAudio.o \
 		NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNIcomNetwork.o NXDNKenwoodNetwork.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o NXDNNetwork.o \
 		NXDNSACCH.o NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o PseudoTTYController.o \
-		POCSAGControl.o POCSAGNetwork.o QR1676.o RemoteControl.o RS129.o RS241213.o RSSIInterpolator.o SerialPort.o SMeter.o StopWatch.o Sync.o SHA256.o \
+		POCSAGControl.o POCSAGNetwork.o QR1676.o RemoteControl.o RS129.o RS634717.o RSSIInterpolator.o SerialPort.o SMeter.o StopWatch.o Sync.o SHA256.o \
 		TFTSurenoo.o Thread.o Timer.o UARTController.o UDPController.o UDPSocket.o UserDB.o UserDBentry.o Utils.o YSFControl.o YSFConvolution.o YSFFICH.o \
 		YSFNetwork.o YSFPayload.o
 

diff --git a/P25Data.cpp b/P25Data.cpp
@@ -1,5 +1,5 @@
 /*
-*   Copyright (C) 2016,2017,2023 by Jonathan Naylor G4KLX
+*   Copyright (C) 2016,2017,2023,2024 by Jonathan Naylor G4KLX
 *   Copyright (C) 2018 by Bryan Biedenkapp <[email protected]> N2PLL
 *
 *   This program is free software; you can redistribute it and/or modify
@@ -44,7 +44,7 @@ m_lcf(0x00U),
 m_emergency(false),
 m_srcId(0U),
 m_dstId(0U),
-m_rs241213(),
+m_rs(),
 m_trellis()
 {
 	m_mi = new unsigned char[P25_MI_LENGTH_BYTES];
@@ -89,7 +89,7 @@ bool CP25Data::decodeHeader(const unsigned char* data)
 
 	// decode RS (36,20,17) FEC
 	try {
-		bool ret = m_rs241213.decode362017(rs);
+		bool ret = m_rs.decode362017(rs);
 		if (!ret)
 			return false;
 	} catch (...) {
@@ -133,7 +133,7 @@ void CP25Data::encodeHeader(unsigned char* data)
 	rs[14U] = (m_dstId >> 0) & 0xFFU;                                               // Talkgroup Address LSB
 
 	// encode RS (36,20,17) FEC
-	m_rs241213.encode362017(rs);
+	m_rs.encode362017(rs);
 
 	unsigned char raw[81U];
 	::memset(raw, 0x00U, 81U);
@@ -171,7 +171,7 @@ bool CP25Data::decodeLDU1(const unsigned char* data)
 	decodeLDUHamming(raw, rs + 15U);
 
 	try {
-		bool ret = m_rs241213.decode(rs);
+		bool ret = m_rs.decode241213(rs);
 		if (!ret)
 			return false;
 	} catch (...) {
@@ -234,7 +234,7 @@ void CP25Data::encodeLDU1(unsigned char* data)
 		break;
 	}
 
-	m_rs241213.encode(rs);
+	m_rs.encode241213(rs);
 
 	unsigned char raw[5U];
 	encodeLDUHamming(raw, rs + 0U);
@@ -284,7 +284,7 @@ bool CP25Data::decodeLDU2(const unsigned char* data)
 
 	// decode RS (24,16,9) FEC
 	try {
-		bool ret = m_rs241213.decode24169(rs);
+		bool ret = m_rs.decode24169(rs);
 		if (!ret)
 			return false;
 	} catch (...) {
@@ -324,7 +324,7 @@ void CP25Data::encodeLDU2(unsigned char* data)
 	rs[11U] = (m_kId >> 0) & 0xFFU;                                      // Key ID LSB
 
 	// encode RS (24,16,9) FEC
-	m_rs241213.encode24169(rs);
+	m_rs.encode24169(rs);
 
 	// encode Hamming (10,6,3) FEC and interleave for LC data
 	unsigned char raw[5U];

diff --git a/P25Data.h b/P25Data.h
@@ -1,5 +1,5 @@
 /*
-*   Copyright (C) 2016,2017 by Jonathan Naylor G4KLX
+*   Copyright (C) 2016,2017,2024 by Jonathan Naylor G4KLX
 *   Copyright (C) 2018 by Bryan Biedenkapp <[email protected]> N2PLL
 *
 *   This program is free software; you can redistribute it and/or modify
@@ -20,7 +20,7 @@
 #if !defined(P25Data_H)
 #define  P25Data_H
 
-#include "RS241213.h"
+#include "RS634717.h"
 #include "P25Trellis.h"
 
 class CP25Data {
@@ -81,7 +81,7 @@ class CP25Data {
 	unsigned int   m_srcId;
 	unsigned int   m_dstId;
 	unsigned char  m_serviceType;
-	CRS241213      m_rs241213;
+	CRS634717      m_rs;
 	CP25Trellis    m_trellis;
 
 	void decodeLDUHamming(const unsigned char* raw, unsigned char* data);