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

Clean ups from merging from master.

Browse Source
This commit is contained in:
Jonathan Naylor
2025-03-14 16:11:04 +00:00
parent 62c33086ca
commit 3109cd03ae
31 changed files with 844 additions and 837 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
RemoteControl.cpp
View File

@@ -34,11 +34,11 @@ const unsigned int CW_ARGS = 2U;
CRemoteControl::CRemoteControl(CMMDVMHost *host, CMQTTConnection* mqtt) :
m_host(host),
m_mqtt(mqtt),
m_command(RCD_NONE),
m_command(REMOTE_COMMAND::NONE),
m_args()
{
assert(host != NULL);
assert(mqtt != NULL);
assert(host != nullptr);
assert(mqtt != nullptr);
}
CRemoteControl::~CRemoteControl()
@@ -47,7 +47,7 @@ CRemoteControl::~CRemoteControl()
REMOTE_COMMAND CRemoteControl::getCommand(const std::string& command)
{
m_command = RCD_NONE;
m_command = REMOTE_COMMAND::NONE;
m_args.clear();
std::string reply = "OK";
@@ -65,163 +65,163 @@ REMOTE_COMMAND CRemoteControl::getCommand(const std::string& command)
if (m_args.at(0U) == "mode" && m_args.size() >= SET_MODE_ARGS) {
// Mode command is in the form of "mode <mode> [<timeout>|fixed]"
if (m_args.at(1U) == "idle")
m_command = RCD_MODE_IDLE;
m_command = REMOTE_COMMAND::MODE_IDLE;
else if (m_args.at(1U) == "lockout")
m_command = RCD_MODE_LOCKOUT;
m_command = REMOTE_COMMAND::MODE_LOCKOUT;
#if defined(USE_DSTAR)
else if (m_args.at(1U) == "d-star")
m_command = RCD_MODE_DSTAR;
m_command = REMOTE_COMMAND::MODE_DSTAR;
#endif
#if defined(USE_DMR)
else if (m_args.at(1U) == "dmr")
m_command = RCD_MODE_DMR;
m_command = REMOTE_COMMAND::MODE_DMR;
#endif
#if defined(USE_YSF)
else if (m_args.at(1U) == "ysf")
m_command = RCD_MODE_YSF;
m_command = REMOTE_COMMAND::MODE_YSF;
#endif
#if defined(USE_P25)
else if (m_args.at(1U) == "p25")
m_command = RCD_MODE_P25;
m_command = REMOTE_COMMAND::MODE_P25;
#endif
#if defined(USE_NXDN)
else if (m_args.at(1U) == "nxdn")
m_command = RCD_MODE_NXDN;
m_command = REMOTE_COMMAND::MODE_NXDN;
#endif
#if defined(USE_M17)
else if (m_args.at(1U) == "m17")
m_command = RCD_MODE_M17;
m_command = REMOTE_COMMAND::MODE_M17;
#endif
else
reply = "KO";
} else if (m_args.at(0U) == "enable" && m_args.size() >= ENABLE_ARGS) {
#if defined(USE_DSTAR)
if (m_args.at(1U) == "dstar")
m_command = RCD_ENABLE_DSTAR;
m_command = REMOTE_COMMAND::ENABLE_DSTAR;
else
#endif
#if defined(USE_DMR)
if (m_args.at(1U) == "dmr")
m_command = RCD_ENABLE_DMR;
m_command = REMOTE_COMMAND::ENABLE_DMR;
else
#endif
#if defined(USE_YSF)
if (m_args.at(1U) == "ysf")
m_command = RCD_ENABLE_YSF;
m_command = REMOTE_COMMAND::ENABLE_YSF;
else
#endif
#if defined(USE_P25)
if (m_args.at(1U) == "p25")
m_command = RCD_ENABLE_P25;
m_command = REMOTE_COMMAND::ENABLE_P25;
else
#endif
#if defined(USE_NXDN)
if (m_args.at(1U) == "nxdn")
m_command = RCD_ENABLE_NXDN;
m_command = REMOTE_COMMAND::ENABLE_NXDN;
else
#endif
#if defined(USE_M17)
if (m_args.at(1U) == "m17")
m_command = RCD_ENABLE_M17;
m_command = REMOTE_COMMAND::ENABLE_M17;
else
#endif
#if defined(USE_FM)
if (m_args.at(1U) == "fm")
m_command = RCD_ENABLE_FM;
m_command = REMOTE_COMMAND::ENABLE_FM;
else
#endif
#if defined(USE_AX25)
if (m_args.at(1U) == "ax25")
m_command = RCD_ENABLE_AX25;
m_command = REMOTE_COMMAND::ENABLE_AX25;
else
#endif
reply = "KO";
} else if (m_args.at(0U) == "disable" && m_args.size() >= DISABLE_ARGS) {
#if defined(USE_DSTAR)
if (m_args.at(1U) == "dstar")
m_command = RCD_DISABLE_DSTAR;
m_command = REMOTE_COMMAND::DISABLE_DSTAR;
else
#endif
#if defined(USE_DMR)
if (m_args.at(1U) == "dmr")
m_command = RCD_DISABLE_DMR;
m_command = REMOTE_COMMAND::DISABLE_DMR;
else
#endif
#if defined(USE_YSF)
if (m_args.at(1U) == "ysf")
m_command = RCD_DISABLE_YSF;
m_command = REMOTE_COMMAND::DISABLE_YSF;
else
#endif
#if defined(USE_P25)
if (m_args.at(1U) == "p25")
m_command = RCD_DISABLE_P25;
m_command = REMOTE_COMMAND::DISABLE_P25;
else
#endif
#if defined(USE_NXDN)
if (m_args.at(1U) == "nxdn")
m_command = RCD_DISABLE_NXDN;
m_command = REMOTE_COMMAND::DISABLE_NXDN;
else
#endif
#if defined(USE_M17)
if (m_args.at(1U) == "m17")
m_command = RCD_DISABLE_M17;
m_command = REMOTE_COMMAND::DISABLE_M17;
else
#endif
#if defined(USE_FM)
if (m_args.at(1U) == "fm")
m_command = RCD_DISABLE_FM;
m_command = REMOTE_COMMAND::DISABLE_FM;
else
#endif
#if defined(USE_AX25)
if (m_args.at(1U) == "ax25")
m_command = RCD_DISABLE_AX25;
m_command = REMOTE_COMMAND::DISABLE_AX25;
else
#endif
reply = "KO";
#if defined(USE_POCSAG)
} else if (m_args.at(0U) == "page" && m_args.size() >= PAGE_ARGS) {
// Page command is in the form of "page <ric> <message>"
m_command = RCD_PAGE;
m_command = REMOTE_COMMAND::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;
m_command = REMOTE_COMMAND::PAGE_BCD;
} else if (m_args.at(0U) == "page_a1" && m_args.size() == 2) {
// Alert1 page command is in the form of "page_a1 <ric>"
m_command = RCD_PAGE_A1;
m_command = REMOTE_COMMAND::PAGE_A1;
} else if (m_args.at(0U) == "page_a2" && m_args.size() >= PAGE_ARGS) {
// Alert2 page command is in the form of "page_a2 <ric> <message>"
m_command = RCD_PAGE_A2;
m_command = REMOTE_COMMAND::PAGE_A2;
#endif
} else if (m_args.at(0U) == "cw" && m_args.size() >= CW_ARGS) {
// CW command is in the form of "cw <message>"
m_command = RCD_CW;
m_command = REMOTE_COMMAND::CW;
} else if (m_args.at(0U) == "reload") {
// Reload command is in the form of "reload"
m_command = RCD_RELOAD;
m_command = REMOTE_COMMAND::RELOAD;
} else if (m_args.at(0U) == "status") {
if (m_host != NULL) {
if (m_host != nullptr) {
m_host->buildNetworkStatusString(reply);
} else {
reply = "KO";
}
m_command = RCD_CONNECTION_STATUS;
m_command = REMOTE_COMMAND::CONNECTION_STATUS;
} else if (m_args.at(0U) == "hosts") {
if (m_host != NULL) {
if (m_host != nullptr) {
m_host->buildNetworkHostsString(reply);
} else {
reply = "KO";
}
m_command = RCD_CONFIG_HOSTS;
m_command = REMOTE_COMMAND::CONFIG_HOSTS;
} else {
reply = "KO";
}
char buffer[200U];
::snprintf(buffer, 200, "%s remote command of \"%s\" received", ((m_command == RCD_NONE) ? "Invalid" : "Valid"), command.c_str());
::snprintf(buffer, 200, "%s remote command of \"%s\" received", ((m_command == REMOTE_COMMAND::NONE) ? "Invalid" : "Valid"), command.c_str());
if (m_command == RCD_NONE) {
if (m_command == REMOTE_COMMAND::NONE) {
m_args.clear();
LogWarning(buffer);
} else {
@@ -236,35 +236,35 @@ REMOTE_COMMAND CRemoteControl::getCommand(const std::string& command)
unsigned int CRemoteControl::getArgCount() const
{
switch (m_command) {
case RCD_MODE_IDLE:
case RCD_MODE_LOCKOUT:
case REMOTE_COMMAND::MODE_IDLE:
case REMOTE_COMMAND::MODE_LOCKOUT:
#if defined(USE_DSTAR)
case RCD_MODE_DSTAR:
case REMOTE_COMMAND::MODE_DSTAR:
#endif
#if defined(USE_DMR)
case RCD_MODE_DMR:
case REMOTE_COMMAND::MODE_DMR:
#endif
#if defined(USE_YSF)
case RCD_MODE_YSF:
case REMOTE_COMMAND::MODE_YSF:
#endif
#if defined(USE_P25)
case RCD_MODE_P25:
case REMOTE_COMMAND::MODE_P25:
#endif
#if defined(USE_NXDN)
case RCD_MODE_NXDN:
case REMOTE_COMMAND::MODE_NXDN:
#endif
#if defined(USE_M17)
case RCD_MODE_M17:
case REMOTE_COMMAND::MODE_M17:
#endif
return (unsigned int)m_args.size() - SET_MODE_ARGS;
#if defined(USE_POCSAG)
case RCD_PAGE:
case RCD_PAGE_BCD:
case RCD_PAGE_A1:
case RCD_PAGE_A2:
case REMOTE_COMMAND::PAGE:
case REMOTE_COMMAND::PAGE_BCD:
case REMOTE_COMMAND::PAGE_A1:
case REMOTE_COMMAND::PAGE_A2:
return (unsigned int)m_args.size() - 1U;
#endif
case RCD_CW:
case REMOTE_COMMAND::CW:
return (unsigned int)m_args.size() - 1U;
default:
return 0U;
@@ -274,37 +274,37 @@ unsigned int CRemoteControl::getArgCount() const
std::string CRemoteControl::getArgString(unsigned int n) const
{
switch (m_command) {
case RCD_MODE_IDLE:
case RCD_MODE_LOCKOUT:
case REMOTE_COMMAND::MODE_IDLE:
case REMOTE_COMMAND::MODE_LOCKOUT:
#if defined(USE_DSTAR)
case RCD_MODE_DSTAR:
case REMOTE_COMMAND::MODE_DSTAR:
#endif
#if defined(USE_DMR)
case RCD_MODE_DMR:
case REMOTE_COMMAND::MODE_DMR:
#endif
#if defined(USE_YSF)
case RCD_MODE_YSF:
case REMOTE_COMMAND::MODE_YSF:
#endif
#if defined(USE_P25)
case RCD_MODE_P25:
case REMOTE_COMMAND::MODE_P25:
#endif
#if defined(USE_NXDN)
case RCD_MODE_NXDN:
case REMOTE_COMMAND::MODE_NXDN:
#endif
#if defined(USE_M17)
case RCD_MODE_M17:
case REMOTE_COMMAND::MODE_M17:
#endif
n += SET_MODE_ARGS;
break;
#if defined(USE_POCSAG)
case RCD_PAGE:
case RCD_PAGE_BCD:
case RCD_PAGE_A1:
case RCD_PAGE_A2:
case REMOTE_COMMAND::PAGE:
case REMOTE_COMMAND::PAGE_BCD:
case REMOTE_COMMAND::PAGE_A1:
case REMOTE_COMMAND::PAGE_A2:
n += 1U;
break;
#endif
case RCD_CW:
case REMOTE_COMMAND::CW:
n += 1U;
break;
default: