VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-02 06:04:39 -04:00
Code Issues Projects Releases Wiki Activity

GS232 Controller API: added serial devices to report + fixes

Browse Source
This commit is contained in:
f4exb
2021-10-04 02:11:27 +02:00
parent f5e14f6502
commit 00b3ae29d9
7 changed files with 81 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/feature/gs232controller/gs232controller.cpp
+20 -1
View File
@@ -21,6 +21,7 @@
#include <QNetworkReply>
#include <QBuffer>
#include <QRegExp>
#include <QSerialPortInfo>
#include "SWGFeatureSettings.h"
#include "SWGFeatureReport.h"
@@ -402,6 +403,8 @@ void GS232Controller::webapiFormatFeatureSettings(
}
response.getGs232ControllerSettings()->setReverseApiPort(settings.m_reverseAPIPort);
response.getGs232ControllerSettings()->setReverseApiFeatureSetIndex(settings.m_reverseAPIFeatureSetIndex);
response.getGs232ControllerSettings()->setReverseApiFeatureIndex(settings.m_reverseAPIFeatureIndex);
}
void GS232Controller::webapiUpdateFeatureSettings(
@@ -419,7 +422,7 @@ void GS232Controller::webapiUpdateFeatureSettings(
settings.m_serialPort = *response.getGs232ControllerSettings()->getSerialPort();
}
if (featureSettingsKeys.contains("baudRate")) {
settings.m_serialPort = response.getGs232ControllerSettings()->getBaudRate();
settings.m_baudRate = response.getGs232ControllerSettings()->getBaudRate();
}
if (featureSettingsKeys.contains("track")) {
settings.m_track = response.getGs232ControllerSettings()->getTrack() != 0;
@@ -466,6 +469,12 @@ void GS232Controller::webapiUpdateFeatureSettings(
if (featureSettingsKeys.contains("reverseAPIPort")) {
settings.m_reverseAPIPort = response.getGs232ControllerSettings()->getReverseApiPort();
}
if (featureSettingsKeys.contains("reverseAPIFeatureSetIndex")) {
settings.m_reverseAPIFeatureSetIndex = response.getGs232ControllerSettings()->getReverseApiFeatureSetIndex();
}
if (featureSettingsKeys.contains("reverseAPIFeatureIndex")) {
settings.m_reverseAPIFeatureIndex = response.getGs232ControllerSettings()->getReverseApiFeatureIndex();
}
}
void GS232Controller::webapiReverseSendSettings(QList<QString>& featureSettingsKeys, const GS232ControllerSettings& settings, bool force)
@@ -555,6 +564,16 @@ void GS232Controller::webapiFormatFeatureReport(SWGSDRangel::SWGFeatureReport& r
for (int i = 0; i < m_availablePipes.size(); i++) {
response.getGs232ControllerReport()->getSources()->append(new QString(m_availablePipes.at(i).getName()));
}
QList<QSerialPortInfo> serialPorts = QSerialPortInfo::availablePorts();
QListIterator<QSerialPortInfo> i(serialPorts);
response.getGs232ControllerReport()->setSerialPorts(new QList<QString*>());
while (i.hasNext())
{
QSerialPortInfo info = i.next();
response.getGs232ControllerReport()->getSerialPorts()->append(new QString(info.portName()));
}
}
void GS232Controller::networkManagerFinished(QNetworkReply *reply)