g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2026-03-01 10:54:18 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Hopefully fix some compilation problems.

Browse source
This commit is contained in:
Jonathan Naylor 2026-02-26 13:55:01 +00:00
parent 4b2d6cf891
commit b048a2929f
2 changed files with 27 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
P25Control.cpp
View file

@ -418,40 +418,41 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
unsigned char data[P25_TSDU_FRAME_LENGTH_BYTES + 2U];
switch (m_rfData.getLCF()) {
case P25_LCF_GROUP:
// Handle Group Voice Channel User - respond with Group Voice Channel Grant for talk permit
LogMessage("P25, received RF TSDU transmission, GROUP VOICE CH USER from %s to TG %u", source.c_str(), dstId);
::memset(data + 2U, 0x00U, P25_TSDU_FRAME_LENGTH_BYTES);
case P25_LCF_GROUP: {
// Handle Group Voice Channel User - respond with Group Voice Channel Grant for talk permit
LogMessage("P25, received RF TSDU transmission, GROUP VOICE CH USER from %s to TG %u", source.c_str(), dstId);
::memset(data + 2U, 0x00U, P25_TSDU_FRAME_LENGTH_BYTES);
// Regenerate Sync
CSync::addP25Sync(data + 2U);
// Regenerate Sync
CSync::addP25Sync(data + 2U);
// Regenerate NID
m_nid.encode(data + 2U, P25_DUID_TSDU);
// Regenerate NID
m_nid.encode(data + 2U, P25_DUID_TSDU);
// Build a Group Voice Channel Grant response
// Save original LCF and set Grant LCF for encoding
unsigned char originalLcf = m_rfData.getLCF();
m_rfData.setLCF(P25_LCF_GROUP);
m_rfData.setServiceType(0x00U); // Service options: 0x00 = routine priority, no emergency
// Build a Group Voice Channel Grant response
// Save original LCF and set Grant LCF for encoding
unsigned char originalLcf = m_rfData.getLCF();
m_rfData.setLCF(P25_LCF_GROUP);
m_rfData.setServiceType(0x00U); // Service options: 0x00 = routine priority, no emergency
// Encode TSDU with Grant response
m_rfData.encodeTSDU(data + 2U);
// Encode TSDU with Grant response
m_rfData.encodeTSDU(data + 2U);
// Restore original LCF
m_rfData.setLCF(originalLcf);
// Restore original LCF
m_rfData.setLCF(originalLcf);
// Add busy bits - outbound busy (channel granted)
addBusyBits(data + 2U, P25_TSDU_FRAME_LENGTH_BITS, true, false);
// Add busy bits - outbound busy (channel granted)
addBusyBits(data + 2U, P25_TSDU_FRAME_LENGTH_BITS, true, false);
// Set first busy bits to 1,0 (outbound busy)
setBusyBits(data + 2U, P25_SS0_START, true, false);
// Set first busy bits to 1,0 (outbound busy)
setBusyBits(data + 2U, P25_SS0_START, true, false);
if (m_duplex) {
data[0U] = TAG_DATA;
data[1U] = 0x00U;
if (m_duplex) {
data[0U] = TAG_DATA;
data[1U] = 0x00U;
writeQueueRF(data, P25_TSDU_FRAME_LENGTH_BYTES + 2U);
writeQueueRF(data, P25_TSDU_FRAME_LENGTH_BYTES + 2U);
}
}
break;
case P25_LCF_TSBK_CALL_ALERT:

2
Version.h
View file

@ -19,6 +19,6 @@
#if !defined(VERSION_H)
#define VERSION_H
const char* VERSION = "20260219";
const char* VERSION = "20260226";
#endif