Merge pull request #1814 from srcejon/psk31_mod

Add PSK31 modulator
f4exb · Sep 7, 2023 · ffbb26c · ffbb26c
2 parents 428c4a3 + 9b4d5fc
commit ffbb26c
Show file tree

Hide file tree

Showing 58 changed files with 7,009 additions and 133 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -108,6 +108,7 @@ option(ENABLE_CHANNELTX_MOD802.15.4 "Enable channeltx mod802.15.4 plugin" ON)
 option(ENABLE_CHANNELTX_REMOTESOURCE "Enable channeltx remotesource plugin" ON)
 option(ENABLE_CHANNELTX_FILESOURCE "Enable channeltx filesource plugin" ON)
 option(ENABLE_CHANNELTX_MODRTTY "Enable channeltx modrtty plugin" ON)
+option(ENABLE_CHANNELTX_MODPSK31 "Enable channeltx modpsk31 plugin" ON)
 
 # Channel MIMO enablers
 option(ENABLE_CHANNELMIMO "Enable channelmimo plugins" ON)

diff --git a/doc/img/PSK31Mod_plugin.png b/doc/img/PSK31Mod_plugin.png
diff --git a/plugins/channelrx/demodrtty/rttydemodgui.cpp b/plugins/channelrx/demodrtty/rttydemodgui.cpp
@@ -307,12 +307,19 @@ void RttyDemodGUI::on_spaceHigh_clicked(bool checked)
     m_settings.m_spaceHigh = checked;
     if (checked) {
         ui->spaceHigh->setText("M-S");
-    } else {
+    }
+    else {
         ui->spaceHigh->setText("S-M");
     }
     applySettings();
 }
 
+void RttyDemodGUI::on_unshiftOnSpace_clicked(bool checked)
+{
+    m_settings.m_unshiftOnSpace = checked;
+    applySettings();
+}
+
 void RttyDemodGUI::on_clearTable_clicked()
 {
     ui->text->clear();
@@ -571,6 +578,7 @@ void RttyDemodGUI::displaySettings()
     } else {
         ui->spaceHigh->setText("S-M");
     }
+    ui->unshiftOnSpace->setChecked(m_settings.m_unshiftOnSpace);
 
     updateIndexLabel();
 
@@ -657,6 +665,7 @@ void RttyDemodGUI::makeUIConnections()
     QObject::connect(ui->atc, &QCheckBox::clicked, this, &RttyDemodGUI::on_atc_clicked);
     QObject::connect(ui->endian, &QCheckBox::clicked, this, &RttyDemodGUI::on_endian_clicked);
     QObject::connect(ui->spaceHigh, &QCheckBox::clicked, this, &RttyDemodGUI::on_spaceHigh_clicked);
+    QObject::connect(ui->unshiftOnSpace, &QCheckBox::clicked, this, &RttyDemodGUI::on_unshiftOnSpace_clicked);
     QObject::connect(ui->clearTable, &QPushButton::clicked, this, &RttyDemodGUI::on_clearTable_clicked);
     QObject::connect(ui->udpEnabled, &QCheckBox::clicked, this, &RttyDemodGUI::on_udpEnabled_clicked);
     QObject::connect(ui->udpAddress, &QLineEdit::editingFinished, this, &RttyDemodGUI::on_udpAddress_editingFinished);

diff --git a/plugins/channelrx/demodrtty/rttydemodgui.h b/plugins/channelrx/demodrtty/rttydemodgui.h
@@ -112,6 +112,7 @@ private slots:
     void on_atc_clicked(bool checked);
     void on_endian_clicked(bool checked);
     void on_spaceHigh_clicked(bool checked);
+    void on_unshiftOnSpace_clicked(bool checked);
     void on_clearTable_clicked();
     void on_udpEnabled_clicked(bool checked);
     void on_udpAddress_editingFinished();

diff --git a/plugins/channelrx/demodrtty/rttydemodsettings.cpp b/plugins/channelrx/demodrtty/rttydemodsettings.cpp
@@ -42,6 +42,7 @@ void RttyDemodSettings::resetToDefaults()
     m_udpPort = 9999;
     m_characterSet = Baudot::ITA2;
     m_suppressCRLF = false;
+    m_unshiftOnSpace = false;
     m_filter = LOWPASS;
     m_atc = true;
     m_msbFirst = false;

diff --git a/plugins/channeltx/CMakeLists.txt b/plugins/channeltx/CMakeLists.txt
@@ -1,5 +1,9 @@
 project(mod)
 
+if (ENABLE_CHANNELTX_MODPSK31)
+    add_subdirectory(modpsk31)
+endif()
+
 if (ENABLE_CHANNELTX_MODRTTY)
     add_subdirectory(modrtty)
 endif()

diff --git a/plugins/channeltx/modpsk31/CMakeLists.txt b/plugins/channeltx/modpsk31/CMakeLists.txt
@@ -0,0 +1,69 @@
+project(modpsk31)
+
+set(modpsk31_SOURCES
+    psk31mod.cpp
+    psk31modbaseband.cpp
+    psk31modsource.cpp
+    psk31modplugin.cpp
+    psk31modsettings.cpp
+    psk31modwebapiadapter.cpp
+)
+
+set(modpsk31_HEADERS
+    psk31mod.h
+    psk31modbaseband.h
+    psk31modsource.h
+    psk31modplugin.h
+    psk31modsettings.h
+    psk31modwebapiadapter.h
+)
+
+include_directories(
+    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
+)
+
+if(NOT SERVER_MODE)
+    set(modpsk31_SOURCES
+        ${modpsk31_SOURCES}
+        psk31modgui.cpp
+        psk31modgui.ui
+        psk31modrepeatdialog.cpp
+        psk31modrepeatdialog.ui
+        psk31modtxsettingsdialog.cpp
+        psk31modtxsettingsdialog.ui
+    )
+    set(modpsk31_HEADERS
+        ${modpsk31_HEADERS}
+        psk31modgui.h
+        psk31modrepeatdialog.h
+        psk31modtxsettingsdialog.h
+    )
+    set(TARGET_NAME modpsk31)
+    set(TARGET_LIB "Qt::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
+else()
+    set(TARGET_NAME modpsk31srv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
+endif()
+
+add_library(${TARGET_NAME} SHARED
+    ${modpsk31_SOURCES}
+)
+
+target_link_libraries(${TARGET_NAME}
+    Qt::Core
+    ${TARGET_LIB}
+    sdrbase
+    ${TARGET_LIB_GUI}
+    swagger
+)
+
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_FOLDER})
+
+# Install debug symbols
+if (WIN32)
+    install(FILES $<TARGET_PDB_FILE:${TARGET_NAME}> CONFIGURATIONS Debug RelWithDebInfo DESTINATION ${INSTALL_FOLDER} )
+endif()