Use mouse keys for CW modulation in SSB modulator. Fixes #1948

2 Bug Fixes

CHANGELOG

@@ -1,6 +1,40 @@
+sdrangel (7.19.0-1) unstable; urgency=medium
+
+   * Upgraded RTL-SDR library to v2.0.1
+   * Fix not remove source buddy. PR #1998
+   * Fix renumberate deviceset without modifying claimed of SamplingDevice. PR #2001
+   * Merge pull request #2000 from srcejon/freq_scanner
+   * ADS-B: Add QT 6 support for map. PR #2000
+   * Fix URLs on QT 6 map. PR #2000
+   * Fix 32-bit float support for Spy Server. PR #2000
+   * Fix Kiwi location. PR #2000
+   * Update map docs. PR #2000
+   * Fix gcc warnings. PR #2000
+   * Update map QML/HTML. PR #2000
+   * Add libqt5svg5-dev dependency. PR #2000
+   * Add SVG and libacars. PR #2000
+   * HTTPDownloadManager: Support latest updates to Google Drive. PR #2000
+   * Add utils. PR #2000
+   * SkyMap: Fix CORS and enabling caching. PR #2000
+   * Map: Add Spy Server and Kiwi SDR. Add weather and satellite overlays. PR #2000
+   * Fix SDRA protocol and improve spectrum refresh rate. PR #2000
+   * Fix gcc warnings. PR #2000
+   * RemoteTCPInput: Add Spy Server support. PR #2000
+   * SDRplay: Prevent nullpointer dereference for #1825 PR #2000
+   * Add End-of-Train demodulator for #1866. PR #2005
+   * AIS, DSC, End-of-Train, Packet, Radiosonde: date/time from File Input device or system clock. PR #2005
+   * Use log2 approximation to increase performance. Part of #2004. PR #2006
+   * SigMF File Sink: implement 16 and 8 bits sample sizes. Fixes #1921
+   * Use F:n for feature Ids. PR #2007
+   * Update Demod Analzyer to use AvailableChannelsOrFeature. PR #2007
+   * Class to handle amateur radio callsigns and corresponding country data. Part of #2008
+   * FT8 demod: implemented DXCC country decoding. Implements #2008
+
+  -- Edouard Griffiths, F4EXB  <f4exb06@gmail.com>  Fri, 08 Mar 2024 18:12:42 +0100
+
 sdrangel (7.18.0-1) unstable; urgency=medium
 
-    * Upgrade to SDRPlay API to 3.14 and support for RSP 1B
+   * Upgrade to SDRPlay API to 3.14 and support for RSP 1B
 
   -- Edouard Griffiths, F4EXB  <f4exb06@gmail.com>  Wed, 21 Feb 2024 12:53:33 +0100
 

CMakeLists.txt

@@ -19,8 +19,8 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 # configure version
 set(sdrangel_VERSION_MAJOR "7")
-set(sdrangel_VERSION_MINOR "18")
-set(sdrangel_VERSION_PATCH "1")
+set(sdrangel_VERSION_MINOR "19")
+set(sdrangel_VERSION_PATCH "0")
 set(sdrangel_VERSION_SUFFIX "")
 
 # SDRAngel cmake options

cmake/cpack/deploy_mac.cmake.in

@@ -38,5 +38,5 @@ endforeach()
 
 # Run macdeployqt which should copy all libraries and frameworks and Qt plugins and qml
 message ("Running macdeployqt in ${CPACK_TEMPORARY_INSTALL_DIRECTORY}")
-execute_process ( COMMAND macdeployqt ${CPACK_TEMPORARY_INSTALL_DIRECTORY}/SDRangel.app -always-overwrite -verbose=1 -qmldir=@CMAKE_CURRENT_SOURCE_DIR@/../../plugins/feature/map )
+execute_process ( COMMAND macdeployqt ${CPACK_TEMPORARY_INSTALL_DIRECTORY}/SDRangel.app -always-overwrite -verbose=1 -qmldir=@CMAKE_CURRENT_SOURCE_DIR@/../../plugins/ )
 

debian/changelog

@@ -1,6 +1,40 @@
+sdrangel (7.19.0-1) unstable; urgency=medium
+
+   * Upgraded RTL-SDR library to v2.0.1
+   * Fix not remove source buddy. PR #1998
+   * Fix renumberate deviceset without modifying claimed of SamplingDevice. PR #2001
+   * Merge pull request #2000 from srcejon/freq_scanner
+   * ADS-B: Add QT 6 support for map. PR #2000
+   * Fix URLs on QT 6 map. PR #2000
+   * Fix 32-bit float support for Spy Server. PR #2000
+   * Fix Kiwi location. PR #2000
+   * Update map docs. PR #2000
+   * Fix gcc warnings. PR #2000
+   * Update map QML/HTML. PR #2000
+   * Add libqt5svg5-dev dependency. PR #2000
+   * Add SVG and libacars. PR #2000
+   * HTTPDownloadManager: Support latest updates to Google Drive. PR #2000
+   * Add utils. PR #2000
+   * SkyMap: Fix CORS and enabling caching. PR #2000
+   * Map: Add Spy Server and Kiwi SDR. Add weather and satellite overlays. PR #2000
+   * Fix SDRA protocol and improve spectrum refresh rate. PR #2000
+   * Fix gcc warnings. PR #2000
+   * RemoteTCPInput: Add Spy Server support. PR #2000
+   * SDRplay: Prevent nullpointer dereference for #1825 PR #2000
+   * Add End-of-Train demodulator for #1866. PR #2005
+   * AIS, DSC, End-of-Train, Packet, Radiosonde: date/time from File Input device or system clock. PR #2005
+   * Use log2 approximation to increase performance. Part of #2004. PR #2006
+   * SigMF File Sink: implement 16 and 8 bits sample sizes. Fixes #1921
+   * Use F:n for feature Ids. PR #2007
+   * Update Demod Analzyer to use AvailableChannelsOrFeature. PR #2007
+   * Class to handle amateur radio callsigns and corresponding country data. Part of #2008
+   * FT8 demod: implemented DXCC country decoding. Implements #2008
+
+  -- Edouard Griffiths, F4EXB  <f4exb06@gmail.com>  Fri, 08 Mar 2024 18:12:42 +0100
+
 sdrangel (7.18.0-1) unstable; urgency=medium
 
-    * Upgrade to SDRPlay API to 3.14 and support for RSP 1B
+   * Upgrade to SDRPlay API to 3.14 and support for RSP 1B
 
   -- Edouard Griffiths, F4EXB  <f4exb06@gmail.com>  Wed, 21 Feb 2024 12:53:33 +0100
 

plugins/channelrx/demodadsb/CMakeLists.txt

@@ -60,7 +60,7 @@ if(NOT SERVER_MODE)
     )
 
     set(TARGET_NAME demodadsb)
-    set(TARGET_LIB Qt::Widgets Qt::Quick Qt::QuickWidgets Qt::Positioning Qt::TextToSpeech)
+    set(TARGET_LIB Qt::Widgets Qt::Quick Qt::QuickWidgets Qt::Positioning Qt::Location Qt::TextToSpeech)
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()

plugins/channelrx/demodadsb/adsbdemoddisplaydialog.cpp

@@ -16,6 +16,7 @@
 ///////////////////////////////////////////////////////////////////////////////////
 
 #include <QFontDialog>
+#include <QGeoServiceProvider>
 #include <QDebug>
 
 #include "adsbdemoddisplaydialog.h"
@@ -28,6 +29,15 @@ ADSBDemodDisplayDialog::ADSBDemodDisplayDialog(ADSBDemodSettings *settings, QWid
     m_fontSize(settings->m_tableFontSize)
 {
     ui->setupUi(this);
+
+    QStringList mapProviders = QGeoServiceProvider::availableServiceProviders();
+    if (!mapProviders.contains("osm")) {
+        ui->mapProvider->removeItem(ui->mapProvider->findText("osm"));
+    }
+    if (!mapProviders.contains("mapboxgl")) {
+        ui->mapProvider->removeItem(ui->mapProvider->findText("mapboxgl"));
+    }
+
     ui->timeout->setValue(settings->m_removeTimeout);
     ui->aircraftMinZoom->setValue(settings->m_aircraftMinZoom);
     ui->airportRange->setValue(settings->m_airportRange);
@@ -46,7 +56,10 @@ ADSBDemodDisplayDialog::ADSBDemodDisplayDialog(ADSBDemodSettings *settings, QWid
         }
     }
     ui->airspaceRange->setValue(settings->m_airspaceRange);
-    ui->mapProvider->setCurrentText(settings->m_mapProvider);
+    int idx = ui->mapProvider->findText(settings->m_mapProvider);
+    if (idx != -1) {
+        ui->mapProvider->setCurrentText(settings->m_mapProvider);
+    }
     ui->mapType->setCurrentIndex((int)settings->m_mapType);
     ui->navAids->setChecked(settings->m_displayNavAids);
     ui->atcCallsigns->setChecked(settings->m_atcCallsigns);

plugins/channelrx/demodadsb/adsbdemodgui.cpp

@@ -34,6 +34,7 @@
 #include <QQmlProperty>
 #include <QJsonDocument>
 #include <QJsonObject>
+#include <QGeoServiceProvider>
 
 #include "ui_adsbdemodgui.h"
 #include "device/deviceapi.h"
@@ -4725,14 +4726,24 @@ void ADSBDemodGUI::applyMapSettings()
         zoom = 10.0;
     }
 
+    // Check requested map provider is available - if not, try the other
+    QString mapProvider = m_settings.m_mapProvider;
+    QStringList mapProviders = QGeoServiceProvider::availableServiceProviders();
+    if ((mapProvider == "osm") && (!mapProviders.contains(mapProvider))) {
+        mapProvider = "mapboxgl";
+    }
+    if ((mapProvider == "mapboxgl") && (!mapProviders.contains(mapProvider))) {
+        mapProvider = "osm";
+    }
+
     // Create the map using the specified provider
     QQmlProperty::write(item, "smoothing", MainCore::instance()->getSettings().getMapSmoothing());
     QQmlProperty::write(item, "aircraftMinZoomLevel", m_settings.m_aircraftMinZoom);
-    QQmlProperty::write(item, "mapProvider", m_settings.m_mapProvider);
+    QQmlProperty::write(item, "mapProvider", mapProvider);
     QVariantMap parameters;
     QString mapType;
 
-    if (m_settings.m_mapProvider == "osm")
+    if (mapProvider == "osm")
     {
         // Use our repo, so we can append API key and redefine transmit maps
         parameters["osm.mapping.providersrepository.address"] = QString("http://127.0.0.1:%1/").arg(m_osmPort);
@@ -4760,7 +4771,7 @@ void ADSBDemodGUI::applyMapSettings()
             break;
         }
     }
-    else if (m_settings.m_mapProvider == "mapboxgl")
+    else if (mapProvider == "mapboxgl")
     {
         switch (m_settings.m_mapType)
         {

plugins/channelrx/demodft8/ft8demodfilterproxy.cpp

@@ -57,6 +57,13 @@ void FT8DemodFilterProxy::setFilterLoc(const QString& locString)
     invalidateFilter();
 }
 
+void FT8DemodFilterProxy::setFilterCountry(const QString& countryString)
+{
+    m_filterActive = FILTER_COUNTRY;
+    m_country = countryString;
+    invalidateFilter();
+}
+
 void FT8DemodFilterProxy::setFilterInfo(const QString& infoString)
 {
     m_filterActive = FILTER_INFO;
@@ -97,6 +104,12 @@ bool FT8DemodFilterProxy::filterAcceptsRow(int sourceRow, const QModelIndex &sou
         return sourceModel()->data(index).toString() == m_loc;
     }
 
+    if (m_filterActive == FILTER_COUNTRY)
+    {
+        QModelIndex index = sourceModel()->index(sourceRow, FT8DemodSettings::MESSAGE_COL_COUNTRY, sourceParent);
+        return sourceModel()->data(index).toString() == m_country;
+    }
+
     if (m_filterActive == FILTER_INFO)
     {
         QModelIndex index = sourceModel()->index(sourceRow, FT8DemodSettings::MESSAGE_COL_INFO, sourceParent);

plugins/channelrx/demodft8/ft8demodfilterproxy.h

@@ -32,6 +32,7 @@ public:
     void setFilterDf(int df);
     void setFilterCall(const QString& utcString);
     void setFilterLoc(const QString& utcString);
+    void setFilterCountry(const QString& countryString);
     void setFilterInfo(const QString& infoString);
 
 protected:
@@ -45,6 +46,7 @@ private:
         FILTER_DF,
         FILTER_CALL,
         FILTER_LOC,
+        FILTER_COUNTRY,
         FILTER_INFO
     };
 
@@ -54,6 +56,7 @@ private:
     int m_df;
     QString m_call;
     QString m_loc;
+    QString m_country;
     QString m_info;
 };
 

plugins/channelrx/demodft8/ft8demodgui.cpp

@@ -33,6 +33,7 @@
 #include "gui/dialpopup.h"
 #include "gui/dialogpositioner.h"
 #include "util/db.h"
+#include "util/callsign.h"
 #include "maincore.h"
 
 #include "ui_ft8demodgui.h"
@@ -89,6 +90,8 @@ QVariant FT8MessagesTableModel::data(const QModelIndex &index, int role) const
                 return ft8Message.m_call2;
             case FT8DemodSettings::MESSAGE_COL_LOC:
                 return ft8Message.m_loc;
+            case FT8DemodSettings::MESSAGE_COL_COUNTRY:
+                return ft8Message.m_country;
             case FT8DemodSettings::MESSAGE_COL_INFO:
                 return ft8Message.m_info;
             default:
@@ -137,6 +140,8 @@ QVariant FT8MessagesTableModel::headerData(int section, Qt::Orientation orientat
                 return tr("Call2");
             case FT8DemodSettings::MESSAGE_COL_LOC:
                 return tr("Loc");
+            case FT8DemodSettings::MESSAGE_COL_COUNTRY:
+                return tr("Country");
             case FT8DemodSettings::MESSAGE_COL_INFO:
                 return tr("Info");
             default:
@@ -167,6 +172,8 @@ QVariant FT8MessagesTableModel::headerData(int section, Qt::Orientation orientat
                 return tr("Second call area");
             case FT8DemodSettings::MESSAGE_COL_LOC:
                 return tr("Locator area");
+            case FT8DemodSettings::MESSAGE_COL_COUNTRY:
+                return tr("DXCC country name");
             case FT8DemodSettings::MESSAGE_COL_INFO:
                 return tr("Decoder information");
             default:
@@ -190,6 +197,7 @@ void FT8MessagesTableModel::messagesReceived(const QList<FT8Message>& messages)
 
     for (const auto& message : messages)
     {
+        CountryDat::CountryInfo countryInfo = Callsign::instance()->getCountryInfo(getCaller(message.call1, message.call2));
         m_ft8Messages.push_back(FT8MesssageData{
             message.ts.toString("HHmmss"),
             message.type,
@@ -201,6 +209,7 @@ void FT8MessagesTableModel::messagesReceived(const QList<FT8Message>& messages)
             message.call1,
             message.call2,
             message.loc,
+            countryInfo.country,
             message.decoderInfo
         });
     }
@@ -208,6 +217,17 @@ void FT8MessagesTableModel::messagesReceived(const QList<FT8Message>& messages)
     endInsertRows();
 }
 
+QString FT8MessagesTableModel::getCaller(const QString& call1, const QString& call2)
+{
+    if (!call2.isEmpty()) {
+        return call2;
+    }
+    if (call1.startsWith("CQ ")) {
+        return call1.mid(3);
+    }
+    return "";
+}
+
 void FT8MessagesTableModel::setDefaultMessage()
 {
     if (m_ft8Messages.size() != 0) {
@@ -226,6 +246,7 @@ void FT8MessagesTableModel::setDefaultMessage()
         "CQ PA900RAALTE",
         "PA900RAALTE",
         "JN000",
+        "Bosnia-Herzegovina",
         "OSD-0-73"
     });
     endInsertRows();
@@ -950,6 +971,8 @@ void FT8DemodGUI::filterMessages()
         m_messagesFilterProxy.setFilterUTC(m_selectedData.toString());
     } else if (m_selectedColumn == FT8DemodSettings::MESSAGE_COL_DF) {
         m_messagesFilterProxy.setFilterDf(m_selectedData.toInt());
+    } else if (m_selectedColumn == FT8DemodSettings::MESSAGE_COL_COUNTRY) {
+        m_messagesFilterProxy.setFilterCountry(m_selectedData.toString());
     } else if (m_selectedColumn == FT8DemodSettings::MESSAGE_COL_INFO) {
         m_messagesFilterProxy.setFilterInfo(m_selectedData.toString());
     }

plugins/channelrx/demodft8/ft8demodgui.h

@@ -56,6 +56,7 @@ struct FT8MesssageData
     QString m_call1;
     QString m_call2;
     QString m_loc;
+    QString m_country;
     QString m_info;
 };
 
@@ -77,7 +78,8 @@ public:
 
 private:
     QVector<FT8MesssageData> m_ft8Messages;
-    static const int m_columnCount = 11;
+    static const int m_columnCount = 12;
+    static QString getCaller(const QString& call1, const QString& call2);
 };
 
 class FT8DemodGUI : public ChannelGUI {

plugins/channelrx/demodft8/ft8demodsettings.h

@@ -64,6 +64,7 @@ struct FT8DemodSettings
         MESSAGE_COL_CALL1,
         MESSAGE_COL_CALL2,
         MESSAGE_COL_LOC,
+        MESSAGE_COL_COUNTRY,
         MESSAGE_COL_INFO,
     };
 

plugins/channelrx/demodft8/readme.md

@@ -124,6 +124,7 @@ Toggles the filtering of messages. Messages are filtered based on the selected c
   - **Call1**: will filter messages matching the call1 area value either in the call1 or call2 areas
   - **Call2**: same as above but taking the call2 value
   - **Loc**: will filter messages matching the value in the locator (loc) area
+  - **Country**: will filter messages matching the value in the country area
   - **Info**: will filter values starting with "OSD" or not starting with "OSD" thus filter messages decoded via OSD or not
 
 <h3>C.5: Band preset selection</h3>
@@ -201,6 +202,7 @@ Displays the received messages in a table which columns are the following:
   - **Call1**: This is the first call area and may contain the caller callsign, a CQ or a custom 13 character message in which case the second call and locator areas are empty. It may be slightly different from the standard for message type 5 (see above).
   - **Call2**: This is the second call area and will contain the callsign of the responding station. This is always a callsign and this may differ slightly from the standard for messages type 5 (see above).
   - **Loc**: Locator area which contains the 4 character Maidenhead locator, a report, an acknowledgement (RRR) or a greetings (73 or RR73)
+  - **Country**: DXCC country name derived from the caller callsign
   - **Info**: FT8 decoder information if any. If OSD is active (see C.1.3) and OSD was activated it reports the OSD decoder status as `OSD-N-MM` where N is the OSD depth reached and MM is the number of correct LDPC bits.
 
 <h3>C.1: More FT8 decoder settings</h2>

plugins/channeltx/modam/readme.md

@@ -72,11 +72,11 @@ Enter the text to be keyed when Morse input is active and in text mode
 
 Clears the CW (Morse) text
 
-<h3>12: Morse keyer controls</h3>
+<h3>12a: Morse keyer controls (line 1)</h3>
 
 ![Morse keyer control GUI1](../../../doc/img/ModCWControls1.png)
 
-<h4>12.1: CW keying speed</h4>
+<h4>12a.1: CW keying speed</h4>
 
 Sets the CW speed in Words Per Minute (WPM). This is based on the word "PARIS" sent 5 times. For 5 WPM the dot length is 240 ms. In other terms the dot length is calculated as 1.2 / WPM seconds. The dot length is used as the base to compute other timings:
 
@@ -85,43 +85,49 @@ Sets the CW speed in Words Per Minute (WPM). This is based on the word "PARIS" s
   - Character silence separator: 3 dot lengths
   - Word silence separator: 7 dot lengths
 
-<h4>12.2: Dots keying</h4>
+<h4>12a.2: Dots keying</h4>
 
 Switch this button to send dots continuously
 
-<h4>12.3: Dashes keying</h4>
+<h4>12a.3: Dashes keying</h4>
 
 Switch this button to send dashes continuously
 
-<h4>12.4: Text keying</h4>
+<h4>12a.4: Text keying</h4>
 
 Switch this button to send the text typed into the text box (10)
 
-<h4>12.5: Text auto repeat</h4>
+<h4>12a.5: Text auto repeat</h4>
 
 Switch this button to auto repeat the text keying
 
-<h4>12.6: Text play/stop</h4>
+<h4>12a.6: Text play/stop</h4>
 
 Use this button to stop sending text. When resuming keying restarts at the start of text
 
+<h3>12a: Morse keyer controls (line 2)</h3>
+
 ![Morse keyer control GUI2](../../../doc/img/ModCWControls2.png)
 
 &#9888; WARNING: what follows is not really useful if you do not use a proper Morse keyer with direct audio feedback. There is a significant audio delay either with the direct monitoring or by monitoring the transmitted signal so keying with this audio as feedback is not practical
 
-12.7: Activate morse keys keyboard control
+12b.1: Activate morse keys keyboard and mouse control
 
-This disables text or continuous dots or dashes. Toggle input from keyboard. Occasionally the focus may get lost and you will have to deactivate and reactivate it to recover the key bindings.
+This disables text or continuous dots or dashes. Toggle input from keyboard or mouse (see 16b.3). Occasionally the focus may get lost and you will have to deactivate and reactivate it to recover the key bindings.
 
-12.8: Iambic or straight
+12b.2: Iambic or straight
 
 Choose iambic or straight keying style. When straight is selected the dot or dash key may be used.
 
-12.9: Register dot key
+12b.3: Mouse control pad
+
+When keyboard and mouse control is activated move the pointer to this area to use the left button as the dot paddle and the right button as the dash paddle. In straight mode both buttons have the same effect (key down).
+
+12a.4: Register dot key
 
 Click on the button and while selected type a character or character and modifier (Shift + key for example) to select which key is used for dots. The key or key sequence appears next (here dot `.`)
 
-12.10: Register dash key
+12a.5: Register dash key
 
 Click on the button and while selected type a character or character and modifier (Shift + key for example) to select which key is used for dashes. The key or key sequence appears next (here dot `.`)
 

plugins/channeltx/modfreedv/readme.md

@@ -81,11 +81,11 @@ Enter the text to be keyed when Morse input is active and in text mode.
 
 Clears the CW (Morse) text
 
-<h3>10: Morse keyer controls</h3>
+<h3>10a: Morse keyer controls (line 1)</h3>
 
 ![Morse keyer control GUI1](../../../doc/img/ModCWControls1.png)
 
-<h4>10.1: CW keying speed</h4>
+<h4>10a.1: CW keying speed</h4>
 
 Sets the CW speed in Words Per Minute (WPM). This is based on the word "PARIS" sent 5 times. For 5 WPM the dot length is 240 ms. In other terms the dot length is calculated as 1.2 / WPM seconds. The dot length is used as the base to compute other timings:
 
@@ -94,43 +94,49 @@ Sets the CW speed in Words Per Minute (WPM). This is based on the word "PARIS" s
   - Character silence separator: 3 dot lengths
   - Word silence separator: 7 dot lengths
 
-<h4>10.2: Dots keying</h4>
+<h4>10a.2: Dots keying</h4>
 
 Switch this button to send dots continuously
 
-<h4>10.3: Dashes keying</h4>
+<h4>10a.3: Dashes keying</h4>
 
 Switch this button to send dashes continuously
 
-<h4>10.4: Text keying</h4>
+<h4>10a.4: Text keying</h4>
 
 Switch this button to send the text typed into the text box (13)
 
-<h4>10.5: Text auto repeat</h4>
+<h4>10a.5: Text auto repeat</h4>
 
 Switch this button to auto repeat the text keying
 
-<h4>10.6: Text play/stop</h4>
+<h4>10a.6: Text play/stop</h4>
 
 Use this button to stop sending text. When resuming keying restarts at the start of text
 
+<h4>10b.1: CW keying speed</h4>
+
 ![Morse keyer control GUI2](../../../doc/img/ModCWControls2.png)
 
 &#9888; WARNING: what follows is not really useful if you do not use a proper Morse keyer with direct audio feedback. There is a significant audio delay either with the direct monitoring or by monitoring the transmitted signal so keying with this audio as feedback is not practical
 
-10.7: Activate morse keys keyboard control
+10b.1: Activate morse keys keyboard and mouse control
 
-This disables text or continuous dots or dashes. Toggle input from keyboard. Occasionally the focus may get lost and you will have to deactivate and reactivate it to recover the key bindings.
+This disables text or continuous dots or dashes. Toggle input from keyboard or mouse (see 16b.3). Occasionally the focus may get lost and you will have to deactivate and reactivate it to recover the key bindings.
 
-10.8: Iambic or straight
+10b.2: Iambic or straight
 
 Choose iambic or straight keying style. When straight is selected the dot or dash key may be used.
 
-10.9: Register dot key
+10b.3: Mouse control pad
+
+When keyboard and mouse control is activated move the pointer to this area to use the left button as the dot paddle and the right button as the dash paddle. In straight mode both buttons have the same effect (key down).
+
+10a.4: Register dot key
 
 Click on the button and while selected type a character or character and modifier (Shift + key for example) to select which key is used for dots. The key or key sequence appears next (here dot `.`)
 
-10.10: Register dash key
+10a.5: Register dash key
 
 Click on the button and while selected type a character or character and modifier (Shift + key for example) to select which key is used for dashes. The key or key sequence appears next (here dot `.`)
 

plugins/channeltx/modnfm/readme.md

@@ -170,11 +170,11 @@ Enter the text to be keyed when Morse input is active and in text mode
 
 Clears the CW (Morse) text
 
-<h3>17: Morse keyer controls</h3>
+<h3>17a: Morse keyer controls (line 1)</h3>
 
 ![Morse keyer control GUI1](../../../doc/img/ModCWControls1.png)
 
-<h4>17.1: CW keying speed</h4>
+<h4>17a.1: CW keying speed</h4>
 
 Sets the CW speed in Words Per Minute (WPM). This is based on the word "PARIS" sent 5 times. For 5 WPM the dot length is 240 ms. In other terms the dot length is calculated as 1.2 / WPM seconds. The dot length is used as the base to compute other timings:
 
@@ -183,45 +183,49 @@ Sets the CW speed in Words Per Minute (WPM). This is based on the word "PARIS" s
   - Character silence separator: 3 dot lengths
   - Word silence separator: 7 dot lengths
 
-<h4>17.2: Dots keying</h4>
+<h4>17a.2: Dots keying</h4>
 
 Switch this button to send dots continuously
 
-<h4>17.3: Dashes keying</h4>
+<h4>17a.3: Dashes keying</h4>
 
 Switch this button to send dashes continuously
 
-<h4>17.4: Text keying</h4>
+<h4>17a.4: Text keying</h4>
 
 Switch this button to send the text typed into the text box (14)
 
-<h4>17.5: Text auto repeat</h4>
+<h4>17a.5: Text auto repeat</h4>
 
 Switch this button to auto repeat the text keying
 
-<h4>17.6: Text play/stop</h4>
+<h4>17a.6: Text play/stop</h4>
 
 Use this button to stop sending text. When resuming keying restarts at the start of text
 
-<h3>18: Use keyboard for morse keying</h3>
+<h3>17b: Morse keyer controls (line 2)</h3>
 
 ![Morse keyer control GUI2](../../../doc/img/ModCWControls2.png)
 
 &#9888; WARNING: this is not really useful if you do not use a proper Morse keyer with direct audio feedback. There is a significant audio delay either with the direct monitoring or by monitoring the transmitted signal so keying with this audio as feedback is not practical
 
-18.7: Activate morse keys keyboard control
+17b.1: Activate morse keys keyboard and mouse control
 
-This disables text or continuous dots or dashes. Toggle input from keyboard. Occasionally the focus may get lost and you will have to deactivate and reactivate it to recover the key bindings.
+This disables text or continuous dots or dashes. Toggle input from keyboard or mouse (see 16b.3). Occasionally the focus may get lost and you will have to deactivate and reactivate it to recover the key bindings.
 
-18.8: Iambic or straight
+17b.2: Iambic or straight
 
 Choose iambic or straight keying style. When straight is selected the dot or dash key may be used.
 
-18.9: Register dot key
+17b.3: Mouse control pad
+
+When keyboard and mouse control is activated move the pointer to this area to use the left button as the dot paddle and the right button as the dash paddle. In straight mode both buttons have the same effect (key down).
+
+17a.4: Register dot key
 
 Click on the button and while selected type a character or character and modifier (Shift + key for example) to select which key is used for dots. The key or key sequence appears next (here dot `.`)
 
-18.10: Register dash key
+17a.5: Register dash key
 
 Click on the button and while selected type a character or character and modifier (Shift + key for example) to select which key is used for dashes. The key or key sequence appears next (here dot `.`)
 

plugins/channeltx/modssb/readme.md

@@ -161,11 +161,11 @@ Enter the text to be keyed when Morse input is active and in text mode
 
 Clears the CW (Morse) text
 
-<h3>16: Morse keyer controls</h3>
+<h3>16a: Morse keyer controls (line1)</h3>
 
 ![Morse keyer control GUI1](../../../doc/img/ModCWControls1.png)
 
-<h4>16.1: CW keying speed</h4>
+<h4>16a.1: CW keying speed</h4>
 
 Sets the CW speed in Words Per Minute (WPM). This is based on the word "PARIS" sent 5 times. For 5 WPM the dot length is 240 ms. In other terms the dot length is calculated as 1.2 / WPM seconds. The dot length is used as the base to compute other timings:
 
@@ -174,43 +174,49 @@ Sets the CW speed in Words Per Minute (WPM). This is based on the word "PARIS" s
   - Character silence separator: 3 dot lengths
   - Word silence separator: 7 dot lengths
 
-<h4>16.2: Dots keying</h4>
+<h4>16a.2: Dots keying</h4>
 
 Switch this button to send dots continuously
 
-<h4>16.3: Dashes keying</h4>
+<h4>16a.3: Dashes keying</h4>
 
 Switch this button to send dashes continuously
 
-<h4>16.4: Text keying</h4>
+<h4>16a.4: Text keying</h4>
 
 Switch this button to send the text typed into the text box (13)
 
-<h4>16.5: Text auto repeat</h4>
+<h4>16a.5: Text auto repeat</h4>
 
 Switch this button to auto repeat the text keying
 
-<h4>16.6: Text play/stop</h4>
+<h4>16a.6: Text play/stop</h4>
 
 Use this button to stop sending text. When resuming keying restarts at the start of text
 
+<h3>16b: Morse keyer controls (line2)</h3>
+
 ![Morse keyer control GUI2](../../../doc/img/ModCWControls2.png)
 
 &#9888; WARNING: what follows is not really useful if you do not use a proper Morse keyer with direct audio feedback. There is a significant audio delay either with the direct monitoring or by monitoring the transmitted signal so keying with this audio as feedback is not practical
 
-16.7: Activate morse keys keyboard control
+16b.1: Activate morse keys keyboard and mouse control
 
-This disables text or continuous dots or dashes. Toggle input from keyboard. Occasionally the focus may get lost and you will have to deactivate and reactivate it to recover the key bindings.
+This disables text or continuous dots or dashes. Toggle input from keyboard or mouse (see 16b.3). Occasionally the focus may get lost and you will have to deactivate and reactivate it to recover the key bindings.
 
-16.8: Iambic or straight
+16b.2: Iambic or straight
 
 Choose iambic or straight keying style. When straight is selected the dot or dash key may be used.
 
-16.9: Register dot key
+16b.3: Mouse control pad
+
+When keyboard and mouse control is activated move the pointer to this area to use the left button as the dot paddle and the right button as the dash paddle. In straight mode both buttons have the same effect (key down).
+
+16b.4: Register dot key
 
 Click on the button and while selected type a character or character and modifier (Shift + key for example) to select which key is used for dots. The key or key sequence appears next (here dot `.`)
 
-16.10: Register dash key
+16b.5: Register dash key
 
 Click on the button and while selected type a character or character and modifier (Shift + key for example) to select which key is used for dashes. The key or key sequence appears next (here dot `.`)
 

plugins/channeltx/modssb/ssbmodgui.cpp

@@ -790,7 +790,7 @@ void SSBModGUI::audioSelect(const QPoint& p)
 void SSBModGUI::audioFeedbackSelect(const QPoint& p)
 {
     qDebug("SSBModGUI::audioFeedbackSelect");
-    AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName, false); // false for output
+    AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_feedbackAudioDeviceName, false); // false for output
     audioSelect.move(p);
     new DialogPositioner(&audioSelect, false);
     audioSelect.exec();

plugins/channeltx/modssb/ssbmodsource.cpp

@@ -35,7 +35,7 @@ SSBModSource::SSBModSource() :
     m_spectrumSink(nullptr),
     m_audioSampleRate(48000),
     m_audioFifo(12000),
-    m_feedbackAudioFifo(48000),
+    m_feedbackAudioFifo(12000),
 	m_levelCalcCount(0),
 	m_peakLevel(0.0f),
 	m_levelSum(0.0f),
@@ -55,7 +55,7 @@ SSBModSource::SSBModSource() :
 	m_audioReadBuffer.resize(24000);
 	m_audioReadBufferFill = 0;
 
-	m_feedbackAudioBuffer.resize(1<<14);
+	m_feedbackAudioBuffer.resize(4800);
 	m_feedbackAudioBufferFill = 0;
 
     m_demodBuffer.resize(1<<12);
@@ -538,22 +538,31 @@ void SSBModSource::pushFeedback(Complex c)
 
 void SSBModSource::processOneSample(Complex& ci)
 {
-    m_feedbackAudioBuffer[m_feedbackAudioBufferFill].l = ci.real();
-    m_feedbackAudioBuffer[m_feedbackAudioBufferFill].r = ci.imag();
-    ++m_feedbackAudioBufferFill;
-
-    if (m_feedbackAudioBufferFill >= m_feedbackAudioBuffer.size())
+    if (m_settings.m_modAFInput == SSBModSettings::SSBModInputCWTone) // minimize latency for CW
     {
-        uint res = m_feedbackAudioFifo.write((const quint8*)&m_feedbackAudioBuffer[0], m_feedbackAudioBufferFill);
+        m_feedbackAudioBuffer[0].l = ci.real();
+        m_feedbackAudioBuffer[0].r = ci.imag();
+        m_feedbackAudioFifo.writeOne((const quint8*) &m_feedbackAudioBuffer[0]);
+    }
+    else
+    {
+        m_feedbackAudioBuffer[m_feedbackAudioBufferFill].l = ci.real();
+        m_feedbackAudioBuffer[m_feedbackAudioBufferFill].r = ci.imag();
+        ++m_feedbackAudioBufferFill;
 
-        if (res != m_feedbackAudioBufferFill)
+        if (m_feedbackAudioBufferFill >= m_feedbackAudioBuffer.size())
         {
-            qDebug("SSBModSource::pushFeedback: %u/%u audio samples written m_feedbackInterpolatorDistance: %f",
-                res, m_feedbackAudioBufferFill, m_feedbackInterpolatorDistance);
-            m_feedbackAudioFifo.clear();
-        }
+            uint res = m_feedbackAudioFifo.write((const quint8*)&m_feedbackAudioBuffer[0], m_feedbackAudioBufferFill);
 
-        m_feedbackAudioBufferFill = 0;
+            if (res != m_feedbackAudioBufferFill)
+            {
+                qDebug("SSBModSource::pushFeedback: %u/%u audio samples written m_feedbackInterpolatorDistance: %f",
+                    res, m_feedbackAudioBufferFill, m_feedbackInterpolatorDistance);
+                m_feedbackAudioFifo.clear();
+            }
+
+            m_feedbackAudioBufferFill = 0;
+        }
     }
 }
 

plugins/channeltx/modwfm/readme.md

@@ -76,11 +76,11 @@ Enter the text to be keyed when Morse input is active and in text mode
 
 Clears the CW (Morse) text
 
-<h3>13: Morse keyer controls</h3>
+<h3>13a: Morse keyer controls (line 1)</h3>
 
 ![Morse keyer control GUI1](../../../doc/img/ModCWControls1.png)
 
-<h4>13.1: CW keying speed</h4>
+<h4>13a.1: CW keying speed</h4>
 
 Sets the CW speed in Words Per Minute (WPM). This is based on the word "PARIS" sent 5 times. For 5 WPM the dot length is 240 ms. In other terms the dot length is calculated as 1.2 / WPM seconds. The dot length is used as the base to compute other timings:
 
@@ -89,43 +89,49 @@ Sets the CW speed in Words Per Minute (WPM). This is based on the word "PARIS" s
   - Character silence separator: 3 dot lengths
   - Word silence separator: 7 dot lengths
 
-<h4>13.2: Dots keying</h4>
+<h4>13a.2: Dots keying</h4>
 
 Switch this button to send dots continuously
 
-<h4>13.3: Dashes keying</h4>
+<h4>13a.3: Dashes keying</h4>
 
 Switch this button to send dashes continuously
 
-<h4>13.4: Text keying</h4>
+<h4>13a.4: Text keying</h4>
 
 Switch this button to send the text typed into the text box (11)
 
-<h4>13.5: Text auto repeat</h4>
+<h4>13a.5: Text auto repeat</h4>
 
 Switch this button to auto repeat the text keying
 
-<h4>13.6: Text play/stop</h4>
+<h4>13a.6: Text play/stop</h4>
 
 Use this button to stop sending text. When resuming keying restarts at the start of text
 
+<h3>13b: Morse keyer controls (line 2)</h3>
+
 ![Morse keyer control GUI2](../../../doc/img/ModCWControls2.png)
 
 &#9888; WARNING: what follows is not really useful if you do not use a proper Morse keyer with direct audio feedback. There is a significant audio delay either with the direct monitoring or by monitoring the transmitted signal so keying with this audio as feedback is not practical
 
-13.7: Activate morse keys keyboard control
+13b.1: Activate morse keys keyboard and mouse control
 
-This disables text or continuous dots or dashes. Toggle input from keyboard. Occasionally the focus may get lost and you will have to deactivate and reactivate it to recover the key bindings.
+This disables text or continuous dots or dashes. Toggle input from keyboard or mouse (see 16b.3). Occasionally the focus may get lost and you will have to deactivate and reactivate it to recover the key bindings.
 
-13.8: Iambic or straight
+13b.2: Iambic or straight
 
 Choose iambic or straight keying style. When straight is selected the dot or dash key may be used.
 
-13.9: Register dot key
+13b.3: Mouse control pad
+
+When keyboard and mouse control is activated move the pointer to this area to use the left button as the dot paddle and the right button as the dash paddle. In straight mode both buttons have the same effect (key down).
+
+13b.4: Register dot key
 
 Click on the button and while selected type a character or character and modifier (Shift + key for example) to select which key is used for dots. The key or key sequence appears next (here dot `.`)
 
-13.10: Register dash key
+13b.5: Register dash key
 
 Click on the button and while selected type a character or character and modifier (Shift + key for example) to select which key is used for dashes. The key or key sequence appears next (here dot `.`)
 

sdrbase/audio/audiofifo.cpp

@@ -174,6 +174,31 @@ bool AudioFifo::readOne(quint8* data)
     return true;
 }
 
+uint32_t AudioFifo::writeOne(const quint8* data)
+{
+	if (!m_fifo) {
+		return 0;
+	}
+
+    if (isFull())
+    {
+        emit overflow(1);
+        return 0;
+    }
+
+	m_mutex.lock();
+
+    memcpy(m_fifo + (m_tail * m_sampleSize), data, m_sampleSize);
+    m_tail += 1;
+    m_tail %= m_size;
+    m_fill += 1;
+
+	m_mutex.unlock();
+
+	emit dataReady();
+	return 1;
+}
+
 uint AudioFifo::drain(uint32_t numSamples)
 {
 	QMutexLocker mutexLocker(&m_mutex);

sdrbase/audio/audiofifo.h

@@ -41,6 +41,7 @@ public:
 	uint32_t write(const quint8* data, uint32_t numSamples);
 	uint32_t read(quint8* data, uint32_t numSamples);
     bool readOne(quint8* data);
+    uint32_t writeOne(const quint8* data);
 
 	uint32_t drain(uint32_t numSamples);
 	void clear();

sdrbase/dsp/vkfftengine.cpp

@@ -26,7 +26,7 @@ vkFFTEngine::vkFFTEngine() :
     m_reuse(true)
 {
     vkGPU = new VkGPU();
-    memset(vkGPU, sizeof(VkGPU), 0);
+    memset(vkGPU, 0, sizeof(VkGPU));
     vkGPU->device_id = 0; // Could be set in GUI to support multiple GPUs
 }
 
@@ -64,9 +64,9 @@ void vkFFTEngine::configure(int n, bool inverse)
 
     // Allocate and intialise plan
     m_currentPlan->m_configuration = new VkFFTConfiguration();
-    memset(m_currentPlan->m_configuration, sizeof(VkFFTConfiguration), 0);
+    memset(m_currentPlan->m_configuration, 0, sizeof(VkFFTConfiguration));
     m_currentPlan->m_app = new VkFFTApplication();
-    memset(m_currentPlan->m_app, sizeof(VkFFTApplication), 0);
+    memset(m_currentPlan->m_app, 0, sizeof(VkFFTApplication));
     m_currentPlan->m_configuration->FFTdim = 1;
     m_currentPlan->m_configuration->size[0] = n;
     m_currentPlan->m_configuration->size[1] = 1;

sdrbase/util/callsign.cpp

@@ -144,41 +144,6 @@ QString Callsign::striped_prefix (QString callsign)
     return match.captured("prefix");
 }
 
-QString Callsign::getCountryData(QString const& callsign)
-{
-    QString pf = callsign.toUpper();
-
-    while (!pf.isEmpty ())
-  	{
-        QString country = "";
-
-        if (pf.length() == callsign.length())
-        {
-            country = m_countryDat.getData().value("="+pf, country);
-
-            if (!country.isEmpty ()) {
-                return country;
-            } else {
-                pf = effective_prefix(callsign);
-            }
-        }
-
-        if (pf == "KG4" && callsign.length() != 5) {
-            pf = "AA";
-        }
-
-        country = m_countryDat.getData().value(pf, country);
-
-        if (!country.isEmpty ()) {
-	        return country;
-        }
-
-        pf = pf.left(pf.length()-1);
-	}
-
-    return "  ,?,where?,  ,  ";
-}
-
 CountryDat::CountryInfo Callsign::getCountryInfo(QString const& callsign)
 {
     QString pf = callsign.toUpper();

sdrbase/util/callsign.h

@@ -41,7 +41,6 @@ public:
     static QString base_callsign(QString);
     static QString effective_prefix(QString);
     static QString striped_prefix(QString);
-    QString getCountryData(QString const& callsign);
     CountryDat::CountryInfo getCountryInfo(QString const& callsign);
 
 private:

sdrbase/util/countrydat.cpp

@@ -44,7 +44,7 @@ const CountryDat::CountryInfo CountryDat::nullCountry = CountryDat::CountryInfo{
 
 void CountryDat::init()
 {
-    _data.clear();
+    _countries.clear();
     _name.clear();
     _name.insert("where?","where?");
     _name.insert("Sov Mil Order of Malta","Sov Mil Order of Malta");
@@ -544,7 +544,7 @@ QStringList CountryDat::_extractPrefix(QString &line, bool &more)
 
 void CountryDat::load()
 {
-    _data.clear();
+    _countries.clear();
     QFile inputFile(":/data/cty.dat");
 
     if (inputFile.open(QIODevice::ReadOnly))
@@ -610,7 +610,6 @@ void CountryDat::load()
                                 _continent = continent;
                             }
 
-                            _data.insert(p, _continent + ',' + masterPrefix + ',' + country + ',' + _cqz + ',' + _ituz);
                             _countries.insert(p, CountryInfo{_continent, masterPrefix, country, _cqz, _ituz});
                         }
                     }

sdrbase/util/countrydat.h

@@ -49,7 +49,6 @@ public:
 
     void init();
     void load();
-    const QHash<QString, QString>& getData() const { return _data; }
     const QHash<QString, CountryInfo>& getCountries() const { return _countries; }
     static const CountryInfo nullCountry;
 
@@ -63,7 +62,6 @@ private:
     QStringList _extractPrefix(QString &line, bool &more);
 
     QString _filename;
-    QHash<QString, QString> _data;
     QHash<QString, QString> _name;
     QHash<QString, CountryInfo> _countries;
 };

sdrbench/test_callsign.cpp

@@ -38,9 +38,8 @@ void MainBench::testCallsign(const QString& argsStr)
     qInfo("%s is the base callsign of %s", qPrintable(Callsign::base_callsign(argsStr)), qPrintable(argsStr));
     qInfo("%s is the effective prefix of %s", qPrintable(Callsign::effective_prefix(argsStr)), qPrintable(argsStr));
     qInfo("%s is the striped prefix of %s", qPrintable(Callsign::striped_prefix(argsStr)), qPrintable(argsStr));
-    qInfo("%s is the country data for callsign %s", qPrintable(Callsign::instance()->getCountryData(argsStr)), qPrintable(argsStr));
     CountryDat::CountryInfo countryInfo = Callsign::instance()->getCountryInfo(argsStr);
-    qInfo("%s is the continent", qPrintable(countryInfo.continent));
+    qInfo("%s DXCC country infoirmation", qPrintable(argsStr));    qInfo("%s is the continent", qPrintable(countryInfo.continent));
     qInfo("%s is the country", qPrintable(countryInfo.country));
     qInfo("%s is the master prefix", qPrintable(countryInfo.masterPrefix));
     qInfo("%s is the cq zone", qPrintable(countryInfo.cqZone));

sdrgui/CMakeLists.txt

@@ -26,6 +26,7 @@ set(sdrgui_SOURCES
     gui/crightclickenabler.cpp
     gui/customtextedit.cpp
     gui/cwkeyergui.cpp
+    gui/cwmousekeyerenabler.cpp
     gui/datetimedelegate.cpp
     gui/decimaldelegate.cpp
     gui/devicesetselectiondialog.cpp
@@ -150,6 +151,7 @@ set(sdrgui_HEADERS
     gui/crightclickenabler.h
     gui/customtextedit.h
     gui/cwkeyergui.h
+    gui/cwmousekeyerenabler.h
     gui/datetimedelegate.h
     gui/decimaldelegate.h
     gui/devicesetselectiondialog.h

sdrgui/gui/crightclickenabler.cpp

@@ -38,21 +38,18 @@ bool CRightClickEnabler::eventFilter(QObject *obj, QEvent *event)
     {
         auto mouseEvent = (QMouseEvent*) event;
 
+        if (mouseEvent->source() == Qt::MouseEventNotSynthesized) {
+            m_mousePressed = true;
+        } else {
+            m_mousePressed = false; // Mouse event generated from touch event
+        }
+
         if (mouseEvent->button() == Qt::RightButton)
         {
             emit rightClick(mouseEvent->globalPos());
             mouseEvent->setAccepted(true);
             return true;
         }
-
-        if (mouseEvent->button() == Qt::LeftButton)
-        {
-            if (mouseEvent->source() == Qt::MouseEventNotSynthesized) {
-                m_mousePressed = true;
-            } else {
-                m_mousePressed = false; // Mouse event generated from touch event
-            }
-        }
     }
     else if (event->type() == QEvent::MouseButtonRelease)
     {
@@ -61,6 +58,7 @@ bool CRightClickEnabler::eventFilter(QObject *obj, QEvent *event)
         if (mouseEvent->button() == Qt::RightButton)
         {
             mouseEvent->setAccepted(true);
+            m_mousePressed = false;
             return true;
         }
 

sdrgui/gui/cwkeyergui.cpp

@@ -21,6 +21,7 @@
 
 #include "gui/cwkeyergui.h"
 #include "gui/dialpopup.h"
+#include "gui/cwmousekeyerenabler.h"
 #include "ui_cwkeyergui.h"
 #include "dsp/cwkeyer.h"
 #include "util/simpleserializer.h"
@@ -40,6 +41,11 @@ CWKeyerGUI::CWKeyerGUI(QWidget* parent) :
     m_commandKeyReceiver->setRelease(true);
     this->installEventFilter(m_commandKeyReceiver);
     DialPopup::addPopupsToChildDials(this);
+    CWMouseKeyerEnabler *cwMouseKeyerEnabler = new CWMouseKeyerEnabler(ui->cwMouseKeyerPad);
+    QObject::connect(cwMouseKeyerEnabler, &CWMouseKeyerEnabler::leftButtonPress, this, &CWKeyerGUI::cwKeyerMouseLeftPressed);
+    QObject::connect(cwMouseKeyerEnabler, &CWMouseKeyerEnabler::leftButtonRelease, this, &CWKeyerGUI::cwKeyerMouseLeftReleased);
+    QObject::connect(cwMouseKeyerEnabler, &CWMouseKeyerEnabler::rightButtonPress, this, &CWKeyerGUI::cwKeyerMouseRightPressed);
+    QObject::connect(cwMouseKeyerEnabler, &CWMouseKeyerEnabler::rightButtonRelease, this, &CWKeyerGUI::cwKeyerMouseRightReleased);
 }
 
 CWKeyerGUI::~CWKeyerGUI()
@@ -359,3 +365,23 @@ void CWKeyerGUI::blockApplySettings(bool block)
 {
     m_doApplySettings = !block;
 }
+
+void CWKeyerGUI::cwKeyerMouseLeftPressed()
+{
+    m_cwKeyer->setKeyboardDots();
+}
+
+void CWKeyerGUI::cwKeyerMouseLeftReleased()
+{
+    m_cwKeyer->setKeyboardSilence();
+}
+
+void CWKeyerGUI::cwKeyerMouseRightPressed()
+{
+    m_cwKeyer->setKeyboardDashes();
+}
+
+void CWKeyerGUI::cwKeyerMouseRightReleased()
+{
+    m_cwKeyer->setKeyboardSilence();
+}

sdrgui/gui/cwkeyergui.h

@@ -90,6 +90,10 @@ private slots:
     void on_keyboardKeyer_toggled(bool checked);
     void commandKeyPressed(Qt::Key key, Qt::KeyboardModifiers keyModifiers, bool release);
     void keyboardKeyPressed(Qt::Key key, Qt::KeyboardModifiers keyModifiers, bool release);
+    void cwKeyerMouseLeftPressed();
+    void cwKeyerMouseLeftReleased();
+    void cwKeyerMouseRightPressed();
+    void cwKeyerMouseRightReleased();
 };
 
 

sdrgui/gui/cwkeyergui.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>375</width>
-    <height>91</height>
+    <height>92</height>
    </rect>
   </property>
   <property name="font">
@@ -82,6 +82,7 @@
        </property>
        <property name="font">
         <font>
+         <family>Liberation Sans</family>
          <pointsize>9</pointsize>
         </font>
        </property>
@@ -149,6 +150,7 @@
        </property>
        <property name="font">
         <font>
+         <family>Liberation Sans</family>
          <pointsize>12</pointsize>
          <weight>75</weight>
          <bold>true</bold>
@@ -215,6 +217,7 @@
        </property>
        <property name="font">
         <font>
+         <family>Liberation Sans</family>
          <pointsize>12</pointsize>
          <weight>75</weight>
          <bold>true</bold>
@@ -487,6 +490,28 @@
        </property>
       </widget>
      </item>
+     <item>
+      <widget class="QLabel" name="cwMouseKeyerPad">
+       <property name="minimumSize">
+        <size>
+         <width>32</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="toolTip">
+        <string>Put the mouse pointer here to activate the CW mouse keyer</string>
+       </property>
+       <property name="frameShape">
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="pixmap">
+        <pixmap resource="../resources/res.qrc">:/mouse.png</pixmap>
+       </property>
+      </widget>
+     </item>
      <item>
       <widget class="ButtonSwitch" name="keyDotCapture">
        <property name="sizePolicy">
@@ -546,6 +571,7 @@
        </property>
        <property name="font">
         <font>
+         <family>Liberation Sans</family>
          <pointsize>12</pointsize>
          <weight>75</weight>
          <bold>true</bold>
@@ -634,6 +660,7 @@
        </property>
        <property name="font">
         <font>
+         <family>Liberation Sans</family>
          <pointsize>12</pointsize>
          <weight>75</weight>
          <bold>true</bold>

sdrgui/gui/cwmousekeyerenabler.cpp

@@ -0,0 +1,70 @@
+///////////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2024 Edouard Griffiths, F4EXB <f4exb06@gmail.com>               //
+//                                                                               //
+// This program is free software; you can redistribute it and/or modify          //
+// it under the terms of the GNU General Public License as published by          //
+// the Free Software Foundation as version 3 of the License, or                  //
+// (at your option) any later version.                                           //
+//                                                                               //
+// This program is distributed in the hope that it will be useful,               //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                  //
+// GNU General Public License V3 for more details.                               //
+//                                                                               //
+// You should have received a copy of the GNU General Public License             //
+// along with this program. If not, see <http://www.gnu.org/licenses/>.          //
+///////////////////////////////////////////////////////////////////////////////////
+
+#include <QEvent>
+#include <QMouseEvent>
+
+#include "cwmousekeyerenabler.h"
+
+CWMouseKeyerEnabler::CWMouseKeyerEnabler(QWidget *widget) :
+    QObject(widget),
+    m_widget(widget)
+{
+    m_widget->installEventFilter(this);
+}
+
+bool CWMouseKeyerEnabler::eventFilter(QObject *obj, QEvent *event)
+{
+    if (event->type() == QEvent::MouseButtonPress)
+    {
+        auto mouseEvent = (QMouseEvent*) event;
+
+        if (mouseEvent->button() == Qt::RightButton)
+        {
+            emit rightButtonPress(mouseEvent->globalPos());
+            mouseEvent->setAccepted(true);
+            return true;
+        }
+
+        if (mouseEvent->button() == Qt::LeftButton)
+        {
+            emit leftButtonPress(mouseEvent->globalPos());
+            mouseEvent->setAccepted(true);
+            return true;
+        }
+    }
+    else if (event->type() == QEvent::MouseButtonRelease)
+    {
+        auto mouseEvent = (QMouseEvent*) event;
+
+        if (mouseEvent->button() == Qt::RightButton)
+        {
+            emit rightButtonRelease(mouseEvent->globalPos());
+            mouseEvent->setAccepted(true);
+            return true;
+        }
+
+        if (mouseEvent->button() == Qt::LeftButton)
+        {
+            emit leftButtonRelease(mouseEvent->globalPos());
+            mouseEvent->setAccepted(true);
+            return true;
+        }
+    }
+
+    return QObject::eventFilter(obj, event);
+}

sdrgui/gui/cwmousekeyerenabler.h

@@ -0,0 +1,43 @@
+///////////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2024 Edouard Griffiths, F4EXB <f4exb06@gmail.com>               //
+//                                                                               //
+// This program is free software; you can redistribute it and/or modify          //
+// it under the terms of the GNU General Public License as published by          //
+// the Free Software Foundation as version 3 of the License, or                  //
+// (at your option) any later version.                                           //
+//                                                                               //
+// This program is distributed in the hope that it will be useful,               //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                  //
+// GNU General Public License V3 for more details.                               //
+//                                                                               //
+// You should have received a copy of the GNU General Public License             //
+// along with this program. If not, see <http://www.gnu.org/licenses/>.          //
+///////////////////////////////////////////////////////////////////////////////////
+
+#ifndef SDRGUI_GUI_CWMOUSEKEYERENABLER_H_
+#define SDRGUI_GUI_CWMOUSEKEYERENABLER_H_
+
+#include <QWidget>
+
+#include "export.h"
+
+class SDRGUI_API CWMouseKeyerEnabler : public QObject {
+    Q_OBJECT
+public:
+    CWMouseKeyerEnabler(QWidget *widget);
+
+signals:
+    void leftButtonPress(const QPoint&);  // Emitted for left mouse press
+    void leftButtonRelease(const QPoint&);  // Emitted for left mouse release
+    void rightButtonPress(const QPoint&);  // Emitted for right mouse press
+    void rightButtonRelease(const QPoint&);  // Emitted for right mouse release
+
+protected:
+    bool eventFilter(QObject *watched, QEvent *event) override;
+
+private:
+    QWidget* m_widget;
+};
+
+#endif /* SDRGUI_GUI_CRIGHTCLICKENABLER_H_ */

sdrgui/resources/res.qrc

@@ -156,6 +156,7 @@
     <file>tab.png</file>
     <file>clockfile.png</file>
     <file>clockcurrent.png</file>
+    <file>mouse.png</file>
     <file>LiberationMono-Regular.ttf</file>
     <file>LiberationSans-Regular.ttf</file>
   </qresource>

snap/local/locale-gen

@@ -0,0 +1,62 @@
+#!/usr/bin/perl
+
+use strict;
+
+sub uniq
+{
+    my %seen;
+    grep !$seen{$_}++, @_;
+}
+
+# TODO support for KDE's in-app language switch feature.
+sub get_languages
+{
+    # Initialize with sane defaults.
+    my @found_languages = ($ENV{'LANG'} or 'C.UTF-8');
+
+    # Go through LC_.
+    foreach (sort keys %ENV)
+    {
+        if (substr($_, 0, length("LC_")) eq "LC_")
+        {
+            push(@found_languages, $ENV{$_});
+        }
+    }
+    # And finally LANGUAGE, but normalize it.
+    if (my $language = $ENV{'LANGUAGE'})
+    {
+        foreach (split(':', $language))
+        {
+            push(@found_languages, "$_.UTF-8");
+        }
+    }
+
+    # Remove duplicates before returning.
+    @found_languages = uniq(@found_languages);
+
+    return @found_languages
+}
+
+my $env_locpath = $ENV{'LOCPATH'} or die "LOCPATH must be set";
+my @locpaths = split(/:/, $env_locpath);
+
+foreach my $lang (get_languages())
+{
+    my $found = 0;
+    foreach my $locpath (@locpaths)
+    {
+        my $loc_target = "$locpath/$lang";
+        if (-e $loc_target)
+        {
+            $found = 1;
+            last;
+        }
+    }
+    next if $found;
+    my $target = "@locpaths[0]/$lang";
+
+    # localedef will exit !0 for unknown reasons, even when everything was
+    # generated fine.
+    my ($locale, $encoding) = split(/\./, $lang);
+    system('localedef', '-i', $locale, '-f', $encoding, $target);
+}

snap/local/sdrangel_wrapper.sh

@@ -0,0 +1,664 @@
+#!/bin/bash
+###########################################################
+# sdrangel init script
+# Based on script from kde-neon extension (https://snapcraft.io/docs/kde-neon-extension),
+# but we use layout in snapcraft.yaml for qt stuff, instead of env vars and qt.conf, as that didn't seem to work
+###########################################################
+
+# shellcheck disable=SC2034
+START=$(date +%s.%N)
+
+# ensure_dir_exists calls `mkdir -p` if the given path is not a directory.
+# This speeds up execution time by avoiding unnecessary calls to mkdir.
+#
+# Usage: ensure_dir_exists <path> [<mkdir-options>]...
+#
+function ensure_dir_exists() {
+  [ -d "$1" ] ||  mkdir -p "$@"
+}
+
+declare -A PIDS
+function async_exec() {
+  "$@" &
+  PIDS[$!]=$*
+}
+function wait_for_async_execs() {
+  for pid in "${!PIDS[@]}"
+  do
+    wait "$pid" && continue || echo "ERROR: ${PIDS[$pid]} exited abnormally with status $?"
+  done
+}
+
+# shellcheck source=/dev/null
+source "$SNAP_USER_DATA/.last_revision" 2>/dev/null || true
+if [ "$SNAP_DESKTOP_LAST_REVISION" = "$SNAP_REVISION" ]; then
+  needs_update=false
+else
+  needs_update=true
+fi
+
+# Set $REALHOME to the users real home directory
+REALHOME=$(getent passwd $UID | cut -d ':' -f 6)
+
+# Set config folder to local path
+export XDG_CONFIG_HOME="$SNAP_USER_DATA/.config"
+ensure_dir_exists "$XDG_CONFIG_HOME"
+chmod 700 "$XDG_CONFIG_HOME"
+
+# If there is no user user-dirs, don't check for the checksum
+if [[ -f "$REALHOME/.config/user-dirs.dirs" ]]; then
+  # If the user has modified their user-dirs settings, force an update
+  if [[ -f "$XDG_CONFIG_HOME/user-dirs.dirs.md5sum" ]]; then
+    if [[ "$(md5sum < "$REALHOME/.config/user-dirs.dirs")" != "$(cat "$XDG_CONFIG_HOME/user-dirs.dirs.md5sum")" ||
+          ( -f "$XDG_CONFIG_HOME/user-dirs.locale.md5sum" &&
+            "$(md5sum < "$REALHOME/.config/user-dirs.locale")" != "$(cat "$XDG_CONFIG_HOME/user-dirs.locale.md5sum")" ) ]]; then
+      needs_update=true
+    fi
+  else
+    # shellcheck disable=SC2034
+    needs_update=true
+  fi
+fi
+
+if [ "$SNAP_ARCH" = "amd64" ]; then
+  ARCH="x86_64-linux-gnu"
+elif [ "$SNAP_ARCH" = "armhf" ]; then
+  ARCH="arm-linux-gnueabihf"
+elif [ "$SNAP_ARCH" = "arm64" ]; then
+  ARCH="aarch64-linux-gnu"
+elif [ "$SNAP_ARCH" = "ppc64el" ]; then
+  ARCH="powerpc64le-linux-gnu"
+else
+  ARCH="$SNAP_ARCH-linux-gnu"
+fi
+
+export SNAP_LAUNCHER_ARCH_TRIPLET="$ARCH"
+
+# Don't LD_PRELOAD bindtextdomain for classic snaps
+if ! grep -qs "^\s*confinement:\s*classic\s*" "$SNAP/meta/snap.yaml"; then
+  if [ -f "$SNAP/lib/$ARCH/bindtextdomain.so" ]; then
+    export LD_PRELOAD="$LD_PRELOAD:$SNAP/\$LIB/bindtextdomain.so"
+  elif [ -f "$SNAP/gnome-platform/lib/$ARCH/bindtextdomain.so" ]; then
+    export LD_PRELOAD="$LD_PRELOAD:$SNAP/gnome-platform/\$LIB/bindtextdomain.so"
+  fi
+fi
+###########################################################
+# Launcher common exports for any desktop app
+# This is not used with the gnome extension for
+# core22 and later, please see
+# https://github.com/snapcore/snapcraft-desktop-integration
+###########################################################
+
+# Note: We avoid using `eval` because we don't want to expand variable names
+#       in paths. For example: LD_LIBRARY_PATH paths might contain `$LIB`.
+function prepend_dir() {
+  local -n var="$1"
+  local dir="$2"
+  # We can't check if the dir exists when the dir contains variables
+  if [[ "$dir" == *"\$"*  || -d "$dir" ]]; then
+    export "${!var}=${dir}${var:+:$var}"
+  fi
+}
+
+function append_dir() {
+  local -n var="$1"
+  local dir="$2"
+  # We can't check if the dir exists when the dir contains variables
+  if [[ "$dir" == *"\$"*  || -d "$dir" ]]; then
+    export "${!var}=${var:+$var:}${dir}"
+  fi
+}
+
+function can_open_file() {
+  [ -f "$1" ] && [ -r "$1" ]
+}
+
+function update_xdg_dirs_values() {
+  local save_initial_values=false
+  local XDG_DIRS="DOCUMENTS DESKTOP DOWNLOAD MUSIC PICTURES VIDEOS PUBLICSHARE TEMPLATES"
+  unset XDG_SPECIAL_DIRS_PATHS
+
+  if [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/user-dirs.dirs" ]; then
+    # shellcheck source=/dev/null
+    source "${XDG_CONFIG_HOME:-$HOME/.config}/user-dirs.dirs"
+  fi
+
+  if [ -z ${XDG_SPECIAL_DIRS+x} ]; then
+    save_initial_values=true
+  fi
+
+  for d in $XDG_DIRS; do
+    var="XDG_${d}_DIR"
+    value="${!var}"
+
+    if [ "$save_initial_values" = true ]; then
+      XDG_SPECIAL_DIRS+=("$var")
+      XDG_SPECIAL_DIRS_INITIAL_PATHS+=("$value")
+    fi
+
+    XDG_SPECIAL_DIRS_PATHS+=("$value")
+  done
+}
+
+function is_subpath() {
+  dir="$(realpath "$1")"
+  parent="$(realpath "$2")"
+  [ "${dir##"${parent}"/}" != "${dir}" ] && return 0 || return 1
+}
+
+# We can't use this snap, as it's missing QtCharts, Gamepad and TextToSpeech
+#if ! snapctl is-connected "kf5-5-108-qt-5-15-10-core22"; then
+#  echo "ERROR: not connected to the kf5-5-108-qt-5-15-10-core22 content interface."
+#  exit 1
+#fi
+
+SNAP_DESKTOP_RUNTIME=$SNAP
+
+append_dir LD_LIBRARY_PATH "$SNAP_DESKTOP_RUNTIME/lib/$ARCH"
+append_dir LD_LIBRARY_PATH "$SNAP_DESKTOP_RUNTIME/usr/lib/$ARCH"
+append_dir LD_LIBRARY_PATH "$SNAP_DESKTOP_RUNTIME/usr/lib"
+append_dir LD_LIBRARY_PATH "$SNAP_DESKTOP_RUNTIME/lib"
+append_dir PATH "$SNAP_DESKTOP_RUNTIME/usr/bin"
+
+# XKB config
+export XKB_CONFIG_ROOT="$SNAP_DESKTOP_RUNTIME/usr/share/X11/xkb"
+
+# Give XOpenIM a chance to locate locale data.
+# This is required for text input to work in SDL2 games.
+export XLOCALEDIR="$SNAP_DESKTOP_RUNTIME/usr/share/X11/locale"
+
+# Set XCursors path
+export XCURSOR_PATH="$SNAP_DESKTOP_RUNTIME/usr/share/icons"
+prepend_dir XCURSOR_PATH "$SNAP/data-dir/icons"
+
+# Mesa Libs for OpenGL support
+append_dir LD_LIBRARY_PATH "$SNAP_DESKTOP_RUNTIME/usr/lib/$ARCH/mesa"
+append_dir LD_LIBRARY_PATH "$SNAP_DESKTOP_RUNTIME/usr/lib/$ARCH/mesa-egl"
+
+# Tell libGL and libva where to find the drivers
+export LIBGL_DRIVERS_PATH="$SNAP_DESKTOP_RUNTIME/usr/lib/$ARCH/dri"
+append_dir LD_LIBRARY_PATH "$LIBGL_DRIVERS_PATH"
+append_dir LIBVA_DRIVERS_PATH "$SNAP_DESKTOP_RUNTIME/usr/lib/$ARCH/dri"
+
+# Set where the VDPAU drivers are located
+export VDPAU_DRIVER_PATH="/usr/lib/$ARCH/vdpau/"
+if [ -e "/var/lib/snapd/lib/gl/vdpau/libvdpau_nvidia.so" ]; then
+  export VDPAU_DRIVER_PATH="/var/lib/snapd/lib/gl/vdpau"
+  if [ "$__NV_PRIME_RENDER_OFFLOAD" = 1 ]; then
+    # Prevent picking VA-API (Intel/AMD) over NVIDIA VDPAU
+    # https://download.nvidia.com/XFree86/Linux-x86_64/510.54/README/primerenderoffload.html#configureapplications
+    unset LIBVA_DRIVERS_PATH
+  fi
+fi
+
+# Workaround in snapd for proprietary nVidia drivers mounts the drivers in
+# /var/lib/snapd/lib/gl that needs to be in LD_LIBRARY_PATH
+# Without that OpenGL using apps do not work with the nVidia drivers.
+# Ref.: https://bugs.launchpad.net/snappy/+bug/1588192
+append_dir LD_LIBRARY_PATH "/var/lib/snapd/lib/gl"
+append_dir LD_LIBRARY_PATH "/var/lib/snapd/lib/gl/vdpau"
+
+# Unity7 export (workaround for https://launchpad.net/bugs/1638405)
+append_dir LD_LIBRARY_PATH "$SNAP_DESKTOP_RUNTIME/usr/lib/$ARCH/libunity"
+
+# Pulseaudio export
+append_dir LD_LIBRARY_PATH "$SNAP_DESKTOP_RUNTIME/usr/lib/$ARCH/pulseaudio"
+
+# EGL vendor files on glvnd enabled systems
+prepend_dir __EGL_VENDOR_LIBRARY_DIRS "/var/lib/snapd/lib/glvnd/egl_vendor.d"
+append_dir __EGL_VENDOR_LIBRARY_DIRS "$SNAP_DESKTOP_RUNTIME/usr/share/glvnd/egl_vendor.d"
+
+# Tell GStreamer where to find its plugins
+export GST_PLUGIN_PATH="$SNAP/usr/lib/$ARCH/gstreamer-1.0"
+export GST_PLUGIN_SYSTEM_PATH="$SNAP_DESKTOP_RUNTIME/usr/lib/$ARCH/gstreamer-1.0"
+# gst plugin scanner doesn't install in the correct path: https://github.com/ubuntu/snapcraft-desktop-helpers/issues/43
+export GST_PLUGIN_SCANNER="$SNAP_DESKTOP_RUNTIME/usr/lib/$ARCH/gstreamer1.0/gstreamer-1.0/gst-plugin-scanner"
+
+# XDG Config
+prepend_dir XDG_CONFIG_DIRS "$SNAP_DESKTOP_RUNTIME/etc/xdg"
+prepend_dir XDG_CONFIG_DIRS "$SNAP/etc/xdg"
+
+# Define snaps' own data dir
+prepend_dir XDG_DATA_DIRS "$SNAP_DESKTOP_RUNTIME/usr/share"
+prepend_dir XDG_DATA_DIRS "$SNAP/usr/share"
+prepend_dir XDG_DATA_DIRS "$SNAP/share"
+prepend_dir XDG_DATA_DIRS "$SNAP/data-dir"
+prepend_dir XDG_DATA_DIRS "$SNAP_USER_DATA"
+
+# Set XDG_DATA_HOME to local path
+export XDG_DATA_HOME="$SNAP_USER_DATA/.local/share"
+ensure_dir_exists "$XDG_DATA_HOME"
+
+# Workaround for GLib < 2.53.2 not searching for schemas in $XDG_DATA_HOME:
+#   https://bugzilla.gnome.org/show_bug.cgi?id=741335
+prepend_dir XDG_DATA_DIRS "$XDG_DATA_HOME"
+
+# Set cache folder to local path
+export XDG_CACHE_HOME="$SNAP_USER_COMMON/.cache"
+if [[ -d "$SNAP_USER_DATA/.cache" && ! -e "$XDG_CACHE_HOME" ]]; then
+  # the .cache directory used to be stored under $SNAP_USER_DATA, migrate it
+  mv "$SNAP_USER_DATA/.cache" "$SNAP_USER_COMMON/"
+fi
+ensure_dir_exists "$XDG_CACHE_HOME"
+
+# Create $XDG_RUNTIME_DIR if not exists (to be removed when LP: #1656340 is fixed)
+# shellcheck disable=SC2174
+ensure_dir_exists "$XDG_RUNTIME_DIR" -m 700
+
+# Ensure the app finds locale definitions (requires locales-all to be installed)
+append_dir LOCPATH "$SNAP_DESKTOP_RUNTIME/usr/lib/locale"
+
+# If any, keep track of where XDG dirs were so we can potentially migrate the content later
+update_xdg_dirs_values
+
+# Setup user-dirs.* or run xdg-user-dirs-update if needed
+needs_xdg_update=false
+needs_xdg_reload=false
+needs_xdg_links=false
+
+if [ "$HOME" != "$SNAP_USER_DATA" ] && ! is_subpath "$XDG_CONFIG_HOME" "$HOME"; then
+  for f in user-dirs.dirs user-dirs.locale; do
+    if [ -f "$HOME/.config/$f" ]; then
+      mv "$HOME/.config/$f" "$XDG_CONFIG_HOME"
+      needs_xdg_reload=true
+    fi
+  done
+fi
+
+if can_open_file "$REALHOME/.config/user-dirs.dirs"; then
+  # shellcheck disable=SC2154
+  if [ "$needs_update" = true ] || [ "$needs_xdg_reload" = true ]; then
+    sed "/^#/!s#\$HOME#${REALHOME}#g" "$REALHOME/.config/user-dirs.dirs" > "$XDG_CONFIG_HOME/user-dirs.dirs"
+    md5sum < "$REALHOME/.config/user-dirs.dirs" > "$XDG_CONFIG_HOME/user-dirs.dirs.md5sum"
+    # It's possible user-dirs.dirs exists when user-dirs.locale doesn't. This
+    # simply means the user opted to never ask to translate their user dirs
+    if can_open_file "$REALHOME/.config/user-dirs.locale"; then
+      cp -a "$REALHOME/.config/user-dirs.locale" "$XDG_CONFIG_HOME"
+      md5sum < "$REALHOME/.config/user-dirs.locale" > "$XDG_CONFIG_HOME/user-dirs.locale.md5sum"
+    elif [ -f "$XDG_CONFIG_HOME/user-dirs.locale.md5sum" ]; then
+      rm "$XDG_CONFIG_HOME/user-dirs.locale.md5sum"
+    fi
+    needs_xdg_reload=true
+  fi
+else
+  needs_xdg_update=true
+  needs_xdg_links=true
+fi
+
+if [ $needs_xdg_reload = true ]; then
+  update_xdg_dirs_values
+  needs_xdg_reload=false
+fi
+
+# Check if we can actually read the contents of each xdg dir
+for ((i = 0; i < ${#XDG_SPECIAL_DIRS_PATHS[@]}; i++)); do
+  if ! can_open_file "${XDG_SPECIAL_DIRS_PATHS[$i]}"; then
+    needs_xdg_update=true
+    needs_xdg_links=true
+    break
+  fi
+done
+
+# If needs XDG update and xdg-user-dirs-update exists in $PATH, run it
+if [ "$needs_xdg_update" = true ] && command -v xdg-user-dirs-update >/dev/null; then
+  xdg-user-dirs-update
+  update_xdg_dirs_values
+fi
+
+# Create links for user-dirs.dirs
+if [ "$needs_xdg_links" = true ]; then
+  for ((i = 0; i < ${#XDG_SPECIAL_DIRS_PATHS[@]}; i++)); do
+    b="$(realpath "${XDG_SPECIAL_DIRS_PATHS[$i]}" --relative-to="$HOME" 2>/dev/null)"
+    if [[ -n "$b" && "$b" != "." && -e "$REALHOME/$b" ]]; then
+      [ -d "$HOME/$b" ] && rmdir "$HOME/$b" 2> /dev/null
+      [ ! -e "$HOME/$b" ] && ln -s "$REALHOME/$b" "$HOME/$b"
+    fi
+  done
+else
+  # If we aren't creating new links, check if we have content saved in old locations and move it
+  for ((i = 0; i < ${#XDG_SPECIAL_DIRS[@]}; i++)); do
+    old="${XDG_SPECIAL_DIRS_INITIAL_PATHS[$i]}"
+    new="${XDG_SPECIAL_DIRS_PATHS[$i]}"
+    if [ -L "$old" ] && [ -d "$new" ] && [ "$(readlink "$old" 2>/dev/null)" != "$new" ] &&
+         (is_subpath "$old" "$SNAP_USER_DATA" || is_subpath "$old" "$SNAP_USER_COMMON"); then
+      mv -vn "$old"/* "$new"/ 2>/dev/null
+    elif [ -d "$old" ] && [ -d "$new" ] && [ "$old" != "$new" ] &&
+         (is_subpath "$old" "$SNAP_USER_DATA" || is_subpath "$old" "$SNAP_USER_COMMON"); then
+      mv -vn "$old"/* "$new"/ 2>/dev/null
+    fi
+  done
+fi
+
+# If detect wayland server socket, then set environment so applications prefer
+# wayland, and setup compat symlink (until we use user mounts. Remember,
+# XDG_RUNTIME_DIR is /run/user/<uid>/snap.$SNAP so look in the parent directory
+# for the socket. For details:
+# https://forum.snapcraft.io/t/wayland-dconf-and-xdg-runtime-dir/186/10
+# Applications that don't support wayland natively may define DISABLE_WAYLAND
+# (to any non-empty value) to skip that logic entirely.
+wayland_available=false
+if [[ -n "$XDG_RUNTIME_DIR" && -z "$DISABLE_WAYLAND" ]]; then
+    wdisplay="wayland-0"
+    if [ -n "$WAYLAND_DISPLAY" ]; then
+        wdisplay="$WAYLAND_DISPLAY"
+    fi
+    wayland_sockpath="$XDG_RUNTIME_DIR/../$wdisplay"
+    wayland_snappath="$XDG_RUNTIME_DIR/$wdisplay"
+    if [ -S "$wayland_sockpath" ]; then
+        # if running under wayland, use it
+        #export WAYLAND_DEBUG=1
+        # shellcheck disable=SC2034
+        wayland_available=true
+        # create the compat symlink for now
+        if [ ! -e "$wayland_snappath" ]; then
+            ln -s "$wayland_sockpath" "$wayland_snappath"
+        fi
+    fi
+fi
+
+# Make PulseAudio socket available inside the snap-specific $XDG_RUNTIME_DIR
+if [ -n "$XDG_RUNTIME_DIR" ]; then
+    pulsenative="pulse/native"
+    pulseaudio_sockpath="$XDG_RUNTIME_DIR/../$pulsenative"
+    if [ -S "$pulseaudio_sockpath" ]; then
+        export PULSE_SERVER="unix:${pulseaudio_sockpath}"
+    fi
+fi
+
+# GI repository
+prepend_dir GI_TYPELIB_PATH "$SNAP_DESKTOP_RUNTIME/usr/lib/$ARCH/girepository-1.0"
+prepend_dir GI_TYPELIB_PATH "$SNAP_DESKTOP_RUNTIME/usr/lib/girepository-1.0"
+prepend_dir GI_TYPELIB_PATH "$SNAP_DESKTOP_RUNTIME/usr/lib/gjs/girepository-1.0"
+prepend_dir GI_TYPELIB_PATH "$SNAP/usr/lib/$ARCH/girepository-1.0"
+prepend_dir GI_TYPELIB_PATH "$SNAP/usr/lib/girepository-1.0"
+prepend_dir GI_TYPELIB_PATH "$SNAP/usr/lib/gjs/girepository-1.0"
+
+# Keep an array of data dirs, for looping through them
+IFS=':' read -r -a data_dirs_array <<< "$XDG_DATA_DIRS"
+
+# Font Config and themes
+export FONTCONFIG_PATH="$SNAP_DESKTOP_RUNTIME/etc/fonts"
+export FONTCONFIG_FILE="$SNAP_DESKTOP_RUNTIME/etc/fonts/fonts.conf"
+
+function make_user_fontconfig {
+  echo "<fontconfig>"
+  if [ -d "$REALHOME/.local/share/fonts" ]; then
+    echo "  <dir>$REALHOME/.local/share/fonts</dir>"
+  fi
+  if [ -d "$REALHOME/.fonts" ]; then
+    echo "  <dir>$REALHOME/.fonts</dir>"
+  fi
+  for ((i = 0; i < ${#data_dirs_array[@]}; i++)); do
+    if [ -d "${data_dirs_array[$i]}/fonts" ]; then
+      echo "  <dir>${data_dirs_array[$i]}/fonts</dir>"
+    fi
+  done
+  echo '  <include ignore_missing="yes">conf.d</include>'
+  # We need to include a user-writable cachedir first to support
+  # caching of per-user fonts.
+  echo '  <cachedir prefix="xdg">fontconfig</cachedir>'
+  echo "  <cachedir>$SNAP_COMMON/fontconfig</cachedir>"
+  echo "</fontconfig>"
+}
+
+if [ "$needs_update" = true ]; then
+  rm -rf "$XDG_DATA_HOME"/{fontconfig,fonts,fonts-*,themes,.themes}
+
+  # This fontconfig fragment is installed in a location that is
+  # included by the system fontconfig configuration: namely the
+  # etc/fonts/conf.d/50-user.conf file.
+  ensure_dir_exists "$XDG_CONFIG_HOME/fontconfig"
+  async_exec make_user_fontconfig > "$XDG_CONFIG_HOME/fontconfig/fonts.conf"
+
+  # the themes symlink are needed for GTK 3.18 when the prefix isn't changed
+  # GTK 3.20 looks into XDG_DATA_DIRS which has connected themes.
+  if [ -d "$SNAP/data-dir/themes" ]; then
+    ln -sf "$SNAP/data-dir/themes" "$XDG_DATA_HOME"
+    ln -sfn "$SNAP/data-dir/themes" "$SNAP_USER_DATA/.themes"
+  elif [ -d "$SNAP_DESKTOP_RUNTIME/usr/share/themes" ]; then
+    ln -sf "$SNAP_DESKTOP_RUNTIME/usr/share/themes" "$XDG_DATA_HOME"
+    ln -sfn "$SNAP_DESKTOP_RUNTIME/usr/share/themes" "$SNAP_USER_DATA/.themes"
+  fi
+fi
+
+# Build mime.cache
+# needed for gtk and qt icon
+if [ "$needs_update" = true ]; then
+  rm -rf "$XDG_DATA_HOME/mime"
+  if [ ! -f "$SNAP_DESKTOP_RUNTIME/usr/share/mime/mime.cache" ]; then
+    if command -v update-mime-database >/dev/null; then
+      cp --preserve=timestamps -dR "$SNAP_DESKTOP_RUNTIME/usr/share/mime" "$XDG_DATA_HOME"
+      async_exec update-mime-database "$XDG_DATA_HOME/mime"
+    fi
+  fi
+fi
+
+# Gio modules and cache (including gsettings module)
+export GIO_MODULE_DIR="$XDG_CACHE_HOME/gio-modules"
+function compile_giomodules {
+  if [ -f "$1/glib-2.0/gio-querymodules" ]; then
+    rm -rf "$GIO_MODULE_DIR"
+    ensure_dir_exists "$GIO_MODULE_DIR"
+    ln -s "$1"/gio/modules/*.so "$GIO_MODULE_DIR"
+    "$1/glib-2.0/gio-querymodules" "$GIO_MODULE_DIR"
+  fi
+}
+if [ "$needs_update" = true ]; then
+  async_exec compile_giomodules "$SNAP_DESKTOP_RUNTIME/usr/lib/$ARCH"
+fi
+
+# Setup compiled gsettings schema
+GS_SCHEMA_DIR="$XDG_DATA_HOME/glib-2.0/schemas"
+function compile_schemas {
+  if [ -f "$1" ]; then
+    rm -rf "$GS_SCHEMA_DIR"
+    ensure_dir_exists "$GS_SCHEMA_DIR"
+    for ((i = 0; i < ${#data_dirs_array[@]}; i++)); do
+      schema_dir="${data_dirs_array[$i]}/glib-2.0/schemas"
+      if [ -f "$schema_dir/gschemas.compiled" ]; then
+        # This directory already has compiled schemas
+        continue
+      fi
+      if [ -n "$(ls -A "$schema_dir"/*.xml 2>/dev/null)" ]; then
+        ln -s "$schema_dir"/*.xml "$GS_SCHEMA_DIR"
+      fi
+      if [ -n "$(ls -A "$schema_dir"/*.override 2>/dev/null)" ]; then
+        ln -s "$schema_dir"/*.override "$GS_SCHEMA_DIR"
+      fi
+    done
+    # Only compile schemas if we copied anything
+    if [ -n "$(ls -A "$GS_SCHEMA_DIR"/*.xml "$GS_SCHEMA_DIR"/*.override 2>/dev/null)" ]; then
+      "$1" "$GS_SCHEMA_DIR"
+    fi
+  fi
+}
+if [ "$needs_update" = true ]; then
+  async_exec compile_schemas "$SNAP_DESKTOP_RUNTIME/usr/lib/$ARCH/glib-2.0/glib-compile-schemas"
+fi
+
+# Enable gsettings user changes
+# symlink the dconf file if home plug is connected for read
+DCONF_DEST_USER_DIR="$SNAP_USER_DATA/.config/dconf"
+if [ ! -f "$DCONF_DEST_USER_DIR/user" ]; then
+  if [ -f "$REALHOME/.config/dconf/user" ]; then
+    ensure_dir_exists "$DCONF_DEST_USER_DIR"
+    ln -s "$REALHOME/.config/dconf/user" "$DCONF_DEST_USER_DIR"
+  fi
+fi
+# symlink the runtime dconf file as well
+if [ -r "$XDG_RUNTIME_DIR/../dconf/user" ]; then
+  ensure_dir_exists "$XDG_RUNTIME_DIR/dconf"
+  ln -sf "../../dconf/user" "$XDG_RUNTIME_DIR/dconf/user"
+fi
+
+# Testability support
+append_dir LD_LIBRARY_PATH "$SNAP/testability"
+append_dir LD_LIBRARY_PATH "$SNAP/testability/$ARCH"
+append_dir LD_LIBRARY_PATH "$SNAP/testability/$ARCH/mesa"
+
+# Gdk-pixbuf loaders
+export GDK_PIXBUF_MODULE_FILE="$XDG_CACHE_HOME/gdk-pixbuf-loaders.cache"
+export GDK_PIXBUF_MODULEDIR="$SNAP_DESKTOP_RUNTIME/usr/lib/$ARCH/gdk-pixbuf-2.0/2.10.0/loaders"
+if [ "$needs_update" = true ] || [ ! -f "$GDK_PIXBUF_MODULE_FILE" ]; then
+  rm -f "$GDK_PIXBUF_MODULE_FILE"
+  if [ -f "$SNAP_DESKTOP_RUNTIME/usr/lib/$ARCH/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders" ]; then
+    async_exec "$SNAP_DESKTOP_RUNTIME/usr/lib/$ARCH/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders" > "$GDK_PIXBUF_MODULE_FILE"
+  fi
+fi
+
+# Icon themes cache
+if [ "$needs_update" = true ]; then
+  rm -rf "$XDG_DATA_HOME/icons"
+  ensure_dir_exists "$XDG_DATA_HOME/icons"
+  for ((i = 0; i < ${#data_dirs_array[@]}; i++)); do
+    # The runtime and theme content snaps should already contain icon caches
+    # so we skip them to optimise app start time.
+    if [[ "${data_dirs_array[$i]}" == "$SNAP/data-dir" || "${data_dirs_array[$i]}" == "$SNAP_DESKTOP_RUNTIME/"* ]]; then
+      continue
+    fi
+    for theme in "${data_dirs_array[$i]}"/icons/*; do
+      if [ -f "$theme/index.theme" ] && [ ! -f "$theme/icon-theme.cache" ]; then
+        theme_dir="$XDG_DATA_HOME/icons/$(basename "$theme")"
+        if [ ! -d "$theme_dir" ]; then
+          ensure_dir_exists "$theme_dir"
+          ln -s "$theme"/* "$theme_dir"
+          if [ -f "$SNAP_DESKTOP_RUNTIME/usr/sbin/update-icon-caches" ]; then
+            async_exec "$SNAP_DESKTOP_RUNTIME/usr/sbin/update-icon-caches" "$theme_dir"
+          elif [ -f "$SNAP_DESKTOP_RUNTIME/usr/sbin/update-icon-cache.gtk2" ]; then
+            async_exec "$SNAP_DESKTOP_RUNTIME/usr/sbin/update-icon-cache.gtk2" "$theme_dir"
+          fi
+        fi
+      fi
+    done
+  done
+fi
+
+# GTK theme and behavior modifier
+# Those can impact the theme engine used by Qt as well
+gtk_configs=(gtk-3.0/settings.ini gtk-3.0/bookmarks gtk-2.0/gtkfilechooser.ini)
+for f in "${gtk_configs[@]}"; do
+  dest="$XDG_CONFIG_HOME/$f"
+  if [ ! -L "$dest" ]; then
+    ensure_dir_exists "$(dirname "$dest")"
+    ln -s "$REALHOME/.config/$f" "$dest"
+  fi
+done
+
+# create symbolic link to ibus socket path for ibus to look up its socket files
+# (see comments #3 and #6 on https://launchpad.net/bugs/1580463)
+IBUS_CONFIG_PATH="$XDG_CONFIG_HOME/ibus"
+ensure_dir_exists "$IBUS_CONFIG_PATH"
+[ -d "$IBUS_CONFIG_PATH/bus" ] && rm -rf "$IBUS_CONFIG_PATH/bus"
+ln -sfn "$REALHOME/.config/ibus/bus" "$IBUS_CONFIG_PATH"
+
+# Set libgweather path
+export LIBGWEATHER_LOCATIONS_PATH="$SNAP_DESKTOP_RUNTIME/usr/lib/$ARCH/libgweather-4/Locations.bin"
+
+# Set libthai dict path
+export LIBTHAI_DICTDIR="$SNAP_DESKTOP_RUNTIME/usr/share/libthai/"
+###################################
+# KDE NEON launcher specific part #
+###################################
+
+# Add paths for games
+append_dir PATH "$SNAP/usr/games"
+append_dir PATH "$SNAP_DESKTOP_RUNTIME/usr/games"
+
+# Qt Libs
+prepend_dir LD_LIBRARY_PATH "$SNAP_DESKTOP_RUNTIME/usr/lib/$ARCH/qt5/libs"
+
+# We use layout in snapcraft.yaml to overlay at5 directories, rather than env vars, as they don't seem to work for WebEngine
+# Add QT_PLUGIN_PATH (Qt Modules).
+#append_dir QT_PLUGIN_PATH "$SNAP/usr/lib/$ARCH/qt5/plugins"
+#append_dir QT_PLUGIN_PATH "$SNAP/usr/lib/$ARCH"
+#append_dir QT_PLUGIN_PATH "$SNAP_DESKTOP_RUNTIME/usr/lib/$ARCH/qt5/plugins"
+#append_dir QT_PLUGIN_PATH "$SNAP_DESKTOP_RUNTIME/usr/lib/$ARCH/"
+# And QML2_IMPORT_PATH (Qt Modules).
+#append_dir QML2_IMPORT_PATH "$SNAP/usr/lib/$ARCH/qt5/qml"
+#append_dir QML2_IMPORT_PATH "$SNAP/lib/$ARCH"
+#append_dir QML2_IMPORT_PATH "$SNAP_DESKTOP_RUNTIME/usr/lib/$ARCH/qt5/qml"
+#append_dir QML2_IMPORT_PATH "$SNAP_DESKTOP_RUNTIME/lib/$ARCH"
+
+# Fix locating the QtWebEngineProcess executable
+#export QTWEBENGINEPROCESS_PATH="$SNAP_DESKTOP_RUNTIME/usr/lib/$ARCH/qt5/libexec/QtWebEngineProcess"
+
+# Removes Qt warning: Could not find a location
+# of the system Compose files
+#export QTCOMPOSE="$SNAP_DESKTOP_RUNTIME/usr/share/X11/locale"
+#export QT_XKB_CONFIG_ROOT="/usr/share/X11/xkb"
+
+# KIO specific
+# Directly fork slaves.
+export KDE_FORK_SLAVES=1
+# Path to KIO slaves.
+#export KF5_LIBEXEC_DIR="$SNAP_DESKTOP_RUNTIME/usr/lib/$ARCH/libexec/kf5"
+
+# Add path to VLC plugins
+export VLC_PLUGIN_PATH="$SNAP_DESKTOP_RUNTIME/usr/lib/x86_64-linux-gnu/vlc/plugins"
+
+# Ensure QtChooser behaves.
+#export QTCHOOSER_NO_GLOBAL_DIR=1
+#export QT_SELECT=5
+# qtchooser hardcodes reference paths, we'll need to rewrite them properly
+#ensure_dir_exists "$XDG_CONFIG_HOME/qtchooser"
+#echo "$SNAP/usr/lib/qt5/bin" > "$XDG_CONFIG_HOME/qtchooser/5.conf"
+#echo "$SNAP/usr/lib/$ARCH" >> "$XDG_CONFIG_HOME/qtchooser/5.conf"
+#echo "$SNAP/usr/lib/qt5/bin" > "$XDG_CONFIG_HOME/qtchooser/default.conf"
+#echo "$SNAP/usr/lib/$ARCH" >> "$XDG_CONFIG_HOME/qtchooser/default.conf"
+
+# This relies on qtbase patch
+# 0001-let-qlibraryinfo-fall-back-to-locate-qt.conf-via-XDG.patch
+# to make QLibraryInfo look in XDG_* locations for qt.conf. The paths configured
+# here are applied to everything that uses QLibraryInfo as final fallback and
+# has no XDG_* fallback before that. Currently the most interesting offender
+# is QtWebEngine which will not work unless the Data path is correctly set.
+#cat << EOF > "$XDG_CONFIG_HOME/qt.conf"
+#[Paths]
+#Data = $SNAP_DESKTOP_RUNTIME/usr/share/qt5/
+#Translations = $SNAP_DESKTOP_RUNTIME/usr/share/qt5/translations
+#EOF
+
+if [ -e "$SNAP_DESKTOP_RUNTIME/usr/share/i18n" ]; then
+    export I18NPATH="$SNAP_DESKTOP_RUNTIME/usr/share/i18n"
+    locpath="$XDG_DATA_HOME/locale"
+    ensure_dir_exists "$locpath"
+    export LOCPATH="$locpath:/usr/lib/locale"
+    LC_ALL=C.UTF-8 async_exec "$SNAP/bin/locale-gen"
+fi
+###########################################################
+# Mark update and exec binary
+# This is not used with the gnome extension for
+# core22 and later, please see
+# https://github.com/snapcore/snapcraft-desktop-integration
+###########################################################
+
+# shellcheck disable=SC2154
+[ "$needs_update" = true ] && echo "SNAP_DESKTOP_LAST_REVISION=$SNAP_REVISION" > "$SNAP_USER_DATA/.last_revision"
+
+wait_for_async_execs
+
+if [ -n "$SNAP_DESKTOP_DEBUG" ]; then
+  echo "desktop-launch elapsed time: $(date +%s.%N --date="$START seconds ago")"
+  echo "Now running: exec $SNAP/usr/local/bin/sdrangel $@"
+fi
+
+# This doesn't appear to work - so we use layout in snapcraft.yaml
+#export QTWEBENGINE_RESOURCES_PATH=$SNAP/usr/share/qt5/resources
+#export QTWEBENGINE_LOCALES_PATH=$SNAP/usr/share/qt5/translations
+
+# Without this, we get:
+# Qt: Session management error: None of the authentication protocols specified are supported
+unset SESSION_MANAGER
+
+# Check we have USB access
+if ! snapctl is-connected raw-usb ; then
+    notify-send -u critical -a SDRangel "SDRangel does not have USB access." "To enable, run:\n\nsnap connect sdrangel:raw-usb"
+fi
+
+# Check we have SSE 4.2
+if ! cat /proc/cpuinfo | grep sse4_2 > /dev/null ; then
+    notify-send -u critical -a SDRangel "SSE 4.2 support not detected in your CPU." "SDRangel may crash."
+fi
+
+# Safe to enable soapy, as we only include soapy remote
+exec $SNAP/opt/install/sdrangel/bin/sdrangel --soapy "$@"

snap/snapcraft.yaml

@@ -1,68 +1,198 @@
+# Tested with snapcraft 8.0.4
+#
+# To install snapcraft on Ubuntu assuming snap is already installed:
+#
+#     sudo snap install snapcraft
+#
+# To build (in sdrangel directory):
+#
+#     snapcraft
+#
+# To install sdrangel local snap:
+#
+#     sudo snap install sdrangel_7.19.0_amd64.snap --dangerous
+#
+# Users appear to need to grant h/w access manually from command line with:
+#
+#     sudo snap connect sdrangel:raw-usb
+#     sudo snap connect sdrangel:hardware-observe
+#     sudo snap connect sdrangel:camera
+#     sudo snap connect sdrangel:alsa
+#     sudo snap connect sdrangel:audio-record
+#     sudo snap connect sdrangel:pulseaudio
+#     sudo snap connect sdrangel:joystick
+#     sudo snap connect sdrangel:removable-media
+#     sudo snap connect sdrangel:network-manager
+#     sudo snap connect sdrangel:location-observe   (This doesn't seem to be supported)
+#     sudo snap connect sdrangel:jack1
+#     sudo snap connect sdrangel:avahi-control
+#
+# To uninstall:
+#
+#     sudo snap remove sdrangel
+#
+# We can clean and build a specific package, and then open a shell after the build in the snap filesystem, with:
+#
+#     snapcraft clean uhd
+#     snapcraft stage uhd --shell-after
+#
+
 name: sdrangel
-version: 4.6.0
-summary: SDRangel + LimeSDR
-description: SDRangel is an Open Source Qt5 / OpenGL 3.0+ SDR and signal analyzer frontend to various hardware.
+base: core22
+type: app
+version: "7.19.0"
+summary: SDRangel
+description: SDRangel is an Open Source Qt5 / OpenGL 3.0+ SDR and signal analyzer frontend to various hardware. SSE 4.2 required.
 confinement: strict
 grade: stable
+license: GPL-3.0
+issues: https://github.com/f4exb/sdrangel/issues
+source-code: https://github.com/f4exb/sdrangel
+website: https://www.sdrangel.org/
+icon: cmake/cpack/sdrangel_icon.svg
 
 apps:
     sdrangel:
-        command: desktop-launch sdrangel
-        plugs: [network, network-bind, home, unity7, opengl, raw-usb]
-
-    LimeUtil:
-        command: LimeUtil
-        plugs: [network, network-bind, home, raw-usb]
+        command: bin/sdrangel_wrapper.sh
+        desktop: opt/install/sdrangel/share/applications/sdrangel.desktop
+        plugs:
+            - network
+            - network-bind
+            - network-manager
+            - desktop
+            - desktop-legacy
+            - wayland
+            - home
+            - unity7
+            - opengl
+            - raw-usb
+            - hardware-observe
+            - audio-playback
+            - audio-record
+            - joystick
+            - camera
+            - browser-support
+            - pulseaudio
+            - alsa
+            - jack1
+            - removable-media
+            - gsettings
+            - location-observe
+            - serial-port
+            - avahi-control
+        environment:
+            LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$SNAP/opt/install/sdrangel/lib/sdrangel:$SNAP/opt/install/sdrangel/lib:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/blas:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/lapack
+        # Can't currently use kde-neon, as it doesn't include Qt Charts, Gamepad or TextToSpeech
+        #extensions:
+        #    - kde-neon
 
     sdrangelsrv:
-        command: sdrangelsrv
-        plugs: [network, network-bind, home, raw-usb]
+        command: opt/install/sdrangel/bin/sdrangelsrv
+        plugs:
+            - network
+            - network-bind
+            - network-manager
+            - home
+            - raw-usb
+            - hardware-observe
+            - removable-media
+        environment:
+            LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$SNAP/opt/install/sdrangel/lib/sdrangel
 
-    sdrangelbench:
-        command: sdrangelbench
+
+layout:
+    /usr/lib/x86_64-linux-gnu/qt5:
+        bind: $SNAP/usr/lib/x86_64-linux-gnu/qt5
+    /usr/share/qt5:
+        bind: $SNAP/usr/share/qt5
 
 parts:
 
-    limesuite:
-        plugin: cmake
-        source: https://github.com/myriadrf/LimeSuite.git
-        source-commit: 025ffa1a
-        configflags:
-            - -DENABLE_QUICKTEST=OFF
-            - -DENABLE_GUI=OFF
-            - -DENABLE_SOAPY_LMS7=OFF
-            - -DENABLE_EXAMPLES=OFF
-            - -DENABLE_UTILITIES=OFF
-            - -DENABLE_HEADERS=ON
-            - -DENABLE_SIMD_FLAGS=SSE3
-        build-packages:
-            - libusb-1.0-0-dev
-        stage-packages:
-            - libstdc++6
+    iconpath:
+        after:
+            - sdrangel
+        plugin: nil
+        override-prime: |
+            sed -i.bak -e 's|Icon=sdrangel_icon|Icon=/opt/install/sdrangel/share/icons/hicolor/scalable/apps/sdrangel_icon.svg|g' $SNAPCRAFT_PRIME/opt/install/sdrangel/share/applications/sdrangel.desktop
+
+    cleanup:
+        after:
+            - sdrangel
+        plugin: nil
+        build-snaps:  # List all content-snaps and base snaps you're using here
+            - core22
+            #- kde-frameworks-5-102-qt-5-15-8-core22
+        override-prime: |
+            set -eux
+            for snap in "core22" ; do  # List all content-snaps and base snaps you're using here
+                cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$SNAPCRAFT_PRIME/{}" \;
+            done
+
+    launcher:
+        plugin: dump
+        source: snap/local
+        organize:
+            sdrangel_wrapper.sh: bin/
+            locale-gen: bin/
 
     sdrangel:
         plugin: cmake
         source: https://github.com/f4exb/sdrangel
         source-type: git
-        source-tag: v4.5.6
-        after: [desktop-qt5, limesuite, mbelib, serialdv, dsdcc, codec2, cm265cc, gcc7]
-        configflags:
-            - -DDEBUG_OUTPUT=ON
+        source-tag: v7.19.0
+        after: [apt, libdab, mbelib, serialdv, dsdcc, codec2, sgp4, cm265cc, libsigmf, airspy, rtlsdr, pluto, bladerf, hackrf, limesuite, airspyhf, uhd, uhdfpga, soapysdr, soapyremote]
+        cmake-parameters:
+            - -DDEBUG_OUTPUT=OFF
             - -DBUILD_TYPE=RELEASE
             - -DRX_SAMPLE_24BIT=ON
-            - -DCMAKE_CXX_COMPILER=/usr/bin/g++-7  #sdrangel fails to compile with with gcc5
+            - -DCMAKE_INSTALL_PREFIX=/opt/install/sdrangel
+            - -DMIRISDR_DIR=$SNAPCRAFT_STAGE/opt/install/sdrangel
+            - -DAIRSPY_DIR=$SNAPCRAFT_STAGE/opt/install/sdrangel
+            - -DAIRSPYHF_DIR=$SNAPCRAFT_STAGE/opt/install/sdrangel
+            - -DBLADERF_DIR=$SNAPCRAFT_STAGE/opt/install/sdrangel
+            - -DHACKRF_DIR=$SNAPCRAFT_STAGE/opt/install/sdrangel
+            - -DRTLSDR_DIR=$SNAPCRAFT_STAGE/opt/install/sdrangel
+            - -DLIMESUITE_DIR=$SNAPCRAFT_STAGE/opt/install/sdrangel
+            - -DIIO_DIR=$SNAPCRAFT_STAGE/opt/install/sdrangel
+            - -DPERSEUS_DIR=$SNAPCRAFT_STAGE/opt/install/sdrangel
+            - -DXTRX_DIR=$SNAPCRAFT_STAGE/opt/install/sdrangel
+            - -DSOAPYSDR_DIR=$SNAPCRAFT_STAGE/opt/install/sdrangel
+            - -DUHD_DIR=$SNAPCRAFT_STAGE/opt/install/sdrangel
+            - -DAPT_DIR=$SNAPCRAFT_STAGE/opt/install/sdrangel
+            - -DCM256CC_DIR=$SNAPCRAFT_STAGE/opt/install/sdrangel
+            - -DDSDCC_DIR=$SNAPCRAFT_STAGE/opt/install/sdrangel
+            - -DSERIALDV_DIR=$SNAPCRAFT_STAGE/opt/install/sdrangel
+            - -DMBE_DIR=$SNAPCRAFT_STAGE/opt/install/sdrangel
+            - -DCODEC2_DIR=$SNAPCRAFT_STAGE/opt/install/sdrangel
+            - -DSGP4_DIR=$SNAPCRAFT_STAGE/opt/install/sdrangel
+            - -DLIBSIGMF_DIR=$SNAPCRAFT_STAGE/opt/install/sdrangel
+            - -DDAB_DIR=$SNAPCRAFT_STAGE/opt/install/sdrangel
+            #- -DQt5_DIR=/usr/lib/x86_64-linux-gnu/cmake/Qt5
         build-packages:
             - libfftw3-dev
             - libusb-1.0-0-dev
             - libusb-dev
-            - qt5-default
+            - libhidapi-dev
             - qtbase5-dev
             - qtchooser
-            - libqt5multimedia5-plugins
             - qtmultimedia5-dev
+            - libqt5websockets5-dev
             - qttools5-dev
             - qttools5-dev-tools
             - libqt5opengl5-dev
+            - libqt5quick5
+            - libqt5serialport5-dev
+            - qtdeclarative5-dev
+            - qtpositioning5-dev
+            - qtlocation5-dev
+            - qtwebengine5-dev
+            - qtbase5-private-dev
+            - libqt5svg5-dev
+            - libqt5charts5-dev
+            - libqt5texttospeech5-dev
+            - libqt5gamepad5-dev
+            - libfaad-dev
+            - zlib1g-dev
             - libboost-all-dev
             - libasound2-dev
             - pulseaudio
@@ -74,60 +204,389 @@ parts:
             - libavcodec-dev
             - libavformat-dev
             - libopus-dev
+            - doxygen
+            - graphviz
+        stage-packages:
+            - libgl1-mesa-dri
+            - libgl1-mesa-glx
+            - libqt5core5a
+            - libqt5gui5
+            - libqt5network5
+            - libqt5widgets5
+            - libqt5multimedia5
+            - libqt5multimedia5-plugins
+            - libqt5positioning5
+            - libqt5positioning5-plugins
+            - libqt5location5
+            - libqt5location5-plugins
+            - libqt5location5-plugin-mapboxgl
+            - libqt5websockets5
+            - libqt5qml5
+            - libqt5quick5
+            - libqt5quickwidgets5
+            - libqt5printsupport5
+            - libqt5webchannel5
+            - libqt5webenginecore5
+            - libqt5webenginewidgets5
+            - libqt5serialport5
+            - libqt5charts5
+            - libqt5texttospeech5
+            - libqt5gamepad5
+            - libqt5dbus5
+            - libqt5sql5
+            - libqt5sql5-mysql
+            - libqt5sql5-sqlite
+            - libqt5svg5
+            - qml-module-qtlocation
+            - qml-module-qtpositioning
+            - qml-module-qtquick-window2
+            - qml-module-qtquick-dialogs
+            - qml-module-qtquick-controls
+            - qml-module-qtquick-controls2
+            - qml-module-qtquick-layouts
+            - libgraphite2-3
+            - libpcre2-16-0
+            - libicu70
+            - libxcb1
+            - libharfbuzz0b
+            - libx11-6
+            - libxau6
+            - libglx0
+            - libmd4c0
+            - libusb-1.0-0
+            - libfaad2
+            - libfftw3-single3
+            - libhidapi-libusb0
+            - libasyncns0
+            - libogg0
+            - libopus0
+            - libpulse0
+            - libsndfile1
+            - libvorbis0a
+            - libvorbisenc2
+            - ocl-icd-libopencl1
+            - libaom3
+            - libavcodec58
+            - libavformat58
+            - libavutil56
+            - libbluray2
+            - libcairo-gobject2
+            - libcairo2
+            - libchromaprint1
+            - libdatrie1
+            - libdav1d5
+            - libfribidi0
+            - libgme0
+            - libgomp1
+            - libgsm1
+            - libmfx1
+            - libmp3lame0
+            - libmpg123-0
+            - libnorm1
+            - libopenjp2-7
+            - libopenmpt0
+            - libpangoft2-1.0-0
+            - libpgm-5.3-0
+            - libpixman-1-0
+            - librabbitmq4
+            - librsvg2-2
+            - librsvg2-2
+            - libtheora0
+            - libswresample3
+            - libsrt1.4-gnutls
+            - libtwolame0
+            - libva-drm2
+            - libva-x11-2
+            - libva2
+            - libvdpau1
+            - libwebp7
+            - libswscale5
+            - libxcomposite1
+            - libxdamage1
+            - libxrandr2
+            - libxtst6
+            - libasound2
+            - libevent-2.1-7
+            - liblcms2-2
+            - libminizip1
+            - libnspr4
+            - libnss3
+            - libnspr4
+            - libnspr4
+            - libre2-9
+            - libwebpdemux2
+            - libxslt1.1
+            - libxdamage1
+            - libxrandr2
+            - libxtst6
+            - libminizip1
+            - libwebpdemux2
+            - libarmadillo10
+            - libhdf4-0-alt
+            - libgdal30
+            - libhdf4-0-alt
+            - libogdi4.1
+            - libilmbase25
+            - libopenexr25
+            - libaec0
+            - libarpack2
+            - libcfitsio9
+            - libcharls2
+            - libcurl3-gnutls
+            - libcurl4
+            - libdc1394-25
+            - libde265-0
+            - libdw1
+            - libexif12
+            - libfreexl1
+            - libfyba0
+            - libgdcm3.0
+            - libgeos3.10.2
+            - libgeos-c1v5
+            - libgeotiff5
+            - libgfortran5
+            - libgif7
+            - libgphoto2-6
+            - libgphoto2-port12
+            - libgstreamer-plugins-base1.0-0
+            - libgstreamer1.0-0
+            - libhdf5-103-1
+            - libhdf5-hl-100
+            - libheif1
+            - libkmlbase1
+            - libkmldom1
+            - libkmlengine1
+            - liblapack3
+            - libldap-2.5-0
+            - liblcms2-2
+            - libltdl7
+            - libminizip1
+            - libmysqlclient21
+            - libnetcdf19
+            - libnghttp2-14
+            - libodbcinst2
+            - libopencv-core4.5d
+            - libopencv-imgcodecs4.5d
+            - libopencv-imgproc4.5d
+            - libopencv-videoio4.5d
+            - libpoppler118
+            - libproj22
+            - libpq5
+            - libpsl5
+            - libqhull-r8.0
+            - libquadmath0
+            - libraw1394-11
+            - librtmp1
+            - librttopo1
+            - libsasl2-2
+            - libspatialite7
+            - libsuperlu5
+            - libswscale5
+            - libsz2
+            - libtbb2
+            - libunwind8
+            - liburiparser1
+            - libilmbase25
+            - libboost-chrono1.74.0
+            - libboost-filesystem1.74.0
+            - libboost-serialization1.74.0
+            - libboost-thread1.74.0
+            - libboost-program-options1.74.0
+            - libboost-test1.74.0
+            - libnotify-bin
 
-    gcc7:			#sdrangel fails to compile with with gcc5, install gcc7
-        plugin: nil
-        override-pull: |
-            sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-            sudo apt update
-            sudo apt install g++-7 -y
-        build-packages:
-            - software-properties-common
+    apt:
+        plugin: cmake
+        source: https://github.com/srcejon/aptdec.git
+        source-type: git
+        source-branch: libaptdec
+        cmake-parameters:
+            - -DCMAKE_INSTALL_PREFIX=/opt/install/sdrangel
+
+    libdab:
+        plugin: cmake
+        source: https://github.com/srcejon/dab-cmdline
+        source-type: git
+        source-branch: msvc
+        source-subdir: library
+        cmake-parameters:
+            - -DCMAKE_INSTALL_PREFIX=/opt/install/sdrangel
 
     mbelib:
         plugin: cmake
         source: https://github.com/szechyjs/mbelib.git
         source-type: git
-        source-commit: e2d84c1
+        source-commit: fe83b32c6a60cdd7bce8cecf3c7a0b9ec87a7667
+        cmake-parameters:
+            - -DCMAKE_INSTALL_PREFIX=/opt/install/sdrangel
 
     serialdv:
         plugin: cmake
         source: https://github.com/f4exb/serialDV.git
         source-type: git
-        source-commit: c58676a
-        configflags:
+        source-tag: v1.1.4
+        cmake-parameters:
             - -DCMAKE_CXX_FLAGS="-std=c++11"
+            - -DCMAKE_INSTALL_PREFIX=/opt/install/sdrangel
 
     dsdcc:
         plugin: cmake
         source: https://github.com/f4exb/dsdcc.git
         source-type: git
-        source-commit: 2a89df4
-        configflags:
+        source-tag: v1.9.5
+        after: [mbelib, serialdv]
+        cmake-parameters:
             - -DUSE_MBELIB=ON
             - -DCMAKE_CXX_FLAGS="-std=c++11"
+            - -DCMAKE_INSTALL_PREFIX=/usr
+            - -DLIBMBE_INCLUDE_DIR=$SNAPCRAFT_STAGE/opt/install/sdrangel/include
+            - -DLIBMBE_LIBRARY=$SNAPCRAFT_STAGE/opt/install/sdrangel/lib/libmbe.so
+            - -DLIBSERIALDV_INCLUDE_DIR=$SNAPCRAFT_STAGE/opt/install/sdrangel/include/serialdv
+            - -DLIBSERIALDV_LIBRARY=$SNAPCRAFT_STAGE/opt/install/sdrangel/lib/libserialdv.so
+
     codec2:
         plugin: cmake
-        source: https://svn.code.sf.net/p/freetel/code/codec2-dev
-        source-type: svn
-        source-commit: "4067"
+        source: https://github.com/drowe67/codec2-dev.git
+        source-type: git
+        source-tag: v1.0.3
         build-packages:
             - libspeexdsp-dev
             - libsamplerate0-dev
+        cmake-parameters:
+            - -DCMAKE_INSTALL_PREFIX=/opt/install/sdrangel
+
+    sgp4:
+        plugin: cmake
+        source: https://github.com/dnwrnr/sgp4.git
+        source-type: git
+        cmake-parameters:
+            - -DCMAKE_INSTALL_PREFIX=/opt/install/sdrangel
 
     cm265cc:
         plugin: cmake
         source: https://github.com/f4exb/cm256cc.git
         source-type: git
-        source-commit: 64beaaa
+        source-commit: c0e92b92aca3d1d36c990b642b937c64d363c559
+        cmake-parameters:
+            - -DCMAKE_INSTALL_PREFIX=/opt/install/sdrangel
 
+    libsigmf:
+        plugin: cmake
+        source: https://github.com/f4exb/libsigmf.git
+        source-type: git
+        source-branch: new-namespaces
+        cmake-parameters:
+            - -DCMAKE_INSTALL_PREFIX=/opt/install/sdrangel
 
+    airspy:
+        plugin: cmake
+        source: https://github.com/airspy/airspyone_host.git
+        source-type: git
+        source-commit: 37c768ce9997b32e7328eb48972a7fda0a1f8554
+        build-packages:
+            - libusb-1.0-0-dev
+        cmake-parameters:
+            - -DCMAKE_INSTALL_PREFIX=/opt/install/sdrangel
 
+    rtlsdr:
+        plugin: cmake
+        source: https://github.com/osmocom/rtl-sdr.git
+        source-type: git
+        source-commit: 420086af84d7eaaf98ff948cd11fea2cae71734a
+        build-packages:
+            - libusb-1.0-0-dev
+        cmake-parameters:
+            - -DCMAKE_INSTALL_PREFIX=/opt/install/sdrangel
 
+    pluto:
+        plugin: cmake
+        source: https://github.com/analogdevicesinc/libiio.git
+        source-type: git
+        source-tag: v0.21
+        cmake-parameters:
+            - -DCMAKE_INSTALL_PREFIX=/opt/install/sdrangel
 
+    bladerf:
+        plugin: cmake
+        source: https://github.com/Nuand/bladeRF.git
+        source-type: git
+        source-tag: 2021.02
+        build-packages:
+            - libusb-1.0-0-dev
+        cmake-parameters:
+            - -DCMAKE_INSTALL_PREFIX=/opt/install/sdrangel
 
+    hackrf:
+        plugin: cmake
+        source: https://github.com/greatscottgadgets/hackrf.git
+        source-type: git
+        source-tag: v2022.09.1
+        source-subdir: host/libhackrf
+        build-packages:
+            - libusb-1.0-0-dev
+        cmake-parameters:
+            - -DCMAKE_INSTALL_PREFIX=/opt/install/sdrangel
 
+    limesuite:
+        plugin: cmake
+        source: https://github.com/myriadrf/LimeSuite.git
+        source-commit: 70e3859a55d8d5353963a5318013c8454594769f
+        build-packages:
+            - libusb-1.0-0-dev
+        stage-packages:
+            - libstdc++6
+        cmake-parameters:
+            - -DCMAKE_INSTALL_PREFIX=/opt/install/sdrangel
 
+    airspyhf:
+        plugin: cmake
+        source: https://github.com/airspy/airspyhf.git
+        source-type: git
+        source-commit: 1af81c0ca18944b8c9897c3c98dc0a991815b686
+        build-packages:
+            - libusb-1.0-0-dev
+        cmake-parameters:
+            - -DCMAKE_INSTALL_PREFIX=/opt/install/sdrangel
 
+    uhd:
+        plugin: cmake
+        source: https://github.com/EttusResearch/uhd.git
+        source-type: git
+        source-commit: v4.5.0.0
+        source-subdir: host
+        build-packages:
+            - libusb-1.0-0-dev
+            - libboost-all-dev
+            - python3-mako
+        cmake-parameters:
+            - -DCMAKE_INSTALL_PREFIX=/opt/install/sdrangel
 
+    uhdfpga:
+        after: [uhd]
+        plugin: nil
+        override-build:
+            pip install requests
+        override-prime: # We only include b2* firmware to keep size down
+            $SNAPCRAFT_STAGE/opt/install/sdrangel/lib/uhd/utils/uhd_images_downloader.py -i $SNAPCRAFT_PRIME/opt/install/sdrangel/share/uhd/images -t b2
+
+    soapysdr:
+        plugin: cmake
+        source: https://github.com/pothosware/SoapySDR.git
+        source-type: git
+        source-tag: soapy-sdr-0.7.1
+        cmake-parameters:
+            - -DCMAKE_INSTALL_PREFIX=/opt/install/sdrangel
+
+    soapyremote:
+        plugin: cmake
+        source: https://github.com/pothosware/SoapyRemote.git
+        source-type: git
+        source-tag: soapy-remote-0.5.1
+        after: [soapysdr]
+        build-packages:
+            - libavahi-client-dev
+            - libavahi-core-dev
+        cmake-parameters:
+            - -DCMAKE_INSTALL_PREFIX=/opt/install/sdrangel
+            - -DCMAKE_PREFIX_PATH=$SNAPCRAFT_STAGE/opt/install/sdrangel