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

Use MQTT for the remote command handling.

Browse Source
This commit is contained in:
Jonathan Naylor
2023-06-20 15:27:56 +01:00
parent 0615a4218d
commit 1afe34f514
11 changed files with 132 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
MMDVMHost.cpp
View File

@@ -769,22 +769,8 @@ int CMMDVMHost::run()
}
bool remoteControlEnabled = m_conf.getRemoteControlEnabled();
if (remoteControlEnabled) {
std::string address = m_conf.getRemoteControlAddress();
unsigned short port = m_conf.getRemoteControlPort();
LogInfo("Remote Control Parameters");
LogInfo(" Address: %s", address.c_str());
LogInfo(" Port: %hu", port);
m_remoteControl = new CRemoteControl(this, address, port);
ret = m_remoteControl->open();
if (!ret) {
delete m_remoteControl;
m_remoteControl = NULL;
}
}
if (remoteControlEnabled)
m_remoteControl = new CRemoteControl(this, m_mqtt);
setMode(MODE_IDLE);
@@ -1205,8 +1191,6 @@ int CMMDVMHost::run()
m_modem->writeTransparentData(data, len);
}
remoteControl();
unsigned int ms = stopWatch.elapsed();
stopWatch.start();
@@ -1387,10 +1371,7 @@ int CMMDVMHost::run()
delete transparentSocket;
}
if (m_remoteControl != NULL) {
m_remoteControl->close();
delete m_remoteControl;
}
delete m_remoteControl;
LogInfo("Stopping protocol handlers");
writeJSONMessage("Stopping protocol handlers");
@@ -2515,12 +2496,12 @@ void CMMDVMHost::removeLockFile() const
::remove(m_lockFileName.c_str());
}
void CMMDVMHost::remoteControl()
void CMMDVMHost::remoteControl(const std::string& commandString)
{
if (m_remoteControl == NULL)
return;
REMOTE_COMMAND command = m_remoteControl->getCommand();
REMOTE_COMMAND command = m_remoteControl->getCommand(commandString);
switch (command) {
case RCD_MODE_IDLE:
m_fixedMode = false;
@@ -2805,6 +2786,9 @@ void CMMDVMHost::writeJSONMessage(const std::string& message)
void CMMDVMHost::onCommand(const std::string& command)
{
assert(host != NULL);
host->remoteControl(command);
}
void CMMDVMHost::onDisplay(const std::string& message)