mirror of
https://github.com/g4klx/MMDVMHost.git
synced 2026-03-01 10:54:18 +01:00
Merge pull request #852 from F4FXL/fix/FastData
Enable and fix DStar Fast Data
This commit is contained in:
Jonathan Naylor
GitHub
commit
bb7295cb08
271
DStarControl.cpp
271
DStarControl.cpp
|
|
@ -86,6 +86,14 @@ m_aveRSSI(0),
|
|||
m_rssiCountTotal(0U),
|
||||
m_rssiAccum(0),
|
||||
m_rssiCount(0U),
|
||||
m_enabled(true),
|
||||
m_fp(nullptr),
|
||||
m_RFdataLookBack(nullptr),
|
||||
m_RFdataLookBackLen(0U),
|
||||
m_RFdataLookBackIndex(0U),
|
||||
m_NetdataLookBack(nullptr),
|
||||
m_NetdataLookBackLen(0U),
|
||||
m_NetdataLookBackIndex(0U),
|
||||
m_bitErrsAccum(0U),
|
||||
m_bitsCount(0U),
|
||||
m_enabled(true)
|
||||
|
|
@ -102,7 +110,7 @@ m_enabled(true)
|
|||
std::string mod = module;
|
||||
mod.resize(1U, ' ');
|
||||
call.append(mod);
|
||||
|
||||
|
||||
std::string gate = callsign;
|
||||
gate.resize(DSTAR_LONG_CALLSIGN_LENGTH - 1U, ' ');
|
||||
gate.append("G");
|
||||
|
|
@ -278,6 +286,7 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
|
|||
|
||||
m_rfFrames = 1U;
|
||||
m_rfN = 0U;
|
||||
m_RFdataLookBackIndex = 0U;
|
||||
|
||||
m_minRSSI = m_rssi;
|
||||
m_maxRSSI = m_rssi;
|
||||
|
|
@ -364,6 +373,41 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
|
|||
if (m_rfState == RPT_RF_STATE::INVALID)
|
||||
return true;
|
||||
|
||||
// The sync is regenerated by the modem so can do exact match
|
||||
if (::memcmp(data + 1U + DSTAR_VOICE_FRAME_LENGTH_BYTES, DSTAR_SYNC_BYTES, DSTAR_DATA_FRAME_LENGTH_BYTES) == 0) {
|
||||
m_rfSlowData.start();
|
||||
m_rfN = 0U;
|
||||
} else {
|
||||
m_rfSlowData.add(data + 1U);
|
||||
}
|
||||
|
||||
if(m_RFdataLookBackIndex == 0U) {
|
||||
m_RFdataLookBack = new unsigned char[len];
|
||||
::memcpy(m_RFdataLookBack, data, len);
|
||||
m_RFdataLookBackLen = len;
|
||||
m_RFdataLookBackIndex ++;
|
||||
return true;
|
||||
} else if (m_RFdataLookBackIndex == 1U) {
|
||||
m_RFdataLookBackIndex ++;
|
||||
|
||||
if (m_rfState == RPT_RF_STATE::AUDIO){
|
||||
unsigned char type = m_rfSlowData.getType(false);
|
||||
// as per specs chapter 6.1.3, this could be any value bewtween 0x81 and 0x9C as one fast data block can only contain 28 bytes 0x80 + 28d = 0x9C
|
||||
if ((type & DSTAR_SLOW_DATA_TYPE_FASTDATA_MASK) == DSTAR_SLOW_DATA_TYPE_FASTDATA){
|
||||
LogMessage("D-Star, starting fast data mode (RF)");
|
||||
m_rfState = RPT_RF_STATE::DATA;
|
||||
}
|
||||
}
|
||||
|
||||
LogDebug("D-Star, processing lookback data (RF)");
|
||||
bool res1 = writeModem(m_RFdataLookBack, m_RFdataLookBackLen);
|
||||
bool res2 = writeModem(data, len);
|
||||
delete[] m_RFdataLookBack;
|
||||
m_RFdataLookBack = nullptr;
|
||||
m_RFdataLookBackLen = 0U;
|
||||
return res1 && res2;
|
||||
}
|
||||
|
||||
if (m_rfState == RPT_RF_STATE::LISTENING) {
|
||||
// The sync is regenerated by the modem so can do exact match
|
||||
if (::memcmp(data + 1U + DSTAR_VOICE_FRAME_LENGTH_BYTES, DSTAR_SYNC_BYTES, DSTAR_DATA_FRAME_LENGTH_BYTES) == 0) {
|
||||
|
|
@ -382,23 +426,29 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
|
|||
m_rfSlowData.add(data + 1U);
|
||||
}
|
||||
|
||||
#ifdef notdef
|
||||
// Switch off D-Star fast data for RF
|
||||
if (m_rfState == RPT_RF_STATE::AUDIO) {
|
||||
unsigned char type = m_rfSlowData.getType();
|
||||
|
||||
if (type == DSTAR_SLOW_DATA_TYPE_FASTDATA_BEGIN) {
|
||||
LogMessage("D-Star, starting fast data mode");
|
||||
unsigned char type = m_rfSlowData.getType(false);
|
||||
//as per specs, this could be any value bewtween 0x80 and 0x9C
|
||||
if ((type & DSTAR_SLOW_DATA_TYPE_FASTDATA_MASK) == DSTAR_SLOW_DATA_TYPE_FASTDATA) {
|
||||
LogMessage("D-Star, starting fast data mode (RF)");
|
||||
m_rfState = RPT_RF_STATE::DATA;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
if (m_rfState == RPT_RF_STATE::DATA) {
|
||||
unsigned char type = m_rfSlowData.getType(true);
|
||||
// as per specs, this could be any value bewtween 0x80 and 0x9C as one fast data block can only contain 28 bytes 0x80 + 28d = 0x9C
|
||||
if(((type & DSTAR_SLOW_DATA_TYPE_FASTDATA_MASK) == DSTAR_SLOW_DATA_TYPE_FASTDATA) && type > 0x9CU) {
|
||||
LogMessage("Invalid fast data type 0x%02X received, returning to audio mode (RF)", type);
|
||||
m_rfState = RPT_RF_STATE::AUDIO;
|
||||
}
|
||||
}
|
||||
|
||||
if (m_rfState == RPT_RF_STATE::DATA) {
|
||||
if (m_rfN == 0U)
|
||||
writeJSONRSSI();
|
||||
|
||||
LogDebug("D-Star, fast data sequence no. %u", m_rfN);
|
||||
LogDebug("D-Star, RF fast data sequence no. %u", m_rfN);
|
||||
|
||||
m_bitsCount += 48U;
|
||||
m_rfBits += 48U;
|
||||
|
|
@ -412,9 +462,9 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
|
|||
|
||||
bool complete = m_rfSlowData.isComplete();
|
||||
if (complete) {
|
||||
unsigned char type = m_rfSlowData.getType();
|
||||
if (type == DSTAR_SLOW_DATA_TYPE_FASTDATA_END) {
|
||||
LogMessage("D-Star, leaving fast data mode");
|
||||
unsigned char type = m_rfSlowData.getType(false);
|
||||
if ((type & DSTAR_SLOW_DATA_TYPE_FASTDATA_MASK) != DSTAR_SLOW_DATA_TYPE_FASTDATA) {
|
||||
LogMessage("D-Star, leaving fast data mode (RF)");
|
||||
m_rfState = RPT_RF_STATE::AUDIO;
|
||||
}
|
||||
}
|
||||
|
|
@ -426,10 +476,12 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
|
|||
|
||||
unsigned int errors = 0U;
|
||||
if (::memcmp(data + 1U, DSTAR_NULL_AMBE_DATA_BYTES_SCRAMBLED, DSTAR_VOICE_FRAME_LENGTH_BYTES) == 0) {
|
||||
LogDebug("D-Star, audio sequence no. %u, null audio", m_rfN);
|
||||
LogDebug("D-Star, RF audio sequence no. %u, null audio", m_rfN);
|
||||
} else {
|
||||
errors = m_fec.regenerateDStar(data + 1U);
|
||||
m_bitErrsAccum += errors;
|
||||
LogDebug("D-Star, RF audio sequence no. %u, errs: %u/48 (%.1f%%)", m_rfN, errors, float(errors) / 0.48F);
|
||||
|
||||
m_bitErrsAccum += errors;
|
||||
m_rfErrs += errors;
|
||||
writeJSONBER();
|
||||
}
|
||||
|
|
@ -529,6 +581,7 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
|
|||
|
||||
m_rfN = 0U;
|
||||
m_rfFrames = 1U;
|
||||
m_RFdataLookBackIndex = 0U;
|
||||
|
||||
m_minRSSI = m_rssi;
|
||||
m_maxRSSI = m_rssi;
|
||||
|
|
@ -691,6 +744,7 @@ void CDStarControl::writeNetwork()
|
|||
|
||||
m_netFrames = 0U;
|
||||
m_netLost = 0U;
|
||||
m_NetdataLookBackIndex = 0U;
|
||||
|
||||
m_netN = 20U;
|
||||
|
||||
|
|
@ -741,82 +795,135 @@ void CDStarControl::writeNetwork()
|
|||
|
||||
writeEndNet();
|
||||
} else if (type == TAG_DATA) {
|
||||
if ((m_netState == RPT_NET_STATE::AUDIO) || (m_netState == RPT_NET_STATE::DATA)) {
|
||||
unsigned char n = data[1U];
|
||||
writeNetworkData(data, length);
|
||||
} else {
|
||||
CUtils::dump("D-Star, unknown data from network", data, DSTAR_FRAME_LENGTH_BYTES + 1U);
|
||||
}
|
||||
}
|
||||
|
||||
if (n == 0U) {
|
||||
CSync::addDStarSync(data + 2U);
|
||||
m_netSlowData.start();
|
||||
} else {
|
||||
m_netSlowData.add(data + 2U);
|
||||
void CDStarControl::writeNetworkData(unsigned char* data, unsigned int length)
|
||||
{
|
||||
assert(data != nullptr);
|
||||
|
||||
#ifdef notdef
|
||||
// Switch off D-Star fast data for network traffic
|
||||
if (m_netState == RPT_NET_STATE::AUDIO) {
|
||||
unsigned char type = m_netSlowData.getType();
|
||||
if (type == DSTAR_SLOW_DATA_TYPE_FASTDATA_BEGIN) {
|
||||
LogMessage("D-Star, starting fast data mode");
|
||||
m_netState = RPT_NET_STATE::DATA;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
unsigned char type = data[0U];
|
||||
assert(type == TAG_DATA);
|
||||
|
||||
if (m_network == nullptr)
|
||||
return;
|
||||
|
||||
if ((m_netState == RPT_NET_STATE::AUDIO) || (m_netState == RPT_NET_STATE::DATA)) {
|
||||
unsigned char n = data[1U];
|
||||
|
||||
if (n == 0U) {
|
||||
CSync::addDStarSync(data + 2U);
|
||||
m_netSlowData.start();
|
||||
} else {
|
||||
m_netSlowData.add(data + 2U);
|
||||
}
|
||||
|
||||
if (m_netState == RPT_NET_STATE::AUDIO) {
|
||||
unsigned char n = data[1U];
|
||||
if(m_NetdataLookBackIndex == 0U) {
|
||||
m_NetdataLookBack = new unsigned char[length];
|
||||
::memcpy(m_NetdataLookBack, data, length);
|
||||
m_NetdataLookBackLen = length;
|
||||
m_NetdataLookBackIndex ++;
|
||||
return;
|
||||
} else if (m_NetdataLookBackIndex == 1U) {
|
||||
m_NetdataLookBackIndex ++;
|
||||
|
||||
if (::memcmp(data + 2U, DSTAR_NULL_AMBE_DATA_BYTES_SCRAMBLED, DSTAR_VOICE_FRAME_LENGTH_BYTES) != 0) {
|
||||
m_fec.regenerateDStar(data + 2U);
|
||||
blankDTMF(data + 2U);
|
||||
}
|
||||
|
||||
data[1U] = TAG_DATA;
|
||||
|
||||
// Insert silence and reject if in the past
|
||||
bool ret = insertSilence(data + 1U, n);
|
||||
if (!ret)
|
||||
return;
|
||||
|
||||
m_netBits += 48U;
|
||||
|
||||
m_netN = n;
|
||||
|
||||
if (m_netN != 0U) {
|
||||
const unsigned char* text = m_netSlowData.getText();
|
||||
if (text != nullptr)
|
||||
LogMessage("D-Star, network slow data text = \"%s\"", text);
|
||||
}
|
||||
|
||||
m_packetTimer.start();
|
||||
m_netFrames++;
|
||||
|
||||
writeQueueDataNet(data + 1U);
|
||||
}
|
||||
|
||||
if (m_netState == RPT_NET_STATE::DATA) {
|
||||
m_netN = data[1U];
|
||||
|
||||
data[1U] = TAG_DATA;
|
||||
|
||||
m_netBits += 48U;
|
||||
|
||||
if (m_netN != 0U) {
|
||||
bool complete = m_netSlowData.isComplete();
|
||||
if (complete) {
|
||||
unsigned char type = m_netSlowData.getType();
|
||||
if (type == DSTAR_SLOW_DATA_TYPE_FASTDATA_END) {
|
||||
LogMessage("D-Star, leaving fast data mode");
|
||||
m_netState = RPT_NET_STATE::AUDIO;
|
||||
}
|
||||
if (m_netState == RPT_NET_STATE::AUDIO){
|
||||
unsigned char type = m_netSlowData.getType(false);
|
||||
// as per specs chapter 6.1.3, this could be any value bewtween 0x81 and 0x9C as one fast data block can only contain 28 bytes 0x80 + 28d = 0x9C
|
||||
if ((type & DSTAR_SLOW_DATA_TYPE_FASTDATA_MASK) == DSTAR_SLOW_DATA_TYPE_FASTDATA){
|
||||
LogMessage("D-Star, starting fast data mode (Net)");
|
||||
m_netState = RPT_NET_STATE::DATA;
|
||||
}
|
||||
}
|
||||
|
||||
m_packetTimer.start();
|
||||
m_netFrames++;
|
||||
|
||||
writeQueueDataNet(data + 1U);
|
||||
LogDebug("D-Star, processing lookback data (Net)");
|
||||
writeNetworkData(m_NetdataLookBack, m_NetdataLookBackLen);
|
||||
writeNetworkData(data, length);
|
||||
delete[] m_NetdataLookBack;
|
||||
m_NetdataLookBack = nullptr;
|
||||
m_NetdataLookBackLen = 0U;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (m_netState == RPT_NET_STATE::AUDIO) {
|
||||
unsigned char type = m_netSlowData.getType(false);
|
||||
LogMessage("A D-Star, slow data type: 0x%02X 0x%02X %i", type, type & DSTAR_SLOW_DATA_TYPE_FASTDATA_MASK, m_netN);
|
||||
// as per specs chapter 6.1.3, this could be any value bewtween 0x81 and 0x9C as one fast data block can only contain 28 bytes 0x80 + 28d = 0x9C
|
||||
if ((type & DSTAR_SLOW_DATA_TYPE_FASTDATA_MASK) == DSTAR_SLOW_DATA_TYPE_FASTDATA){
|
||||
LogMessage("D-Star, starting fast data mode (Net)");
|
||||
m_netState = RPT_NET_STATE::DATA;
|
||||
}
|
||||
}
|
||||
|
||||
if (m_netState == RPT_NET_STATE::DATA) {
|
||||
unsigned char type = m_netSlowData.getType(true);
|
||||
// as per specs chapter 6.1.3, this could be any value bewtween 0x81 and 0x9C as one fast data block can only contain 28 bytes 0x80 + 28d = 0x9C
|
||||
if (((type & DSTAR_SLOW_DATA_TYPE_FASTDATA_MASK) == DSTAR_SLOW_DATA_TYPE_FASTDATA) && type > 0x9CU) {
|
||||
LogMessage("Invalid fast data type 0x%02X received, returning to audio mode (Net)", type);
|
||||
m_netState = RPT_NET_STATE::AUDIO;
|
||||
}
|
||||
}
|
||||
|
||||
if (m_netState == RPT_NET_STATE::AUDIO) {
|
||||
unsigned char n = data[1U];
|
||||
|
||||
unsigned int errors = 0U;
|
||||
if (::memcmp(data + 2U, DSTAR_NULL_AMBE_DATA_BYTES_SCRAMBLED, DSTAR_VOICE_FRAME_LENGTH_BYTES) != 0) {
|
||||
errors = m_fec.regenerateDStar(data + 2U);
|
||||
LogDebug("D-Star, Net audio sequence no. %u, errs: %u/48 (%.1f%%)", n, errors, float(errors) / 0.48F);
|
||||
blankDTMF(data + 2U);
|
||||
}
|
||||
|
||||
data[1U] = TAG_DATA;
|
||||
|
||||
// Insert silence and reject if in the past
|
||||
bool ret = insertSilence(data + 1U, n);
|
||||
if (!ret)
|
||||
return;
|
||||
|
||||
m_netErrs += errors;
|
||||
m_netBits += 48U;
|
||||
|
||||
m_netN = n;
|
||||
|
||||
if (m_netN != 0U) {
|
||||
const unsigned char* text = m_netSlowData.getText();
|
||||
if (text != nullptr)
|
||||
LogMessage("D-Star, network slow data text = \"%s\"", text);
|
||||
}
|
||||
|
||||
m_packetTimer.start();
|
||||
m_netFrames++;
|
||||
|
||||
writeQueueDataNet(data + 1U);
|
||||
}
|
||||
|
||||
if (m_netState == RPT_NET_STATE::DATA) {
|
||||
m_netN = data[1U];
|
||||
LogDebug("D-Star, Net fast data sequence no. %u", m_netN);
|
||||
|
||||
data[1U] = TAG_DATA;
|
||||
|
||||
m_netBits += 48U;
|
||||
|
||||
if (m_netN != 0U) {
|
||||
bool complete = m_netSlowData.isComplete();
|
||||
if (complete) {
|
||||
unsigned char type = m_netSlowData.getType();
|
||||
if ((type & DSTAR_SLOW_DATA_TYPE_FASTDATA_MASK) != DSTAR_SLOW_DATA_TYPE_FASTDATA) {
|
||||
LogMessage("D-Star, leaving fast data mode (Net)");
|
||||
m_netState = RPT_NET_STATE::AUDIO;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
m_packetTimer.start();
|
||||
m_netFrames++;
|
||||
|
||||
writeQueueDataNet(data + 1U);
|
||||
} else {
|
||||
CUtils::dump("D-Star, unknown data from network", data, DSTAR_FRAME_LENGTH_BYTES + 1U);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -103,8 +103,16 @@ private:
|
|||
unsigned int m_bitErrsAccum;
|
||||
unsigned int m_bitsCount;
|
||||
bool m_enabled;
|
||||
FILE* m_fp;
|
||||
unsigned char * m_RFdataLookBack;
|
||||
unsigned int m_RFdataLookBackLen;
|
||||
unsigned int m_RFdataLookBackIndex;
|
||||
unsigned char * m_NetdataLookBack;
|
||||
unsigned int m_NetdataLookBackLen;
|
||||
unsigned int m_NetdataLookBackIndex;
|
||||
|
||||
void writeNetwork();
|
||||
void writeNetworkData(unsigned char* data, unsigned int length);
|
||||
|
||||
void writeQueueHeaderRF(const unsigned char* data);
|
||||
void writeQueueDataRF(const unsigned char* data);
|
||||
|
|
|
|||
|
|
@ -48,8 +48,8 @@ const unsigned char DSTAR_SLOW_DATA_TYPE_MASK = 0xF0U;
|
|||
const unsigned char DSTAR_SLOW_DATA_TYPE_GPSDATA = 0x30U;
|
||||
const unsigned char DSTAR_SLOW_DATA_TYPE_TEXT = 0x40U;
|
||||
const unsigned char DSTAR_SLOW_DATA_TYPE_HEADER = 0x50U;
|
||||
const unsigned char DSTAR_SLOW_DATA_TYPE_FASTDATA_END = 0x80U;
|
||||
const unsigned char DSTAR_SLOW_DATA_TYPE_FASTDATA_BEGIN = 0x90U;
|
||||
const unsigned char DSTAR_SLOW_DATA_TYPE_FASTDATA = 0x80U;
|
||||
const unsigned char DSTAR_SLOW_DATA_TYPE_FASTDATA_MASK = 0xE0U;
|
||||
const unsigned char DSTAR_SLOW_DATA_TYPE_SQUELCH = 0xC0U;
|
||||
const unsigned char DSTAR_SLOW_DATA_LENGTH_MASK = 0x0FU;
|
||||
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ void CDStarSlowData::add(const unsigned char* data)
|
|||
m_buffer[5U] = data[11U] ^ DSTAR_SCRAMBLER_BYTES[2U];
|
||||
m_state = SDD_STATE::FIRST;
|
||||
m_complete = true;
|
||||
CUtils::dump(1U, "D-Star slow data element", m_buffer, 6U);
|
||||
////CUtils::dump(1U, "D-Star slow data element", m_buffer, 6U);
|
||||
loadHeader();
|
||||
loadText();
|
||||
break;
|
||||
|
|
@ -113,7 +113,7 @@ void CDStarSlowData::loadText()
|
|||
{
|
||||
switch (m_buffer[0U]) {
|
||||
case DSTAR_SLOW_DATA_TYPE_TEXT | 0U:
|
||||
CUtils::dump(1U, "D-Star slow data text fragment 0", m_buffer, 6U);
|
||||
//CUtils::dump(1U, "D-Star slow data text fragment 0", m_buffer, 6U);
|
||||
m_text[0U] = m_buffer[1U] & 0x7FU;
|
||||
m_text[1U] = m_buffer[2U] & 0x7FU;
|
||||
m_text[2U] = m_buffer[3U] & 0x7FU;
|
||||
|
|
@ -123,7 +123,7 @@ void CDStarSlowData::loadText()
|
|||
break;
|
||||
|
||||
case DSTAR_SLOW_DATA_TYPE_TEXT | 1U:
|
||||
CUtils::dump(1U, "D-Star slow data text fragment 1", m_buffer, 6U);
|
||||
//CUtils::dump(1U, "D-Star slow data text fragment 1", m_buffer, 6U);
|
||||
m_text[5U] = m_buffer[1U] & 0x7FU;
|
||||
m_text[6U] = m_buffer[2U] & 0x7FU;
|
||||
m_text[7U] = m_buffer[3U] & 0x7FU;
|
||||
|
|
@ -133,7 +133,7 @@ void CDStarSlowData::loadText()
|
|||
break;
|
||||
|
||||
case DSTAR_SLOW_DATA_TYPE_TEXT | 2U:
|
||||
CUtils::dump(1U, "D-Star slow data text fragment 2", m_buffer, 6U);
|
||||
//CUtils::dump(1U, "D-Star slow data text fragment 2", m_buffer, 6U);
|
||||
m_text[10U] = m_buffer[1U] & 0x7FU;
|
||||
m_text[11U] = m_buffer[2U] & 0x7FU;
|
||||
m_text[12U] = m_buffer[3U] & 0x7FU;
|
||||
|
|
@ -143,7 +143,7 @@ void CDStarSlowData::loadText()
|
|||
break;
|
||||
|
||||
case DSTAR_SLOW_DATA_TYPE_TEXT | 3U:
|
||||
CUtils::dump(1U, "D-Star slow data text fragment 3", m_buffer, 6U);
|
||||
//CUtils::dump(1U, "D-Star slow data text fragment 3", m_buffer, 6U);
|
||||
m_text[15U] = m_buffer[1U] & 0x7FU;
|
||||
m_text[16U] = m_buffer[2U] & 0x7FU;
|
||||
m_text[17U] = m_buffer[3U] & 0x7FU;
|
||||
|
|
@ -163,7 +163,7 @@ const unsigned char* CDStarSlowData::getText()
|
|||
if (m_textBits != 0x0FU)
|
||||
return nullptr;
|
||||
|
||||
CUtils::dump(1U, "D-Star slow data text", m_text, 20U);
|
||||
//CUtils::dump(1U, "D-Star slow data text", m_text, 20U);
|
||||
|
||||
m_textBits = 0x00U;
|
||||
|
||||
|
|
@ -239,9 +239,9 @@ void CDStarSlowData::getSlowData(unsigned char* data)
|
|||
}
|
||||
}
|
||||
|
||||
unsigned char CDStarSlowData::getType() const
|
||||
unsigned char CDStarSlowData::getType(bool unmasked) const
|
||||
{
|
||||
return m_buffer[0U] & DSTAR_SLOW_DATA_TYPE_MASK;
|
||||
return unmasked ? m_buffer[0U] : m_buffer[0U] & DSTAR_SLOW_DATA_TYPE_MASK ;
|
||||
}
|
||||
|
||||
bool CDStarSlowData::isComplete() const
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ public:
|
|||
|
||||
CDStarHeader* getHeader();
|
||||
const unsigned char* getText();
|
||||
unsigned char getType() const;
|
||||
unsigned char getType(bool unmasked = false) const;
|
||||
|
||||
bool isComplete() const;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue