Merge pull request #2605 from srcejon/inmarsat

f4exb · web-flow · commit 5706cfd61504 · 2026-01-14T16:21:47.000+01:00
Fix Inmarsat on Mac
diff --git a/doc/img/InmarsatDemod_plugin.png b/doc/img/InmarsatDemod_plugin.png
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -322,11 +322,19 @@ if (NOT FAAD_FOUND AND NOT USE_PRECOMPILED_LIBS)
 endif (NOT FAAD_FOUND AND NOT USE_PRECOMPILED_LIBS)
 
 if (NOT FFTW3F_FOUND AND NOT USE_PRECOMPILED_LIBS)
+    if (WIN32)
+        set(FFTW3F_LIBRARIES "${SDRANGEL_BINARY_LIB_DIR}/libfftw3f.lib" CACHE INTERNAL "")
+    elseif (LINUX)
+        set(FFTW3F_LIBRARIES "${EXTERNAL_BUILD_LIBRARIES}/lib${LIB_SUFFIX}/libfftw3f${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "")
+    elseif (APPLE)
+        set(FFTW3F_LIBRARIES "${EXTERNAL_BUILD_LIBRARIES}/fftw3f/src/fftw3f-build/.libs/libfftw3f.a" CACHE INTERNAL "")
+    endif ()
     ExternalProject_Add(fftw3f
             URL http://fftw.org/fftw-3.3.10.tar.gz
             PREFIX "${EXTERNAL_BUILD_LIBRARIES}/fftw3f"
             CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --enable-float
             BUILD_COMMAND ${MAKE}
+            BUILD_BYPRODUCTS "${FFTW3F_LIBRARIES}"
             INSTALL_COMMAND ""
             TEST_COMMAND ""
             )
@@ -335,13 +343,6 @@ if (NOT FFTW3F_FOUND AND NOT USE_PRECOMPILED_LIBS)
     set_global_cache(FFTW3F_FOUND ON)
     set(FFTW3F_EXTERNAL ON CACHE INTERNAL "")
     set(FFTW3F_INCLUDE_DIRS "${source_dir}/api" "${binary_dir}" CACHE INTERNAL "")
-    if (WIN32)
-        set(FFTW3F_LIBRARIES "${SDRANGEL_BINARY_LIB_DIR}/libfftw3f.lib" CACHE INTERNAL "")
-    elseif (LINUX)
-        set(FFTW3F_LIBRARIES "${EXTERNAL_BUILD_LIBRARIES}/lib${LIB_SUFFIX}/libfftw3f${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "")
-    elseif (APPLE)
-        set(FFTW3F_LIBRARIES "${binary_dir}/.libs/libfftw3f.a" CACHE INTERNAL "")
-    endif ()
 endif (NOT FFTW3F_FOUND AND NOT USE_PRECOMPILED_LIBS)
 
 # Can't build Boost using ExternalProject_Add, as we want to use find_package(Boost) as it defines many variables,
@@ -964,7 +965,7 @@ if(ENABLE_CHANNELRX_DEMODINMARSAT)
     elseif (APPLE)
         install(DIRECTORY "${binary_dir}" DESTINATION "${INSTALL_LIB_DIR}"
                 FILES_MATCHING PATTERN "libinmarsatc*${CMAKE_SHARED_LIBRARY_SUFFIX}")
-        set(MACOS_EXTERNAL_LIBS_FIXUP "${MACOS_EXTERNAL_LIBS_FIXUP};${binary_dir}/src")
+        set(MACOS_EXTERNAL_LIBS_FIXUP "${MACOS_EXTERNAL_LIBS_FIXUP};${binary_dir}")
     endif ()
 endif()
 
diff --git a/plugins/channelrx/demodinmarsat/CMakeLists.txt b/plugins/channelrx/demodinmarsat/CMakeLists.txt
@@ -55,6 +55,10 @@ if(NOT BUILD_SHARED_LIBS)
     set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
 endif()
 
+if(DEFINED INMARSATC_DEPENDS)
+    add_dependencies(${TARGET_NAME} ${INMARSATC_DEPENDS})
+endif()
+
 target_link_libraries(${TARGET_NAME} PRIVATE
     Qt::Core
     ${TARGET_LIB}
diff --git a/plugins/channelrx/demodinmarsat/inmarsatdemod.cpp b/plugins/channelrx/demodinmarsat/inmarsatdemod.cpp
@@ -143,15 +143,15 @@ bool InmarsatDemod::handleMessage(const Message& cmd)
 {
     if (MsgConfigureInmarsatDemod::match(cmd))
     {
-        MsgConfigureInmarsatDemod& cfg = (MsgConfigureInmarsatDemod&) cmd;
+        const MsgConfigureInmarsatDemod& cfg = (const MsgConfigureInmarsatDemod&) cmd;
         qDebug() << "InmarsatDemod::handleMessage: MsgConfigureInmarsatDemod";
         applySettings(cfg.getSettings(), cfg.getSettingsKeys(), cfg.getForce());
 
         return true;
     }
     else if (DSPSignalNotification::match(cmd))
     {
-        DSPSignalNotification& notif = (DSPSignalNotification&) cmd;
+        const DSPSignalNotification& notif = (const DSPSignalNotification&) cmd;
         m_basebandSampleRate = notif.getSampleRate();
         m_centerFrequency = notif.getCenterFrequency();
         // Forward to the sink
@@ -168,7 +168,7 @@ bool InmarsatDemod::handleMessage(const Message& cmd)
     else if (MainCore::MsgPacket::match(cmd))
     {
         // Forward to GUI
-        MainCore::MsgPacket& report = (MainCore::MsgPacket&)cmd;
+        const MainCore::MsgPacket& report = (const MainCore::MsgPacket&)cmd;
         if (getMessageQueueToGUI())
         {
             MainCore::MsgPacket *msg = new MainCore::MsgPacket(report);
diff --git a/plugins/channelrx/demodinmarsat/inmarsatdemod.h b/plugins/channelrx/demodinmarsat/inmarsatdemod.h
@@ -68,7 +68,7 @@ class InmarsatDemod : public BasebandSampleSink, public ChannelAPI {
         { }
     };
 
-    InmarsatDemod(DeviceAPI *deviceAPI);
+    explicit InmarsatDemod(DeviceAPI *deviceAPI);
     virtual ~InmarsatDemod();
     virtual void destroy() { delete this; }
     virtual void setDeviceAPI(DeviceAPI *deviceAPI);
diff --git a/plugins/channelrx/demodinmarsat/inmarsatdemodbaseband.h b/plugins/channelrx/demodinmarsat/inmarsatdemodbaseband.h
@@ -64,7 +64,7 @@ class InmarsatDemodBaseband : public QObject
         { }
     };
 
-    InmarsatDemodBaseband(InmarsatDemod *packetDemod);
+    explicit InmarsatDemodBaseband(InmarsatDemod *packetDemod);
     ~InmarsatDemodBaseband();
     void reset();
     void startWork();
diff --git a/plugins/channelrx/demodinmarsat/inmarsatdemodgui.cpp b/plugins/channelrx/demodinmarsat/inmarsatdemodgui.cpp
@@ -45,7 +45,7 @@
 
 #include "inmarsatdemod.h"
 
-MultipartMessage::MultipartMessage(int id, std::map<std::string, std::string> params, const QDateTime& dateTime) :
+MultipartMessage::MultipartMessage(int id, std::map<std::string, std::string>& params, const QDateTime& dateTime) :
     m_id(id),
     m_icon(nullptr),
     m_latitude(0.0f),
@@ -54,7 +54,7 @@ MultipartMessage::MultipartMessage(int id, std::map<std::string, std::string> pa
     update(params, dateTime);
 }
 
-void MultipartMessage::update(std::map<std::string, std::string> params, const QDateTime& dateTime)
+void MultipartMessage::update(std::map<std::string, std::string>& params, const QDateTime& dateTime)
 {
     m_dateTime = dateTime;
     m_service = QString::fromStdString(params["serviceCodeAndAddressName"]);
@@ -1324,7 +1324,7 @@ void InmarsatDemodGUI::handleInputMessages()
 {
     Message* message;
 
-    while ((message = getInputMessageQueue()->pop()) != 0)
+    while ((message = getInputMessageQueue()->pop()) != nullptr)
     {
         if (handleMessage(*message))
         {
diff --git a/plugins/channelrx/demodinmarsat/inmarsatdemodgui.h b/plugins/channelrx/demodinmarsat/inmarsatdemodgui.h
@@ -62,8 +62,8 @@ struct MessagePart {
 class MultipartMessage {
 public:
 
-    MultipartMessage(int id, std::map<std::string, std::string> params, const QDateTime& dateTime);
-    void update(std::map<std::string, std::string> params, const QDateTime& dateTime);
+    explicit MultipartMessage(int id, std::map<std::string, std::string>& params, const QDateTime& dateTime);
+    void update(std::map<std::string, std::string>& params, const QDateTime& dateTime);
     void addPart(const MessagePart& part);
     QString getMessage() const;
     int getParts() const { return m_parts.size(); }
@@ -157,7 +157,7 @@ public slots:
     QRegularExpression m_typeRE;
     QRegularExpression m_messageRE;
 
-    explicit InmarsatDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* parent = 0);
+    explicit InmarsatDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* parent = nullptr);
     virtual ~InmarsatDemodGUI();
 
     void blockApplySettings(bool block);
diff --git a/plugins/channelrx/demodinmarsat/inmarsatdemodplugin.cpp b/plugins/channelrx/demodinmarsat/inmarsatdemodplugin.cpp
@@ -79,7 +79,7 @@ ChannelGUI* InmarsatDemodPlugin::createRxChannelGUI(
 {
     (void) deviceUISet;
     (void) rxChannel;
-    return 0;
+    return nullptr;
 }
 #else
 ChannelGUI* InmarsatDemodPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const
diff --git a/plugins/channelrx/demodinmarsat/inmarsatdemodsettings.cpp b/plugins/channelrx/demodinmarsat/inmarsatdemodsettings.cpp
@@ -41,14 +41,14 @@ void InmarsatDemodSettings::appendDefaultColumnSettings()
     appendDefaultColumnSizes(m_messagesColumnSizes, INMARSATDEMOD_MESSAGES_COLUMNS);
 }
 
-void InmarsatDemodSettings::appendDefaultColumnIndexes(QList<int>& list, int size)
+void InmarsatDemodSettings::appendDefaultColumnIndexes(QList<int>& list, int size) const
 {
     while (list.size() < size) {
         list.append(list.size());
     }
 }
 
-void InmarsatDemodSettings::appendDefaultColumnSizes(QList<int>& list, int size)
+void InmarsatDemodSettings::appendDefaultColumnSizes(QList<int>& list, int size) const
 {
     while (list.size() < size) {
         list.append(-1);
diff --git a/plugins/channelrx/demodinmarsat/inmarsatdemodsettings.h b/plugins/channelrx/demodinmarsat/inmarsatdemodsettings.h
@@ -86,8 +86,8 @@ struct InmarsatDemodSettings
     void applySettings(const QStringList& settingsKeys, const InmarsatDemodSettings& settings);
     QString getDebugString(const QStringList& settingsKeys, bool force = false) const;
     void appendDefaultColumnSettings();
-    void appendDefaultColumnIndexes(QList<int>& list, int size);
-    void appendDefaultColumnSizes(QList<int>& list, int size);
+    void appendDefaultColumnIndexes(QList<int>& list, int size) const;
+    void appendDefaultColumnSizes(QList<int>& list, int size) const;
 };
 
 #endif /* INCLUDE_INMARSATDEMODSETTINGS_H */
diff --git a/plugins/channelrx/demodinmarsat/inmarsatdemodsink.h b/plugins/channelrx/demodinmarsat/inmarsatdemodsink.h
@@ -42,7 +42,7 @@ class ScopeVis;
 // Automatic Gain Control
 class AGC {
 public:
-    AGC();
+    explicit AGC();
     Complex processOneSample(const Complex &iq, bool locked);
     Real getGain() const { return m_gain; }
     Real getAverage() const { return m_agcMovingAverage.instantAverage(); }
@@ -54,7 +54,7 @@ class AGC {
 
 class FrequencyOffsetEstimate {
 public:
-    FrequencyOffsetEstimate();
+    explicit FrequencyOffsetEstimate();
     ~FrequencyOffsetEstimate();
     void processOneSample(Complex& iq, bool locked);
     Real getFreqHz() const { return m_freqOffsetHz; }
@@ -81,7 +81,7 @@ class FrequencyOffsetEstimate {
 // Circular symbol/bit buffer for unique word detection, EVM calculation and equalizer training
 class SymbolBuffer {
 public:
-    SymbolBuffer(int size=64*162);
+    explicit SymbolBuffer(int size=64*162);
     void push(quint8 bit, Complex symbol);
     bool checkUW() const;
     Complex getSymbol(int idx) const;
@@ -98,7 +98,7 @@ class SymbolBuffer {
 
 class Equalizer {
 public:
-    Equalizer(int samplesPerSymbol);
+    explicit Equalizer(int samplesPerSymbol);
     virtual ~Equalizer() {}
     virtual Complex processOneSample(Complex x, bool update, bool training=false) = 0;
     Complex getError() const { return m_error; }
@@ -114,14 +114,14 @@ class Equalizer {
 // Constant Modulus Equalizer
 class CMAEqualizer : public Equalizer {
 public:
-    CMAEqualizer(int samplesPerSymbol);
+    explicit CMAEqualizer(int samplesPerSymbol);
     Complex processOneSample(Complex x, bool update, bool training=false) override;
 };
 
 // Least Mean Square Equalizer
 class LMSEqualizer : public Equalizer {
 public:
-    LMSEqualizer(int samplesPerSymbol);
+    explicit LMSEqualizer(int samplesPerSymbol);
     Complex processOneSample(Complex x, bool update, bool training=false) override;
 };
 
diff --git a/plugins/channelrx/demodinmarsat/readme.md b/plugins/channelrx/demodinmarsat/readme.md
@@ -121,3 +121,8 @@ Right click on the table headers to select which columns are visible. Columns ca
 
 Right clicking on a cell in the table will show a context menu, allowing the contents to be copied.
 If the message contains coordinates, an option to find that location on the [Map Feature](../../feature/map/readme.md) will be shown.
+
+<h3>Waveforms</h3>
+
+The Waveforms rollup has a scope that can display various signals within the demodulator.
+To see a constellation diagram for the recevied symbols, set the X & Y traces to IQ Derot Real & Imag, and Display to XY trace.
diff --git a/wdsp/CMakeLists.txt b/wdsp/CMakeLists.txt
@@ -152,6 +152,10 @@ target_link_libraries(wdsp
     Qt::Core
 )
 
+if(DEFINED FFTW3F_DEPENDS)
+    add_dependencies(wdsp ${FFTW3F_DEPENDS})
+endif()
+
 set_target_properties(wdsp PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS true)
 if (MSVC)
     set_target_properties(wdsp PROPERTIES INTERPROCEDURAL_OPTIMIZATION false)

Original file line number	Diff line number	Diff line change
`@@ -143,15 +143,15 @@ bool InmarsatDemod::handleMessage(const Message& cmd)`
`143`	`143`	`{`
`144`	`144`	`if (MsgConfigureInmarsatDemod::match(cmd))`
`145`	`145`	`{`
`146`		`- MsgConfigureInmarsatDemod& cfg = (MsgConfigureInmarsatDemod&) cmd;`
	`146`	`+ const MsgConfigureInmarsatDemod& cfg = (const MsgConfigureInmarsatDemod&) cmd;`
`147`	`147`	`qDebug() << "InmarsatDemod::handleMessage: MsgConfigureInmarsatDemod";`
`148`	`148`	`applySettings(cfg.getSettings(), cfg.getSettingsKeys(), cfg.getForce());`
`149`	`149`
`150`	`150`	`return true;`
`151`	`151`	`}`
`152`	`152`	`else if (DSPSignalNotification::match(cmd))`
`153`	`153`	`{`
`154`		`- DSPSignalNotification& notif = (DSPSignalNotification&) cmd;`
	`154`	`+ const DSPSignalNotification& notif = (const DSPSignalNotification&) cmd;`
`155`	`155`	`m_basebandSampleRate = notif.getSampleRate();`
`156`	`156`	`m_centerFrequency = notif.getCenterFrequency();`
`157`	`157`	`// Forward to the sink`
`@@ -168,7 +168,7 @@ bool InmarsatDemod::handleMessage(const Message& cmd)`
`168`	`168`	`else if (MainCore::MsgPacket::match(cmd))`
`169`	`169`	`{`
`170`	`170`	`// Forward to GUI`
`171`		`- MainCore::MsgPacket& report = (MainCore::MsgPacket&)cmd;`
	`171`	`+ const MainCore::MsgPacket& report = (const MainCore::MsgPacket&)cmd;`
`172`	`172`	`if (getMessageQueueToGUI())`
`173`	`173`	`{`
`174`	`174`	`MainCore::MsgPacket *msg = new MainCore::MsgPacket(report);`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@`
`45`	`45`
`46`	`46`	`#include "inmarsatdemod.h"`
`47`	`47`
`48`		`-MultipartMessage::MultipartMessage(int id, std::map<std::string, std::string> params, const QDateTime& dateTime) :`
	`48`	`+MultipartMessage::MultipartMessage(int id, std::map<std::string, std::string>& params, const QDateTime& dateTime) :`
`49`	`49`	`m_id(id),`
`50`	`50`	`m_icon(nullptr),`
`51`	`51`	`m_latitude(0.0f),`
`@@ -54,7 +54,7 @@ MultipartMessage::MultipartMessage(int id, std::map<std::string, std::string> pa`
`54`	`54`	`update(params, dateTime);`
`55`	`55`	`}`
`56`	`56`
`57`		`-void MultipartMessage::update(std::map<std::string, std::string> params, const QDateTime& dateTime)`
	`57`	`+void MultipartMessage::update(std::map<std::string, std::string>& params, const QDateTime& dateTime)`
`58`	`58`	`{`
`59`	`59`	`m_dateTime = dateTime;`
`60`	`60`	`m_service = QString::fromStdString(params["serviceCodeAndAddressName"]);`
`@@ -1324,7 +1324,7 @@ void InmarsatDemodGUI::handleInputMessages()`
`1324`	`1324`	`{`
`1325`	`1325`	`Message* message;`
`1326`	`1326`
`1327`		`- while ((message = getInputMessageQueue()->pop()) != 0)`
	`1327`	`+ while ((message = getInputMessageQueue()->pop()) != nullptr)`
`1328`	`1328`	`{`
`1329`	`1329`	`if (handleMessage(*message))`
`1330`	`1330`	`{`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ ChannelGUI* InmarsatDemodPlugin::createRxChannelGUI(`
`79`	`79`	`{`
`80`	`80`	`(void) deviceUISet;`
`81`	`81`	`(void) rxChannel;`
`82`		`- return 0;`
	`82`	`+ return nullptr;`
`83`	`83`	`}`
`84`	`84`	`#else`
`85`	`85`	`ChannelGUI* InmarsatDemodPlugin::createRxChannelGUI(DeviceUISet deviceUISet, BasebandSampleSink rxChannel) const`
Original file line number	Diff line number	Diff line change
`@@ -41,14 +41,14 @@ void InmarsatDemodSettings::appendDefaultColumnSettings()`
`41`	`41`	`appendDefaultColumnSizes(m_messagesColumnSizes, INMARSATDEMOD_MESSAGES_COLUMNS);`
`42`	`42`	`}`
`43`	`43`
`44`		`-void InmarsatDemodSettings::appendDefaultColumnIndexes(QList<int>& list, int size)`
	`44`	`+void InmarsatDemodSettings::appendDefaultColumnIndexes(QList<int>& list, int size) const`
`45`	`45`	`{`
`46`	`46`	`while (list.size() < size) {`
`47`	`47`	`list.append(list.size());`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
`51`		`-void InmarsatDemodSettings::appendDefaultColumnSizes(QList<int>& list, int size)`
	`51`	`+void InmarsatDemodSettings::appendDefaultColumnSizes(QList<int>& list, int size) const`
`52`	`52`	`{`
`53`	`53`	`while (list.size() < size) {`
`54`	`54`	`list.append(-1);`