diff --git a/MMDVMHost.cpp b/MMDVMHost.cpp
index b7e60bc..e79c2a8 100644
--- a/MMDVMHost.cpp
+++ b/MMDVMHost.cpp
@@ -26,6 +26,7 @@
#include "TFTSerial.h"
#include "NullDisplay.h"
#include "YSFControl.h"
+#include "P25Control.h"
#include "Nextion.h"
#include "Thread.h"
@@ -375,6 +376,23 @@ int CMMDVMHost::run()
ysf = new CYSFControl(m_callsign, m_ysfNetwork, m_display, m_timeout, m_duplex, rssiMultiplier, rssiOffset);
}
+ CP25Control* p25 = NULL;
+ if (m_p25Enabled) {
+ unsigned int id = m_conf.getP25Id();
+ int rssiMultiplier = m_conf.getModemRSSIMultiplier();
+ int rssiOffset = m_conf.getModemRSSIOffset();
+
+ LogInfo("P25 Parameters");
+ LogInfo(" Id: %u", id);
+
+ 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);
+ }
+
setMode(MODE_IDLE);
LogMessage("MMDVMHost-%s is running", VERSION);
@@ -498,6 +516,22 @@ int CMMDVMHost::run()
}
}
+ len = m_modem->readP25Data(data);
+ if (p25 != NULL && len > 0U) {
+ if (m_mode == MODE_IDLE) {
+ bool ret = p25->writeModem(data, len);
+ if (ret) {
+ m_modeTimer.setTimeout(m_rfModeHang);
+ setMode(MODE_P25);
+ }
+ } else if (m_mode == MODE_P25) {
+ p25->writeModem(data, len);
+ m_modeTimer.start();
+ } else if (m_mode != MODE_LOCKOUT) {
+ LogWarning("P25 modem data received when in mode %u", m_mode);
+ }
+ }
+
if (m_modeTimer.isRunning() && m_modeTimer.hasExpired())
setMode(MODE_IDLE);
@@ -585,6 +619,26 @@ int CMMDVMHost::run()
}
}
+ if (p25 != NULL) {
+ ret = m_modem->hasP25Space();
+ if (ret) {
+ len = p25->readModem(data);
+ if (len > 0U) {
+ if (m_mode == MODE_IDLE) {
+ m_modeTimer.setTimeout(m_netModeHang);
+ setMode(MODE_P25);
+ }
+ if (m_mode == MODE_P25) {
+ m_modem->writeP25Data(data, len);
+ m_modeTimer.start();
+ }
+ else if (m_mode != MODE_LOCKOUT) {
+ LogWarning("P25 data received when in mode %u", m_mode);
+ }
+ }
+ }
+ }
+
if (m_dmrNetwork != NULL) {
bool run = m_dmrNetwork->wantsBeacon();
if (dmrBeaconsEnabled && run && m_mode == MODE_IDLE && !m_modem->hasTX()) {
@@ -607,6 +661,8 @@ int CMMDVMHost::run()
dmr->clock();
if (ysf != NULL)
ysf->clock(ms);
+ if (p25 != NULL)
+ p25->clock(ms);
if (m_dstarNetwork != NULL)
m_dstarNetwork->clock(ms);
@@ -669,6 +725,7 @@ int CMMDVMHost::run()
delete dstar;
delete dmr;
delete ysf;
+ delete p25;
return 0;
}
diff --git a/MMDVMHost.vcxproj b/MMDVMHost.vcxproj
index 99088cc..04bba5f 100644
--- a/MMDVMHost.vcxproj
+++ b/MMDVMHost.vcxproj
@@ -181,6 +181,7 @@
+
@@ -235,6 +236,7 @@
+
diff --git a/MMDVMHost.vcxproj.filters b/MMDVMHost.vcxproj.filters
index 78f7d0e..e1dbca3 100644
--- a/MMDVMHost.vcxproj.filters
+++ b/MMDVMHost.vcxproj.filters
@@ -176,6 +176,9 @@
Header Files
+
+ Header Files
+
@@ -322,5 +325,8 @@
Source Files
+
+ Source Files
+
\ No newline at end of file
diff --git a/Makefile b/Makefile
index ae39487..929fc2c 100644
--- a/Makefile
+++ b/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 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 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
all: MMDVMHost
diff --git a/Makefile.Pi.Adafruit b/Makefile.Pi.Adafruit
index 859e9a4..fef63c3 100644
--- a/Makefile.Pi.Adafruit
+++ b/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 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 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
all: MMDVMHost
diff --git a/Makefile.Pi.HD44780 b/Makefile.Pi.HD44780
index 2e7a90a..9dac5df 100644
--- a/Makefile.Pi.HD44780
+++ b/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 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 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
all: MMDVMHost
diff --git a/Makefile.Pi.OLED b/Makefile.Pi.OLED
index cac8209..b95bc1e 100644
--- a/Makefile.Pi.OLED
+++ b/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 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 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
all: MMDVMHost
diff --git a/Makefile.Pi.PCF8574 b/Makefile.Pi.PCF8574
index 0abc3c4..990725c 100644
--- a/Makefile.Pi.PCF8574
+++ b/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 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 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
all: MMDVMHost
diff --git a/Makefile.Solaris b/Makefile.Solaris
index ded1b5f..a66f313 100644
--- a/Makefile.Solaris
+++ b/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 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 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
all: MMDVMHost
diff --git a/Modem.cpp b/Modem.cpp
index a5e58f8..30d355d 100644
--- a/Modem.cpp
+++ b/Modem.cpp
@@ -889,7 +889,7 @@ bool CModem::setConfig()
buffer[0U] = MMDVM_FRAME_START;
- buffer[1U] = 15U;
+ buffer[1U] = 16U;
buffer[2U] = MMDVM_SET_CONFIG;
diff --git a/P25Control.cpp b/P25Control.cpp
new file mode 100644
index 0000000..1c4fd22
--- /dev/null
+++ b/P25Control.cpp
@@ -0,0 +1,268 @@
+/*
+* Copyright (C) 2016 by Jonathan Naylor G4KLX
+*
+* 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
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "P25Control.h"
+#include "P25Defines.h"
+#include "Sync.h"
+#include "Log.h"
+
+#include
+#include
+
+const unsigned char BIT_MASK_TABLE[] = {0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U, 0x02U, 0x01U};
+
+#define WRITE_BIT(p,i,b) p[(i)>>3] = (b) ? (p[(i)>>3] | BIT_MASK_TABLE[(i)&7]) : (p[(i)>>3] & ~BIT_MASK_TABLE[(i)&7])
+#define READ_BIT(p,i) (p[(i)>>3] & BIT_MASK_TABLE[(i)&7])
+
+CP25Control::CP25Control(unsigned int id, CDisplay* display, unsigned int timeout, bool duplex, int rssiMultiplier, int rssiOffset) :
+m_id(id),
+m_display(display),
+m_duplex(duplex),
+m_rssiMultiplier(rssiMultiplier),
+m_rssiOffset(rssiOffset),
+m_queue(1000U, "P25 Control"),
+m_rfState(RS_RF_LISTENING),
+m_netState(RS_NET_IDLE),
+m_rfTimeout(1000U, timeout),
+m_netTimeout(1000U, timeout),
+m_rfFrames(0U),
+m_rfBits(0U),
+m_rfErrs(0U)
+{
+ assert(display != NULL);
+}
+
+CP25Control::~CP25Control()
+{
+}
+
+bool CP25Control::writeModem(unsigned char* data, unsigned int len)
+{
+ assert(data != NULL);
+
+ bool sync = data[1U] == 0x01U;
+
+ if (data[0U] == TAG_LOST && m_rfState == RS_RF_LISTENING)
+ return false;
+
+ if (data[0U] == TAG_LOST) {
+ LogMessage("P25, transmission lost, %.1f seconds, BER: %.1f%%", float(m_rfFrames) / 5.56F, float(m_rfErrs * 100U) / float(m_rfBits));
+ m_rfState = RS_RF_LISTENING;
+ m_rfTimeout.stop();
+ return false;
+ }
+
+ if (!sync && m_rfState == RS_RF_LISTENING)
+ return false;
+
+ // Put into the NID decoder
+ unsigned char duid = 0U; // XXX
+
+ if (data[0U] == TAG_HEADER) {
+ // Regenerate Sync
+ CSync::addP25Sync(data + 2U);
+
+ // Regenerate NID
+
+ // Regenerate Enc Data
+
+ // Add busy bits
+ addBusyBits(data + 2U, P25_HDR_FRAME_LENGTH_BITS, false, true);
+
+ m_rfFrames = 0U;
+ m_rfErrs = 0U;
+ m_rfBits = 1U;
+ m_rfTimeout.start();
+
+ if (m_duplex) {
+ data[0U] = TAG_HEADER;
+ data[1U] = 0x00U;
+ writeQueueRF(data, P25_HDR_FRAME_LENGTH_BYTES + 2U);
+ }
+
+ LogMessage("P25, received RF header");
+ } else if (duid == P25_DUID_LDU1) {
+ if (m_rfState == RS_RF_LISTENING) {
+ m_rfFrames = 0U;
+ m_rfErrs = 0U;
+ m_rfBits = 1U;
+ m_rfTimeout.start();
+ // Decode LDU1
+ }
+
+ // Regenerate Sync
+ CSync::addP25Sync(data + 2U);
+
+ // Regenerate NID
+
+ // Regenerate LDU1 Data
+
+ // Regenerate Audio
+ unsigned int errors = 0U; // XXX
+ LogDebug("P25, LDU1 audio, errs: %u/1233", errors);
+
+ m_rfBits += 1233U;
+ m_rfErrs += errors;
+ m_rfFrames++;
+
+ // Add busy bits
+ addBusyBits(data + 2U, P25_LDU_FRAME_LENGTH_BITS, false, true);
+
+ if (m_duplex) {
+ data[0U] = TAG_DATA;
+ data[1U] = 0x00U;
+ writeQueueRF(data, P25_LDU_FRAME_LENGTH_BYTES + 2U);
+ }
+
+ if (m_rfState == RS_RF_LISTENING) {
+ // LogMessage("P25, received RF LC from %8.8s/%4.4s to %8.8s", my1, my2, your);
+ m_rfState = RS_RF_AUDIO;
+ }
+ } else if (duid == P25_DUID_LDU2) {
+ if (m_rfState == RS_RF_LISTENING)
+ return false;
+
+ // Decode LDU2
+
+ // Regenerate Sync
+ CSync::addP25Sync(data + 2U);
+
+ // Regenerate NID
+
+ // Regenerate LDU2 Data
+
+ // Regenerate Audio
+ unsigned int errors = 0U; // XXX
+ LogDebug("P25, LDU2 audio, errs: %u/1233", errors);
+
+ m_rfBits += 1233U;
+ m_rfErrs += errors;
+ m_rfFrames++;
+
+ // Add busy bits
+ addBusyBits(data + 2U, P25_LDU_FRAME_LENGTH_BITS, false, true);
+
+ if (m_duplex) {
+ data[0U] = TAG_DATA;
+ data[1U] = 0x00U;
+ writeQueueRF(data, P25_LDU_FRAME_LENGTH_BYTES + 2U);
+ }
+ } else if (duid == P25_DUID_TERM_LC) {
+ if (m_rfState == RS_RF_LISTENING)
+ return false;
+
+ // Regenerate Sync
+ CSync::addP25Sync(data + 2U);
+
+ // Regenerate NID
+
+ // Regenerate LDU1 Data
+
+ // Add busy bits
+ addBusyBits(data + 2U, P25_TERMLC_FRAME_LENGTH_BITS, false, true);
+
+ m_rfState = RS_RF_LISTENING;
+ m_rfTimeout.stop();
+
+ LogMessage("P25, received RF end of transmission, %.1f seconds, BER: %.1f%%", float(m_rfFrames) / 5.56F, float(m_rfErrs * 100U) / float(m_rfBits));
+
+ if (m_duplex) {
+ data[0U] = TAG_EOT;
+ data[1U] = 0x00U;
+ writeQueueRF(data, P25_TERMLC_FRAME_LENGTH_BYTES + 2U);
+ }
+ } else if (duid == P25_DUID_TERM) {
+ if (m_rfState == RS_RF_LISTENING)
+ return false;
+
+ // Regenerate Sync
+ CSync::addP25Sync(data + 2U);
+
+ // Regenerate NID
+
+ // Add busy bits
+ addBusyBits(data + 2U, P25_TERM_FRAME_LENGTH_BITS, false, true);
+
+ m_rfState = RS_RF_LISTENING;
+ m_rfTimeout.stop();
+
+ LogMessage("P25, received RF end of transmission, %.1f seconds, BER: %.1f%%", float(m_rfFrames) / 5.56F, float(m_rfErrs * 100U) / float(m_rfBits));
+
+ if (m_duplex) {
+ data[0U] = TAG_EOT;
+ data[1U] = 0x00U;
+ writeQueueRF(data, P25_TERM_FRAME_LENGTH_BYTES + 2U);
+ }
+ } else {
+ return false;
+ }
+
+ return true;
+}
+
+unsigned int CP25Control::readModem(unsigned char* data)
+{
+ assert(data != NULL);
+
+ if (m_queue.isEmpty())
+ return 0U;
+
+ unsigned char len = 0U;
+ m_queue.getData(&len, 1U);
+
+ m_queue.getData(data, len);
+
+ return len;
+}
+
+void CP25Control::clock(unsigned int ms)
+{
+ m_rfTimeout.clock(ms);
+ m_netTimeout.clock(ms);
+}
+
+void CP25Control::writeQueueRF(const unsigned char* data, unsigned int length)
+{
+ assert(data != NULL);
+
+ if (m_rfTimeout.isRunning() && m_rfTimeout.hasExpired())
+ return;
+
+ unsigned int space = m_queue.freeSpace();
+ if (space < (length + 1U)) {
+ LogError("P25, overflow in the P25 RF queue");
+ return;
+ }
+
+ unsigned char len = length;
+ m_queue.addData(&len, 1U);
+
+ m_queue.addData(data, len);
+}
+
+void CP25Control::addBusyBits(unsigned char* data, unsigned int length, bool b1, bool b2)
+{
+ assert(data != NULL);
+
+ for (unsigned int i = 0U; i < length; i++) {
+ if (i > 0U && (i % 70U) == 0U)
+ WRITE_BIT(data, i, b1);
+ if (i > 0U && (i % 71U) == 0U)
+ WRITE_BIT(data, i, b2);
+ }
+}
diff --git a/P25Control.h b/P25Control.h
new file mode 100644
index 0000000..054e3d6
--- /dev/null
+++ b/P25Control.h
@@ -0,0 +1,58 @@
+/*
+* Copyright (C) 2016 by Jonathan Naylor G4KLX
+*
+* 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
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#if !defined(P25Control_H)
+#define P25Control_H
+
+#include "RingBuffer.h"
+#include "Defines.h"
+#include "Display.h"
+#include "Modem.h"
+#include "Timer.h"
+
+class CP25Control {
+public:
+ CP25Control(unsigned int id, CDisplay* display, unsigned int timeout, bool duplex, int rssiMultiplier, int rssiOffset);
+ ~CP25Control();
+
+ bool writeModem(unsigned char* data, unsigned int len);
+
+ unsigned int readModem(unsigned char* data);
+
+ void clock(unsigned int ms);
+
+private:
+ unsigned int m_id;
+ CDisplay* m_display;
+ bool m_duplex;
+ int m_rssiMultiplier;
+ int m_rssiOffset;
+ CRingBuffer m_queue;
+ RPT_RF_STATE m_rfState;
+ RPT_NET_STATE m_netState;
+ CTimer m_rfTimeout;
+ CTimer m_netTimeout;
+ unsigned int m_rfFrames;
+ unsigned int m_rfBits;
+ unsigned int m_rfErrs;
+
+ void writeQueueRF(const unsigned char* data, unsigned int length);
+ void addBusyBits(unsigned char* data, unsigned int length, bool b1, bool b2);
+};
+
+#endif
diff --git a/P25Defines.h b/P25Defines.h
index 21ce64d..1c971cf 100644
--- a/P25Defines.h
+++ b/P25Defines.h
@@ -20,8 +20,16 @@
#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_LDU_FRAME_LENGTH_BYTES = 216U;
+const unsigned int P25_LDU_FRAME_LENGTH_BITS = P25_LDU_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_TERMLC_FRAME_LENGTH_BYTES = 54U;
+const unsigned int P25_TERMLC_FRAME_LENGTH_BITS = P25_TERMLC_FRAME_LENGTH_BYTES * 8U;
const unsigned int P25_SYNC_LENGTH_BYTES = 6U;
const unsigned int P25_NID_LENGTH_BYTES = 8U;
@@ -29,5 +37,12 @@ const unsigned int P25_NID_LENGTH_BYTES = 8U;
const unsigned char P25_SYNC_BYTES[] = {0x55U, 0x75U, 0xF5U, 0xFFU, 0x77U, 0xFFU};
const unsigned char P25_SYNC_BYTES_LENGTH = 6U;
+const unsigned char P25_DUID_HEADER = 0x00U;
+const unsigned char P25_DUID_TERM = 0x03U;
+const unsigned char P25_DUID_LDU1 = 0x05U;
+const unsigned char P25_DUID_LDU2 = 0x09U;
+const unsigned char P25_DUID_PDU = 0x0CU;
+const unsigned char P25_DUID_TERM_LC = 0x0FU;
+
#endif