From ff508df7eb05085a2c844cd42a72911c2c58eb1b Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Thu, 22 Jul 2021 16:08:55 +0100
Subject: [PATCH] Radio Clock: Add support for WWVB

---
 plugins/channelrx/radioclock/radioclock.h     | 14 +++++++-----
 .../channelrx/radioclock/radioclockgui.cpp    | 22 +++++++++++++++++--
 .../channelrx/radioclock/radioclocksettings.h | 12 +++++++++-
 3 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/plugins/channelrx/radioclock/radioclock.h b/plugins/channelrx/radioclock/radioclock.h
index 051f64936..667a74f72 100644
--- a/plugins/channelrx/radioclock/radioclock.h
+++ b/plugins/channelrx/radioclock/radioclock.h
@@ -68,19 +68,23 @@ public:
         MESSAGE_CLASS_DECLARATION
 
     public:
-        QDateTime getDateTime() const { return m_dateTime; }
 
-        static MsgDateTime* create(QDateTime dateTime)
+        QDateTime getDateTime() const { return m_dateTime; }
+        RadioClockSettings::DST getDST() const { return m_dst; }
+
+        static MsgDateTime* create(QDateTime dateTime, RadioClockSettings::DST dst = RadioClockSettings::DST::UNKNOWN)
         {
-            return new MsgDateTime(dateTime);
+            return new MsgDateTime(dateTime, dst);
         }
 
     private:
         QDateTime m_dateTime;
+        RadioClockSettings::DST m_dst;
 
-        MsgDateTime(QDateTime dateTime) :
+        MsgDateTime(QDateTime dateTime, RadioClockSettings::DST dst) :
             Message(),
-            m_dateTime(dateTime)
+            m_dateTime(dateTime),
+            m_dst(dst)
         {
         }
     };
diff --git a/plugins/channelrx/radioclock/radioclockgui.cpp b/plugins/channelrx/radioclock/radioclockgui.cpp
index 9f4ce1da0..e05073c0d 100644
--- a/plugins/channelrx/radioclock/radioclockgui.cpp
+++ b/plugins/channelrx/radioclock/radioclockgui.cpp
@@ -104,6 +104,24 @@ bool RadioClockGUI::handleMessage(const Message& message)
         RadioClock::MsgDateTime& report = (RadioClock::MsgDateTime&) message;
         m_dateTime = report.getDateTime();
         displayDateTime();
+        switch (report.getDST())
+        {
+        case RadioClockSettings::UNKNOWN:
+            ui->dst->setText("");
+            break;
+        case RadioClockSettings::NOT_IN_EFFECT:
+            ui->dst->setText("Not in effect");
+            break;
+        case RadioClockSettings::IN_EFFECT:
+            ui->dst->setText("In effect");
+            break;
+        case RadioClockSettings::ENDING:
+            ui->dst->setText("Ending");
+            break;
+        case RadioClockSettings::STARTING:
+            ui->dst->setText("Starting");
+            break;
+        }
         return true;
     }
     else if (RadioClock::MsgStatus::match(message))
@@ -257,11 +275,11 @@ RadioClockGUI::RadioClockGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Bas
 
     m_scopeVis = m_radioClock->getScopeSink();
     m_scopeVis->setGLScope(ui->glScope);
-    m_scopeVis->setNbStreams(7);
+    m_scopeVis->setNbStreams(RadioClockSettings::m_scopeStreams);
     m_scopeVis->setLiveRate(RadioClockSettings::RADIOCLOCK_CHANNEL_SAMPLE_RATE);
     ui->glScope->connectTimer(MainCore::instance()->getMasterTimer());
     ui->scopeGUI->setBuddies(m_scopeVis->getInputMessageQueue(), m_scopeVis, ui->glScope);
-    ui->scopeGUI->setStreams(QStringList({"IQ", "MagSq", "TH", "FM", "Data", "Samp", "GotMM"}));
+    ui->scopeGUI->setStreams(QStringList({"IQ", "MagSq", "TH", "FM", "Data", "Samp", "GotMM", "GotM"}));
     ui->scopeGUI->setSampleRate(RadioClockSettings::RADIOCLOCK_CHANNEL_SAMPLE_RATE);
 
     ui->status->setText("Looking for minute marker");
diff --git a/plugins/channelrx/radioclock/radioclocksettings.h b/plugins/channelrx/radioclock/radioclocksettings.h
index c72437aef..9f5624fb0 100644
--- a/plugins/channelrx/radioclock/radioclocksettings.h
+++ b/plugins/channelrx/radioclock/radioclocksettings.h
@@ -34,7 +34,8 @@ struct RadioClockSettings
     enum Modulation {
         MSF,
         DCF77,
-        TDF
+        TDF,
+        WWVB
     } m_modulation;
     enum DisplayTZ {
         BROADCAST,
@@ -53,6 +54,7 @@ struct RadioClockSettings
     uint16_t m_reverseAPIChannelIndex;
     Serializable *m_scopeGUI;
     static const int RADIOCLOCK_CHANNEL_SAMPLE_RATE = 1000;
+    static const int m_scopeStreams = 8;
 
     RadioClockSettings();
     void resetToDefaults();
@@ -60,6 +62,14 @@ struct RadioClockSettings
     void setScopeGUI(Serializable *scopeGUI) { m_scopeGUI = scopeGUI; }
     QByteArray serialize() const;
     bool deserialize(const QByteArray& data);
+
+    enum DST {
+        UNKNOWN,
+        IN_EFFECT,
+        NOT_IN_EFFECT,
+        STARTING,
+        ENDING
+    };                              // Daylight savings status
 };
 
 #endif /* INCLUDE_RADIOCLOCKSETTINGS_H */