Crash_Override/MMDVMHost-Private
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Add beginnings of P25 data handling.

Browse source
This commit is contained in:
Jonathan Naylor 2018-01-03 20:03:10 +00:00
parent 8423f3f653
commit 97e51ca60d
3 changed files with 29 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
P25Control.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2016,2017 by Jonathan Naylor G4KLX * Copyright (C) 2016,2017,2018 by Jonathan Naylor G4KLX
* *
* 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
@ -150,6 +150,9 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
case P25_DUID_LDU1: case P25_DUID_LDU1:
duid = P25_DUID_LDU2; duid = P25_DUID_LDU2;
break; break;
case P25_DUID_PDU:
duid = P25_DUID_PDU;
break;
default: default:
break; break;
} }
@ -358,6 +361,9 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
writeQueueRF(data, P25_TERM_FRAME_LENGTH_BYTES + 2U); writeQueueRF(data, P25_TERM_FRAME_LENGTH_BYTES + 2U);
} }
} }
} else if (duid == P25_DUID_PDU) {
LogMessage("P25, PDU received");
CUtils::dump("P25, PDU data", data + 2U, P25_LDU_FRAME_LENGTH_BYTES);
} }
return false; return false;

22
P25NID.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2016 by Jonathan Naylor G4KLX * Copyright (C) 2016,2018 by Jonathan Naylor G4KLX
* *
* 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
@ -32,7 +32,8 @@ m_hdr(NULL),
m_ldu1(NULL), m_ldu1(NULL),
m_ldu2(NULL), m_ldu2(NULL),
m_termlc(NULL), m_termlc(NULL),
m_term(NULL) m_term(NULL),
m_pdu(NULL)
{ {
CBCH bch; CBCH bch;
@ -70,6 +71,13 @@ m_term(NULL)
m_term[1U] |= P25_DUID_TERM; m_term[1U] |= P25_DUID_TERM;
bch.encode(m_term); bch.encode(m_term);
m_term[7U] &= 0xFEU; // Clear the parity bit m_term[7U] &= 0xFEU; // Clear the parity bit
m_pdu = new unsigned char[P25_NID_LENGTH_BYTES];
m_pdu[0U] = (nac >> 4) & 0xFFU;
m_pdu[1U] = (nac << 4) & 0xF0U;
m_pdu[1U] |= P25_DUID_PDU;
bch.encode(m_pdu);
m_pdu[7U] &= 0xFEU; // Clear the parity bit
} }
CP25NID::~CP25NID() CP25NID::~CP25NID()
@ -79,6 +87,7 @@ CP25NID::~CP25NID()
delete[] m_ldu2; delete[] m_ldu2;
delete[] m_termlc; delete[] m_termlc;
delete[] m_term; delete[] m_term;
delete[] m_pdu;
} }
bool CP25NID::decode(const unsigned char* data) bool CP25NID::decode(const unsigned char* data)
@ -118,6 +127,12 @@ bool CP25NID::decode(const unsigned char* data)
return true; return true;
} }
errs = CP25Utils::compare(nid, m_pdu, P25_NID_LENGTH_BYTES);
if (errs < MAX_NID_ERRS) {
m_duid = P25_DUID_PDU;
return true;
}
return false; return false;
} }
@ -141,6 +156,9 @@ void CP25NID::encode(unsigned char* data, unsigned char duid) const
case P25_DUID_TERM_LC: case P25_DUID_TERM_LC:
CP25Utils::encode(m_termlc, data, 48U, 114U); CP25Utils::encode(m_termlc, data, 48U, 114U);
break; break;
case P25_DUID_PDU:
CP25Utils::encode(m_pdu, data, 48U, 114U);
break;
default: default:
break; break;
} }

3
P25NID.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2016 by Jonathan Naylor G4KLX * Copyright (C) 2016,2018 by Jonathan Naylor G4KLX
* *
* 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
@ -37,6 +37,7 @@ private:
unsigned char* m_ldu2; unsigned char* m_ldu2;
unsigned char* m_termlc; unsigned char* m_termlc;
unsigned char* m_term; unsigned char* m_term;
unsigned char* m_pdu;
}; };
#endif #endif