mirror of
https://github.com/g4klx/MMDVMHost.git
synced 2025-12-06 05:32:00 +01:00
Update the P25 Reed-Solomon FEC to be the same as the DVMM project.
This commit is contained in:
Jonathan Naylor
parent
b1ac8ccfd6
commit
bc43db1e02
|
|
@ -251,8 +251,9 @@
|
||||||
<ClInclude Include="QR1676.h" />
|
<ClInclude Include="QR1676.h" />
|
||||||
<ClInclude Include="RemoteControl.h" />
|
<ClInclude Include="RemoteControl.h" />
|
||||||
<ClInclude Include="RingBuffer.h" />
|
<ClInclude Include="RingBuffer.h" />
|
||||||
|
<ClInclude Include="RS.h" />
|
||||||
<ClInclude Include="RS129.h" />
|
<ClInclude Include="RS129.h" />
|
||||||
<ClInclude Include="RS241213.h" />
|
<ClInclude Include="RS634717.h" />
|
||||||
<ClInclude Include="RSSIInterpolator.h" />
|
<ClInclude Include="RSSIInterpolator.h" />
|
||||||
<ClInclude Include="NXDNSACCH.h" />
|
<ClInclude Include="NXDNSACCH.h" />
|
||||||
<ClInclude Include="UARTController.h" />
|
<ClInclude Include="UARTController.h" />
|
||||||
|
|
@ -359,7 +360,7 @@
|
||||||
<ClCompile Include="QR1676.cpp" />
|
<ClCompile Include="QR1676.cpp" />
|
||||||
<ClCompile Include="RemoteControl.cpp" />
|
<ClCompile Include="RemoteControl.cpp" />
|
||||||
<ClCompile Include="RS129.cpp" />
|
<ClCompile Include="RS129.cpp" />
|
||||||
<ClCompile Include="RS241213.cpp" />
|
<ClCompile Include="RS634717.cpp" />
|
||||||
<ClCompile Include="RSSIInterpolator.cpp" />
|
<ClCompile Include="RSSIInterpolator.cpp" />
|
||||||
<ClCompile Include="UARTController.cpp" />
|
<ClCompile Include="UARTController.cpp" />
|
||||||
<ClCompile Include="Modem.cpp" />
|
<ClCompile Include="Modem.cpp" />
|
||||||
|
|
|
||||||
|
|
@ -191,9 +191,6 @@
|
||||||
<ClInclude Include="BCH.h">
|
<ClInclude Include="BCH.h">
|
||||||
<Filter>Header Files</Filter>
|
<Filter>Header Files</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
<ClInclude Include="RS241213.h">
|
|
||||||
<Filter>Header Files</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="SerialPort.h">
|
<ClInclude Include="SerialPort.h">
|
||||||
<Filter>Header Files</Filter>
|
<Filter>Header Files</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
|
|
@ -350,6 +347,12 @@
|
||||||
<ClInclude Include="SMeter.h">
|
<ClInclude Include="SMeter.h">
|
||||||
<Filter>Header Files</Filter>
|
<Filter>Header Files</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
|
<ClInclude Include="RS634717.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="RS.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="BPTC19696.cpp">
|
<ClCompile Include="BPTC19696.cpp">
|
||||||
|
|
@ -511,9 +514,6 @@
|
||||||
<ClCompile Include="BCH.cpp">
|
<ClCompile Include="BCH.cpp">
|
||||||
<Filter>Source Files</Filter>
|
<Filter>Source Files</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ClCompile Include="RS241213.cpp">
|
|
||||||
<Filter>Source Files</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="SerialPort.cpp">
|
<ClCompile Include="SerialPort.cpp">
|
||||||
<Filter>Source Files</Filter>
|
<Filter>Source Files</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
|
@ -658,5 +658,8 @@
|
||||||
<ClCompile Include="SMeter.cpp">
|
<ClCompile Include="SMeter.cpp">
|
||||||
<Filter>Source Files</Filter>
|
<Filter>Source Files</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
<ClCompile Include="RS634717.cpp">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
2
Makefile
2
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 \
|
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 \
|
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 \
|
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
|
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
|
all: MMDVMHost RemoteCommand
|
||||||
|
|
|
||||||
|
|
@ -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 \
|
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 \
|
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 \
|
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 \
|
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
|
YSFNetwork.o YSFPayload.o
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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 \
|
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 \
|
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 \
|
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 \
|
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
|
YSFNetwork.o YSFPayload.o
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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 \
|
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 \
|
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 \
|
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
|
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
|
all: MMDVMHost RemoteCommand
|
||||||
|
|
|
||||||
|
|
@ -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 \
|
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 \
|
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 \
|
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 \
|
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
|
YSFNetwork.o YSFPayload.o
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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 \
|
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 \
|
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 \
|
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 \
|
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
|
YSFNetwork.o YSFPayload.o
|
||||||
|
|
||||||
|
|
|
||||||
16
P25Data.cpp
16
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 <gatekeep@gmail.com> N2PLL
|
* Copyright (C) 2018 by Bryan Biedenkapp <gatekeep@gmail.com> N2PLL
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
|
@ -44,7 +44,7 @@ m_lcf(0x00U),
|
||||||
m_emergency(false),
|
m_emergency(false),
|
||||||
m_srcId(0U),
|
m_srcId(0U),
|
||||||
m_dstId(0U),
|
m_dstId(0U),
|
||||||
m_rs241213(),
|
m_rs(),
|
||||||
m_trellis()
|
m_trellis()
|
||||||
{
|
{
|
||||||
m_mi = new unsigned char[P25_MI_LENGTH_BYTES];
|
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
|
// decode RS (36,20,17) FEC
|
||||||
try {
|
try {
|
||||||
bool ret = m_rs241213.decode362017(rs);
|
bool ret = m_rs.decode362017(rs);
|
||||||
if (!ret)
|
if (!ret)
|
||||||
return false;
|
return false;
|
||||||
} catch (...) {
|
} catch (...) {
|
||||||
|
|
@ -133,7 +133,7 @@ void CP25Data::encodeHeader(unsigned char* data)
|
||||||
rs[14U] = (m_dstId >> 0) & 0xFFU; // Talkgroup Address LSB
|
rs[14U] = (m_dstId >> 0) & 0xFFU; // Talkgroup Address LSB
|
||||||
|
|
||||||
// encode RS (36,20,17) FEC
|
// encode RS (36,20,17) FEC
|
||||||
m_rs241213.encode362017(rs);
|
m_rs.encode362017(rs);
|
||||||
|
|
||||||
unsigned char raw[81U];
|
unsigned char raw[81U];
|
||||||
::memset(raw, 0x00U, 81U);
|
::memset(raw, 0x00U, 81U);
|
||||||
|
|
@ -171,7 +171,7 @@ bool CP25Data::decodeLDU1(const unsigned char* data)
|
||||||
decodeLDUHamming(raw, rs + 15U);
|
decodeLDUHamming(raw, rs + 15U);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
bool ret = m_rs241213.decode(rs);
|
bool ret = m_rs.decode241213(rs);
|
||||||
if (!ret)
|
if (!ret)
|
||||||
return false;
|
return false;
|
||||||
} catch (...) {
|
} catch (...) {
|
||||||
|
|
@ -234,7 +234,7 @@ void CP25Data::encodeLDU1(unsigned char* data)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
m_rs241213.encode(rs);
|
m_rs.encode241213(rs);
|
||||||
|
|
||||||
unsigned char raw[5U];
|
unsigned char raw[5U];
|
||||||
encodeLDUHamming(raw, rs + 0U);
|
encodeLDUHamming(raw, rs + 0U);
|
||||||
|
|
@ -284,7 +284,7 @@ bool CP25Data::decodeLDU2(const unsigned char* data)
|
||||||
|
|
||||||
// decode RS (24,16,9) FEC
|
// decode RS (24,16,9) FEC
|
||||||
try {
|
try {
|
||||||
bool ret = m_rs241213.decode24169(rs);
|
bool ret = m_rs.decode24169(rs);
|
||||||
if (!ret)
|
if (!ret)
|
||||||
return false;
|
return false;
|
||||||
} catch (...) {
|
} catch (...) {
|
||||||
|
|
@ -324,7 +324,7 @@ void CP25Data::encodeLDU2(unsigned char* data)
|
||||||
rs[11U] = (m_kId >> 0) & 0xFFU; // Key ID LSB
|
rs[11U] = (m_kId >> 0) & 0xFFU; // Key ID LSB
|
||||||
|
|
||||||
// encode RS (24,16,9) FEC
|
// 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
|
// encode Hamming (10,6,3) FEC and interleave for LC data
|
||||||
unsigned char raw[5U];
|
unsigned char raw[5U];
|
||||||
|
|
|
||||||
|
|
@ -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 <gatekeep@gmail.com> N2PLL
|
* Copyright (C) 2018 by Bryan Biedenkapp <gatekeep@gmail.com> N2PLL
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
|
@ -20,7 +20,7 @@
|
||||||
#if !defined(P25Data_H)
|
#if !defined(P25Data_H)
|
||||||
#define P25Data_H
|
#define P25Data_H
|
||||||
|
|
||||||
#include "RS241213.h"
|
#include "RS634717.h"
|
||||||
#include "P25Trellis.h"
|
#include "P25Trellis.h"
|
||||||
|
|
||||||
class CP25Data {
|
class CP25Data {
|
||||||
|
|
@ -81,7 +81,7 @@ private:
|
||||||
unsigned int m_srcId;
|
unsigned int m_srcId;
|
||||||
unsigned int m_dstId;
|
unsigned int m_dstId;
|
||||||
unsigned char m_serviceType;
|
unsigned char m_serviceType;
|
||||||
CRS241213 m_rs241213;
|
CRS634717 m_rs;
|
||||||
CP25Trellis m_trellis;
|
CP25Trellis m_trellis;
|
||||||
|
|
||||||
void decodeLDUHamming(const unsigned char* raw, unsigned char* data);
|
void decodeLDUHamming(const unsigned char* raw, unsigned char* data);
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (C) 2016 by Jonathan Naylor G4KLX
|
* Copyright (C) 2016,2024 by Jonathan Naylor G4KLX
|
||||||
* Copyright (C) 2018 by Bryan Biedenkapp <gatekeep@gmail.com> N2PLL
|
* Copyright (C) 2018,2023 by Bryan Biedenkapp <gatekeep@gmail.com> N2PLL
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* This program is free software; you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
|
@ -17,13 +17,16 @@
|
||||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "RS241213.h"
|
#include "RS634717.h"
|
||||||
|
#include "RS.h"
|
||||||
|
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
|
|
||||||
const unsigned char ENCODE_MATRIX[12U][24U] = {
|
const unsigned char ENCODE_MATRIX_241213[12U][24U] = {
|
||||||
{1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 062, 044, 003, 025, 014, 016, 027, 003, 053, 004, 036, 047},
|
{1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 062, 044, 003, 025, 014, 016, 027, 003, 053, 004, 036, 047},
|
||||||
{0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 011, 012, 011, 011, 016, 064, 067, 055, 001, 076, 026, 073},
|
{0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 011, 012, 011, 011, 016, 064, 067, 055, 001, 076, 026, 073},
|
||||||
{0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 003, 001, 005, 075, 014, 006, 020, 044, 066, 006, 070, 066},
|
{0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 003, 001, 005, 075, 014, 006, 020, 044, 066, 006, 070, 066},
|
||||||
|
|
@ -118,20 +121,69 @@ static void hex2Bin(unsigned char input, unsigned char* output, unsigned int off
|
||||||
WRITE_BIT(output, offset + 5U, input & 0x01U);
|
WRITE_BIT(output, offset + 5U, input & 0x01U);
|
||||||
}
|
}
|
||||||
|
|
||||||
CRS241213::CRS241213()
|
#define __RS(TYPE, SYMBOLS, PAYLOAD, POLY, FCR, PRIM) \
|
||||||
|
rs::reed_solomon<TYPE, \
|
||||||
|
rs::log_<(SYMBOLS) + 1>::value, \
|
||||||
|
(SYMBOLS) - (PAYLOAD), FCR, PRIM, \
|
||||||
|
rs::gfpoly<rs::log_<(SYMBOLS) + 1>::value, POLY>>
|
||||||
|
|
||||||
|
#define __RS_63(PAYLOAD) __RS(unsigned char, 63, PAYLOAD, 0x43, 1, 1)
|
||||||
|
|
||||||
|
class RS6347 : public __RS_63(47) {
|
||||||
|
public:
|
||||||
|
RS6347() : __RS_63(47)() { /* stub */ }
|
||||||
|
};
|
||||||
|
RS6347 rs634717; // 16 bit / 8 bit corrections max / 5 bytes total
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Implements Reed-Solomon (24,12,13)
|
||||||
|
*/
|
||||||
|
class RS6351 : public __RS_63(51) {
|
||||||
|
public:
|
||||||
|
RS6351() : __RS_63(51)() { /* stub */ }
|
||||||
|
};
|
||||||
|
RS6351 rs241213; // 12 bit / 6 bit corrections max / 3 bytes total
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Implements Reed-Solomon (24,16,9)
|
||||||
|
*/
|
||||||
|
class RS6355 : public __RS_63(55) {
|
||||||
|
public:
|
||||||
|
RS6355() : __RS_63(55)() { /* stub */ }
|
||||||
|
};
|
||||||
|
RS6355 rs24169; // 8 bit / 4 bit corrections max / 2 bytes total
|
||||||
|
|
||||||
|
CRS634717::CRS634717()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
CRS241213::~CRS241213()
|
CRS634717::~CRS634717()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CRS241213::decode(unsigned char* data)
|
bool CRS634717::decode241213(unsigned char* data)
|
||||||
{
|
{
|
||||||
return decode(data, 24U, 39, 12);
|
assert(data != NULL);
|
||||||
|
|
||||||
|
std::vector<unsigned char> codeword(63, 0);
|
||||||
|
|
||||||
|
unsigned int offset = 0U;
|
||||||
|
for (unsigned int i = 0U; i < 24U; i++, offset += 6U)
|
||||||
|
codeword[39U + i] = bin2Hex(data, offset);
|
||||||
|
|
||||||
|
int ec = rs241213.decode(codeword);
|
||||||
|
|
||||||
|
offset = 0U;
|
||||||
|
for (unsigned int i = 0U; i < 12U; i++, offset += 6U)
|
||||||
|
hex2Bin(codeword[39U + i], data, offset);
|
||||||
|
|
||||||
|
if (ec == -1 || ec >= 6)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CRS241213::encode(unsigned char* data)
|
void CRS634717::encode241213(unsigned char* data)
|
||||||
{
|
{
|
||||||
assert(data != NULL);
|
assert(data != NULL);
|
||||||
|
|
||||||
|
|
@ -143,7 +195,7 @@ void CRS241213::encode(unsigned char* data)
|
||||||
unsigned int offset = 0U;
|
unsigned int offset = 0U;
|
||||||
for (unsigned int j = 0U; j < 12U; j++, offset += 6U) {
|
for (unsigned int j = 0U; j < 12U; j++, offset += 6U) {
|
||||||
unsigned char hexbit = bin2Hex(data, offset);
|
unsigned char hexbit = bin2Hex(data, offset);
|
||||||
codeword[i] ^= gf6Mult(hexbit, ENCODE_MATRIX[j][i]);
|
codeword[i] ^= gf6Mult(hexbit, ENCODE_MATRIX_241213[j][i]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -152,12 +204,29 @@ void CRS241213::encode(unsigned char* data)
|
||||||
hex2Bin(codeword[i], data, offset);
|
hex2Bin(codeword[i], data, offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CRS241213::decode24169(unsigned char* data)
|
bool CRS634717::decode24169(unsigned char* data)
|
||||||
{
|
{
|
||||||
return decode(data, 24U, 39, 8);
|
assert(data != NULL);
|
||||||
|
|
||||||
|
std::vector<unsigned char> codeword(63, 0);
|
||||||
|
|
||||||
|
unsigned int offset = 0U;
|
||||||
|
for (unsigned int i = 0U; i < 24U; i++, offset += 6U)
|
||||||
|
codeword[39U + i] = bin2Hex(data, offset);
|
||||||
|
|
||||||
|
int ec = rs24169.decode(codeword);
|
||||||
|
|
||||||
|
offset = 0U;
|
||||||
|
for (unsigned int i = 0U; i < 16U; i++, offset += 6U)
|
||||||
|
hex2Bin(codeword[39U + i], data, offset);
|
||||||
|
|
||||||
|
if (ec == -1 || ec >= 4)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CRS241213::encode24169(unsigned char* data)
|
void CRS634717::encode24169(unsigned char* data)
|
||||||
{
|
{
|
||||||
assert(data != NULL);
|
assert(data != NULL);
|
||||||
|
|
||||||
|
|
@ -178,12 +247,29 @@ void CRS241213::encode24169(unsigned char* data)
|
||||||
hex2Bin(codeword[i], data, offset);
|
hex2Bin(codeword[i], data, offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CRS241213::decode362017(unsigned char* data)
|
bool CRS634717::decode362017(unsigned char* data)
|
||||||
{
|
{
|
||||||
return decode(data, 36U, 27, 16);
|
assert(data != NULL);
|
||||||
|
|
||||||
|
std::vector<unsigned char> codeword(63, 0);
|
||||||
|
|
||||||
|
unsigned int offset = 0U;
|
||||||
|
for (unsigned int i = 0U; i < 36U; i++, offset += 6U)
|
||||||
|
codeword[27U + i] = bin2Hex(data, offset);
|
||||||
|
|
||||||
|
int ec = rs634717.decode(codeword);
|
||||||
|
|
||||||
|
offset = 0U;
|
||||||
|
for (unsigned int i = 0U; i < 20U; i++, offset += 6U)
|
||||||
|
hex2Bin(codeword[27U + i], data, offset);
|
||||||
|
|
||||||
|
if (ec == -1 || ec >= 8)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CRS241213::encode362017(unsigned char* data)
|
void CRS634717::encode362017(unsigned char* data)
|
||||||
{
|
{
|
||||||
assert(data != NULL);
|
assert(data != NULL);
|
||||||
|
|
||||||
|
|
@ -205,7 +291,7 @@ void CRS241213::encode362017(unsigned char* data)
|
||||||
}
|
}
|
||||||
|
|
||||||
// GF(2 ^ 6) multiply(for Reed - Solomon encoder)
|
// GF(2 ^ 6) multiply(for Reed - Solomon encoder)
|
||||||
unsigned char CRS241213::gf6Mult(unsigned char a, unsigned char b) const
|
unsigned char CRS634717::gf6Mult(unsigned char a, unsigned char b) const
|
||||||
{
|
{
|
||||||
unsigned char p = 0x00U;
|
unsigned char p = 0x00U;
|
||||||
|
|
||||||
|
|
@ -223,262 +309,3 @@ unsigned char CRS241213::gf6Mult(unsigned char a, unsigned char b) const
|
||||||
|
|
||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CRS241213::decode(unsigned char* data, const unsigned int bitLength, const int firstData, const int roots)
|
|
||||||
{
|
|
||||||
assert(data != NULL);
|
|
||||||
|
|
||||||
//unsigned char HB[24U];
|
|
||||||
unsigned char HB[63U];
|
|
||||||
::memset(HB, 0x00U, 63U);
|
|
||||||
|
|
||||||
unsigned int offset = 0U;
|
|
||||||
for (unsigned int i = 0U; i < bitLength; i++, offset += 6)
|
|
||||||
HB[i] = bin2Hex(data, offset);
|
|
||||||
|
|
||||||
//RS (63,63-nroots,nroots+1) decoder where nroots = number of parity bits
|
|
||||||
// rsDec(8, 39) rsDec(16, 27) rsDec(12, 39)
|
|
||||||
|
|
||||||
const int nroots = roots;
|
|
||||||
int lambda[18]; // Err+Eras Locator poly
|
|
||||||
int S[17]; // syndrome poly
|
|
||||||
int b[18];
|
|
||||||
int t[18];
|
|
||||||
int omega[18];
|
|
||||||
int root[17];
|
|
||||||
int reg[18];
|
|
||||||
int locn[17];
|
|
||||||
|
|
||||||
int i, j, count, r, el, SynError, DiscrR, q, DegOmega, tmp, num1, num2, den, DegLambda;
|
|
||||||
|
|
||||||
// form the syndromes; i.e., evaluate HB(x) at roots of g(x)
|
|
||||||
for (i = 0; i <= nroots - 1; i++) {
|
|
||||||
S[i] = HB[0];
|
|
||||||
}
|
|
||||||
|
|
||||||
//for (j = 1; j <= 24; j++) { // XXX was 62
|
|
||||||
//for (j = 1; j <= (int)(bitLength - 1); j++) {
|
|
||||||
for (j = 1; j <= 62; j++) {
|
|
||||||
for (i = 0; i <= nroots - 1; i++) {
|
|
||||||
if (S[i] == 0) {
|
|
||||||
S[i] = HB[j];
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
S[i] = HB[j] ^ rsGFexp[(rsGFlog[S[i]] + i + 1) % 63];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// convert syndromes to index form, checking for nonzero condition
|
|
||||||
SynError = 0;
|
|
||||||
|
|
||||||
for (i = 0; i <= nroots - 1; i++) {
|
|
||||||
SynError = SynError | S[i];
|
|
||||||
S[i] = rsGFlog[S[i]];
|
|
||||||
}
|
|
||||||
|
|
||||||
if (SynError == 0) {
|
|
||||||
// if syndrome is zero, rsData[] is a codeword and there are
|
|
||||||
// no errors to correct. So return rsData[] unmodified
|
|
||||||
count = 0;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (i = 1; i <= nroots; i++) {
|
|
||||||
lambda[i] = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
lambda[0] = 1;
|
|
||||||
|
|
||||||
for (i = 0; i <= nroots; i++) {
|
|
||||||
b[i] = rsGFlog[lambda[i]];
|
|
||||||
}
|
|
||||||
|
|
||||||
// begin Berlekamp-Massey algorithm to determine error+erasure
|
|
||||||
// locator polynomial
|
|
||||||
r = 0;
|
|
||||||
el = 0;
|
|
||||||
while (++r <= nroots) {
|
|
||||||
// r is the step number
|
|
||||||
//r = r + 1;
|
|
||||||
// compute discrepancy at the r-th step in poly-form
|
|
||||||
DiscrR = 0;
|
|
||||||
|
|
||||||
for (i = 0; i <= r - 1; i++) {
|
|
||||||
if ((lambda[i] != 0) && (S[r - i - 1] != 63)) {
|
|
||||||
DiscrR = DiscrR ^ rsGFexp[(rsGFlog[lambda[i]] + S[r - i - 1]) % 63];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
DiscrR = rsGFlog[DiscrR]; // index form
|
|
||||||
|
|
||||||
if (DiscrR == 63) {
|
|
||||||
// shift elements upward one step
|
|
||||||
for (i = nroots; i >= 1; i += -1) {
|
|
||||||
b[i] = b[i - 1];
|
|
||||||
}
|
|
||||||
|
|
||||||
b[0] = 63;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
// t(x) <-- lambda(x) - DiscrR*x*b(x)
|
|
||||||
t[0] = lambda[0];
|
|
||||||
|
|
||||||
for (i = 0; i <= nroots - 1; i++) {
|
|
||||||
if (b[i] != 63) {
|
|
||||||
t[i + 1] = lambda[i + 1] ^ rsGFexp[(DiscrR + b[i]) % 63];
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
t[i + 1] = lambda[i + 1];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (2 * el <= r - 1) {
|
|
||||||
el = r - el;
|
|
||||||
// b(x) <-- inv(DiscrR) * lambda(x)
|
|
||||||
|
|
||||||
for (i = 0; i <= nroots; i++) {
|
|
||||||
if (lambda[i]) {
|
|
||||||
b[i] = (rsGFlog[lambda[i]] - DiscrR + 63) % 63;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
b[i] = 63;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
// shift elements upward one step
|
|
||||||
for (i = nroots; i >= 1; i += -1) {
|
|
||||||
b[i] = b[i - 1];
|
|
||||||
}
|
|
||||||
|
|
||||||
b[0] = 63;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (i = 0; i <= nroots; i++) {
|
|
||||||
lambda[i] = t[i];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} /* end while() */
|
|
||||||
|
|
||||||
// convert lambda to index form and compute deg(lambda(x))
|
|
||||||
DegLambda = 0;
|
|
||||||
for (i = 0; i <= nroots; i++) {
|
|
||||||
lambda[i] = rsGFlog[lambda[i]];
|
|
||||||
|
|
||||||
if (lambda[i] != 63) {
|
|
||||||
DegLambda = i;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Find roots of the error+erasure locator polynomial by Chien search
|
|
||||||
for (i = 1; i <= nroots; i++) {
|
|
||||||
reg[i] = lambda[i];
|
|
||||||
}
|
|
||||||
|
|
||||||
count = 0;// number of roots of lambda(x)
|
|
||||||
|
|
||||||
for (i = 1; i <= 63; i++) {
|
|
||||||
q = 1;// lambda[0] is always 0
|
|
||||||
|
|
||||||
for (j = DegLambda; j >= 1; j += -1) {
|
|
||||||
if (reg[j] != 63) {
|
|
||||||
reg[j] = (reg[j] + j) % 63;
|
|
||||||
q = q ^ rsGFexp[reg[j]];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// it is a root
|
|
||||||
if (q == 0) {
|
|
||||||
// store root (index-form) and error location number
|
|
||||||
root[count] = i;
|
|
||||||
locn[count] = i - 40;
|
|
||||||
// if we have max possible roots, abort search to save time
|
|
||||||
count = count + 1;
|
|
||||||
|
|
||||||
if (count == DegLambda) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (DegLambda != count) {
|
|
||||||
// deg(lambda) unequal to number of roots => uncorrectable error detected
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// compute err+eras evaluator poly omega(x)
|
|
||||||
// = s(x)*lambda(x) (modulo x**nroots). in index form. Also find deg(omega).
|
|
||||||
DegOmega = 0;
|
|
||||||
for (i = 0; i <= nroots - 1; i++) {
|
|
||||||
tmp = 0;
|
|
||||||
if (DegLambda < i) {
|
|
||||||
j = DegLambda;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
j = i;
|
|
||||||
}
|
|
||||||
|
|
||||||
for ( /* j = j */; j >= 0; j += -1) {
|
|
||||||
if ((S[i - j] != 63) && (lambda[j] != 63)) {
|
|
||||||
tmp = tmp ^ rsGFexp[(S[i - j] + lambda[j]) % 63];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (tmp) {
|
|
||||||
DegOmega = i;
|
|
||||||
}
|
|
||||||
|
|
||||||
omega[i] = rsGFlog[tmp];
|
|
||||||
}
|
|
||||||
|
|
||||||
omega[nroots] = 63;
|
|
||||||
|
|
||||||
//compute error values in poly-form:
|
|
||||||
// num1 = omega(inv(X(l)))
|
|
||||||
// num2 = inv(X(l))**(FCR - 1)
|
|
||||||
// den = lambda_pr(inv(X(l)))
|
|
||||||
for (j = count - 1; j >= 0; j += -1) {
|
|
||||||
num1 = 0;
|
|
||||||
|
|
||||||
for (i = DegOmega; i >= 0; i += -1) {
|
|
||||||
if (omega[i] != 63) {
|
|
||||||
num1 = num1 ^ rsGFexp[(omega[i] + i * root[j]) % 63];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
num2 = rsGFexp[0];
|
|
||||||
den = 0;
|
|
||||||
|
|
||||||
// lambda[i+1] for i even is the formal derivative lambda_pr of lambda[i]
|
|
||||||
if (DegLambda < nroots) {
|
|
||||||
i = DegLambda;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
i = nroots;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (i = i & ~1; i >= 0; i += -2) {
|
|
||||||
if (lambda[i + 1] != 63) {
|
|
||||||
den = den ^ rsGFexp[(lambda[i + 1] + i * root[j]) % 63];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (den == 0) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// apply error to data
|
|
||||||
if (num1 != 0) {
|
|
||||||
if (locn[j] < firstData)
|
|
||||||
return false;
|
|
||||||
HB[locn[j]] = HB[locn[j]] ^ (rsGFexp[(rsGFlog[num1] + rsGFlog[num2] + 63 - rsGFlog[den]) % 63]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
offset = 0U;
|
|
||||||
for (unsigned int i = 0U; i < (unsigned int)nroots; i++, offset += 6)
|
|
||||||
hex2Bin(HB[i], data, offset);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (C) 2016 by Jonathan Naylor G4KLX
|
* Copyright (C) 2016,2024 by Jonathan Naylor G4KLX
|
||||||
* Copyright (C) 2018 by Bryan Biedenkapp <gatekeep@gmail.com> N2PLL
|
* Copyright (C) 2018,2023 by Bryan Biedenkapp <gatekeep@gmail.com> N2PLL
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* This program is free software; you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
|
@ -17,26 +17,25 @@
|
||||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#if !defined(RS241213_H)
|
#if !defined(RS634717_H)
|
||||||
#define RS241213_H
|
#define RS634717_H
|
||||||
|
|
||||||
class CRS241213
|
class CRS634717
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
CRS241213();
|
CRS634717();
|
||||||
~CRS241213();
|
~CRS634717();
|
||||||
|
|
||||||
bool decode(unsigned char* data);
|
bool decode241213(unsigned char* data);
|
||||||
bool decode24169(unsigned char* data);
|
bool decode24169(unsigned char* data);
|
||||||
bool decode362017(unsigned char* data);
|
bool decode362017(unsigned char* data);
|
||||||
|
|
||||||
void encode(unsigned char* data);
|
void encode241213(unsigned char* data);
|
||||||
void encode24169(unsigned char* data);
|
void encode24169(unsigned char* data);
|
||||||
void encode362017(unsigned char* data);
|
void encode362017(unsigned char* data);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
unsigned char gf6Mult(unsigned char a, unsigned char b) const;
|
unsigned char gf6Mult(unsigned char a, unsigned char b) const;
|
||||||
bool decode(unsigned char* data, const unsigned int bitLength, const int firstData, const int roots);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
Loading…
Reference in a new issue