MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-21 15:09:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add new GPS and TA DMR network messages.

Browse Source
This commit is contained in:
Jonathan Naylor
2017-05-17 18:16:08 +01:00
parent 3ab8bdfdc9
commit f9e20cd737
3 changed files with 60 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
DMRNetwork.cpp
View File

@@ -278,6 +278,48 @@ bool CDMRNetwork::write(const CDMRData& data)
return true; return true;
} }
bool CDMRNetwork::writePosition(unsigned int id, const unsigned char* data)
{
if (m_status != RUNNING)
return false;
unsigned char buffer[20U];
::memcpy(buffer + 0U, "DMRG", 4U);
::memcpy(buffer + 4U, m_id, 4U);
buffer[8U] = id >> 16;
buffer[9U] = id >> 8;
buffer[10U] = id >> 0;
::memcpy(buffer + 11U, data + 2U, 7U);
return write(buffer, 18U);
}
bool CDMRNetwork::writeTalkerAlias(unsigned int id, unsigned char type, const unsigned char* data)
{
if (m_status != RUNNING)
return false;
unsigned char buffer[20U];
::memcpy(buffer + 0U, "DMRA", 4U);
::memcpy(buffer + 4U, m_id, 4U);
buffer[8U] = id >> 16;
buffer[9U] = id >> 8;
buffer[10U] = id >> 0;
buffer[11U] = type;
::memcpy(buffer + 12U, data + 2U, 7U);
return write(buffer, 19U);
}
void CDMRNetwork::close() void CDMRNetwork::close()
{ {
LogMessage("DMR, Closing DMR Network"); LogMessage("DMR, Closing DMR Network");

4
DMRNetwork.h
View File

@@ -46,6 +46,10 @@ public:
bool write(const CDMRData& data); bool write(const CDMRData& data);
bool writePosition(unsigned int id, const unsigned char* data);
bool writeTalkerAlias(unsigned int id, unsigned char type, const unsigned char* data);
bool wantsBeacon(); bool wantsBeacon();
void clock(unsigned int ms); void clock(unsigned int ms);

14
DMRSlot.cpp
View File

@@ -602,6 +602,8 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len)
::sprintf(text, "DMR Slot %u, Embedded GPS Info", m_slotNo); ::sprintf(text, "DMR Slot %u, Embedded GPS Info", m_slotNo);
CUtils::dump(2U, text, data, 9U); CUtils::dump(2U, text, data, 9U);
} }
if (m_network != NULL)
m_network->writePosition(m_rfLC->getSrcId(), data);
break; break;
case FLCO_TALKER_ALIAS_HEADER: case FLCO_TALKER_ALIAS_HEADER:
if (!(m_rfTalkerId & TALKER_ID_HEADER)) { if (!(m_rfTalkerId & TALKER_ID_HEADER)) {
@@ -610,6 +612,9 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len)
CUtils::dump(2U, text, data, 9U); CUtils::dump(2U, text, data, 9U);
} }
if (m_network != NULL)
m_network->writeTalkerAlias(m_rfLC->getSrcId(), 0U, data);
m_rfTalkerId |= TALKER_ID_HEADER; m_rfTalkerId |= TALKER_ID_HEADER;
} }
break; break;
@@ -620,6 +625,9 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len)
CUtils::dump(2U, text, data, 9U); CUtils::dump(2U, text, data, 9U);
} }
if (m_network != NULL)
m_network->writeTalkerAlias(m_rfLC->getSrcId(), 1U, data);
m_rfTalkerId |= TALKER_ID_BLOCK1; m_rfTalkerId |= TALKER_ID_BLOCK1;
} }
break; break;
@@ -630,6 +638,9 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len)
CUtils::dump(2U, text, data, 9U); CUtils::dump(2U, text, data, 9U);
} }
if (m_network != NULL)
m_network->writeTalkerAlias(m_rfLC->getSrcId(), 2U, data);
m_rfTalkerId |= TALKER_ID_BLOCK2; m_rfTalkerId |= TALKER_ID_BLOCK2;
} }
break; break;
@@ -640,6 +651,9 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len)
CUtils::dump(2U, text, data, 9U); CUtils::dump(2U, text, data, 9U);
} }
if (m_network != NULL)
m_network->writeTalkerAlias(m_rfLC->getSrcId(), 3U, data);
m_rfTalkerId |= TALKER_ID_BLOCK3; m_rfTalkerId |= TALKER_ID_BLOCK3;
} }
break; break;