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

Add BN/BT of the YSF FICH for debugging.

Browse Source
This commit is contained in:
Jonathan Naylor
2016-07-05 17:51:16 +01:00
parent 73c02972ec
commit ca636338d9
4 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Defines.h
View File

@@ -35,7 +35,7 @@ enum RPT_RF_STATE {
RS_RF_LISTENING, RS_RF_LISTENING,
RS_RF_LATE_ENTRY, RS_RF_LATE_ENTRY,
RS_RF_AUDIO, RS_RF_AUDIO,
RS_RF_DATA, RS_RF_DATA
}; };
enum RPT_NET_STATE { enum RPT_NET_STATE {

8
YSFControl.cpp
View File

@@ -186,6 +186,8 @@ bool CYSFControl::writeModem(unsigned char *data)
} else if (valid) { } else if (valid) {
CSync::addYSFSync(data + 2U); CSync::addYSFSync(data + 2U);
unsigned char bn = fich.getBN();
unsigned char bt = fich.getBT();
unsigned char fn = fich.getFN(); unsigned char fn = fich.getFN();
unsigned char ft = fich.getFT(); unsigned char ft = fich.getFT();
unsigned char dt = fich.getDT(); unsigned char dt = fich.getDT();
@@ -212,6 +214,7 @@ bool CYSFControl::writeModem(unsigned char *data)
break; break;
case YSF_DT_DATA_FR_MODE: case YSF_DT_DATA_FR_MODE:
LogDebug("YSF, RF data FICH B=%u/%u F=%u/%u", bn, bt, fn, ft);
valid = m_rfPayload.processDataFRModeData(data + 2U, fn); valid = m_rfPayload.processDataFRModeData(data + 2U, fn);
break; break;
@@ -430,10 +433,12 @@ void CYSFControl::writeNetwork()
CYSFFICH fich; CYSFFICH fich;
bool valid = fich.decode(data + 35U); bool valid = fich.decode(data + 35U);
if (valid) { if (valid) {
unsigned char bn = fich.getBN();
unsigned char bt = fich.getBT();
unsigned char dt = fich.getDT(); unsigned char dt = fich.getDT();
unsigned char fn = fich.getFN(); unsigned char fn = fich.getFN();
unsigned char fi = fich.getFI();
unsigned char ft = fich.getFT(); unsigned char ft = fich.getFT();
unsigned char fi = fich.getFI();
// Set the downlink callsign // Set the downlink callsign
switch (fi) { switch (fi) {
@@ -463,6 +468,7 @@ void CYSFControl::writeNetwork()
break; break;
case YSF_DT_DATA_FR_MODE: case YSF_DT_DATA_FR_MODE:
LogDebug("YSF, Network data FICH B=%u/%u F=%u/%u", bn, bt, fn, ft);
m_netPayload.processDataFRModeData(data + 35U, fn, gateway); m_netPayload.processDataFRModeData(data + 35U, fn, gateway);
break; break;

10
YSFFICH.cpp
View File

@@ -169,6 +169,16 @@ unsigned char CYSFFICH::getCM() const
return (m_fich[0U] >> 2) & 0x03U; return (m_fich[0U] >> 2) & 0x03U;
} }
unsigned char CYSFFICH::getBN() const
{
return m_fich[0U] & 0x03U;
}
unsigned char CYSFFICH::getBT() const
{
return (m_fich[1U] >> 6) & 0x03U;
}
unsigned char CYSFFICH::getFN() const unsigned char CYSFFICH::getFN() const
{ {
return (m_fich[1U] >> 3) & 0x07U; return (m_fich[1U] >> 3) & 0x07U;

2
YSFFICH.h
View File

@@ -30,6 +30,8 @@ public:
unsigned char getFI() const; unsigned char getFI() const;
unsigned char getCM() const; unsigned char getCM() const;
unsigned char getBN() const;
unsigned char getBT() const;
unsigned char getFN() const; unsigned char getFN() const;
unsigned char getFT() const; unsigned char getFT() const;
unsigned char getDT() const; unsigned char getDT() const;