Fixed scheduler.

Author: shajen

sources/radio/scheduler.cpp

@@ -17,7 +17,7 @@ ScheduledTransmission::ScheduledTransmission(
     : m_name(name), m_begin(begin), m_end(end), m_frequency(frequency), m_bandwidth(bandwidth), m_modulation(modulation) {}
 
 Scheduler::Scheduler(const Config& config, const Device& device, RemoteController& remoteController)
-    : m_config(config), m_device(device), m_remoteController(remoteController), m_lastUpdateTime(0), m_isRunning(true), m_thread([this]() { worker(); }) {}
+    : m_config(config), m_device(device), m_remoteController(remoteController), m_lastUpdateTime(0), m_isRefreshEnabled(true), m_isRunning(true), m_thread([this]() { worker(); }) {}
 
 Scheduler::~Scheduler() {
   m_isRunning = false;
@@ -65,7 +65,7 @@ void Scheduler::worker() {
   m_remoteController.satellitesCallback(m_device.getName(), std::bind(&Scheduler::satellitesCallback, this, _1));
   while (m_isRunning) {
     const auto now = getTime();
-    if (m_lastUpdateTime + UPDATE_INTERVAL <= now) {
+    if (m_isRefreshEnabled && m_lastUpdateTime + UPDATE_INTERVAL <= now) {
       satellitesQuery();
       m_lastUpdateTime = now;
     }
@@ -106,3 +106,5 @@ void Scheduler::satellitesCallback(const nlohmann::json& json) {
   std::unique_lock lock(m_mutex);
   m_scheduledTransmissions = scheduledTransmissions;
 }
+
+void Scheduler::setRefreshEnabled(const bool& enabled) { m_isRefreshEnabled = enabled; }

sources/radio/scheduler.h

@@ -33,12 +33,14 @@ class Scheduler {
   void worker();
   void satellitesQuery();
   void satellitesCallback(const nlohmann::json& json);
+  void setRefreshEnabled(const bool& enabled);
 
   const Config& m_config;
   const Device m_device;
   RemoteController& m_remoteController;
   std::list<ScheduledTransmission> m_scheduledTransmissions;
   std::chrono::milliseconds m_lastUpdateTime;
+  std::atomic<bool> m_isRefreshEnabled;
   std::atomic<bool> m_isRunning;
   std::thread m_thread;
   std::mutex m_mutex;

sources/scanner.cpp

@@ -38,9 +38,17 @@ Scanner::~Scanner() {
 void Scanner::runScheduler(const std::optional<FrequencyRange>& activeRange) {
   auto recordings = m_scheduler.getRecordings(getTime());
   if (recordings) {
-    m_device.updateRecordings({});
-    m_device.setFrequencyRange(recordings->first);
+    Logger::info(LABEL, "start scheduled recording");
+    m_scheduler.setRefreshEnabled(false);
+    auto lastRange = FrequencyRange(0, 0);
     while (m_isRunning && recordings) {
+      const auto range = recordings->first;
+      if (range != lastRange) {
+        const auto center = (range.first + range.second) / 2;
+        Logger::info(LABEL, "update scheduled frequency, center: {}", formatFrequency(center));
+        m_device.setFrequencyRange(range);
+        lastRange = range;
+      }
       m_device.updateRecordings(recordings->second);
       recordings = m_scheduler.getRecordings(getTime());
       std::this_thread::sleep_for(LOOP_TIMEOUT);
@@ -49,6 +57,8 @@ void Scanner::runScheduler(const std::optional<FrequencyRange>& activeRange) {
     if (activeRange) {
       m_device.setFrequencyRange(*activeRange);
     }
+    m_scheduler.setRefreshEnabled(true);
+    Logger::info(LABEL, "stop scheduled recording");
   }
 }