MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2026-02-04 22:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allow for remote System Fusion gateway operation.

Browse Source
This commit is contained in:
Jonathan Naylor
2016-09-26 18:07:06 +01:00
parent f6a485fe6b
commit 9408367a0f
8 changed files with 42 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
YSFControl.cpp
View File

@@ -24,10 +24,11 @@
// #define DUMP_YSF
CYSFControl::CYSFControl(const std::string& callsign, CYSFNetwork* network, CDisplay* display, unsigned int timeout, bool duplex, int rssiMultiplier, int rssiOffset) :
CYSFControl::CYSFControl(const std::string& callsign, CYSFNetwork* network, CDisplay* display, unsigned int timeout, bool duplex, bool remoteGateway, int rssiMultiplier, int rssiOffset) :
m_network(network),
m_display(display),
m_duplex(duplex),
m_remoteGateway(remoteGateway),
m_queue(5000U, "YSF Control"),
m_rfState(RS_RF_LISTENING),
m_netState(RS_NET_IDLE),
@@ -50,6 +51,7 @@ m_netDest(NULL),
m_lastFrame(NULL),
m_lastFrameValid(false),
m_lastMode(YSF_DT_VOICE_FR_MODE),
m_lastMR(YSF_MR_NOT_BUSY),
m_netN(0U),
m_rfPayload(),
m_netPayload(),
@@ -124,6 +126,18 @@ bool CYSFControl::writeModem(unsigned char *data, unsigned int len)
if (m_rfState != RS_RF_AUDIO)
return false;
if (valid)
m_lastMR = fich.getMR();
// Stop repeater packets coming through, unless we're acting as a remote gateway
if (m_remoteGateway) {
if (m_lastMR != YSF_MR_BUSY)
return false;
} else {
if (m_lastMR == YSF_MR_BUSY)
return false;
}
unsigned char fi = fich.getFI();
if (valid && fi == YSF_FI_HEADER) {
CSync::addYSFSync(data + 2U);
@@ -167,7 +181,7 @@ bool CYSFControl::writeModem(unsigned char *data, unsigned int len)
#endif
if (m_duplex) {
fich.setMR(YSF_MR_BUSY);
fich.setMR(m_remoteGateway ? YSF_MR_NOT_BUSY : YSF_MR_BUSY);
fich.encode(data + 2U);
writeQueueRF(data);
}
@@ -190,7 +204,7 @@ bool CYSFControl::writeModem(unsigned char *data, unsigned int len)
#endif
if (m_duplex) {
fich.setMR(YSF_MR_BUSY);
fich.setMR(m_remoteGateway ? YSF_MR_NOT_BUSY : YSF_MR_BUSY);
fich.encode(data + 2U);
writeQueueRF(data);
}
@@ -292,7 +306,7 @@ bool CYSFControl::writeModem(unsigned char *data, unsigned int len)
writeNetwork(data, m_rfFrames % 128U);
if (m_duplex) {
fich.setMR(YSF_MR_BUSY);
fich.setMR(m_remoteGateway ? YSF_MR_NOT_BUSY : YSF_MR_BUSY);
fich.encode(data + 2U);
writeQueueRF(data);
}
@@ -462,7 +476,7 @@ void CYSFControl::writeNetwork()
unsigned char fi = fich.getFI();
fich.setVoIP(true);
fich.setMR(YSF_MR_BUSY);
fich.setMR(m_remoteGateway ? YSF_MR_NOT_BUSY : YSF_MR_BUSY);
fich.encode(data + 35U);
m_lastMode = dt;