hamradio/gqrx
1
0
Fork 0
mirror of https://github.com/gqrx-sdr/gqrx.git synced 2024-09-21 02:37:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow remote control commands to be pipelined

Browse Source
This commit is contained in:
Clayton Smith 2024-03-19 17:34:21 -04:00
parent da7012dcca
commit ce929ffaca
2 changed files with 69 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/news.txt
View File

@ -3,6 +3,7 @@
NEW: PlutoSDR and LimeSDR support in AppImage release, via SoapySDR.
IMPROVED: Updated GNU Radio, SDR driver, and Qt versions in AppImage release.
FIXED: Respond correctly to pipelined remote control commands.
REMOVED: FreeSRP support in AppImage release.

134
src/applications/gqrx/remote_control.cpp
View File

@ -193,80 +193,82 @@ void RemoteControl::acceptConnection()
*/
void RemoteControl::startRead()
{
char buffer[1024] = {0};
int bytes_read;
QString answer = "";
while (rc_socket->canReadLine()) {
char buffer[1024] = {0};
int bytes_read;
QString answer = "";
bytes_read = rc_socket->readLine(buffer, 1024);
if (bytes_read < 2) // command + '\n'
return;
bytes_read = rc_socket->readLine(buffer, 1024);
if (bytes_read < 2) // command + '\n'
continue;
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
QStringList cmdlist = QString(buffer).trimmed().split(" ", QString::SkipEmptyParts);
QStringList cmdlist = QString(buffer).trimmed().split(" ", QString::SkipEmptyParts);
#else
QStringList cmdlist = QString(buffer).trimmed().split(" ", Qt::SkipEmptyParts);
QStringList cmdlist = QString(buffer).trimmed().split(" ", Qt::SkipEmptyParts);
#endif
if (cmdlist.size() == 0)
return;
if (cmdlist.size() == 0)
continue;
QString cmd = cmdlist[0];
if (cmd == "f")
answer = cmd_get_freq();
else if (cmd == "F")
answer = cmd_set_freq(cmdlist);
else if (cmd == "m")
answer = cmd_get_mode();
else if (cmd == "M")
answer = cmd_set_mode(cmdlist);
else if (cmd == "l")
answer = cmd_get_level(cmdlist);
else if (cmd == "L")
answer = cmd_set_level(cmdlist);
else if (cmd == "u")
answer = cmd_get_func(cmdlist);
else if (cmd == "U")
answer = cmd_set_func(cmdlist);
else if (cmd == "v")
answer = cmd_get_vfo();
else if (cmd == "V")
answer = cmd_set_vfo(cmdlist);
else if (cmd == "s")
answer = cmd_get_split_vfo();
else if (cmd == "S")
answer = cmd_set_split_vfo();
else if (cmd == "p")
answer = cmd_get_param(cmdlist);
else if (cmd == "_")
answer = cmd_get_info();
else if (cmd == "AOS")
answer = cmd_AOS();
else if (cmd == "LOS")
answer = cmd_LOS();
else if (cmd == "LNB_LO")
answer = cmd_lnb_lo(cmdlist);
else if (cmd == "\\chk_vfo")
answer = QString("0\n");
else if (cmd == "\\dump_state")
answer = cmd_dump_state();
else if (cmd == "\\get_powerstat")
answer = QString("1\n");
else if (cmd == "q" || cmd == "Q")
{
// FIXME: for now we assume 'close' command
rc_socket->close();
rc_socket->deleteLater();
rc_socket = 0;
return;
}
else
{
// print unknown command and respond with an error
qWarning() << "Unknown remote command:" << cmdlist;
answer = QString("RPRT 1\n");
}
QString cmd = cmdlist[0];
if (cmd == "f")
answer = cmd_get_freq();
else if (cmd == "F")
answer = cmd_set_freq(cmdlist);
else if (cmd == "m")
answer = cmd_get_mode();
else if (cmd == "M")
answer = cmd_set_mode(cmdlist);
else if (cmd == "l")
answer = cmd_get_level(cmdlist);
else if (cmd == "L")
answer = cmd_set_level(cmdlist);
else if (cmd == "u")
answer = cmd_get_func(cmdlist);
else if (cmd == "U")
answer = cmd_set_func(cmdlist);
else if (cmd == "v")
answer = cmd_get_vfo();
else if (cmd == "V")
answer = cmd_set_vfo(cmdlist);
else if (cmd == "s")
answer = cmd_get_split_vfo();
else if (cmd == "S")
answer = cmd_set_split_vfo();
else if (cmd == "p")
answer = cmd_get_param(cmdlist);
else if (cmd == "_")
answer = cmd_get_info();
else if (cmd == "AOS")
answer = cmd_AOS();
else if (cmd == "LOS")
answer = cmd_LOS();
else if (cmd == "LNB_LO")
answer = cmd_lnb_lo(cmdlist);
else if (cmd == "\\chk_vfo")
answer = QString("0\n");
else if (cmd == "\\dump_state")
answer = cmd_dump_state();
else if (cmd == "\\get_powerstat")
answer = QString("1\n");
else if (cmd == "q" || cmd == "Q")
{
// FIXME: for now we assume 'close' command
rc_socket->close();
rc_socket->deleteLater();
rc_socket = 0;
return;
}
else
{
// print unknown command and respond with an error
qWarning() << "Unknown remote command:" << cmdlist;
answer = QString("RPRT 1\n");
}
rc_socket->write(answer.toLatin1());
rc_socket->write(answer.toLatin1());
}
}
/*! \brief Slot called when the receiver is tuned to a new frequency.