diff --git a/plugins/channelrx/demodais/aisdemodgui.cpp b/plugins/channelrx/demodais/aisdemodgui.cpp
index f3090c6fd..d84a3901f 100644
--- a/plugins/channelrx/demodais/aisdemodgui.cpp
+++ b/plugins/channelrx/demodais/aisdemodgui.cpp
@@ -347,8 +347,18 @@ void AISDemodGUI::filter()
void AISDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown)
{
- (void) widget;
- (void) rollDown;
+ if (widget == ui->scopeContainer)
+ {
+ if (rollDown)
+ {
+ // Make wide enough for scope controls
+ setMinimumWidth(716);
+ }
+ else
+ {
+ setMinimumWidth(352);
+ }
+ }
}
void AISDemodGUI::onMenuDialogCalled(const QPoint &p)
diff --git a/plugins/channelrx/demodais/aisdemodsink.cpp b/plugins/channelrx/demodais/aisdemodsink.cpp
index b140d0955..48353ca4c 100644
--- a/plugins/channelrx/demodais/aisdemodsink.cpp
+++ b/plugins/channelrx/demodais/aisdemodsink.cpp
@@ -31,8 +31,6 @@
#include "aisdemod.h"
#include "aisdemodsink.h"
-#define AISDEMOD_MINS_MAXS 5
-
AISDemodSink::AISDemodSink(AISDemod *aisDemod) :
m_scopeSink(nullptr),
m_aisDemod(aisDemod),
diff --git a/plugins/channelrx/demodais/aisdemodsink.h b/plugins/channelrx/demodais/aisdemodsink.h
index 0a1ddda3b..fc7688e9a 100644
--- a/plugins/channelrx/demodais/aisdemodsink.h
+++ b/plugins/channelrx/demodais/aisdemodsink.h
@@ -125,7 +125,6 @@ private:
Real *m_train; // Training sequence to look for
int m_correlationLength;
- int m_symbolPrev;
unsigned char m_bytes[AISDEMOD_MAX_BYTES];
crc16x25 m_crc;
diff --git a/plugins/channelrx/demodpager/pagerdemodgui.cpp b/plugins/channelrx/demodpager/pagerdemodgui.cpp
index fea6c9a1b..f2086c50e 100644
--- a/plugins/channelrx/demodpager/pagerdemodgui.cpp
+++ b/plugins/channelrx/demodpager/pagerdemodgui.cpp
@@ -390,8 +390,18 @@ void PagerDemodGUI::filter()
void PagerDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown)
{
- (void) widget;
- (void) rollDown;
+ if (widget == ui->scopeContainer)
+ {
+ if (rollDown)
+ {
+ // Make wide enough for scope controls
+ setMinimumWidth(716);
+ }
+ else
+ {
+ setMinimumWidth(352);
+ }
+ }
}
void PagerDemodGUI::onMenuDialogCalled(const QPoint &p)
diff --git a/plugins/channelrx/radioclock/radioclockgui.cpp b/plugins/channelrx/radioclock/radioclockgui.cpp
index 32ba972c0..9f4ce1da0 100644
--- a/plugins/channelrx/radioclock/radioclockgui.cpp
+++ b/plugins/channelrx/radioclock/radioclockgui.cpp
@@ -178,8 +178,18 @@ void RadioClockGUI::on_timezone_currentIndexChanged(int index)
void RadioClockGUI::onWidgetRolled(QWidget* widget, bool rollDown)
{
- (void) widget;
- (void) rollDown;
+ if (widget == ui->scopeContainer)
+ {
+ if (rollDown)
+ {
+ // Make wide enough for scope controls
+ setMinimumWidth(716);
+ }
+ else
+ {
+ setMinimumWidth(352);
+ }
+ }
}
void RadioClockGUI::onMenuDialogCalled(const QPoint &p)
diff --git a/plugins/channeltx/modpacket/packetmod.cpp b/plugins/channeltx/modpacket/packetmod.cpp
index 1e8e19485..94dd6e3c4 100644
--- a/plugins/channeltx/modpacket/packetmod.cpp
+++ b/plugins/channeltx/modpacket/packetmod.cpp
@@ -615,13 +615,13 @@ void PacketMod::webapiUpdateChannelSettings(
settings.m_reverseAPIChannelIndex = response.getPacketModSettings()->getReverseApiChannelIndex();
}
if (channelSettingsKeys.contains("udpEnabled")) {
- settings.m_udpEnabled = response.getPacketDemodSettings()->getUdpEnabled();
+ settings.m_udpEnabled = response.getPacketModSettings()->getUdpEnabled();
}
if (channelSettingsKeys.contains("udpAddress")) {
- settings.m_udpAddress = *response.getPacketDemodSettings()->getUdpAddress();
+ settings.m_udpAddress = *response.getPacketModSettings()->getUdpAddress();
}
if (channelSettingsKeys.contains("udpPort")) {
- settings.m_udpPort = response.getPacketDemodSettings()->getUdpPort();
+ settings.m_udpPort = response.getPacketModSettings()->getUdpPort();
}
}
@@ -930,7 +930,7 @@ void PacketMod::webapiFormatChannelSettings(
swgPacketModSettings->setData(new QString(settings.m_data));
}
if (channelSettingsKeys.contains("bpf") || force) {
- swgPacketModSettings->setBpf(settings.m_preEmphasis ? 1 : 0);
+ swgPacketModSettings->setBpf(settings.m_bpf ? 1 : 0);
}
if (channelSettingsKeys.contains("bpfLowCutoff") || force) {
swgPacketModSettings->setBpfLowCutoff(settings.m_bpfLowCutoff);
diff --git a/plugins/channeltx/modpacket/packetmodgui.cpp b/plugins/channeltx/modpacket/packetmodgui.cpp
index 7dbb7a6ce..892333a93 100644
--- a/plugins/channeltx/modpacket/packetmodgui.cpp
+++ b/plugins/channeltx/modpacket/packetmodgui.cpp
@@ -476,6 +476,8 @@ PacketModGUI::PacketModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseb
ui->spectrumGUI->setBuddies(m_spectrumVis, ui->glSpectrum);
+ ui->spectrumContainer->setVisible(false);
+
displaySettings();
applySettings();
}
diff --git a/plugins/feature/ais/aisgui.ui b/plugins/feature/ais/aisgui.ui
index a391051b9..1c4875bac 100644
--- a/plugins/feature/ais/aisgui.ui
+++ b/plugins/feature/ais/aisgui.ui
@@ -35,7 +35,7 @@
- GS-232 Rotator Controller
+ AIS
diff --git a/plugins/feature/pertester/pertestergui.ui.autosave b/plugins/feature/pertester/pertestergui.ui.autosave
deleted file mode 100644
index d7b16de17..000000000
--- a/plugins/feature/pertester/pertestergui.ui.autosave
+++ /dev/null
@@ -1,576 +0,0 @@
-
-
- PERTesterGUI
-
-
-
- 0
- 0
- 350
- 430
-
-
-
-
- 0
- 0
-
-
-
-
- 320
- 100
-
-
-
-
- 350
- 16777215
-
-
-
-
- Liberation Sans
- 9
-
-
-
- GS-232 Rotator Controller
-
-
-
-
- 10
- 10
- 331
- 291
-
-
-
- Settings
-
-
-
- 3
-
-
- 2
-
-
- 2
-
-
- 2
-
-
- 2
-
- -
-
-
-
-
-
- Start/stop PER Test
-
-
-
-
-
-
- :/play.png
- :/stop.png:/play.png
-
-
-
- -
-
-
- Reset statistics
-
-
-
-
-
-
- :/recycle.png:/recycle.png
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
- -
-
-
-
-
-
- Start test
-
-
-
- -
-
-
- Number of packets to transmit
-
-
- 1
-
-
- 2000000000
-
-
-
- -
-
-
- When to start the test, after the start button is pressed
-
-
-
-
- Immediately
-
-
- -
-
- On satellite AOS
-
-
- -
-
- On satellite mid pass
-
-
-
-
- -
-
-
- Packets
-
-
-
- -
-
-
- Interval in seconds between packets
-
-
- 3
-
-
- 1000000.000000000000000
-
-
-
- -
-
-
- Interval (s)
-
-
-
- -
-
-
- Satellites
-
-
-
- -
-
-
- Space separated list of satellite names to start the PER test on
-
-
- ISS
-
-
-
-
-
- -
-
-
-
-
-
- Packet
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 0
- 0
-
-
-
- Hex encoded packet to transmit.
-
-Substitutions:
-%{ax25.src=CALLSIGN}
-%{ax25.dst=CALLSIGN}
-%{num}
-%{data=min,max}
-
-
-
-
-
- -
-
-
-
-
-
- Ignore
-
-
-
- -
-
-
- Leading
-
-
-
- -
-
-
- 10000
-
-
-
- -
-
-
- Trailing
-
-
-
- -
-
-
- 10000
-
-
-
- -
-
-
- bytes
-
-
-
-
-
- -
-
-
-
-
-
- TX UDP
-
-
-
- -
-
-
-
- 120
- 0
-
-
-
- Qt::ClickFocus
-
-
- Destination UDP address
-
-
- 000.000.000.000
-
-
- 127.0.0.1
-
-
-
- -
-
-
- :
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
-
- 50
- 0
-
-
-
-
- 50
- 16777215
-
-
-
- Qt::ClickFocus
-
-
- Destination UDP port
-
-
- 00000
-
-
- 9997
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
- -
-
-
-
-
-
- RX UDP
-
-
-
- -
-
-
-
- 120
- 0
-
-
-
- Qt::ClickFocus
-
-
- Destination UDP address
-
-
- 000.000.000.000
-
-
- 127.0.0.1
-
-
-
- -
-
-
- :
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
-
- 50
- 0
-
-
-
-
- 50
- 16777215
-
-
-
- Qt::ClickFocus
-
-
- Destination UDP port
-
-
- 00000
-
-
- 9998
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
-
-
-
-
-
- 10
- 310
- 331
- 91
-
-
-
- Statistics
-
-
-
- 3
-
-
- 2
-
-
- 2
-
-
- 2
-
-
- 2
-
- -
-
-
-
-
-
- Number of packets received that match a transmitted packet
-
-
- 0
-
-
-
- -
-
-
- Received and Matched
-
-
-
- -
-
-
- PER
-
-
-
- -
-
-
- 0%
-
-
-
- -
-
-
- Number of packets that have been transmitted
-
-
- 0
-
-
-
- -
-
-
- Transmitted
-
-
-
- -
-
-
- Received and Unmatched
-
-
-
- -
-
-
- Number of packets received that do not match a transmitted packet
-
-
- 0
-
-
-
-
-
-
-
-
-
-
- RollupWidget
- QWidget
-
- 1
-
-
- ButtonSwitch
- QToolButton
-
-
-
-
- startStop
-
-
-
-
-
-