diff --git a/plugins/channeltx/filesource/filesource.cpp b/plugins/channeltx/filesource/filesource.cpp
index 9f2c1d70d..b446dc2b8 100644
--- a/plugins/channeltx/filesource/filesource.cpp
+++ b/plugins/channeltx/filesource/filesource.cpp
@@ -34,6 +34,7 @@
 #include "dsp/hbfilterchainconverter.h"
 #include "dsp/filerecord.h"
 #include "feature/feature.h"
+#include "settings/serializable.h"
 #include "util/db.h"
 #include "maincore.h"
 
@@ -373,6 +374,9 @@ void FileSource::webapiUpdateChannelSettings(
     if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
         settings.m_reverseAPIChannelIndex = response.getFileSourceSettings()->getReverseApiChannelIndex();
     }
+    if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
+        settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getFileSourceSettings()->getChannelMarker());
+    }
 }
 
 int FileSource::webapiReportGet(
@@ -463,6 +467,20 @@ void FileSource::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& re
     response.getFileSourceSettings()->setReverseApiPort(settings.m_reverseAPIPort);
     response.getFileSourceSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
     response.getFileSourceSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
+
+    if (settings.m_channelMarker)
+    {
+        if (response.getFileSourceSettings()->getChannelMarker())
+        {
+            settings.m_channelMarker->formatTo(response.getFileSourceSettings()->getChannelMarker());
+        }
+        else
+        {
+            SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
+            settings.m_channelMarker->formatTo(swgChannelMarker);
+            response.getFileSourceSettings()->setChannelMarker(swgChannelMarker);
+        }
+    }
 }
 
 void FileSource::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
@@ -584,6 +602,13 @@ void FileSource::webapiFormatChannelSettings(
     if (channelSettingsKeys.contains("streamIndex") || force) {
         swgFileSourceSettings->setStreamIndex(settings.m_streamIndex);
     }
+
+    if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
+    {
+        SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
+        settings.m_channelMarker->formatTo(swgChannelMarker);
+        swgFileSourceSettings->setChannelMarker(swgChannelMarker);
+    }
 }
 
 void FileSource::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/channeltx/filesource/filesourcegui.cpp b/plugins/channeltx/filesource/filesourcegui.cpp
index d738db3e6..fdffc867a 100644
--- a/plugins/channeltx/filesource/filesourcegui.cpp
+++ b/plugins/channeltx/filesource/filesourcegui.cpp
@@ -82,6 +82,7 @@ bool FileSourceGUI::handleMessage(const Message& message)
         const FileSource::MsgConfigureFileSource& cfg = (FileSource::MsgConfigureFileSource&) message;
         m_settings = cfg.getSettings();
         blockApplySettings(true);
+        m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
         displaySettings();
         blockApplySettings(false);
         return true;
diff --git a/plugins/channeltx/localsource/localsource.cpp b/plugins/channeltx/localsource/localsource.cpp
index cebf07dad..c89b0cddd 100644
--- a/plugins/channeltx/localsource/localsource.cpp
+++ b/plugins/channeltx/localsource/localsource.cpp
@@ -32,6 +32,7 @@
 #include "dsp/hbfilterchainconverter.h"
 #include "device/deviceapi.h"
 #include "feature/feature.h"
+#include "settings/serializable.h"
 #include "maincore.h"
 
 #include "localsourcebaseband.h"
@@ -414,6 +415,9 @@ void LocalSource::webapiUpdateChannelSettings(
     if (channelSettingsKeys.contains("streamIndex")) {
         settings.m_streamIndex = response.getLocalSourceSettings()->getStreamIndex();
     }
+    if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
+        settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getLocalSourceSettings()->getChannelMarker());
+    }
 }
 
 void LocalSource::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const LocalSourceSettings& settings)
@@ -441,6 +445,20 @@ void LocalSource::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& r
     response.getLocalSourceSettings()->setReverseApiPort(settings.m_reverseAPIPort);
     response.getLocalSourceSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
     response.getLocalSourceSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
+
+    if (settings.m_channelMarker)
+    {
+        if (response.getLocalSourceSettings()->getChannelMarker())
+        {
+            settings.m_channelMarker->formatTo(response.getLocalSourceSettings()->getChannelMarker());
+        }
+        else
+        {
+            SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
+            settings.m_channelMarker->formatTo(swgChannelMarker);
+            response.getLocalSourceSettings()->setChannelMarker(swgChannelMarker);
+        }
+    }
 }
 
 void LocalSource::webapiReverseSendSettings(QList<QString>& channelSettingsKeys, const LocalSourceSettings& settings, bool force)
@@ -527,6 +545,13 @@ void LocalSource::webapiFormatChannelSettings(
     if (channelSettingsKeys.contains("streamIndex") || force) {
         swgLocalSourceSettings->setRgbColor(settings.m_streamIndex);
     }
+
+    if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
+    {
+        SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
+        settings.m_channelMarker->formatTo(swgChannelMarker);
+        swgLocalSourceSettings->setChannelMarker(swgChannelMarker);
+    }
 }
 
 void LocalSource::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/channeltx/localsource/localsourcegui.cpp b/plugins/channeltx/localsource/localsourcegui.cpp
index aac0df1ec..f587e8790 100644
--- a/plugins/channeltx/localsource/localsourcegui.cpp
+++ b/plugins/channeltx/localsource/localsourcegui.cpp
@@ -76,6 +76,7 @@ bool LocalSourceGUI::handleMessage(const Message& message)
         const LocalSource::MsgConfigureLocalSource& cfg = (LocalSource::MsgConfigureLocalSource&) message;
         m_settings = cfg.getSettings();
         blockApplySettings(true);
+        m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
         displaySettings();
         blockApplySettings(false);
         return true;
diff --git a/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.cpp b/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.cpp
index 0b7830ff8..deb9ff717 100644
--- a/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.cpp
+++ b/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.cpp
@@ -541,6 +541,9 @@ void IEEE_802_15_4_Mod::webapiUpdateChannelSettings(
     if (channelSettingsKeys.contains("udpPort")) {
         settings.m_udpPort = response.getIeee802154ModSettings()->getUdpPort();
     }
+    if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
+        settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getIeee802154ModSettings()->getChannelMarker());
+    }
 }
 
 int IEEE_802_15_4_Mod::webapiReportGet(
@@ -655,6 +658,20 @@ void IEEE_802_15_4_Mod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSetti
     }
 
     response.getIeee802154ModSettings()->setUdpPort(settings.m_udpPort);
+
+    if (settings.m_channelMarker)
+    {
+        if (response.getIeee802154ModSettings()->getChannelMarker())
+        {
+            settings.m_channelMarker->formatTo(response.getIeee802154ModSettings()->getChannelMarker());
+        }
+        else
+        {
+            SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
+            settings.m_channelMarker->formatTo(swgChannelMarker);
+            response.getIeee802154ModSettings()->setChannelMarker(swgChannelMarker);
+        }
+    }
 }
 
 void IEEE_802_15_4_Mod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
@@ -834,6 +851,13 @@ void IEEE_802_15_4_Mod::webapiFormatChannelSettings(
     if (channelSettingsKeys.contains("udpPort") || force) {
         swgIEEE_802_15_4_ModSettings->setUdpPort(settings.m_udpPort);
     }
+
+    if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
+    {
+        SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
+        settings.m_channelMarker->formatTo(swgChannelMarker);
+        swgIEEE_802_15_4_ModSettings->setChannelMarker(swgChannelMarker);
+    }
 }
 
 void IEEE_802_15_4_Mod::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.cpp b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.cpp
index d89afd12c..579d0dbd6 100644
--- a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.cpp
+++ b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.cpp
@@ -115,6 +115,7 @@ bool IEEE_802_15_4_ModGUI::handleMessage(const Message& message)
         const IEEE_802_15_4_Mod::MsgConfigureIEEE_802_15_4_Mod& cfg = (IEEE_802_15_4_Mod::MsgConfigureIEEE_802_15_4_Mod&) message;
         m_settings = cfg.getSettings();
         blockApplySettings(true);
+        m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
         displaySettings();
         blockApplySettings(false);
         return true;
diff --git a/plugins/channeltx/modais/aismod.cpp b/plugins/channeltx/modais/aismod.cpp
index c4fce1a30..ff011c748 100644
--- a/plugins/channeltx/modais/aismod.cpp
+++ b/plugins/channeltx/modais/aismod.cpp
@@ -641,6 +641,9 @@ void AISMod::webapiUpdateChannelSettings(
     if (channelSettingsKeys.contains("udpPort")) {
         settings.m_udpPort = response.getAisModSettings()->getUdpPort();
     }
+    if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
+        settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getAisModSettings()->getChannelMarker());
+    }
 }
 
 int AISMod::webapiReportGet(
@@ -766,6 +769,20 @@ void AISMod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& respon
     response.getAisModSettings()->setUdpEnabled(settings.m_udpEnabled);
     response.getAisModSettings()->setUdpAddress(new QString(settings.m_udpAddress));
     response.getAisModSettings()->setUdpPort(settings.m_udpPort);
+
+    if (settings.m_channelMarker)
+    {
+        if (response.getAisModSettings()->getChannelMarker())
+        {
+            settings.m_channelMarker->formatTo(response.getAisModSettings()->getChannelMarker());
+        }
+        else
+        {
+            SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
+            settings.m_channelMarker->formatTo(swgChannelMarker);
+            response.getAisModSettings()->setChannelMarker(swgChannelMarker);
+        }
+    }
 }
 
 void AISMod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
@@ -930,6 +947,13 @@ void AISMod::webapiFormatChannelSettings(
     if (channelSettingsKeys.contains("udpPort") || force) {
         swgAISModSettings->setUdpPort(settings.m_udpPort);
     }
+
+    if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
+    {
+        SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
+        settings.m_channelMarker->formatTo(swgChannelMarker);
+        swgAISModSettings->setChannelMarker(swgChannelMarker);
+    }
 }
 
 void AISMod::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/channeltx/modais/aismodgui.cpp b/plugins/channeltx/modais/aismodgui.cpp
index 37f16b6b9..fa14e9e6c 100644
--- a/plugins/channeltx/modais/aismodgui.cpp
+++ b/plugins/channeltx/modais/aismodgui.cpp
@@ -84,6 +84,7 @@ bool AISModGUI::handleMessage(const Message& message)
         const AISMod::MsgConfigureAISMod& cfg = (AISMod::MsgConfigureAISMod&) message;
         m_settings = cfg.getSettings();
         blockApplySettings(true);
+        m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
         displaySettings();
         blockApplySettings(false);
         return true;
diff --git a/plugins/channeltx/modam/ammod.cpp b/plugins/channeltx/modam/ammod.cpp
index d406b4eea..c9f0c6634 100644
--- a/plugins/channeltx/modam/ammod.cpp
+++ b/plugins/channeltx/modam/ammod.cpp
@@ -473,6 +473,9 @@ void AMMod::webapiUpdateChannelSettings(
     if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
         settings.m_reverseAPIChannelIndex = response.getAmModSettings()->getReverseApiChannelIndex();
     }
+    if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
+        settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getAmModSettings()->getChannelMarker());
+    }
 }
 
 int AMMod::webapiReportGet(
@@ -526,6 +529,20 @@ void AMMod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& respons
     response.getAmModSettings()->setReverseApiPort(settings.m_reverseAPIPort);
     response.getAmModSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
     response.getAmModSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
+
+    if (settings.m_channelMarker)
+    {
+        if (response.getAmModSettings()->getChannelMarker())
+        {
+            settings.m_channelMarker->formatTo(response.getAmModSettings()->getChannelMarker());
+        }
+        else
+        {
+            SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
+            settings.m_channelMarker->formatTo(swgChannelMarker);
+            response.getAmModSettings()->setChannelMarker(swgChannelMarker);
+        }
+    }
 }
 
 void AMMod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
@@ -674,6 +691,13 @@ void AMMod::webapiFormatChannelSettings(
         SWGSDRangel::SWGCWKeyerSettings *apiCwKeyerSettings = swgAMModSettings->getCwKeyer();
         m_basebandSource->getCWKeyer().webapiFormatChannelSettings(apiCwKeyerSettings, cwKeyerSettings);
     }
+
+    if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
+    {
+        SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
+        settings.m_channelMarker->formatTo(swgChannelMarker);
+        swgAMModSettings->setChannelMarker(swgChannelMarker);
+    }
 }
 
 void AMMod::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/channeltx/modam/ammodgui.cpp b/plugins/channeltx/modam/ammodgui.cpp
index 755b2c305..1414b1dfa 100644
--- a/plugins/channeltx/modam/ammodgui.cpp
+++ b/plugins/channeltx/modam/ammodgui.cpp
@@ -93,6 +93,7 @@ bool AMModGUI::handleMessage(const Message& message)
         const AMMod::MsgConfigureAMMod& cfg = (AMMod::MsgConfigureAMMod&) message;
         m_settings = cfg.getSettings();
         blockApplySettings(true);
+        m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
         displaySettings();
         blockApplySettings(false);
         return true;
diff --git a/plugins/channeltx/modatv/atvmod.cpp b/plugins/channeltx/modatv/atvmod.cpp
index 699fbd854..f3c414555 100644
--- a/plugins/channeltx/modatv/atvmod.cpp
+++ b/plugins/channeltx/modatv/atvmod.cpp
@@ -35,6 +35,7 @@
 #include "dsp/devicesamplemimo.h"
 #include "device/deviceapi.h"
 #include "feature/feature.h"
+#include "settings/serializable.h"
 #include "util/db.h"
 #include "maincore.h"
 
@@ -510,6 +511,9 @@ void ATVMod::webapiUpdateChannelSettings(
     if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
         settings.m_reverseAPIChannelIndex = response.getAtvModSettings()->getReverseApiChannelIndex();
     }
+    if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
+        settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getAtvModSettings()->getChannelMarker());
+    }
 }
 
 int ATVMod::webapiReportGet(
@@ -581,6 +585,20 @@ void ATVMod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& respon
     response.getAtvModSettings()->setReverseApiPort(settings.m_reverseAPIPort);
     response.getAtvModSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
     response.getAtvModSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
+
+    if (settings.m_channelMarker)
+    {
+        if (response.getAtvModSettings()->getChannelMarker())
+        {
+            settings.m_channelMarker->formatTo(response.getAtvModSettings()->getChannelMarker());
+        }
+        else
+        {
+            SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
+            settings.m_channelMarker->formatTo(swgChannelMarker);
+            response.getAtvModSettings()->setChannelMarker(swgChannelMarker);
+        }
+    }
 }
 
 void ATVMod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
@@ -718,6 +736,13 @@ void ATVMod::webapiFormatChannelSettings(
     if (channelSettingsKeys.contains("streamIndex") || force) {
         swgATVModSettings->setStreamIndex(settings.m_streamIndex);
     }
+
+    if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
+    {
+        SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
+        settings.m_channelMarker->formatTo(swgChannelMarker);
+        swgATVModSettings->setChannelMarker(swgChannelMarker);
+    }
 }
 
 void ATVMod::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/channeltx/modatv/atvmodgui.cpp b/plugins/channeltx/modatv/atvmodgui.cpp
index fcc786054..28e700b22 100644
--- a/plugins/channeltx/modatv/atvmodgui.cpp
+++ b/plugins/channeltx/modatv/atvmodgui.cpp
@@ -208,6 +208,7 @@ bool ATVModGUI::handleMessage(const Message& message)
         const ATVMod::MsgConfigureATVMod& cfg = (ATVMod::MsgConfigureATVMod&) message;
         m_settings = cfg.getSettings();
         blockApplySettings(true);
+        m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
         displaySettings();
         blockApplySettings(false);
         return true;
diff --git a/plugins/channeltx/modchirpchat/chirpchatmod.cpp b/plugins/channeltx/modchirpchat/chirpchatmod.cpp
index 5254689c9..e139ebbe3 100644
--- a/plugins/channeltx/modchirpchat/chirpchatmod.cpp
+++ b/plugins/channeltx/modchirpchat/chirpchatmod.cpp
@@ -37,6 +37,7 @@
 #include "dsp/dspcommands.h"
 #include "device/deviceapi.h"
 #include "feature/feature.h"
+#include "settings/serializable.h"
 #include "util/db.h"
 #include "maincore.h"
 
@@ -584,6 +585,9 @@ void ChirpChatMod::webapiUpdateChannelSettings(
     if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
         settings.m_reverseAPIChannelIndex = response.getChirpChatModSettings()->getReverseApiChannelIndex();
     }
+    if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
+        settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getChirpChatModSettings()->getChannelMarker());
+    }
 }
 
 int ChirpChatMod::webapiReportGet(
@@ -725,6 +729,20 @@ void ChirpChatMod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings&
     response.getChirpChatModSettings()->setReverseApiPort(settings.m_reverseAPIPort);
     response.getChirpChatModSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
     response.getChirpChatModSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
+
+    if (settings.m_channelMarker)
+    {
+        if (response.getChirpChatModSettings()->getChannelMarker())
+        {
+            settings.m_channelMarker->formatTo(response.getChirpChatModSettings()->getChannelMarker());
+        }
+        else
+        {
+            SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
+            settings.m_channelMarker->formatTo(swgChannelMarker);
+            response.getChirpChatModSettings()->setChannelMarker(swgChannelMarker);
+        }
+    }
 }
 
 void ChirpChatMod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
@@ -913,6 +931,13 @@ void ChirpChatMod::webapiFormatChannelSettings(
     if (channelSettingsKeys.contains("title") || force) {
         swgChirpChatModSettings->setTitle(new QString(settings.m_title));
     }
+
+    if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
+    {
+        SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
+        settings.m_channelMarker->formatTo(swgChannelMarker);
+        swgChirpChatModSettings->setChannelMarker(swgChannelMarker);
+    }
 }
 
 void ChirpChatMod::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/channeltx/modchirpchat/chirpchatmodgui.cpp b/plugins/channeltx/modchirpchat/chirpchatmodgui.cpp
index c27489462..f508366de 100644
--- a/plugins/channeltx/modchirpchat/chirpchatmodgui.cpp
+++ b/plugins/channeltx/modchirpchat/chirpchatmodgui.cpp
@@ -81,6 +81,7 @@ bool ChirpChatModGUI::handleMessage(const Message& message)
         const ChirpChatMod::MsgConfigureChirpChatMod& cfg = (ChirpChatMod::MsgConfigureChirpChatMod&) message;
         m_settings = cfg.getSettings();
         blockApplySettings(true);
+        m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
         displaySettings();
         blockApplySettings(false);
         return true;
diff --git a/plugins/channeltx/moddatv/datvmod.cpp b/plugins/channeltx/moddatv/datvmod.cpp
index 7f970cd47..300257dc9 100644
--- a/plugins/channeltx/moddatv/datvmod.cpp
+++ b/plugins/channeltx/moddatv/datvmod.cpp
@@ -39,6 +39,7 @@
 #include "dsp/devicesamplemimo.h"
 #include "device/deviceapi.h"
 #include "feature/feature.h"
+#include "settings/serializable.h"
 #include "util/db.h"
 #include "maincore.h"
 
@@ -444,6 +445,9 @@ void DATVMod::webapiUpdateChannelSettings(
     if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
         settings.m_reverseAPIChannelIndex = response.getDatvModSettings()->getReverseApiChannelIndex();
     }
+    if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
+        settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getDatvModSettings()->getChannelMarker());
+    }
 }
 
 int DATVMod::webapiReportGet(
@@ -493,6 +497,20 @@ void DATVMod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& respo
     response.getDatvModSettings()->setReverseApiPort(settings.m_reverseAPIPort);
     response.getDatvModSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
     response.getDatvModSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
+
+    if (settings.m_channelMarker)
+    {
+        if (response.getDatvModSettings()->getChannelMarker())
+        {
+            settings.m_channelMarker->formatTo(response.getDatvModSettings()->getChannelMarker());
+        }
+        else
+        {
+            SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
+            settings.m_channelMarker->formatTo(swgChannelMarker);
+            response.getDatvModSettings()->setChannelMarker(swgChannelMarker);
+        }
+    }
 }
 
 void DATVMod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
@@ -627,6 +645,13 @@ void DATVMod::webapiFormatChannelSettings(
     if (channelSettingsKeys.contains("streamIndex") || force) {
         swgDATVModSettings->setStreamIndex(settings.m_streamIndex);
     }
+
+    if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
+    {
+        SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
+        settings.m_channelMarker->formatTo(swgChannelMarker);
+        swgDATVModSettings->setChannelMarker(swgChannelMarker);
+    }
 }
 
 void DATVMod::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/channeltx/moddatv/datvmodgui.cpp b/plugins/channeltx/moddatv/datvmodgui.cpp
index da9d263ef..01096ffc9 100644
--- a/plugins/channeltx/moddatv/datvmodgui.cpp
+++ b/plugins/channeltx/moddatv/datvmodgui.cpp
@@ -193,6 +193,7 @@ bool DATVModGUI::handleMessage(const Message& message)
         const DATVMod::MsgConfigureDATVMod& cfg = (DATVMod::MsgConfigureDATVMod&) message;
         m_settings = cfg.getSettings();
         blockApplySettings(true);
+        m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
         displaySettings();
         blockApplySettings(false);
         return true;
diff --git a/plugins/channeltx/modfreedv/freedvmod.cpp b/plugins/channeltx/modfreedv/freedvmod.cpp
index 6e4e36623..06a8d3043 100644
--- a/plugins/channeltx/modfreedv/freedvmod.cpp
+++ b/plugins/channeltx/modfreedv/freedvmod.cpp
@@ -453,6 +453,9 @@ void FreeDVMod::webapiUpdateChannelSettings(
     if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) {
         settings.m_spectrumGUI->updateFrom(channelSettingsKeys, response.getFreeDvModSettings()->getSpectrumConfig());
     }
+    if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
+        settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getFreeDvModSettings()->getChannelMarker());
+    }
 }
 
 int FreeDVMod::webapiReportGet(
@@ -521,6 +524,20 @@ void FreeDVMod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& res
             response.getFreeDvModSettings()->setSpectrumConfig(swgGLSpectrum);
         }
     }
+
+    if (settings.m_channelMarker)
+    {
+        if (response.getFreeDvModSettings()->getChannelMarker())
+        {
+            settings.m_channelMarker->formatTo(response.getFreeDvModSettings()->getChannelMarker());
+        }
+        else
+        {
+            SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
+            settings.m_channelMarker->formatTo(swgChannelMarker);
+            response.getFreeDvModSettings()->setChannelMarker(swgChannelMarker);
+        }
+    }
 }
 
 void FreeDVMod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
@@ -664,6 +681,7 @@ void FreeDVMod::webapiFormatChannelSettings(
     if (channelSettingsKeys.contains("streamIndex") || force) {
         swgFreeDVModSettings->setStreamIndex(settings.m_streamIndex);
     }
+
     if (settings.m_spectrumGUI && (channelSettingsKeys.contains("spectrunConfig") || force))
     {
         SWGSDRangel::SWGGLSpectrum *swgGLSpectrum = new SWGSDRangel::SWGGLSpectrum();
@@ -671,6 +689,13 @@ void FreeDVMod::webapiFormatChannelSettings(
         swgFreeDVModSettings->setSpectrumConfig(swgGLSpectrum);
     }
 
+    if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
+    {
+        SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
+        settings.m_channelMarker->formatTo(swgChannelMarker);
+        swgFreeDVModSettings->setChannelMarker(swgChannelMarker);
+    }
+
     if (force)
     {
         const CWKeyerSettings& cwKeyerSettings = m_basebandSource->getCWKeyer().getSettings();
diff --git a/plugins/channeltx/modfreedv/freedvmodgui.cpp b/plugins/channeltx/modfreedv/freedvmodgui.cpp
index 5d39cbfbf..74766e2ec 100644
--- a/plugins/channeltx/modfreedv/freedvmodgui.cpp
+++ b/plugins/channeltx/modfreedv/freedvmodgui.cpp
@@ -105,6 +105,7 @@ bool FreeDVModGUI::handleMessage(const Message& message)
         m_settings = cfg.getSettings();
         blockApplySettings(true);
         ui->spectrumGUI->updateSettings();
+        m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
         displaySettings();
         blockApplySettings(false);
         return true;
diff --git a/plugins/channeltx/modnfm/nfmmod.cpp b/plugins/channeltx/modnfm/nfmmod.cpp
index 7f7936649..986e00f39 100644
--- a/plugins/channeltx/modnfm/nfmmod.cpp
+++ b/plugins/channeltx/modnfm/nfmmod.cpp
@@ -535,6 +535,9 @@ void NFMMod::webapiUpdateChannelSettings(
     if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
         settings.m_reverseAPIChannelIndex = response.getNfmModSettings()->getReverseApiChannelIndex();
     }
+    if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
+        settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getNfmModSettings()->getChannelMarker());
+    }
 }
 
 int NFMMod::webapiReportGet(
@@ -594,6 +597,20 @@ void NFMMod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& respon
     response.getNfmModSettings()->setReverseApiPort(settings.m_reverseAPIPort);
     response.getNfmModSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
     response.getNfmModSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
+
+    if (settings.m_channelMarker)
+    {
+        if (response.getNfmModSettings()->getChannelMarker())
+        {
+            settings.m_channelMarker->formatTo(response.getNfmModSettings()->getChannelMarker());
+        }
+        else
+        {
+            SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
+            settings.m_channelMarker->formatTo(swgChannelMarker);
+            response.getNfmModSettings()->setChannelMarker(swgChannelMarker);
+        }
+    }
 }
 
 void NFMMod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
@@ -753,6 +770,13 @@ void NFMMod::webapiFormatChannelSettings(
         swgNFMModSettings->setStreamIndex(settings.m_streamIndex);
     }
 
+    if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
+    {
+        SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
+        settings.m_channelMarker->formatTo(swgChannelMarker);
+        swgNFMModSettings->setChannelMarker(swgChannelMarker);
+    }
+
     if (force)
     {
         const CWKeyerSettings& cwKeyerSettings = m_basebandSource->getCWKeyer().getSettings();
diff --git a/plugins/channeltx/modnfm/nfmmodgui.cpp b/plugins/channeltx/modnfm/nfmmodgui.cpp
index ecf6881ca..75d868357 100644
--- a/plugins/channeltx/modnfm/nfmmodgui.cpp
+++ b/plugins/channeltx/modnfm/nfmmodgui.cpp
@@ -94,6 +94,7 @@ bool NFMModGUI::handleMessage(const Message& message)
         const NFMMod::MsgConfigureNFMMod& cfg = (NFMMod::MsgConfigureNFMMod&) message;
         m_settings = cfg.getSettings();
         blockApplySettings(true);
+        m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
         displaySettings();
         blockApplySettings(false);
         return true;
diff --git a/plugins/channeltx/modpacket/packetmod.cpp b/plugins/channeltx/modpacket/packetmod.cpp
index f3521d215..fadc6dd5e 100644
--- a/plugins/channeltx/modpacket/packetmod.cpp
+++ b/plugins/channeltx/modpacket/packetmod.cpp
@@ -636,6 +636,9 @@ void PacketMod::webapiUpdateChannelSettings(
     if (channelSettingsKeys.contains("udpPort")) {
         settings.m_udpPort = response.getPacketModSettings()->getUdpPort();
     }
+    if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
+        settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getPacketModSettings()->getChannelMarker());
+    }
 }
 
 int PacketMod::webapiReportGet(
@@ -796,6 +799,20 @@ void PacketMod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& res
     response.getPacketModSettings()->setReverseApiPort(settings.m_reverseAPIPort);
     response.getPacketModSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
     response.getPacketModSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
+
+    if (settings.m_channelMarker)
+    {
+        if (response.getPacketModSettings()->getChannelMarker())
+        {
+            settings.m_channelMarker->formatTo(response.getPacketModSettings()->getChannelMarker());
+        }
+        else
+        {
+            SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
+            settings.m_channelMarker->formatTo(swgChannelMarker);
+            response.getPacketModSettings()->setChannelMarker(swgChannelMarker);
+        }
+    }
 }
 
 void PacketMod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
@@ -1005,6 +1022,13 @@ void PacketMod::webapiFormatChannelSettings(
     if (channelSettingsKeys.contains("udpPort") || force) {
         swgPacketModSettings->setUdpPort(settings.m_udpPort);
     }
+
+    if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
+    {
+        SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
+        settings.m_channelMarker->formatTo(swgChannelMarker);
+        swgPacketModSettings->setChannelMarker(swgChannelMarker);
+    }
 }
 
 void PacketMod::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/channeltx/modpacket/packetmodgui.cpp b/plugins/channeltx/modpacket/packetmodgui.cpp
index b8b62c1f3..24c4f74c1 100644
--- a/plugins/channeltx/modpacket/packetmodgui.cpp
+++ b/plugins/channeltx/modpacket/packetmodgui.cpp
@@ -84,6 +84,7 @@ bool PacketModGUI::handleMessage(const Message& message)
         const PacketMod::MsgConfigurePacketMod& cfg = (PacketMod::MsgConfigurePacketMod&) message;
         m_settings = cfg.getSettings();
         blockApplySettings(true);
+        m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
         displaySettings();
         blockApplySettings(false);
         return true;
diff --git a/plugins/channeltx/modssb/ssbmod.cpp b/plugins/channeltx/modssb/ssbmod.cpp
index 0b57a0398..cd73a9d91 100644
--- a/plugins/channeltx/modssb/ssbmod.cpp
+++ b/plugins/channeltx/modssb/ssbmod.cpp
@@ -524,6 +524,9 @@ void SSBMod::webapiUpdateChannelSettings(
     if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) {
         settings.m_spectrumGUI->updateFrom(channelSettingsKeys, response.getSsbModSettings()->getSpectrumConfig());
     }
+    if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
+        settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getSsbModSettings()->getChannelMarker());
+    }
 }
 
 int SSBMod::webapiReportGet(
@@ -599,6 +602,20 @@ void SSBMod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& respon
             response.getSsbModSettings()->setSpectrumConfig(swgGLSpectrum);
         }
     }
+
+    if (settings.m_channelMarker)
+    {
+        if (response.getSsbModSettings()->getChannelMarker())
+        {
+            settings.m_channelMarker->formatTo(response.getSsbModSettings()->getChannelMarker());
+        }
+        else
+        {
+            SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
+            settings.m_channelMarker->formatTo(swgChannelMarker);
+            response.getSsbModSettings()->setChannelMarker(swgChannelMarker);
+        }
+    }
 }
 
 void SSBMod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
@@ -763,6 +780,7 @@ void SSBMod::webapiFormatChannelSettings(
     if (channelSettingsKeys.contains("streamIndex") || force) {
         swgSSBModSettings->setStreamIndex(settings.m_streamIndex);
     }
+
     if (settings.m_spectrumGUI && (channelSettingsKeys.contains("spectrunConfig") || force))
     {
         SWGSDRangel::SWGGLSpectrum *swgGLSpectrum = new SWGSDRangel::SWGGLSpectrum();
@@ -770,6 +788,14 @@ void SSBMod::webapiFormatChannelSettings(
         swgSSBModSettings->setSpectrumConfig(swgGLSpectrum);
     }
 
+
+    if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
+    {
+        SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
+        settings.m_channelMarker->formatTo(swgChannelMarker);
+        swgSSBModSettings->setChannelMarker(swgChannelMarker);
+    }
+
     if (force)
     {
         const CWKeyerSettings& cwKeyerSettings = m_basebandSource->getCWKeyer().getSettings();
diff --git a/plugins/channeltx/modssb/ssbmodgui.cpp b/plugins/channeltx/modssb/ssbmodgui.cpp
index 47832369e..3c97a29b1 100644
--- a/plugins/channeltx/modssb/ssbmodgui.cpp
+++ b/plugins/channeltx/modssb/ssbmodgui.cpp
@@ -111,6 +111,7 @@ bool SSBModGUI::handleMessage(const Message& message)
         m_settings = mod_settings;
         blockApplySettings(true);
         ui->spectrumGUI->updateSettings();
+        m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
         displaySettings();
         blockApplySettings(false);
         return true;
diff --git a/plugins/channeltx/modwfm/wfmmod.cpp b/plugins/channeltx/modwfm/wfmmod.cpp
index dcbac3bd2..ce35f8779 100644
--- a/plugins/channeltx/modwfm/wfmmod.cpp
+++ b/plugins/channeltx/modwfm/wfmmod.cpp
@@ -459,6 +459,9 @@ void WFMMod::webapiUpdateChannelSettings(
     if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
         settings.m_reverseAPIChannelIndex = response.getWfmModSettings()->getReverseApiChannelIndex();
     }
+    if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
+        settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getWfmModSettings()->getChannelMarker());
+    }
 }
 
 int WFMMod::webapiReportGet(
@@ -513,6 +516,20 @@ void WFMMod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& respon
     response.getWfmModSettings()->setReverseApiPort(settings.m_reverseAPIPort);
     response.getWfmModSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
     response.getWfmModSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
+
+    if (settings.m_channelMarker)
+    {
+        if (response.getWfmModSettings()->getChannelMarker())
+        {
+            settings.m_channelMarker->formatTo(response.getWfmModSettings()->getChannelMarker());
+        }
+        else
+        {
+            SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
+            settings.m_channelMarker->formatTo(swgChannelMarker);
+            response.getWfmModSettings()->setChannelMarker(swgChannelMarker);
+        }
+    }
 }
 
 void WFMMod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
@@ -657,6 +674,13 @@ void WFMMod::webapiFormatChannelSettings(
         swgWFMModSettings->setAudioDeviceName(new QString(settings.m_audioDeviceName));
     }
 
+    if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
+    {
+        SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
+        settings.m_channelMarker->formatTo(swgChannelMarker);
+        swgWFMModSettings->setChannelMarker(swgChannelMarker);
+    }
+
     if (force)
     {
         const CWKeyerSettings& cwKeyerSettings = m_basebandSource->getCWKeyer().getSettings();
diff --git a/plugins/channeltx/modwfm/wfmmodgui.cpp b/plugins/channeltx/modwfm/wfmmodgui.cpp
index df161495b..e6d2f3139 100644
--- a/plugins/channeltx/modwfm/wfmmodgui.cpp
+++ b/plugins/channeltx/modwfm/wfmmodgui.cpp
@@ -93,6 +93,7 @@ bool WFMModGUI::handleMessage(const Message& message)
         const WFMMod::MsgConfigureWFMMod& cfg = (WFMMod::MsgConfigureWFMMod&) message;
         m_settings = cfg.getSettings();
         blockApplySettings(true);
+        m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
         displaySettings();
         blockApplySettings(false);
         return true;
diff --git a/plugins/channeltx/remotesource/remotesource.cpp b/plugins/channeltx/remotesource/remotesource.cpp
index 5e7b93774..2c410da9c 100644
--- a/plugins/channeltx/remotesource/remotesource.cpp
+++ b/plugins/channeltx/remotesource/remotesource.cpp
@@ -30,6 +30,7 @@
 #include "dsp/devicesamplesink.h"
 #include "device/deviceapi.h"
 #include "feature/feature.h"
+#include "settings/serializable.h"
 #include "util/timeutil.h"
 #include "util/db.h"
 #include "maincore.h"
@@ -291,6 +292,9 @@ void RemoteSource::webapiUpdateChannelSettings(
     if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
         settings.m_reverseAPIChannelIndex = response.getRemoteSourceSettings()->getReverseApiChannelIndex();
     }
+    if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
+        settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getRemoteSourceSettings()->getChannelMarker());
+    }
 }
 
 int RemoteSource::webapiReportGet(
@@ -332,6 +336,20 @@ void RemoteSource::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings&
     response.getRemoteSourceSettings()->setReverseApiPort(settings.m_reverseAPIPort);
     response.getRemoteSourceSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
     response.getRemoteSourceSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
+
+    if (settings.m_channelMarker)
+    {
+        if (response.getRemoteSourceSettings()->getChannelMarker())
+        {
+            settings.m_channelMarker->formatTo(response.getRemoteSourceSettings()->getChannelMarker());
+        }
+        else
+        {
+            SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
+            settings.m_channelMarker->formatTo(swgChannelMarker);
+            response.getRemoteSourceSettings()->setChannelMarker(swgChannelMarker);
+        }
+    }
 }
 
 void RemoteSource::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
@@ -433,6 +451,13 @@ void RemoteSource::webapiFormatChannelSettings(
     if (channelSettingsKeys.contains("streamIndex") || force) {
         swgRemoteSourceSettings->setStreamIndex(settings.m_streamIndex);
     }
+
+    if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
+    {
+        SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
+        settings.m_channelMarker->formatTo(swgChannelMarker);
+        swgRemoteSourceSettings->setChannelMarker(swgChannelMarker);
+    }
 }
 
 void RemoteSource::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/channeltx/remotesource/remotesourcegui.cpp b/plugins/channeltx/remotesource/remotesourcegui.cpp
index 02a95f9b0..ea6f77d15 100644
--- a/plugins/channeltx/remotesource/remotesourcegui.cpp
+++ b/plugins/channeltx/remotesource/remotesourcegui.cpp
@@ -70,6 +70,7 @@ bool RemoteSourceGUI::handleMessage(const Message& message)
         const RemoteSource::MsgConfigureRemoteSource& cfg = (RemoteSource::MsgConfigureRemoteSource&) message;
         m_settings = cfg.getSettings();
         blockApplySettings(true);
+        m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
         displaySettings();
         blockApplySettings(false);
         return true;
diff --git a/plugins/channeltx/udpsource/udpsource.cpp b/plugins/channeltx/udpsource/udpsource.cpp
index 1277ecbce..56f99a4aa 100644
--- a/plugins/channeltx/udpsource/udpsource.cpp
+++ b/plugins/channeltx/udpsource/udpsource.cpp
@@ -421,6 +421,9 @@ void UDPSource::webapiUpdateChannelSettings(
     if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) {
         settings.m_spectrumGUI->updateFrom(channelSettingsKeys, response.getUdpSourceSettings()->getSpectrumConfig());
     }
+    if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
+        settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getUdpSourceSettings()->getChannelMarker());
+    }
 }
 
 int UDPSource::webapiReportGet(
@@ -500,6 +503,20 @@ void UDPSource::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& res
             response.getUdpSourceSettings()->setSpectrumConfig(swgGLSpectrum);
         }
     }
+
+    if (settings.m_channelMarker)
+    {
+        if (response.getUdpSourceSettings()->getChannelMarker())
+        {
+            settings.m_channelMarker->formatTo(response.getUdpSourceSettings()->getChannelMarker());
+        }
+        else
+        {
+            SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
+            settings.m_channelMarker->formatTo(swgChannelMarker);
+            response.getUdpSourceSettings()->setChannelMarker(swgChannelMarker);
+        }
+    }
 }
 
 void UDPSource::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
@@ -640,12 +657,20 @@ void UDPSource::webapiFormatChannelSettings(
     if (channelSettingsKeys.contains("streamIndex") || force) {
         swgUDPSourceSettings->setStreamIndex(settings.m_streamIndex);
     }
+
     if (settings.m_spectrumGUI && (channelSettingsKeys.contains("spectrunConfig") || force))
     {
         SWGSDRangel::SWGGLSpectrum *swgGLSpectrum = new SWGSDRangel::SWGGLSpectrum();
         settings.m_spectrumGUI->formatTo(swgGLSpectrum);
         swgUDPSourceSettings->setSpectrumConfig(swgGLSpectrum);
     }
+
+    if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
+    {
+        SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
+        settings.m_channelMarker->formatTo(swgChannelMarker);
+        swgUDPSourceSettings->setChannelMarker(swgChannelMarker);
+    }
 }
 
 void UDPSource::networkManagerFinished(QNetworkReply *reply)
diff --git a/plugins/channeltx/udpsource/udpsourcegui.cpp b/plugins/channeltx/udpsource/udpsourcegui.cpp
index a1f9d0dbe..3f8fafcfd 100644
--- a/plugins/channeltx/udpsource/udpsourcegui.cpp
+++ b/plugins/channeltx/udpsource/udpsourcegui.cpp
@@ -73,6 +73,7 @@ bool UDPSourceGUI::handleMessage(const Message& message)
         m_settings = cfg.getSettings();
         blockApplySettings(true);
         ui->spectrumGUI->updateSettings();
+        m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
         displaySettings();
         blockApplySettings(false);
         return true;
diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html
index c125149b8..5f7687aed 100644
--- a/sdrbase/resources/webapi/doc/html2/index.html
+++ b/sdrbase/resources/webapi/doc/html2/index.html
@@ -1159,6 +1159,9 @@ margin-bottom: 20px;
     "udpPort" : {
       "type" : "integer",
       "description" : "UDP port to receive messages to transmit via"
+    },
+    "channelMarker" : {
+      "$ref" : "#/definitions/ChannelMarker"
     }
   },
   "description" : "AISMod"
@@ -1390,6 +1393,9 @@ margin-bottom: 20px;
     },
     "cwKeyer" : {
       "$ref" : "#/definitions/CWKeyerSettings"
+    },
+    "channelMarker" : {
+      "$ref" : "#/definitions/ChannelMarker"
     }
   },
   "description" : "AMMod"
@@ -1795,6 +1801,9 @@ margin-bottom: 20px;
     },
     "reverseAPIChannelIndex" : {
       "type" : "integer"
+    },
+    "channelMarker" : {
+      "$ref" : "#/definitions/ChannelMarker"
     }
   },
   "description" : "ATVMod"
@@ -3794,6 +3803,9 @@ margin-bottom: 20px;
     },
     "reverseAPIChannelIndex" : {
       "type" : "integer"
+    },
+    "channelMarker" : {
+      "$ref" : "#/definitions/ChannelMarker"
     }
   },
   "description" : "ChirpChatMod"
@@ -4185,6 +4197,9 @@ margin-bottom: 20px;
     },
     "reverseAPIChannelIndex" : {
       "type" : "integer"
+    },
+    "channelMarker" : {
+      "$ref" : "#/definitions/ChannelMarker"
     }
   },
   "description" : "DATVMod"
@@ -5577,6 +5592,9 @@ margin-bottom: 20px;
     },
     "reverseAPIChannelIndex" : {
       "type" : "integer"
+    },
+    "channelMarker" : {
+      "$ref" : "#/definitions/ChannelMarker"
     }
   },
   "description" : "FileSource"
@@ -5751,6 +5769,9 @@ margin-bottom: 20px;
     },
     "spectrumConfig" : {
       "$ref" : "#/definitions/GLSpectrum"
+    },
+    "channelMarker" : {
+      "$ref" : "#/definitions/ChannelMarker"
     }
   },
   "description" : "FreeDVMod"
@@ -6486,6 +6507,9 @@ margin-bottom: 20px;
     "udpPort" : {
       "type" : "integer",
       "description" : "UDP port to listen for frames to transmit on"
+    },
+    "channelMarker" : {
+      "$ref" : "#/definitions/ChannelMarker"
     }
   },
   "description" : "IEEE_802_15_4_Mod"
@@ -7536,6 +7560,9 @@ margin-bottom: 20px;
     },
     "reverseAPIChannelIndex" : {
       "type" : "integer"
+    },
+    "channelMarker" : {
+      "$ref" : "#/definitions/ChannelMarker"
     }
   },
   "description" : "Local channel source settings"
@@ -8110,6 +8137,9 @@ margin-bottom: 20px;
     },
     "cwKeyer" : {
       "$ref" : "#/definitions/CWKeyerSettings"
+    },
+    "channelMarker" : {
+      "$ref" : "#/definitions/ChannelMarker"
     }
   },
   "description" : "NFMMod"
@@ -8641,6 +8671,9 @@ margin-bottom: 20px;
     },
     "reverseAPIChannelIndex" : {
       "type" : "integer"
+    },
+    "channelMarker" : {
+      "$ref" : "#/definitions/ChannelMarker"
     }
   },
   "description" : "PacketMod"
@@ -9992,6 +10025,9 @@ margin-bottom: 20px;
     },
     "reverseAPIChannelIndex" : {
       "type" : "integer"
+    },
+    "channelMarker" : {
+      "$ref" : "#/definitions/ChannelMarker"
     }
   },
   "description" : "Remote channel source settings"
@@ -10553,6 +10589,9 @@ margin-bottom: 20px;
     },
     "spectrumConfig" : {
       "$ref" : "#/definitions/GLSpectrum"
+    },
+    "channelMarker" : {
+      "$ref" : "#/definitions/ChannelMarker"
     }
   },
   "description" : "SSBMod"
@@ -12484,6 +12523,9 @@ margin-bottom: 20px;
     },
     "spectrumConfig" : {
       "$ref" : "#/definitions/GLSpectrum"
+    },
+    "channelMarker" : {
+      "$ref" : "#/definitions/ChannelMarker"
     }
   },
   "description" : "UDPSource"
@@ -13051,6 +13093,9 @@ margin-bottom: 20px;
     },
     "cwKeyer" : {
       "$ref" : "#/definitions/CWKeyerSettings"
+    },
+    "channelMarker" : {
+      "$ref" : "#/definitions/ChannelMarker"
     }
   },
   "description" : "WFMMod"
@@ -51554,7 +51599,7 @@ except ApiException as e:
           </div>
           <div id="generator">
             <div class="content">
-              Generated 2021-12-02T23:38:15.455+01:00
+              Generated 2021-12-03T00:35:44.973+01:00
             </div>
           </div>
       </div>
diff --git a/sdrbase/resources/webapi/doc/swagger/include/AISMod.yaml b/sdrbase/resources/webapi/doc/swagger/include/AISMod.yaml
index 44ba4686d..4e95cecbc 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/AISMod.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/AISMod.yaml
@@ -116,6 +116,8 @@ AISModSettings:
     udpPort:
       description: "UDP port to receive messages to transmit via"
       type: integer
+    channelMarker:
+      $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
 
 AISModReport:
   description: AISMod
diff --git a/sdrbase/resources/webapi/doc/swagger/include/AMMod.yaml b/sdrbase/resources/webapi/doc/swagger/include/AMMod.yaml
index a54700d72..34b31f874 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/AMMod.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/AMMod.yaml
@@ -45,6 +45,8 @@ AMModSettings:
       type: integer
     cwKeyer:
       $ref: "/doc/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
+    channelMarker:
+      $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
 
 AMModReport:
   description: AMMod
diff --git a/sdrbase/resources/webapi/doc/swagger/include/ATVMod.yaml b/sdrbase/resources/webapi/doc/swagger/include/ATVMod.yaml
index dbf135d53..a146b4403 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/ATVMod.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/ATVMod.yaml
@@ -67,6 +67,8 @@ ATVModSettings:
       type: integer
     reverseAPIChannelIndex:
       type: integer
+    channelMarker:
+      $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
 
 ATVModReport:
   description: ATVMod
diff --git a/sdrbase/resources/webapi/doc/swagger/include/ChirpChatMod.yaml b/sdrbase/resources/webapi/doc/swagger/include/ChirpChatMod.yaml
index 51d0ba3d4..f161b4635 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/ChirpChatMod.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/ChirpChatMod.yaml
@@ -157,6 +157,8 @@ ChirpChatModSettings:
       type: integer
     reverseAPIChannelIndex:
       type: integer
+    channelMarker:
+      $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
 
 ChirpChatModReport:
   description: ChirpChatMod
diff --git a/sdrbase/resources/webapi/doc/swagger/include/DATVMod.yaml b/sdrbase/resources/webapi/doc/swagger/include/DATVMod.yaml
index 012b08f06..f7199ecd4 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/DATVMod.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/DATVMod.yaml
@@ -58,6 +58,8 @@ DATVModSettings:
       type: integer
     reverseAPIChannelIndex:
       type: integer
+    channelMarker:
+      $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
 
 DATVModReport:
   description: DATVMod
diff --git a/sdrbase/resources/webapi/doc/swagger/include/FileSource.yaml b/sdrbase/resources/webapi/doc/swagger/include/FileSource.yaml
index 7bde851de..aeea4033f 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/FileSource.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/FileSource.yaml
@@ -31,6 +31,8 @@ FileSourceSettings:
       type: integer
     reverseAPIChannelIndex:
       type: integer
+    channelMarker:
+      $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
 
 FileSourceReport:
   description: FileSource
diff --git a/sdrbase/resources/webapi/doc/swagger/include/FreeDVMod.yaml b/sdrbase/resources/webapi/doc/swagger/include/FreeDVMod.yaml
index 879aeb616..282ab01ae 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/FreeDVMod.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/FreeDVMod.yaml
@@ -46,6 +46,8 @@ FreeDVModSettings:
       $ref: "/doc/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
     spectrumConfig:
       $ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum"
+    channelMarker:
+      $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
 
 FreeDVModReport:
   description: FreeDVMod
diff --git a/sdrbase/resources/webapi/doc/swagger/include/IEEE_802_15_4_Mod.yaml b/sdrbase/resources/webapi/doc/swagger/include/IEEE_802_15_4_Mod.yaml
index 845045eda..d8e697208 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/IEEE_802_15_4_Mod.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/IEEE_802_15_4_Mod.yaml
@@ -124,6 +124,8 @@ IEEE_802_15_4_ModSettings:
     udpPort:
       description: UDP port to listen for frames to transmit on
       type: integer
+    channelMarker:
+      $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
 
 IEEE_802_15_4_ModReport:
   description: IEEE_802_15_4_Mod
diff --git a/sdrbase/resources/webapi/doc/swagger/include/LocalSource.yaml b/sdrbase/resources/webapi/doc/swagger/include/LocalSource.yaml
index 2b2e462ed..1883c9ce4 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/LocalSource.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/LocalSource.yaml
@@ -29,3 +29,5 @@ LocalSourceSettings:
       type: integer
     reverseAPIChannelIndex:
       type: integer
+    channelMarker:
+      $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
diff --git a/sdrbase/resources/webapi/doc/swagger/include/NFMMod.yaml b/sdrbase/resources/webapi/doc/swagger/include/NFMMod.yaml
index 306fcc451..57c2fb28e 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/NFMMod.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/NFMMod.yaml
@@ -69,6 +69,8 @@ NFMModSettings:
       type: integer
     cwKeyer:
       $ref: "/doc/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
+    channelMarker:
+      $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
 
 NFMModReport:
   description: NFMMod
diff --git a/sdrbase/resources/webapi/doc/swagger/include/PacketMod.yaml b/sdrbase/resources/webapi/doc/swagger/include/PacketMod.yaml
index 1ccb4206b..d98d6fe62 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/PacketMod.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/PacketMod.yaml
@@ -149,6 +149,8 @@ PacketModSettings:
       type: integer
     reverseAPIChannelIndex:
       type: integer
+    channelMarker:
+      $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
 
 PacketModReport:
   description: PacketMod
diff --git a/sdrbase/resources/webapi/doc/swagger/include/RemoteSource.yaml b/sdrbase/resources/webapi/doc/swagger/include/RemoteSource.yaml
index 60b4033ab..42d9e0f3a 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/RemoteSource.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/RemoteSource.yaml
@@ -25,6 +25,8 @@ RemoteSourceSettings:
       type: integer
     reverseAPIChannelIndex:
       type: integer
+    channelMarker:
+      $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
 
 RemoteSourceReport:
   description: "Remote channel source report"
diff --git a/sdrbase/resources/webapi/doc/swagger/include/SSBMod.yaml b/sdrbase/resources/webapi/doc/swagger/include/SSBMod.yaml
index edd6f1ecc..3f4d9b8c2 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/SSBMod.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/SSBMod.yaml
@@ -62,6 +62,8 @@ SSBModSettings:
       $ref: "/doc/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
     spectrumConfig:
       $ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum"
+    channelMarker:
+      $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
 
 SSBModReport:
   description: SSBMod
diff --git a/sdrbase/resources/webapi/doc/swagger/include/UDPSource.yaml b/sdrbase/resources/webapi/doc/swagger/include/UDPSource.yaml
index b29337b7d..a843fd9d8 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/UDPSource.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/UDPSource.yaml
@@ -73,6 +73,8 @@ UDPSourceSettings:
       type: integer
     spectrumConfig:
       $ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum"
+    channelMarker:
+      $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
 
 UDPSourceReport:
   description: UDPSource
diff --git a/sdrbase/resources/webapi/doc/swagger/include/WFMMod.yaml b/sdrbase/resources/webapi/doc/swagger/include/WFMMod.yaml
index d87997db8..67ea88651 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/WFMMod.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/WFMMod.yaml
@@ -47,6 +47,8 @@ WFMModSettings:
       type: integer
     cwKeyer:
       $ref: "/doc/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
+    channelMarker:
+      $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
 
 WFMModReport:
   description: WFMMod
diff --git a/swagger/sdrangel/api/swagger/include/AISMod.yaml b/swagger/sdrangel/api/swagger/include/AISMod.yaml
index 44ba4686d..5cea39428 100644
--- a/swagger/sdrangel/api/swagger/include/AISMod.yaml
+++ b/swagger/sdrangel/api/swagger/include/AISMod.yaml
@@ -116,6 +116,8 @@ AISModSettings:
     udpPort:
       description: "UDP port to receive messages to transmit via"
       type: integer
+    channelMarker:
+      $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
 
 AISModReport:
   description: AISMod
diff --git a/swagger/sdrangel/api/swagger/include/AMMod.yaml b/swagger/sdrangel/api/swagger/include/AMMod.yaml
index 68ecb57b7..86d460cb1 100644
--- a/swagger/sdrangel/api/swagger/include/AMMod.yaml
+++ b/swagger/sdrangel/api/swagger/include/AMMod.yaml
@@ -45,6 +45,8 @@ AMModSettings:
       type: integer
     cwKeyer:
       $ref: "http://swgserver:8081/api/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
+    channelMarker:
+      $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
 
 AMModReport:
   description: AMMod
diff --git a/swagger/sdrangel/api/swagger/include/ATVMod.yaml b/swagger/sdrangel/api/swagger/include/ATVMod.yaml
index dbf135d53..91e0bf15c 100644
--- a/swagger/sdrangel/api/swagger/include/ATVMod.yaml
+++ b/swagger/sdrangel/api/swagger/include/ATVMod.yaml
@@ -67,6 +67,8 @@ ATVModSettings:
       type: integer
     reverseAPIChannelIndex:
       type: integer
+    channelMarker:
+      $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
 
 ATVModReport:
   description: ATVMod
diff --git a/swagger/sdrangel/api/swagger/include/ChirpChatMod.yaml b/swagger/sdrangel/api/swagger/include/ChirpChatMod.yaml
index 51d0ba3d4..5a2c4bd80 100644
--- a/swagger/sdrangel/api/swagger/include/ChirpChatMod.yaml
+++ b/swagger/sdrangel/api/swagger/include/ChirpChatMod.yaml
@@ -157,6 +157,8 @@ ChirpChatModSettings:
       type: integer
     reverseAPIChannelIndex:
       type: integer
+    channelMarker:
+      $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
 
 ChirpChatModReport:
   description: ChirpChatMod
diff --git a/swagger/sdrangel/api/swagger/include/DATVMod.yaml b/swagger/sdrangel/api/swagger/include/DATVMod.yaml
index 012b08f06..b55240267 100644
--- a/swagger/sdrangel/api/swagger/include/DATVMod.yaml
+++ b/swagger/sdrangel/api/swagger/include/DATVMod.yaml
@@ -58,6 +58,8 @@ DATVModSettings:
       type: integer
     reverseAPIChannelIndex:
       type: integer
+    channelMarker:
+      $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
 
 DATVModReport:
   description: DATVMod
diff --git a/swagger/sdrangel/api/swagger/include/FileSource.yaml b/swagger/sdrangel/api/swagger/include/FileSource.yaml
index 7bde851de..697b576f6 100644
--- a/swagger/sdrangel/api/swagger/include/FileSource.yaml
+++ b/swagger/sdrangel/api/swagger/include/FileSource.yaml
@@ -31,6 +31,8 @@ FileSourceSettings:
       type: integer
     reverseAPIChannelIndex:
       type: integer
+    channelMarker:
+      $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
 
 FileSourceReport:
   description: FileSource
diff --git a/swagger/sdrangel/api/swagger/include/FreeDVMod.yaml b/swagger/sdrangel/api/swagger/include/FreeDVMod.yaml
index 6328e2a3a..17514a154 100644
--- a/swagger/sdrangel/api/swagger/include/FreeDVMod.yaml
+++ b/swagger/sdrangel/api/swagger/include/FreeDVMod.yaml
@@ -46,6 +46,8 @@ FreeDVModSettings:
       $ref: "http://swgserver:8081/api/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
     spectrumConfig:
       $ref: "http://swgserver:8081/api/swagger/include/GLSpectrum.yaml#/GLSpectrum"
+    channelMarker:
+      $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
 
 FreeDVModReport:
   description: FreeDVMod
diff --git a/swagger/sdrangel/api/swagger/include/IEEE_802_15_4_Mod.yaml b/swagger/sdrangel/api/swagger/include/IEEE_802_15_4_Mod.yaml
index 845045eda..06f796ac5 100644
--- a/swagger/sdrangel/api/swagger/include/IEEE_802_15_4_Mod.yaml
+++ b/swagger/sdrangel/api/swagger/include/IEEE_802_15_4_Mod.yaml
@@ -124,6 +124,8 @@ IEEE_802_15_4_ModSettings:
     udpPort:
       description: UDP port to listen for frames to transmit on
       type: integer
+    channelMarker:
+      $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
 
 IEEE_802_15_4_ModReport:
   description: IEEE_802_15_4_Mod
diff --git a/swagger/sdrangel/api/swagger/include/LocalSource.yaml b/swagger/sdrangel/api/swagger/include/LocalSource.yaml
index 2b2e462ed..225842773 100644
--- a/swagger/sdrangel/api/swagger/include/LocalSource.yaml
+++ b/swagger/sdrangel/api/swagger/include/LocalSource.yaml
@@ -29,3 +29,5 @@ LocalSourceSettings:
       type: integer
     reverseAPIChannelIndex:
       type: integer
+    channelMarker:
+      $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
diff --git a/swagger/sdrangel/api/swagger/include/NFMMod.yaml b/swagger/sdrangel/api/swagger/include/NFMMod.yaml
index 20897b8bb..fd8b35543 100644
--- a/swagger/sdrangel/api/swagger/include/NFMMod.yaml
+++ b/swagger/sdrangel/api/swagger/include/NFMMod.yaml
@@ -69,6 +69,8 @@ NFMModSettings:
       type: integer
     cwKeyer:
       $ref: "http://swgserver:8081/api/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
+    channelMarker:
+      $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
 
 NFMModReport:
   description: NFMMod
diff --git a/swagger/sdrangel/api/swagger/include/PacketMod.yaml b/swagger/sdrangel/api/swagger/include/PacketMod.yaml
index 1ccb4206b..b09213970 100644
--- a/swagger/sdrangel/api/swagger/include/PacketMod.yaml
+++ b/swagger/sdrangel/api/swagger/include/PacketMod.yaml
@@ -149,6 +149,8 @@ PacketModSettings:
       type: integer
     reverseAPIChannelIndex:
       type: integer
+    channelMarker:
+      $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
 
 PacketModReport:
   description: PacketMod
diff --git a/swagger/sdrangel/api/swagger/include/RemoteSource.yaml b/swagger/sdrangel/api/swagger/include/RemoteSource.yaml
index 60b4033ab..21e544e65 100644
--- a/swagger/sdrangel/api/swagger/include/RemoteSource.yaml
+++ b/swagger/sdrangel/api/swagger/include/RemoteSource.yaml
@@ -25,6 +25,8 @@ RemoteSourceSettings:
       type: integer
     reverseAPIChannelIndex:
       type: integer
+    channelMarker:
+      $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
 
 RemoteSourceReport:
   description: "Remote channel source report"
diff --git a/swagger/sdrangel/api/swagger/include/SSBMod.yaml b/swagger/sdrangel/api/swagger/include/SSBMod.yaml
index 1a639b357..ed0fc1ae2 100644
--- a/swagger/sdrangel/api/swagger/include/SSBMod.yaml
+++ b/swagger/sdrangel/api/swagger/include/SSBMod.yaml
@@ -62,6 +62,8 @@ SSBModSettings:
       $ref: "http://swgserver:8081/api/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
     spectrumConfig:
       $ref: "http://swgserver:8081/api/swagger/include/GLSpectrum.yaml#/GLSpectrum"
+    channelMarker:
+      $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
 
 SSBModReport:
   description: SSBMod
diff --git a/swagger/sdrangel/api/swagger/include/UDPSource.yaml b/swagger/sdrangel/api/swagger/include/UDPSource.yaml
index a0cbc2dda..7f458e1a0 100644
--- a/swagger/sdrangel/api/swagger/include/UDPSource.yaml
+++ b/swagger/sdrangel/api/swagger/include/UDPSource.yaml
@@ -73,6 +73,8 @@ UDPSourceSettings:
       type: integer
     spectrumConfig:
       $ref: "http://swgserver:8081/api/swagger/include/GLSpectrum.yaml#/GLSpectrum"
+    channelMarker:
+      $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
 
 UDPSourceReport:
   description: UDPSource
diff --git a/swagger/sdrangel/api/swagger/include/WFMMod.yaml b/swagger/sdrangel/api/swagger/include/WFMMod.yaml
index 8d5d4b64f..17d40a19b 100644
--- a/swagger/sdrangel/api/swagger/include/WFMMod.yaml
+++ b/swagger/sdrangel/api/swagger/include/WFMMod.yaml
@@ -47,6 +47,8 @@ WFMModSettings:
       type: integer
     cwKeyer:
       $ref: "http://swgserver:8081/api/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
+    channelMarker:
+      $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
 
 WFMModReport:
   description: WFMMod
diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html
index c125149b8..5f7687aed 100644
--- a/swagger/sdrangel/code/html2/index.html
+++ b/swagger/sdrangel/code/html2/index.html
@@ -1159,6 +1159,9 @@ margin-bottom: 20px;
     "udpPort" : {
       "type" : "integer",
       "description" : "UDP port to receive messages to transmit via"
+    },
+    "channelMarker" : {
+      "$ref" : "#/definitions/ChannelMarker"
     }
   },
   "description" : "AISMod"
@@ -1390,6 +1393,9 @@ margin-bottom: 20px;
     },
     "cwKeyer" : {
       "$ref" : "#/definitions/CWKeyerSettings"
+    },
+    "channelMarker" : {
+      "$ref" : "#/definitions/ChannelMarker"
     }
   },
   "description" : "AMMod"
@@ -1795,6 +1801,9 @@ margin-bottom: 20px;
     },
     "reverseAPIChannelIndex" : {
       "type" : "integer"
+    },
+    "channelMarker" : {
+      "$ref" : "#/definitions/ChannelMarker"
     }
   },
   "description" : "ATVMod"
@@ -3794,6 +3803,9 @@ margin-bottom: 20px;
     },
     "reverseAPIChannelIndex" : {
       "type" : "integer"
+    },
+    "channelMarker" : {
+      "$ref" : "#/definitions/ChannelMarker"
     }
   },
   "description" : "ChirpChatMod"
@@ -4185,6 +4197,9 @@ margin-bottom: 20px;
     },
     "reverseAPIChannelIndex" : {
       "type" : "integer"
+    },
+    "channelMarker" : {
+      "$ref" : "#/definitions/ChannelMarker"
     }
   },
   "description" : "DATVMod"
@@ -5577,6 +5592,9 @@ margin-bottom: 20px;
     },
     "reverseAPIChannelIndex" : {
       "type" : "integer"
+    },
+    "channelMarker" : {
+      "$ref" : "#/definitions/ChannelMarker"
     }
   },
   "description" : "FileSource"
@@ -5751,6 +5769,9 @@ margin-bottom: 20px;
     },
     "spectrumConfig" : {
       "$ref" : "#/definitions/GLSpectrum"
+    },
+    "channelMarker" : {
+      "$ref" : "#/definitions/ChannelMarker"
     }
   },
   "description" : "FreeDVMod"
@@ -6486,6 +6507,9 @@ margin-bottom: 20px;
     "udpPort" : {
       "type" : "integer",
       "description" : "UDP port to listen for frames to transmit on"
+    },
+    "channelMarker" : {
+      "$ref" : "#/definitions/ChannelMarker"
     }
   },
   "description" : "IEEE_802_15_4_Mod"
@@ -7536,6 +7560,9 @@ margin-bottom: 20px;
     },
     "reverseAPIChannelIndex" : {
       "type" : "integer"
+    },
+    "channelMarker" : {
+      "$ref" : "#/definitions/ChannelMarker"
     }
   },
   "description" : "Local channel source settings"
@@ -8110,6 +8137,9 @@ margin-bottom: 20px;
     },
     "cwKeyer" : {
       "$ref" : "#/definitions/CWKeyerSettings"
+    },
+    "channelMarker" : {
+      "$ref" : "#/definitions/ChannelMarker"
     }
   },
   "description" : "NFMMod"
@@ -8641,6 +8671,9 @@ margin-bottom: 20px;
     },
     "reverseAPIChannelIndex" : {
       "type" : "integer"
+    },
+    "channelMarker" : {
+      "$ref" : "#/definitions/ChannelMarker"
     }
   },
   "description" : "PacketMod"
@@ -9992,6 +10025,9 @@ margin-bottom: 20px;
     },
     "reverseAPIChannelIndex" : {
       "type" : "integer"
+    },
+    "channelMarker" : {
+      "$ref" : "#/definitions/ChannelMarker"
     }
   },
   "description" : "Remote channel source settings"
@@ -10553,6 +10589,9 @@ margin-bottom: 20px;
     },
     "spectrumConfig" : {
       "$ref" : "#/definitions/GLSpectrum"
+    },
+    "channelMarker" : {
+      "$ref" : "#/definitions/ChannelMarker"
     }
   },
   "description" : "SSBMod"
@@ -12484,6 +12523,9 @@ margin-bottom: 20px;
     },
     "spectrumConfig" : {
       "$ref" : "#/definitions/GLSpectrum"
+    },
+    "channelMarker" : {
+      "$ref" : "#/definitions/ChannelMarker"
     }
   },
   "description" : "UDPSource"
@@ -13051,6 +13093,9 @@ margin-bottom: 20px;
     },
     "cwKeyer" : {
       "$ref" : "#/definitions/CWKeyerSettings"
+    },
+    "channelMarker" : {
+      "$ref" : "#/definitions/ChannelMarker"
     }
   },
   "description" : "WFMMod"
@@ -51554,7 +51599,7 @@ except ApiException as e:
           </div>
           <div id="generator">
             <div class="content">
-              Generated 2021-12-02T23:38:15.455+01:00
+              Generated 2021-12-03T00:35:44.973+01:00
             </div>
           </div>
       </div>
diff --git a/swagger/sdrangel/code/qt5/client/SWGAISModSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGAISModSettings.cpp
index d51ee5594..f1b7972df 100644
--- a/swagger/sdrangel/code/qt5/client/SWGAISModSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGAISModSettings.cpp
@@ -100,6 +100,8 @@ SWGAISModSettings::SWGAISModSettings() {
     m_udp_address_isSet = false;
     udp_port = 0;
     m_udp_port_isSet = false;
+    channel_marker = nullptr;
+    m_channel_marker_isSet = false;
 }
 
 SWGAISModSettings::~SWGAISModSettings() {
@@ -180,6 +182,8 @@ SWGAISModSettings::init() {
     m_udp_address_isSet = false;
     udp_port = 0;
     m_udp_port_isSet = false;
+    channel_marker = new SWGChannelMarker();
+    m_channel_marker_isSet = false;
 }
 
 void
@@ -230,6 +234,9 @@ SWGAISModSettings::cleanup() {
         delete udp_address;
     }
 
+    if(channel_marker != nullptr) { 
+        delete channel_marker;
+    }
 }
 
 SWGAISModSettings*
@@ -315,6 +322,8 @@ SWGAISModSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&udp_port, pJson["udpPort"], "qint32", "");
     
+    ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker");
+    
 }
 
 QString
@@ -439,6 +448,9 @@ SWGAISModSettings::asJsonObject() {
     if(m_udp_port_isSet){
         obj->insert("udpPort", QJsonValue(udp_port));
     }
+    if((channel_marker != nullptr) && (channel_marker->isSet())){
+        toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker"));
+    }
 
     return obj;
 }
@@ -803,6 +815,16 @@ SWGAISModSettings::setUdpPort(qint32 udp_port) {
     this->m_udp_port_isSet = true;
 }
 
+SWGChannelMarker*
+SWGAISModSettings::getChannelMarker() {
+    return channel_marker;
+}
+void
+SWGAISModSettings::setChannelMarker(SWGChannelMarker* channel_marker) {
+    this->channel_marker = channel_marker;
+    this->m_channel_marker_isSet = true;
+}
+
 
 bool
 SWGAISModSettings::isSet(){
@@ -916,6 +938,9 @@ SWGAISModSettings::isSet(){
         if(m_udp_port_isSet){
             isObjectUpdated = true; break;
         }
+        if(channel_marker && channel_marker->isSet()){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGAISModSettings.h b/swagger/sdrangel/code/qt5/client/SWGAISModSettings.h
index f3aafe924..b0d78d7a7 100644
--- a/swagger/sdrangel/code/qt5/client/SWGAISModSettings.h
+++ b/swagger/sdrangel/code/qt5/client/SWGAISModSettings.h
@@ -22,6 +22,7 @@
 #include <QJsonObject>
 
 
+#include "SWGChannelMarker.h"
 #include <QString>
 
 #include "SWGObject.h"
@@ -150,6 +151,9 @@ public:
     qint32 getUdpPort();
     void setUdpPort(qint32 udp_port);
 
+    SWGChannelMarker* getChannelMarker();
+    void setChannelMarker(SWGChannelMarker* channel_marker);
+
 
     virtual bool isSet() override;
 
@@ -262,6 +266,9 @@ private:
     qint32 udp_port;
     bool m_udp_port_isSet;
 
+    SWGChannelMarker* channel_marker;
+    bool m_channel_marker_isSet;
+
 };
 
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGAMModSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGAMModSettings.cpp
index be07a5bc4..332d67629 100644
--- a/swagger/sdrangel/code/qt5/client/SWGAMModSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGAMModSettings.cpp
@@ -64,6 +64,8 @@ SWGAMModSettings::SWGAMModSettings() {
     m_reverse_api_channel_index_isSet = false;
     cw_keyer = nullptr;
     m_cw_keyer_isSet = false;
+    channel_marker = nullptr;
+    m_channel_marker_isSet = false;
 }
 
 SWGAMModSettings::~SWGAMModSettings() {
@@ -108,6 +110,8 @@ SWGAMModSettings::init() {
     m_reverse_api_channel_index_isSet = false;
     cw_keyer = new SWGCWKeyerSettings();
     m_cw_keyer_isSet = false;
+    channel_marker = new SWGChannelMarker();
+    m_channel_marker_isSet = false;
 }
 
 void
@@ -138,6 +142,9 @@ SWGAMModSettings::cleanup() {
     if(cw_keyer != nullptr) { 
         delete cw_keyer;
     }
+    if(channel_marker != nullptr) { 
+        delete channel_marker;
+    }
 }
 
 SWGAMModSettings*
@@ -187,6 +194,8 @@ SWGAMModSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&cw_keyer, pJson["cwKeyer"], "SWGCWKeyerSettings", "SWGCWKeyerSettings");
     
+    ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker");
+    
 }
 
 QString
@@ -257,6 +266,9 @@ SWGAMModSettings::asJsonObject() {
     if((cw_keyer != nullptr) && (cw_keyer->isSet())){
         toJsonValue(QString("cwKeyer"), cw_keyer, obj, QString("SWGCWKeyerSettings"));
     }
+    if((channel_marker != nullptr) && (channel_marker->isSet())){
+        toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker"));
+    }
 
     return obj;
 }
@@ -441,6 +453,16 @@ SWGAMModSettings::setCwKeyer(SWGCWKeyerSettings* cw_keyer) {
     this->m_cw_keyer_isSet = true;
 }
 
+SWGChannelMarker*
+SWGAMModSettings::getChannelMarker() {
+    return channel_marker;
+}
+void
+SWGAMModSettings::setChannelMarker(SWGChannelMarker* channel_marker) {
+    this->channel_marker = channel_marker;
+    this->m_channel_marker_isSet = true;
+}
+
 
 bool
 SWGAMModSettings::isSet(){
@@ -500,6 +522,9 @@ SWGAMModSettings::isSet(){
         if(cw_keyer && cw_keyer->isSet()){
             isObjectUpdated = true; break;
         }
+        if(channel_marker && channel_marker->isSet()){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGAMModSettings.h b/swagger/sdrangel/code/qt5/client/SWGAMModSettings.h
index 65233f12f..b38532129 100644
--- a/swagger/sdrangel/code/qt5/client/SWGAMModSettings.h
+++ b/swagger/sdrangel/code/qt5/client/SWGAMModSettings.h
@@ -23,6 +23,7 @@
 
 
 #include "SWGCWKeyerSettings.h"
+#include "SWGChannelMarker.h"
 #include <QString>
 
 #include "SWGObject.h"
@@ -97,6 +98,9 @@ public:
     SWGCWKeyerSettings* getCwKeyer();
     void setCwKeyer(SWGCWKeyerSettings* cw_keyer);
 
+    SWGChannelMarker* getChannelMarker();
+    void setChannelMarker(SWGChannelMarker* channel_marker);
+
 
     virtual bool isSet() override;
 
@@ -155,6 +159,9 @@ private:
     SWGCWKeyerSettings* cw_keyer;
     bool m_cw_keyer_isSet;
 
+    SWGChannelMarker* channel_marker;
+    bool m_channel_marker_isSet;
+
 };
 
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGATVModSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGATVModSettings.cpp
index 368035b01..b4682e44b 100644
--- a/swagger/sdrangel/code/qt5/client/SWGATVModSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGATVModSettings.cpp
@@ -86,6 +86,8 @@ SWGATVModSettings::SWGATVModSettings() {
     m_reverse_api_device_index_isSet = false;
     reverse_api_channel_index = 0;
     m_reverse_api_channel_index_isSet = false;
+    channel_marker = nullptr;
+    m_channel_marker_isSet = false;
 }
 
 SWGATVModSettings::~SWGATVModSettings() {
@@ -152,6 +154,8 @@ SWGATVModSettings::init() {
     m_reverse_api_device_index_isSet = false;
     reverse_api_channel_index = 0;
     m_reverse_api_channel_index_isSet = false;
+    channel_marker = new SWGChannelMarker();
+    m_channel_marker_isSet = false;
 }
 
 void
@@ -195,6 +199,9 @@ SWGATVModSettings::cleanup() {
 
 
 
+    if(channel_marker != nullptr) { 
+        delete channel_marker;
+    }
 }
 
 SWGATVModSettings*
@@ -266,6 +273,8 @@ SWGATVModSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", "");
     
+    ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker");
+    
 }
 
 QString
@@ -369,6 +378,9 @@ SWGATVModSettings::asJsonObject() {
     if(m_reverse_api_channel_index_isSet){
         obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index));
     }
+    if((channel_marker != nullptr) && (channel_marker->isSet())){
+        toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker"));
+    }
 
     return obj;
 }
@@ -663,6 +675,16 @@ SWGATVModSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_index) {
     this->m_reverse_api_channel_index_isSet = true;
 }
 
+SWGChannelMarker*
+SWGATVModSettings::getChannelMarker() {
+    return channel_marker;
+}
+void
+SWGATVModSettings::setChannelMarker(SWGChannelMarker* channel_marker) {
+    this->channel_marker = channel_marker;
+    this->m_channel_marker_isSet = true;
+}
+
 
 bool
 SWGATVModSettings::isSet(){
@@ -755,6 +777,9 @@ SWGATVModSettings::isSet(){
         if(m_reverse_api_channel_index_isSet){
             isObjectUpdated = true; break;
         }
+        if(channel_marker && channel_marker->isSet()){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGATVModSettings.h b/swagger/sdrangel/code/qt5/client/SWGATVModSettings.h
index 8f0fdfb3a..2a0bab716 100644
--- a/swagger/sdrangel/code/qt5/client/SWGATVModSettings.h
+++ b/swagger/sdrangel/code/qt5/client/SWGATVModSettings.h
@@ -22,6 +22,7 @@
 #include <QJsonObject>
 
 
+#include "SWGChannelMarker.h"
 #include <QString>
 
 #include "SWGObject.h"
@@ -129,6 +130,9 @@ public:
     qint32 getReverseApiChannelIndex();
     void setReverseApiChannelIndex(qint32 reverse_api_channel_index);
 
+    SWGChannelMarker* getChannelMarker();
+    void setChannelMarker(SWGChannelMarker* channel_marker);
+
 
     virtual bool isSet() override;
 
@@ -220,6 +224,9 @@ private:
     qint32 reverse_api_channel_index;
     bool m_reverse_api_channel_index_isSet;
 
+    SWGChannelMarker* channel_marker;
+    bool m_channel_marker_isSet;
+
 };
 
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGChirpChatModSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGChirpChatModSettings.cpp
index 39f893043..f34e796ff 100644
--- a/swagger/sdrangel/code/qt5/client/SWGChirpChatModSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGChirpChatModSettings.cpp
@@ -106,6 +106,8 @@ SWGChirpChatModSettings::SWGChirpChatModSettings() {
     m_reverse_api_device_index_isSet = false;
     reverse_api_channel_index = 0;
     m_reverse_api_channel_index_isSet = false;
+    channel_marker = nullptr;
+    m_channel_marker_isSet = false;
 }
 
 SWGChirpChatModSettings::~SWGChirpChatModSettings() {
@@ -192,6 +194,8 @@ SWGChirpChatModSettings::init() {
     m_reverse_api_device_index_isSet = false;
     reverse_api_channel_index = 0;
     m_reverse_api_channel_index_isSet = false;
+    channel_marker = new SWGChannelMarker();
+    m_channel_marker_isSet = false;
 }
 
 void
@@ -273,6 +277,9 @@ SWGChirpChatModSettings::cleanup() {
 
 
 
+    if(channel_marker != nullptr) { 
+        delete channel_marker;
+    }
 }
 
 SWGChirpChatModSettings*
@@ -364,6 +371,8 @@ SWGChirpChatModSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", "");
     
+    ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker");
+    
 }
 
 QString
@@ -497,6 +506,9 @@ SWGChirpChatModSettings::asJsonObject() {
     if(m_reverse_api_channel_index_isSet){
         obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index));
     }
+    if((channel_marker != nullptr) && (channel_marker->isSet())){
+        toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker"));
+    }
 
     return obj;
 }
@@ -891,6 +903,16 @@ SWGChirpChatModSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_in
     this->m_reverse_api_channel_index_isSet = true;
 }
 
+SWGChannelMarker*
+SWGChirpChatModSettings::getChannelMarker() {
+    return channel_marker;
+}
+void
+SWGChirpChatModSettings::setChannelMarker(SWGChannelMarker* channel_marker) {
+    this->channel_marker = channel_marker;
+    this->m_channel_marker_isSet = true;
+}
+
 
 bool
 SWGChirpChatModSettings::isSet(){
@@ -1013,6 +1035,9 @@ SWGChirpChatModSettings::isSet(){
         if(m_reverse_api_channel_index_isSet){
             isObjectUpdated = true; break;
         }
+        if(channel_marker && channel_marker->isSet()){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGChirpChatModSettings.h b/swagger/sdrangel/code/qt5/client/SWGChirpChatModSettings.h
index aa24fbc7b..80d7e4971 100644
--- a/swagger/sdrangel/code/qt5/client/SWGChirpChatModSettings.h
+++ b/swagger/sdrangel/code/qt5/client/SWGChirpChatModSettings.h
@@ -22,6 +22,7 @@
 #include <QJsonObject>
 
 
+#include "SWGChannelMarker.h"
 #include <QList>
 #include <QString>
 
@@ -160,6 +161,9 @@ public:
     qint32 getReverseApiChannelIndex();
     void setReverseApiChannelIndex(qint32 reverse_api_channel_index);
 
+    SWGChannelMarker* getChannelMarker();
+    void setChannelMarker(SWGChannelMarker* channel_marker);
+
 
     virtual bool isSet() override;
 
@@ -281,6 +285,9 @@ private:
     qint32 reverse_api_channel_index;
     bool m_reverse_api_channel_index_isSet;
 
+    SWGChannelMarker* channel_marker;
+    bool m_channel_marker_isSet;
+
 };
 
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGDATVModSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGDATVModSettings.cpp
index fd720cddb..be7b6b0fd 100644
--- a/swagger/sdrangel/code/qt5/client/SWGDATVModSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGDATVModSettings.cpp
@@ -72,6 +72,8 @@ SWGDATVModSettings::SWGDATVModSettings() {
     m_reverse_api_device_index_isSet = false;
     reverse_api_channel_index = 0;
     m_reverse_api_channel_index_isSet = false;
+    channel_marker = nullptr;
+    m_channel_marker_isSet = false;
 }
 
 SWGDATVModSettings::~SWGDATVModSettings() {
@@ -124,6 +126,8 @@ SWGDATVModSettings::init() {
     m_reverse_api_device_index_isSet = false;
     reverse_api_channel_index = 0;
     m_reverse_api_channel_index_isSet = false;
+    channel_marker = new SWGChannelMarker();
+    m_channel_marker_isSet = false;
 }
 
 void
@@ -158,6 +162,9 @@ SWGDATVModSettings::cleanup() {
 
 
 
+    if(channel_marker != nullptr) { 
+        delete channel_marker;
+    }
 }
 
 SWGDATVModSettings*
@@ -215,6 +222,8 @@ SWGDATVModSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", "");
     
+    ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker");
+    
 }
 
 QString
@@ -297,6 +306,9 @@ SWGDATVModSettings::asJsonObject() {
     if(m_reverse_api_channel_index_isSet){
         obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index));
     }
+    if((channel_marker != nullptr) && (channel_marker->isSet())){
+        toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker"));
+    }
 
     return obj;
 }
@@ -521,6 +533,16 @@ SWGDATVModSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_index)
     this->m_reverse_api_channel_index_isSet = true;
 }
 
+SWGChannelMarker*
+SWGDATVModSettings::getChannelMarker() {
+    return channel_marker;
+}
+void
+SWGDATVModSettings::setChannelMarker(SWGChannelMarker* channel_marker) {
+    this->channel_marker = channel_marker;
+    this->m_channel_marker_isSet = true;
+}
+
 
 bool
 SWGDATVModSettings::isSet(){
@@ -592,6 +614,9 @@ SWGDATVModSettings::isSet(){
         if(m_reverse_api_channel_index_isSet){
             isObjectUpdated = true; break;
         }
+        if(channel_marker && channel_marker->isSet()){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGDATVModSettings.h b/swagger/sdrangel/code/qt5/client/SWGDATVModSettings.h
index baeaac28f..491e80cfd 100644
--- a/swagger/sdrangel/code/qt5/client/SWGDATVModSettings.h
+++ b/swagger/sdrangel/code/qt5/client/SWGDATVModSettings.h
@@ -22,6 +22,7 @@
 #include <QJsonObject>
 
 
+#include "SWGChannelMarker.h"
 #include <QString>
 
 #include "SWGObject.h"
@@ -108,6 +109,9 @@ public:
     qint32 getReverseApiChannelIndex();
     void setReverseApiChannelIndex(qint32 reverse_api_channel_index);
 
+    SWGChannelMarker* getChannelMarker();
+    void setChannelMarker(SWGChannelMarker* channel_marker);
+
 
     virtual bool isSet() override;
 
@@ -178,6 +182,9 @@ private:
     qint32 reverse_api_channel_index;
     bool m_reverse_api_channel_index_isSet;
 
+    SWGChannelMarker* channel_marker;
+    bool m_channel_marker_isSet;
+
 };
 
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGFileSourceSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGFileSourceSettings.cpp
index 76e88d53d..662dda866 100644
--- a/swagger/sdrangel/code/qt5/client/SWGFileSourceSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGFileSourceSettings.cpp
@@ -54,6 +54,8 @@ SWGFileSourceSettings::SWGFileSourceSettings() {
     m_reverse_api_device_index_isSet = false;
     reverse_api_channel_index = 0;
     m_reverse_api_channel_index_isSet = false;
+    channel_marker = nullptr;
+    m_channel_marker_isSet = false;
 }
 
 SWGFileSourceSettings::~SWGFileSourceSettings() {
@@ -88,6 +90,8 @@ SWGFileSourceSettings::init() {
     m_reverse_api_device_index_isSet = false;
     reverse_api_channel_index = 0;
     m_reverse_api_channel_index_isSet = false;
+    channel_marker = new SWGChannelMarker();
+    m_channel_marker_isSet = false;
 }
 
 void
@@ -111,6 +115,9 @@ SWGFileSourceSettings::cleanup() {
 
 
 
+    if(channel_marker != nullptr) { 
+        delete channel_marker;
+    }
 }
 
 SWGFileSourceSettings*
@@ -150,6 +157,8 @@ SWGFileSourceSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", "");
     
+    ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker");
+    
 }
 
 QString
@@ -205,6 +214,9 @@ SWGFileSourceSettings::asJsonObject() {
     if(m_reverse_api_channel_index_isSet){
         obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index));
     }
+    if((channel_marker != nullptr) && (channel_marker->isSet())){
+        toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker"));
+    }
 
     return obj;
 }
@@ -339,6 +351,16 @@ SWGFileSourceSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_inde
     this->m_reverse_api_channel_index_isSet = true;
 }
 
+SWGChannelMarker*
+SWGFileSourceSettings::getChannelMarker() {
+    return channel_marker;
+}
+void
+SWGFileSourceSettings::setChannelMarker(SWGChannelMarker* channel_marker) {
+    this->channel_marker = channel_marker;
+    this->m_channel_marker_isSet = true;
+}
+
 
 bool
 SWGFileSourceSettings::isSet(){
@@ -383,6 +405,9 @@ SWGFileSourceSettings::isSet(){
         if(m_reverse_api_channel_index_isSet){
             isObjectUpdated = true; break;
         }
+        if(channel_marker && channel_marker->isSet()){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGFileSourceSettings.h b/swagger/sdrangel/code/qt5/client/SWGFileSourceSettings.h
index 62cc43867..79a14f45c 100644
--- a/swagger/sdrangel/code/qt5/client/SWGFileSourceSettings.h
+++ b/swagger/sdrangel/code/qt5/client/SWGFileSourceSettings.h
@@ -22,6 +22,7 @@
 #include <QJsonObject>
 
 
+#include "SWGChannelMarker.h"
 #include <QString>
 
 #include "SWGObject.h"
@@ -81,6 +82,9 @@ public:
     qint32 getReverseApiChannelIndex();
     void setReverseApiChannelIndex(qint32 reverse_api_channel_index);
 
+    SWGChannelMarker* getChannelMarker();
+    void setChannelMarker(SWGChannelMarker* channel_marker);
+
 
     virtual bool isSet() override;
 
@@ -124,6 +128,9 @@ private:
     qint32 reverse_api_channel_index;
     bool m_reverse_api_channel_index_isSet;
 
+    SWGChannelMarker* channel_marker;
+    bool m_channel_marker_isSet;
+
 };
 
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGFreeDVModSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGFreeDVModSettings.cpp
index 3422c5227..6473fb9fd 100644
--- a/swagger/sdrangel/code/qt5/client/SWGFreeDVModSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGFreeDVModSettings.cpp
@@ -68,6 +68,8 @@ SWGFreeDVModSettings::SWGFreeDVModSettings() {
     m_cw_keyer_isSet = false;
     spectrum_config = nullptr;
     m_spectrum_config_isSet = false;
+    channel_marker = nullptr;
+    m_channel_marker_isSet = false;
 }
 
 SWGFreeDVModSettings::~SWGFreeDVModSettings() {
@@ -116,6 +118,8 @@ SWGFreeDVModSettings::init() {
     m_cw_keyer_isSet = false;
     spectrum_config = new SWGGLSpectrum();
     m_spectrum_config_isSet = false;
+    channel_marker = new SWGChannelMarker();
+    m_channel_marker_isSet = false;
 }
 
 void
@@ -150,6 +154,9 @@ SWGFreeDVModSettings::cleanup() {
     if(spectrum_config != nullptr) { 
         delete spectrum_config;
     }
+    if(channel_marker != nullptr) { 
+        delete channel_marker;
+    }
 }
 
 SWGFreeDVModSettings*
@@ -203,6 +210,8 @@ SWGFreeDVModSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&spectrum_config, pJson["spectrumConfig"], "SWGGLSpectrum", "SWGGLSpectrum");
     
+    ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker");
+    
 }
 
 QString
@@ -279,6 +288,9 @@ SWGFreeDVModSettings::asJsonObject() {
     if((spectrum_config != nullptr) && (spectrum_config->isSet())){
         toJsonValue(QString("spectrumConfig"), spectrum_config, obj, QString("SWGGLSpectrum"));
     }
+    if((channel_marker != nullptr) && (channel_marker->isSet())){
+        toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker"));
+    }
 
     return obj;
 }
@@ -483,6 +495,16 @@ SWGFreeDVModSettings::setSpectrumConfig(SWGGLSpectrum* spectrum_config) {
     this->m_spectrum_config_isSet = true;
 }
 
+SWGChannelMarker*
+SWGFreeDVModSettings::getChannelMarker() {
+    return channel_marker;
+}
+void
+SWGFreeDVModSettings::setChannelMarker(SWGChannelMarker* channel_marker) {
+    this->channel_marker = channel_marker;
+    this->m_channel_marker_isSet = true;
+}
+
 
 bool
 SWGFreeDVModSettings::isSet(){
@@ -548,6 +570,9 @@ SWGFreeDVModSettings::isSet(){
         if(spectrum_config && spectrum_config->isSet()){
             isObjectUpdated = true; break;
         }
+        if(channel_marker && channel_marker->isSet()){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGFreeDVModSettings.h b/swagger/sdrangel/code/qt5/client/SWGFreeDVModSettings.h
index 4fb581b60..e31f12640 100644
--- a/swagger/sdrangel/code/qt5/client/SWGFreeDVModSettings.h
+++ b/swagger/sdrangel/code/qt5/client/SWGFreeDVModSettings.h
@@ -23,6 +23,7 @@
 
 
 #include "SWGCWKeyerSettings.h"
+#include "SWGChannelMarker.h"
 #include "SWGGLSpectrum.h"
 #include <QString>
 
@@ -104,6 +105,9 @@ public:
     SWGGLSpectrum* getSpectrumConfig();
     void setSpectrumConfig(SWGGLSpectrum* spectrum_config);
 
+    SWGChannelMarker* getChannelMarker();
+    void setChannelMarker(SWGChannelMarker* channel_marker);
+
 
     virtual bool isSet() override;
 
@@ -168,6 +172,9 @@ private:
     SWGGLSpectrum* spectrum_config;
     bool m_spectrum_config_isSet;
 
+    SWGChannelMarker* channel_marker;
+    bool m_channel_marker_isSet;
+
 };
 
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGIEEE_802_15_4_ModSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGIEEE_802_15_4_ModSettings.cpp
index 337d9eac0..b2b980aab 100644
--- a/swagger/sdrangel/code/qt5/client/SWGIEEE_802_15_4_ModSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGIEEE_802_15_4_ModSettings.cpp
@@ -100,6 +100,8 @@ SWGIEEE_802_15_4_ModSettings::SWGIEEE_802_15_4_ModSettings() {
     m_udp_address_isSet = false;
     udp_port = 0;
     m_udp_port_isSet = false;
+    channel_marker = nullptr;
+    m_channel_marker_isSet = false;
 }
 
 SWGIEEE_802_15_4_ModSettings::~SWGIEEE_802_15_4_ModSettings() {
@@ -180,6 +182,8 @@ SWGIEEE_802_15_4_ModSettings::init() {
     m_udp_address_isSet = false;
     udp_port = 0;
     m_udp_port_isSet = false;
+    channel_marker = new SWGChannelMarker();
+    m_channel_marker_isSet = false;
 }
 
 void
@@ -228,6 +232,9 @@ SWGIEEE_802_15_4_ModSettings::cleanup() {
         delete udp_address;
     }
 
+    if(channel_marker != nullptr) { 
+        delete channel_marker;
+    }
 }
 
 SWGIEEE_802_15_4_ModSettings*
@@ -313,6 +320,8 @@ SWGIEEE_802_15_4_ModSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&udp_port, pJson["udpPort"], "qint32", "");
     
+    ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker");
+    
 }
 
 QString
@@ -437,6 +446,9 @@ SWGIEEE_802_15_4_ModSettings::asJsonObject() {
     if(m_udp_port_isSet){
         obj->insert("udpPort", QJsonValue(udp_port));
     }
+    if((channel_marker != nullptr) && (channel_marker->isSet())){
+        toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker"));
+    }
 
     return obj;
 }
@@ -801,6 +813,16 @@ SWGIEEE_802_15_4_ModSettings::setUdpPort(qint32 udp_port) {
     this->m_udp_port_isSet = true;
 }
 
+SWGChannelMarker*
+SWGIEEE_802_15_4_ModSettings::getChannelMarker() {
+    return channel_marker;
+}
+void
+SWGIEEE_802_15_4_ModSettings::setChannelMarker(SWGChannelMarker* channel_marker) {
+    this->channel_marker = channel_marker;
+    this->m_channel_marker_isSet = true;
+}
+
 
 bool
 SWGIEEE_802_15_4_ModSettings::isSet(){
@@ -914,6 +936,9 @@ SWGIEEE_802_15_4_ModSettings::isSet(){
         if(m_udp_port_isSet){
             isObjectUpdated = true; break;
         }
+        if(channel_marker && channel_marker->isSet()){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGIEEE_802_15_4_ModSettings.h b/swagger/sdrangel/code/qt5/client/SWGIEEE_802_15_4_ModSettings.h
index 192068d0a..a912b16b7 100644
--- a/swagger/sdrangel/code/qt5/client/SWGIEEE_802_15_4_ModSettings.h
+++ b/swagger/sdrangel/code/qt5/client/SWGIEEE_802_15_4_ModSettings.h
@@ -22,6 +22,7 @@
 #include <QJsonObject>
 
 
+#include "SWGChannelMarker.h"
 #include <QString>
 
 #include "SWGObject.h"
@@ -150,6 +151,9 @@ public:
     qint32 getUdpPort();
     void setUdpPort(qint32 udp_port);
 
+    SWGChannelMarker* getChannelMarker();
+    void setChannelMarker(SWGChannelMarker* channel_marker);
+
 
     virtual bool isSet() override;
 
@@ -262,6 +266,9 @@ private:
     qint32 udp_port;
     bool m_udp_port_isSet;
 
+    SWGChannelMarker* channel_marker;
+    bool m_channel_marker_isSet;
+
 };
 
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGLocalSourceSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGLocalSourceSettings.cpp
index 7bf6b5cc0..74d474fa0 100644
--- a/swagger/sdrangel/code/qt5/client/SWGLocalSourceSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGLocalSourceSettings.cpp
@@ -52,6 +52,8 @@ SWGLocalSourceSettings::SWGLocalSourceSettings() {
     m_reverse_api_device_index_isSet = false;
     reverse_api_channel_index = 0;
     m_reverse_api_channel_index_isSet = false;
+    channel_marker = nullptr;
+    m_channel_marker_isSet = false;
 }
 
 SWGLocalSourceSettings::~SWGLocalSourceSettings() {
@@ -84,6 +86,8 @@ SWGLocalSourceSettings::init() {
     m_reverse_api_device_index_isSet = false;
     reverse_api_channel_index = 0;
     m_reverse_api_channel_index_isSet = false;
+    channel_marker = new SWGChannelMarker();
+    m_channel_marker_isSet = false;
 }
 
 void
@@ -104,6 +108,9 @@ SWGLocalSourceSettings::cleanup() {
 
 
 
+    if(channel_marker != nullptr) { 
+        delete channel_marker;
+    }
 }
 
 SWGLocalSourceSettings*
@@ -141,6 +148,8 @@ SWGLocalSourceSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", "");
     
+    ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker");
+    
 }
 
 QString
@@ -193,6 +202,9 @@ SWGLocalSourceSettings::asJsonObject() {
     if(m_reverse_api_channel_index_isSet){
         obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index));
     }
+    if((channel_marker != nullptr) && (channel_marker->isSet())){
+        toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker"));
+    }
 
     return obj;
 }
@@ -317,6 +329,16 @@ SWGLocalSourceSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_ind
     this->m_reverse_api_channel_index_isSet = true;
 }
 
+SWGChannelMarker*
+SWGLocalSourceSettings::getChannelMarker() {
+    return channel_marker;
+}
+void
+SWGLocalSourceSettings::setChannelMarker(SWGChannelMarker* channel_marker) {
+    this->channel_marker = channel_marker;
+    this->m_channel_marker_isSet = true;
+}
+
 
 bool
 SWGLocalSourceSettings::isSet(){
@@ -358,6 +380,9 @@ SWGLocalSourceSettings::isSet(){
         if(m_reverse_api_channel_index_isSet){
             isObjectUpdated = true; break;
         }
+        if(channel_marker && channel_marker->isSet()){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGLocalSourceSettings.h b/swagger/sdrangel/code/qt5/client/SWGLocalSourceSettings.h
index 9859b9358..24f0f538b 100644
--- a/swagger/sdrangel/code/qt5/client/SWGLocalSourceSettings.h
+++ b/swagger/sdrangel/code/qt5/client/SWGLocalSourceSettings.h
@@ -22,6 +22,7 @@
 #include <QJsonObject>
 
 
+#include "SWGChannelMarker.h"
 #include <QString>
 
 #include "SWGObject.h"
@@ -78,6 +79,9 @@ public:
     qint32 getReverseApiChannelIndex();
     void setReverseApiChannelIndex(qint32 reverse_api_channel_index);
 
+    SWGChannelMarker* getChannelMarker();
+    void setChannelMarker(SWGChannelMarker* channel_marker);
+
 
     virtual bool isSet() override;
 
@@ -118,6 +122,9 @@ private:
     qint32 reverse_api_channel_index;
     bool m_reverse_api_channel_index_isSet;
 
+    SWGChannelMarker* channel_marker;
+    bool m_channel_marker_isSet;
+
 };
 
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGNFMModSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGNFMModSettings.cpp
index d6d9460d6..27e60b89e 100644
--- a/swagger/sdrangel/code/qt5/client/SWGNFMModSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGNFMModSettings.cpp
@@ -76,6 +76,8 @@ SWGNFMModSettings::SWGNFMModSettings() {
     m_reverse_api_channel_index_isSet = false;
     cw_keyer = nullptr;
     m_cw_keyer_isSet = false;
+    channel_marker = nullptr;
+    m_channel_marker_isSet = false;
 }
 
 SWGNFMModSettings::~SWGNFMModSettings() {
@@ -132,6 +134,8 @@ SWGNFMModSettings::init() {
     m_reverse_api_channel_index_isSet = false;
     cw_keyer = new SWGCWKeyerSettings();
     m_cw_keyer_isSet = false;
+    channel_marker = new SWGChannelMarker();
+    m_channel_marker_isSet = false;
 }
 
 void
@@ -168,6 +172,9 @@ SWGNFMModSettings::cleanup() {
     if(cw_keyer != nullptr) { 
         delete cw_keyer;
     }
+    if(channel_marker != nullptr) { 
+        delete channel_marker;
+    }
 }
 
 SWGNFMModSettings*
@@ -229,6 +236,8 @@ SWGNFMModSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&cw_keyer, pJson["cwKeyer"], "SWGCWKeyerSettings", "SWGCWKeyerSettings");
     
+    ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker");
+    
 }
 
 QString
@@ -317,6 +326,9 @@ SWGNFMModSettings::asJsonObject() {
     if((cw_keyer != nullptr) && (cw_keyer->isSet())){
         toJsonValue(QString("cwKeyer"), cw_keyer, obj, QString("SWGCWKeyerSettings"));
     }
+    if((channel_marker != nullptr) && (channel_marker->isSet())){
+        toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker"));
+    }
 
     return obj;
 }
@@ -561,6 +573,16 @@ SWGNFMModSettings::setCwKeyer(SWGCWKeyerSettings* cw_keyer) {
     this->m_cw_keyer_isSet = true;
 }
 
+SWGChannelMarker*
+SWGNFMModSettings::getChannelMarker() {
+    return channel_marker;
+}
+void
+SWGNFMModSettings::setChannelMarker(SWGChannelMarker* channel_marker) {
+    this->channel_marker = channel_marker;
+    this->m_channel_marker_isSet = true;
+}
+
 
 bool
 SWGNFMModSettings::isSet(){
@@ -638,6 +660,9 @@ SWGNFMModSettings::isSet(){
         if(cw_keyer && cw_keyer->isSet()){
             isObjectUpdated = true; break;
         }
+        if(channel_marker && channel_marker->isSet()){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGNFMModSettings.h b/swagger/sdrangel/code/qt5/client/SWGNFMModSettings.h
index 0b9407667..ca0e98611 100644
--- a/swagger/sdrangel/code/qt5/client/SWGNFMModSettings.h
+++ b/swagger/sdrangel/code/qt5/client/SWGNFMModSettings.h
@@ -23,6 +23,7 @@
 
 
 #include "SWGCWKeyerSettings.h"
+#include "SWGChannelMarker.h"
 #include <QString>
 
 #include "SWGObject.h"
@@ -115,6 +116,9 @@ public:
     SWGCWKeyerSettings* getCwKeyer();
     void setCwKeyer(SWGCWKeyerSettings* cw_keyer);
 
+    SWGChannelMarker* getChannelMarker();
+    void setChannelMarker(SWGChannelMarker* channel_marker);
+
 
     virtual bool isSet() override;
 
@@ -191,6 +195,9 @@ private:
     SWGCWKeyerSettings* cw_keyer;
     bool m_cw_keyer_isSet;
 
+    SWGChannelMarker* channel_marker;
+    bool m_channel_marker_isSet;
+
 };
 
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGPacketModSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGPacketModSettings.cpp
index 9b254a59b..79b4a8fc7 100644
--- a/swagger/sdrangel/code/qt5/client/SWGPacketModSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGPacketModSettings.cpp
@@ -132,6 +132,8 @@ SWGPacketModSettings::SWGPacketModSettings() {
     m_reverse_api_device_index_isSet = false;
     reverse_api_channel_index = 0;
     m_reverse_api_channel_index_isSet = false;
+    channel_marker = nullptr;
+    m_channel_marker_isSet = false;
 }
 
 SWGPacketModSettings::~SWGPacketModSettings() {
@@ -244,6 +246,8 @@ SWGPacketModSettings::init() {
     m_reverse_api_device_index_isSet = false;
     reverse_api_channel_index = 0;
     m_reverse_api_channel_index_isSet = false;
+    channel_marker = new SWGChannelMarker();
+    m_channel_marker_isSet = false;
 }
 
 void
@@ -314,6 +318,9 @@ SWGPacketModSettings::cleanup() {
 
 
 
+    if(channel_marker != nullptr) { 
+        delete channel_marker;
+    }
 }
 
 SWGPacketModSettings*
@@ -431,6 +438,8 @@ SWGPacketModSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", "");
     
+    ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker");
+    
 }
 
 QString
@@ -603,6 +612,9 @@ SWGPacketModSettings::asJsonObject() {
     if(m_reverse_api_channel_index_isSet){
         obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index));
     }
+    if((channel_marker != nullptr) && (channel_marker->isSet())){
+        toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker"));
+    }
 
     return obj;
 }
@@ -1127,6 +1139,16 @@ SWGPacketModSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_index
     this->m_reverse_api_channel_index_isSet = true;
 }
 
+SWGChannelMarker*
+SWGPacketModSettings::getChannelMarker() {
+    return channel_marker;
+}
+void
+SWGPacketModSettings::setChannelMarker(SWGChannelMarker* channel_marker) {
+    this->channel_marker = channel_marker;
+    this->m_channel_marker_isSet = true;
+}
+
 
 bool
 SWGPacketModSettings::isSet(){
@@ -1288,6 +1310,9 @@ SWGPacketModSettings::isSet(){
         if(m_reverse_api_channel_index_isSet){
             isObjectUpdated = true; break;
         }
+        if(channel_marker && channel_marker->isSet()){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGPacketModSettings.h b/swagger/sdrangel/code/qt5/client/SWGPacketModSettings.h
index db6475504..131660ef4 100644
--- a/swagger/sdrangel/code/qt5/client/SWGPacketModSettings.h
+++ b/swagger/sdrangel/code/qt5/client/SWGPacketModSettings.h
@@ -22,6 +22,7 @@
 #include <QJsonObject>
 
 
+#include "SWGChannelMarker.h"
 #include <QString>
 
 #include "SWGObject.h"
@@ -198,6 +199,9 @@ public:
     qint32 getReverseApiChannelIndex();
     void setReverseApiChannelIndex(qint32 reverse_api_channel_index);
 
+    SWGChannelMarker* getChannelMarker();
+    void setChannelMarker(SWGChannelMarker* channel_marker);
+
 
     virtual bool isSet() override;
 
@@ -358,6 +362,9 @@ private:
     qint32 reverse_api_channel_index;
     bool m_reverse_api_channel_index_isSet;
 
+    SWGChannelMarker* channel_marker;
+    bool m_channel_marker_isSet;
+
 };
 
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGRemoteSourceSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGRemoteSourceSettings.cpp
index ba1ba4666..fdbabcdd7 100644
--- a/swagger/sdrangel/code/qt5/client/SWGRemoteSourceSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGRemoteSourceSettings.cpp
@@ -48,6 +48,8 @@ SWGRemoteSourceSettings::SWGRemoteSourceSettings() {
     m_reverse_api_device_index_isSet = false;
     reverse_api_channel_index = 0;
     m_reverse_api_channel_index_isSet = false;
+    channel_marker = nullptr;
+    m_channel_marker_isSet = false;
 }
 
 SWGRemoteSourceSettings::~SWGRemoteSourceSettings() {
@@ -76,6 +78,8 @@ SWGRemoteSourceSettings::init() {
     m_reverse_api_device_index_isSet = false;
     reverse_api_channel_index = 0;
     m_reverse_api_channel_index_isSet = false;
+    channel_marker = new SWGChannelMarker();
+    m_channel_marker_isSet = false;
 }
 
 void
@@ -96,6 +100,9 @@ SWGRemoteSourceSettings::cleanup() {
 
 
 
+    if(channel_marker != nullptr) { 
+        delete channel_marker;
+    }
 }
 
 SWGRemoteSourceSettings*
@@ -129,6 +136,8 @@ SWGRemoteSourceSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", "");
     
+    ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker");
+    
 }
 
 QString
@@ -175,6 +184,9 @@ SWGRemoteSourceSettings::asJsonObject() {
     if(m_reverse_api_channel_index_isSet){
         obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index));
     }
+    if((channel_marker != nullptr) && (channel_marker->isSet())){
+        toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker"));
+    }
 
     return obj;
 }
@@ -279,6 +291,16 @@ SWGRemoteSourceSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_in
     this->m_reverse_api_channel_index_isSet = true;
 }
 
+SWGChannelMarker*
+SWGRemoteSourceSettings::getChannelMarker() {
+    return channel_marker;
+}
+void
+SWGRemoteSourceSettings::setChannelMarker(SWGChannelMarker* channel_marker) {
+    this->channel_marker = channel_marker;
+    this->m_channel_marker_isSet = true;
+}
+
 
 bool
 SWGRemoteSourceSettings::isSet(){
@@ -314,6 +336,9 @@ SWGRemoteSourceSettings::isSet(){
         if(m_reverse_api_channel_index_isSet){
             isObjectUpdated = true; break;
         }
+        if(channel_marker && channel_marker->isSet()){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGRemoteSourceSettings.h b/swagger/sdrangel/code/qt5/client/SWGRemoteSourceSettings.h
index 1ba8e4d47..ce0acbbb7 100644
--- a/swagger/sdrangel/code/qt5/client/SWGRemoteSourceSettings.h
+++ b/swagger/sdrangel/code/qt5/client/SWGRemoteSourceSettings.h
@@ -22,6 +22,7 @@
 #include <QJsonObject>
 
 
+#include "SWGChannelMarker.h"
 #include <QString>
 
 #include "SWGObject.h"
@@ -72,6 +73,9 @@ public:
     qint32 getReverseApiChannelIndex();
     void setReverseApiChannelIndex(qint32 reverse_api_channel_index);
 
+    SWGChannelMarker* getChannelMarker();
+    void setChannelMarker(SWGChannelMarker* channel_marker);
+
 
     virtual bool isSet() override;
 
@@ -106,6 +110,9 @@ private:
     qint32 reverse_api_channel_index;
     bool m_reverse_api_channel_index_isSet;
 
+    SWGChannelMarker* channel_marker;
+    bool m_channel_marker_isSet;
+
 };
 
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGSSBModSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGSSBModSettings.cpp
index 934cb90c4..7432f45d0 100644
--- a/swagger/sdrangel/code/qt5/client/SWGSSBModSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGSSBModSettings.cpp
@@ -82,6 +82,8 @@ SWGSSBModSettings::SWGSSBModSettings() {
     m_cw_keyer_isSet = false;
     spectrum_config = nullptr;
     m_spectrum_config_isSet = false;
+    channel_marker = nullptr;
+    m_channel_marker_isSet = false;
 }
 
 SWGSSBModSettings::~SWGSSBModSettings() {
@@ -144,6 +146,8 @@ SWGSSBModSettings::init() {
     m_cw_keyer_isSet = false;
     spectrum_config = new SWGGLSpectrum();
     m_spectrum_config_isSet = false;
+    channel_marker = new SWGChannelMarker();
+    m_channel_marker_isSet = false;
 }
 
 void
@@ -185,6 +189,9 @@ SWGSSBModSettings::cleanup() {
     if(spectrum_config != nullptr) { 
         delete spectrum_config;
     }
+    if(channel_marker != nullptr) { 
+        delete channel_marker;
+    }
 }
 
 SWGSSBModSettings*
@@ -252,6 +259,8 @@ SWGSSBModSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&spectrum_config, pJson["spectrumConfig"], "SWGGLSpectrum", "SWGGLSpectrum");
     
+    ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker");
+    
 }
 
 QString
@@ -349,6 +358,9 @@ SWGSSBModSettings::asJsonObject() {
     if((spectrum_config != nullptr) && (spectrum_config->isSet())){
         toJsonValue(QString("spectrumConfig"), spectrum_config, obj, QString("SWGGLSpectrum"));
     }
+    if((channel_marker != nullptr) && (channel_marker->isSet())){
+        toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker"));
+    }
 
     return obj;
 }
@@ -623,6 +635,16 @@ SWGSSBModSettings::setSpectrumConfig(SWGGLSpectrum* spectrum_config) {
     this->m_spectrum_config_isSet = true;
 }
 
+SWGChannelMarker*
+SWGSSBModSettings::getChannelMarker() {
+    return channel_marker;
+}
+void
+SWGSSBModSettings::setChannelMarker(SWGChannelMarker* channel_marker) {
+    this->channel_marker = channel_marker;
+    this->m_channel_marker_isSet = true;
+}
+
 
 bool
 SWGSSBModSettings::isSet(){
@@ -709,6 +731,9 @@ SWGSSBModSettings::isSet(){
         if(spectrum_config && spectrum_config->isSet()){
             isObjectUpdated = true; break;
         }
+        if(channel_marker && channel_marker->isSet()){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGSSBModSettings.h b/swagger/sdrangel/code/qt5/client/SWGSSBModSettings.h
index 4d26fb639..c39054cc0 100644
--- a/swagger/sdrangel/code/qt5/client/SWGSSBModSettings.h
+++ b/swagger/sdrangel/code/qt5/client/SWGSSBModSettings.h
@@ -23,6 +23,7 @@
 
 
 #include "SWGCWKeyerSettings.h"
+#include "SWGChannelMarker.h"
 #include "SWGGLSpectrum.h"
 #include <QString>
 
@@ -125,6 +126,9 @@ public:
     SWGGLSpectrum* getSpectrumConfig();
     void setSpectrumConfig(SWGGLSpectrum* spectrum_config);
 
+    SWGChannelMarker* getChannelMarker();
+    void setChannelMarker(SWGChannelMarker* channel_marker);
+
 
     virtual bool isSet() override;
 
@@ -210,6 +214,9 @@ private:
     SWGGLSpectrum* spectrum_config;
     bool m_spectrum_config_isSet;
 
+    SWGChannelMarker* channel_marker;
+    bool m_channel_marker_isSet;
+
 };
 
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGUDPSourceSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGUDPSourceSettings.cpp
index 40a171660..a1002813d 100644
--- a/swagger/sdrangel/code/qt5/client/SWGUDPSourceSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGUDPSourceSettings.cpp
@@ -84,6 +84,8 @@ SWGUDPSourceSettings::SWGUDPSourceSettings() {
     m_reverse_api_channel_index_isSet = false;
     spectrum_config = nullptr;
     m_spectrum_config_isSet = false;
+    channel_marker = nullptr;
+    m_channel_marker_isSet = false;
 }
 
 SWGUDPSourceSettings::~SWGUDPSourceSettings() {
@@ -148,6 +150,8 @@ SWGUDPSourceSettings::init() {
     m_reverse_api_channel_index_isSet = false;
     spectrum_config = new SWGGLSpectrum();
     m_spectrum_config_isSet = false;
+    channel_marker = new SWGChannelMarker();
+    m_channel_marker_isSet = false;
 }
 
 void
@@ -190,6 +194,9 @@ SWGUDPSourceSettings::cleanup() {
     if(spectrum_config != nullptr) { 
         delete spectrum_config;
     }
+    if(channel_marker != nullptr) { 
+        delete channel_marker;
+    }
 }
 
 SWGUDPSourceSettings*
@@ -259,6 +266,8 @@ SWGUDPSourceSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&spectrum_config, pJson["spectrumConfig"], "SWGGLSpectrum", "SWGGLSpectrum");
     
+    ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker");
+    
 }
 
 QString
@@ -359,6 +368,9 @@ SWGUDPSourceSettings::asJsonObject() {
     if((spectrum_config != nullptr) && (spectrum_config->isSet())){
         toJsonValue(QString("spectrumConfig"), spectrum_config, obj, QString("SWGGLSpectrum"));
     }
+    if((channel_marker != nullptr) && (channel_marker->isSet())){
+        toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker"));
+    }
 
     return obj;
 }
@@ -643,6 +655,16 @@ SWGUDPSourceSettings::setSpectrumConfig(SWGGLSpectrum* spectrum_config) {
     this->m_spectrum_config_isSet = true;
 }
 
+SWGChannelMarker*
+SWGUDPSourceSettings::getChannelMarker() {
+    return channel_marker;
+}
+void
+SWGUDPSourceSettings::setChannelMarker(SWGChannelMarker* channel_marker) {
+    this->channel_marker = channel_marker;
+    this->m_channel_marker_isSet = true;
+}
+
 
 bool
 SWGUDPSourceSettings::isSet(){
@@ -732,6 +754,9 @@ SWGUDPSourceSettings::isSet(){
         if(spectrum_config && spectrum_config->isSet()){
             isObjectUpdated = true; break;
         }
+        if(channel_marker && channel_marker->isSet()){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGUDPSourceSettings.h b/swagger/sdrangel/code/qt5/client/SWGUDPSourceSettings.h
index b27663825..0df1237ab 100644
--- a/swagger/sdrangel/code/qt5/client/SWGUDPSourceSettings.h
+++ b/swagger/sdrangel/code/qt5/client/SWGUDPSourceSettings.h
@@ -22,6 +22,7 @@
 #include <QJsonObject>
 
 
+#include "SWGChannelMarker.h"
 #include "SWGGLSpectrum.h"
 #include <QString>
 
@@ -127,6 +128,9 @@ public:
     SWGGLSpectrum* getSpectrumConfig();
     void setSpectrumConfig(SWGGLSpectrum* spectrum_config);
 
+    SWGChannelMarker* getChannelMarker();
+    void setChannelMarker(SWGChannelMarker* channel_marker);
+
 
     virtual bool isSet() override;
 
@@ -215,6 +219,9 @@ private:
     SWGGLSpectrum* spectrum_config;
     bool m_spectrum_config_isSet;
 
+    SWGChannelMarker* channel_marker;
+    bool m_channel_marker_isSet;
+
 };
 
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGWFMModSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGWFMModSettings.cpp
index e5da5da98..e8c2724da 100644
--- a/swagger/sdrangel/code/qt5/client/SWGWFMModSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGWFMModSettings.cpp
@@ -66,6 +66,8 @@ SWGWFMModSettings::SWGWFMModSettings() {
     m_reverse_api_channel_index_isSet = false;
     cw_keyer = nullptr;
     m_cw_keyer_isSet = false;
+    channel_marker = nullptr;
+    m_channel_marker_isSet = false;
 }
 
 SWGWFMModSettings::~SWGWFMModSettings() {
@@ -112,6 +114,8 @@ SWGWFMModSettings::init() {
     m_reverse_api_channel_index_isSet = false;
     cw_keyer = new SWGCWKeyerSettings();
     m_cw_keyer_isSet = false;
+    channel_marker = new SWGChannelMarker();
+    m_channel_marker_isSet = false;
 }
 
 void
@@ -143,6 +147,9 @@ SWGWFMModSettings::cleanup() {
     if(cw_keyer != nullptr) { 
         delete cw_keyer;
     }
+    if(channel_marker != nullptr) { 
+        delete channel_marker;
+    }
 }
 
 SWGWFMModSettings*
@@ -194,6 +201,8 @@ SWGWFMModSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&cw_keyer, pJson["cwKeyer"], "SWGCWKeyerSettings", "SWGCWKeyerSettings");
     
+    ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker");
+    
 }
 
 QString
@@ -267,6 +276,9 @@ SWGWFMModSettings::asJsonObject() {
     if((cw_keyer != nullptr) && (cw_keyer->isSet())){
         toJsonValue(QString("cwKeyer"), cw_keyer, obj, QString("SWGCWKeyerSettings"));
     }
+    if((channel_marker != nullptr) && (channel_marker->isSet())){
+        toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker"));
+    }
 
     return obj;
 }
@@ -461,6 +473,16 @@ SWGWFMModSettings::setCwKeyer(SWGCWKeyerSettings* cw_keyer) {
     this->m_cw_keyer_isSet = true;
 }
 
+SWGChannelMarker*
+SWGWFMModSettings::getChannelMarker() {
+    return channel_marker;
+}
+void
+SWGWFMModSettings::setChannelMarker(SWGChannelMarker* channel_marker) {
+    this->channel_marker = channel_marker;
+    this->m_channel_marker_isSet = true;
+}
+
 
 bool
 SWGWFMModSettings::isSet(){
@@ -523,6 +545,9 @@ SWGWFMModSettings::isSet(){
         if(cw_keyer && cw_keyer->isSet()){
             isObjectUpdated = true; break;
         }
+        if(channel_marker && channel_marker->isSet()){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGWFMModSettings.h b/swagger/sdrangel/code/qt5/client/SWGWFMModSettings.h
index b241ddbc8..6c44dc28a 100644
--- a/swagger/sdrangel/code/qt5/client/SWGWFMModSettings.h
+++ b/swagger/sdrangel/code/qt5/client/SWGWFMModSettings.h
@@ -23,6 +23,7 @@
 
 
 #include "SWGCWKeyerSettings.h"
+#include "SWGChannelMarker.h"
 #include <QString>
 
 #include "SWGObject.h"
@@ -100,6 +101,9 @@ public:
     SWGCWKeyerSettings* getCwKeyer();
     void setCwKeyer(SWGCWKeyerSettings* cw_keyer);
 
+    SWGChannelMarker* getChannelMarker();
+    void setChannelMarker(SWGChannelMarker* channel_marker);
+
 
     virtual bool isSet() override;
 
@@ -161,6 +165,9 @@ private:
     SWGCWKeyerSettings* cw_keyer;
     bool m_cw_keyer_isSet;
 
+    SWGChannelMarker* channel_marker;
+    bool m_channel_marker_isSet;
+
 };
 
 }