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

Add command page_bcd to send bcd message with pocsag

Browse Source
This commit is contained in:
Max Lapan
2022-11-25 20:58:26 +01:00
parent f3fb072238
commit 8f5ff4ca05
5 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
MMDVMHost.cpp
View File

@@ -2639,9 +2639,21 @@ void CMMDVMHost::remoteControl()
text += m_remoteControl->getArgString(i); text += m_remoteControl->getArgString(i);
} }
m_pocsag->sendPage(ric, text); m_pocsag->sendPage(ric, text);
m_pocsag->sendBCDPage(ric, "01234");
} }
break; break;
case RCD_PAGE_BCD:
if (m_pocsag != NULL) {
unsigned int ric = m_remoteControl->getArgUInt(0U);
std::string text;
for (unsigned int i = 1U; i < m_remoteControl->getArgCount(); i++) {
if (i > 1U)
text += " ";
text += m_remoteControl->getArgString(i);
}
m_pocsag->sendPageBCD(ric, text);
}
break;
case RCD_CW: case RCD_CW:
setMode(MODE_IDLE); // Force the modem to go idle so that we can send the CW text. setMode(MODE_IDLE); // Force the modem to go idle so that we can send the CW text.
if (!m_modem->hasTX()) { if (!m_modem->hasTX()) {

2
POCSAGControl.cpp
View File

@@ -124,7 +124,7 @@ void CPOCSAGControl::sendPage(unsigned int ric, const std::string& text)
} }
void CPOCSAGControl::sendBCDPage(unsigned int ric, const std::string& text) void CPOCSAGControl::sendPageBCD(unsigned int ric, const std::string& text)
{ {
if (!m_enabled) if (!m_enabled)
return; return;

2
POCSAGControl.h
View File

@@ -43,7 +43,7 @@ public:
~CPOCSAGControl(); ~CPOCSAGControl();
void sendPage(unsigned int ric, const std::string& text); void sendPage(unsigned int ric, const std::string& text);
void sendBCDPage(unsigned int ric, const std::string& text); void sendPageBCD(unsigned int ric, const std::string& text);
unsigned int readModem(unsigned char* data); unsigned int readModem(unsigned char* data);

5
RemoteControl.cpp
View File

@@ -137,6 +137,9 @@ REMOTE_COMMAND CRemoteControl::getCommand()
} else if (m_args.at(0U) == "page" && m_args.size() >= PAGE_ARGS) { } else if (m_args.at(0U) == "page" && m_args.size() >= PAGE_ARGS) {
// Page command is in the form of "page <ric> <message>" // Page command is in the form of "page <ric> <message>"
m_command = RCD_PAGE; m_command = RCD_PAGE;
} else if (m_args.at(0U) == "page_bcd" && m_args.size() >= PAGE_ARGS) {
// BCD page command is in the form of "page_bcd <ric> <bcd message>"
m_command = RCD_PAGE_BCD;
} else if (m_args.at(0U) == "cw" && m_args.size() >= CW_ARGS) { } else if (m_args.at(0U) == "cw" && m_args.size() >= CW_ARGS) {
// CW command is in the form of "cw <message>" // CW command is in the form of "cw <message>"
m_command = RCD_CW; m_command = RCD_CW;
@@ -192,6 +195,7 @@ unsigned int CRemoteControl::getArgCount() const
case RCD_MODE_M17: case RCD_MODE_M17:
return m_args.size() - SET_MODE_ARGS; return m_args.size() - SET_MODE_ARGS;
case RCD_PAGE: case RCD_PAGE:
case RCD_PAGE_BCD:
return m_args.size() - 1U; return m_args.size() - 1U;
case RCD_CW: case RCD_CW:
return m_args.size() - 1U; return m_args.size() - 1U;
@@ -214,6 +218,7 @@ std::string CRemoteControl::getArgString(unsigned int n) const
n += SET_MODE_ARGS; n += SET_MODE_ARGS;
break; break;
case RCD_PAGE: case RCD_PAGE:
case RCD_PAGE_BCD:
n += 1U; n += 1U;
break; break;
case RCD_CW: case RCD_CW:

1
RemoteControl.h
View File

@@ -54,6 +54,7 @@ enum REMOTE_COMMAND {
RCD_DISABLE_FM, RCD_DISABLE_FM,
RCD_DISABLE_AX25, RCD_DISABLE_AX25,
RCD_PAGE, RCD_PAGE,
RCD_PAGE_BCD,
RCD_CW, RCD_CW,
RCD_RELOAD, RCD_RELOAD,
RCD_CONNECTION_STATUS, RCD_CONNECTION_STATUS,