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

GS-232 Controller updates.

Browse Source 
Update GS-232 controller to use message pipes for the target.
Add field displaying the name of the target.
Add azimuth and elevation offsets.
Report worker thread errors to the GUI.
This commit is contained in:
Jon Beniston
2021-01-13 19:44:53 +00:00
parent f2ebd72004
commit 931a63dc8b
13 changed files with 417 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/feature/gs232controller/gs232controllersettings.cpp
+18 -7
View File
@@ -23,7 +23,15 @@
#include "gs232controllersettings.h"
MESSAGE_CLASS_DEFINITION(GS232ControllerSettings::MsgChannelIndexChange, Message)
const QStringList GS232ControllerSettings::m_pipeTypes = {
QStringLiteral("ADSBDemod"),
QStringLiteral("StarTracker")
};
const QStringList GS232ControllerSettings::m_pipeURIs = {
QStringLiteral("sdrangel.channel.adsbdemod"),
QStringLiteral("sdrangel.feature.startracker")
};
GS232ControllerSettings::GS232ControllerSettings()
{
@@ -37,8 +45,7 @@ void GS232ControllerSettings::resetToDefaults()
m_serialPort = "";
m_baudRate = 9600;
m_track = false;
m_deviceIndex = -1;
m_channelIndex = -1;
m_target = "";
m_title = "GS-232 Rotator Controller";
m_rgbColor = QColor(225, 25, 99).rgb();
m_useReverseAPI = false;
@@ -46,6 +53,8 @@ void GS232ControllerSettings::resetToDefaults()
m_reverseAPIPort = 8888;
m_reverseAPIFeatureSetIndex = 0;
m_reverseAPIFeatureIndex = 0;
m_azimuthOffset = 0;
m_elevationOffset = 0;
}
QByteArray GS232ControllerSettings::serialize() const
@@ -57,8 +66,7 @@ QByteArray GS232ControllerSettings::serialize() const
s.writeString(3, m_serialPort);
s.writeS32(4, m_baudRate);
s.writeBool(5, m_track);
s.writeS32(6, m_deviceIndex);
s.writeS32(7, m_channelIndex);
s.writeString(6, m_target);
s.writeString(8, m_title);
s.writeU32(9, m_rgbColor);
s.writeBool(10, m_useReverseAPI);
@@ -66,6 +74,8 @@ QByteArray GS232ControllerSettings::serialize() const
s.writeU32(12, m_reverseAPIPort);
s.writeU32(13, m_reverseAPIFeatureSetIndex);
s.writeU32(14, m_reverseAPIFeatureIndex);
s.writeS32(15, m_azimuthOffset);
s.writeS32(16, m_elevationOffset);
return s.final();
}
@@ -91,8 +101,7 @@ bool GS232ControllerSettings::deserialize(const QByteArray& data)
d.readString(3, &m_serialPort, "");
d.readS32(4, &m_baudRate, 9600);
d.readBool(5, &m_track, false);
d.readS32(6, &m_deviceIndex, -1);
d.readS32(7, &m_channelIndex, -1);
d.readString(6, &m_target, "");
d.readString(8, &m_title, "GS-232 Rotator Controller");
d.readU32(9, &m_rgbColor, QColor(225, 25, 99).rgb());
d.readBool(10, &m_useReverseAPI, false);
@@ -109,6 +118,8 @@ bool GS232ControllerSettings::deserialize(const QByteArray& data)
m_reverseAPIFeatureSetIndex = utmp > 99 ? 99 : utmp;
d.readU32(14, &utmp, 0);
m_reverseAPIFeatureIndex = utmp > 99 ? 99 : utmp;
d.readS32(15, &m_azimuthOffset, 0);
d.readS32(16, &m_elevationOffset, 0);
return true;
}