More fixes to rigctld

lv2
Phil Taylor 2021-08-05 11:29:20 +01:00
rodzic f36cefac3a
commit 273132de89
1 zmienionych plików z 27 dodań i 14 usunięć

Wyświetl plik

@ -80,7 +80,7 @@ void rigCtlClient::socketReadyRead()
{ {
QByteArray data = socket->readAll(); QByteArray data = socket->readAll();
commandBuffer.append(data); commandBuffer.append(data);
static QString sep = " "; QString sep = "\n";
static int num = 0; static int num = 0;
bool longReply = false; bool longReply = false;
char responseCode = 0; char responseCode = 0;
@ -129,7 +129,7 @@ void rigCtlClient::socketReadyRead()
} }
QStringList command = commandBuffer.mid(num).split(" "); QStringList command = commandBuffer.mid(num).split(" ");
if (command[0] == 0xf0 || command[0]=="chk_vfo") if (command[0] == 0xf0 || command[0] == "chk_vfo")
{ {
response.append(QString("%1").arg(rigState->currentVfo)); response.append(QString("%1").arg(rigState->currentVfo));
} }
@ -141,7 +141,9 @@ void rigCtlClient::socketReadyRead()
response.append("0"); response.append("0");
response.append("150000.000000 1500000000.000000 0x1ff -1 -1 0x16000003 0xf"); response.append("150000.000000 1500000000.000000 0x1ff -1 -1 0x16000003 0xf");
response.append("0 0 0 0 0 0 0"); response.append("0 0 0 0 0 0 0");
response.append("0 0 0 0 0 0 0");
response.append("0x1ff 1"); response.append("0x1ff 1");
response.append("0x1ff 0");
response.append("0 0"); response.append("0 0");
response.append("0x1e 2400"); response.append("0x1e 2400");
response.append("0x2 500"); response.append("0x2 500");
@ -149,14 +151,16 @@ void rigCtlClient::socketReadyRead()
response.append("0x1 2400"); response.append("0x1 2400");
response.append("0x20 15000"); response.append("0x20 15000");
response.append("0x20 8000"); response.append("0x20 8000");
response.append("0x20 230000"); response.append("0x40 230000");
response.append("0 0"); response.append("0 0");
response.append("9900"); response.append("9900");
response.append("9900"); response.append("9900");
response.append("10000"); response.append("10000");
response.append("0"); response.append("0");
response.append("10");
response.append("10 20 30"); response.append("10 20 30");
response.append("0x3effffff"); response.append("0x3effffff");
response.append("0x3effffff");
response.append("0x7fffffff"); response.append("0x7fffffff");
response.append("0x7fffffff"); response.append("0x7fffffff");
response.append("0x7fffffff"); response.append("0x7fffffff");
@ -176,7 +180,7 @@ void rigCtlClient::socketReadyRead()
else if (command[0] == "F" || command[0] == "set_freq") else if (command[0] == "F" || command[0] == "set_freq")
{ {
setCommand = true; setCommand = true;
if (command.length()>1) if (command.length() > 1)
{ {
freqt freq; freqt freq;
bool ok; bool ok;
@ -220,6 +224,7 @@ void rigCtlClient::socketReadyRead()
} }
else if (command[0] == "T" || command[0] == "set_ptt") else if (command[0] == "T" || command[0] == "set_ptt")
{ {
setCommand = true;
if (rigCaps.hasPTTCommand) { if (rigCaps.hasPTTCommand) {
if (command.length() > 1 && command[1] == "0") { if (command.length() > 1 && command[1] == "0") {
emit parent->setPTT(false); emit parent->setPTT(false);
@ -345,14 +350,22 @@ void rigCtlClient::socketReadyRead()
} }
if (setCommand == true || responseCode != 0) { if (setCommand == true || responseCode != 0) {
response.append(QString("RPRT %1").arg(responseCode)); if (responseCode == 0) {
response.append(QString("RPRT 0"));
}
else {
response.append(QString("RPRT %1").arg(responseCode));
}
} }
for (QString str : response) for (QString str : response)
{ {
sendData(QString("%1%2").arg(str).arg(sep)); sendData(QString("%1%2").arg(str).arg(sep));
} }
sendData(QString("\n"));
if (sep != "\n") {
sendData(QString("\n"));
}
commandBuffer.clear(); commandBuffer.clear();
sep = " "; sep = " ";