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

Rebuild broken FICHs.

Browse Source
This commit is contained in:
Jonathan Naylor
2017-08-14 17:34:04 +01:00
parent f4beafc593
commit b3c0e68b23
3 changed files with 51 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
YSFControl.cpp
View File

@@ -189,7 +189,7 @@ bool CYSFControl::writeModem(unsigned char *data, unsigned int len)
bool CYSFControl::processVWData(bool valid, unsigned char *data) bool CYSFControl::processVWData(bool valid, unsigned char *data)
{ {
unsigned char fi = m_lastFICH.getFI(); unsigned char fi = m_lastFICH.getFI();
if (fi == YSF_FI_HEADER) { if (valid && fi == YSF_FI_HEADER) {
if (m_rfState != RS_RF_LISTENING) if (m_rfState != RS_RF_LISTENING)
return false; return false;
@@ -255,7 +255,7 @@ bool CYSFControl::processVWData(bool valid, unsigned char *data)
m_rfFrames++; m_rfFrames++;
m_display->writeFusionRSSI(m_rssi); m_display->writeFusionRSSI(m_rssi);
} else if (fi == YSF_FI_TERMINATOR) { } else if (valid && fi == YSF_FI_TERMINATOR) {
if (m_rfState != RS_RF_AUDIO) if (m_rfState != RS_RF_AUDIO)
return false; return false;
@@ -304,7 +304,12 @@ bool CYSFControl::processVWData(bool valid, unsigned char *data)
if (m_rfState != RS_RF_AUDIO) if (m_rfState != RS_RF_AUDIO)
return false; return false;
// XXX If valid is false, update the m_lastFICH for this transmission // If valid is false, update the m_lastFICH for this transmission
if (!valid) {
// XXX Check these values
m_lastFICH.setFT(0U);
m_lastFICH.setFN(0U);
}
CSync::addYSFSync(data + 2U); CSync::addYSFSync(data + 2U);
@@ -358,7 +363,7 @@ bool CYSFControl::processVWData(bool valid, unsigned char *data)
bool CYSFControl::processDNData(bool valid, unsigned char *data) bool CYSFControl::processDNData(bool valid, unsigned char *data)
{ {
unsigned char fi = m_lastFICH.getFI(); unsigned char fi = m_lastFICH.getFI();
if (fi == YSF_FI_HEADER) { if (valid && fi == YSF_FI_HEADER) {
if (m_rfState != RS_RF_LISTENING) if (m_rfState != RS_RF_LISTENING)
return false; return false;
@@ -424,7 +429,7 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
m_rfFrames++; m_rfFrames++;
m_display->writeFusionRSSI(m_rssi); m_display->writeFusionRSSI(m_rssi);
} else if (fi == YSF_FI_TERMINATOR) { } else if (valid && fi == YSF_FI_TERMINATOR) {
if (m_rfState != RS_RF_AUDIO) if (m_rfState != RS_RF_AUDIO)
return false; return false;
@@ -471,7 +476,16 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
return false; return false;
} else { } else {
if (m_rfState == RS_RF_AUDIO) { if (m_rfState == RS_RF_AUDIO) {
// XXX If valid is false, update the m_lastFICH for this transmission // If valid is false, update the m_lastFICH for this transmission
if (!valid) {
unsigned char ft = m_lastFICH.getFT();
unsigned char fn = m_lastFICH.getFN() + 1U;
if (fn > ft)
fn = 0U;
m_lastFICH.setFN(fn);
}
CSync::addYSFSync(data + 2U); CSync::addYSFSync(data + 2U);
@@ -534,6 +548,7 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
m_display->writeFusionRSSI(m_rssi); m_display->writeFusionRSSI(m_rssi);
} else if (valid) { } else if (valid) {
// Only use clean frames for late entry.
CSync::addYSFSync(data + 2U); CSync::addYSFSync(data + 2U);
unsigned char fn = m_lastFICH.getFN(); unsigned char fn = m_lastFICH.getFN();
@@ -596,14 +611,14 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
fich.encode(buffer + 2U); fich.encode(buffer + 2U);
unsigned char csd1[20U], csd2[20U]; unsigned char csd1[20U], csd2[20U];
memcpy(csd1, m_rfSource, YSF_CALLSIGN_LENGTH); memcpy(csd1 + YSF_CALLSIGN_LENGTH, m_rfSource, YSF_CALLSIGN_LENGTH);
memset(csd2, ' ', 20U); memset(csd2, ' ', YSF_CALLSIGN_LENGTH + YSF_CALLSIGN_LENGTH);
unsigned char cm = fich.getCM(); unsigned char cm = fich.getCM();
if (cm == YSF_CM_GROUP) if (cm == YSF_CM_GROUP)
memset(csd1 + YSF_CALLSIGN_LENGTH, '*', YSF_CALLSIGN_LENGTH); memset(csd1 + 0U, '*', YSF_CALLSIGN_LENGTH);
else else
memcpy(csd1 + YSF_CALLSIGN_LENGTH, m_rfDest, YSF_CALLSIGN_LENGTH); memcpy(csd1 + 0U, m_rfDest, YSF_CALLSIGN_LENGTH);
CYSFPayload payload; CYSFPayload payload;
payload.writeHeader(buffer + 2U, csd1, csd2); payload.writeHeader(buffer + 2U, csd1, csd2);
@@ -670,7 +685,7 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
bool CYSFControl::processFRData(bool valid, unsigned char *data) bool CYSFControl::processFRData(bool valid, unsigned char *data)
{ {
unsigned char fi = m_lastFICH.getFI(); unsigned char fi = m_lastFICH.getFI();
if (fi == YSF_FI_HEADER) { if (valid && fi == YSF_FI_HEADER) {
if (m_rfState != RS_RF_LISTENING) if (m_rfState != RS_RF_LISTENING)
return false; return false;
@@ -733,7 +748,7 @@ bool CYSFControl::processFRData(bool valid, unsigned char *data)
m_rfFrames++; m_rfFrames++;
m_display->writeFusionRSSI(m_rssi); m_display->writeFusionRSSI(m_rssi);
} else if (fi == YSF_FI_TERMINATOR) { } else if (valid && fi == YSF_FI_TERMINATOR) {
if (m_rfState != RS_RF_DATA) if (m_rfState != RS_RF_DATA)
return false; return false;
@@ -782,7 +797,16 @@ bool CYSFControl::processFRData(bool valid, unsigned char *data)
if (m_rfState != RS_RF_DATA) if (m_rfState != RS_RF_DATA)
return false; return false;
// XXX If valid is false, update the m_lastFICH for this transmission // If valid is false, update the m_lastFICH for this transmission
if (!valid) {
unsigned char ft = m_lastFICH.getFT();
unsigned char fn = m_lastFICH.getFN() + 1U;
if (fn > ft)
fn = 0U;
m_lastFICH.setFN(fn);
}
CSync::addYSFSync(data + 2U); CSync::addYSFSync(data + 2U);

12
YSFFICH.cpp
View File

@@ -230,6 +230,18 @@ void CYSFFICH::setFI(unsigned char fi)
m_fich[0U] |= (fi << 6) & 0xC0U; m_fich[0U] |= (fi << 6) & 0xC0U;
} }
void CYSFFICH::setFN(unsigned char fn)
{
m_fich[1U] &= 0xC7U;
m_fich[1U] |= (fn << 3) & 0x38U;
}
void CYSFFICH::setFT(unsigned char ft)
{
m_fich[1U] &= 0xF8U;
m_fich[1U] |= ft & 0x07U;
}
void CYSFFICH::setMR(unsigned char mr) void CYSFFICH::setMR(unsigned char mr)
{ {
m_fich[2U] &= 0xC7U; m_fich[2U] &= 0xC7U;

2
YSFFICH.h
View File

@@ -42,6 +42,8 @@ public:
unsigned char getSQ() const; unsigned char getSQ() const;
void setFI(unsigned char fi); void setFI(unsigned char fi);
void setFN(unsigned char fn);
void setFT(unsigned char ft);
void setMR(unsigned char mr); void setMR(unsigned char mr);
void setVoIP(bool set); void setVoIP(bool set);
void setDev(bool set); void setDev(bool set);