Replaced FrequencyFlush with Recording.

Author: shajen

sources/radio/blocks/transmission.cpp

@@ -163,11 +163,11 @@ bool Transmission::isIndexIgnored(const Index& index) const {
   return false;
 }
 
-std::vector<FrequencyFlush> Transmission::getSortedTransmissions(const std::chrono::milliseconds now) const {
+std::vector<Recording> Transmission::getSortedTransmissions(const std::chrono::milliseconds now) const {
   std::vector<Index> indexes;
   std::transform(m_signals.begin(), m_signals.end(), std::back_inserter(indexes), [](auto& kv) { return kv.first; });
   std::sort(indexes.begin(), indexes.end(), [this](const Index& i1, const Index& i2) { return m_signals.at(i1).getPower() > m_signals.at(i2).getPower(); });
-  std::vector<FrequencyFlush> transmissions;
+  std::vector<Recording> transmissions;
   for (const auto& index : indexes) {
     const auto frequency = getTunedFrequency(m_indexToShift(index), m_config.recordingTuningStep());
     transmissions.emplace_back(frequency, m_signals.at(index).needFlush(now));

sources/radio/blocks/transmission.h

@@ -34,7 +34,7 @@ class Transmission : virtual public gr::sync_block {
   void updateSignals(const float* avgPower, const float* rawPower, const std::chrono::milliseconds now);
   Index getBestIndex(Index index) const;
   bool isIndexIgnored(const Index& index) const;
-  std::vector<FrequencyFlush> getSortedTransmissions(const std::chrono::milliseconds now) const;
+  std::vector<Recording> getSortedTransmissions(const std::chrono::milliseconds now) const;
 
   const Config& m_config;
   const Device& m_device;

sources/radio/help_structures.cpp

@@ -1,5 +1,7 @@
 #include "help_structures.h"
 
+Recording::Recording(const Frequency& shift, const bool& flush) : m_shift(shift), m_flush(flush) {}
+
 Satellite::Satellite(const int& id, const std::string& name, const Frequency& frequency, const Frequency& bandwidth, const std::string& modulation)
     : m_id(id), m_name(name), m_frequency(frequency), m_bandwidth(bandwidth), m_modulation(modulation) {}
 

sources/radio/help_structures.h

@@ -13,8 +13,15 @@
 
 using Frequency = int32_t;
 using FrequencyRange = std::pair<Frequency, Frequency>;
-using FrequencyFlush = std::pair<Frequency, bool>;
-using TransmissionNotification = Notification<std::vector<FrequencyFlush>>;
+
+struct Recording {
+  Recording(const Frequency& shift, const bool& flush);
+
+  Frequency m_shift;
+  bool m_flush;
+};
+
+using TransmissionNotification = Notification<std::vector<Recording>>;
 using SimpleComplex = std::complex<int8_t>;
 
 struct Satellite {

sources/radio/scheduler.cpp

@@ -47,4 +47,4 @@ void Scheduler::satellitesQuery() {
   m_remoteController.satellitesQuery(m_device.getName(), json.dump());
 }
 
-void Scheduler::satellitesCallback(const nlohmann::json& json) { Logger::info(LABEL, "received satellites: {}", colored(GREEN, "{}", json.dump())); }
+void Scheduler::satellitesCallback(const nlohmann::json& json) { Logger::info(LABEL, "received satellites: {}", colored(GREEN, "{}", json.dump())); }

sources/radio/scheduler.h

@@ -20,4 +20,4 @@ class Scheduler {
   std::chrono::milliseconds m_lastUpdateTime;
   std::atomic<bool> m_isRunning;
   std::thread m_thread;
-};
+};

sources/radio/sdr_device.cpp

@@ -79,11 +79,11 @@ void SdrDevice::setFrequencyRange(FrequencyRange frequencyRange) {
   m_blocker->setBlocking(false);
 }
 
-void SdrDevice::updateRecordings(const std::vector<FrequencyFlush> sortedShifts) {
+void SdrDevice::updateRecordings(const std::vector<Recording> sortedShifts) {
   const auto isWaitingForRecording = [&sortedShifts](const Frequency shift) {
-    return std::find_if(sortedShifts.begin(), sortedShifts.end(), [shift](const FrequencyFlush shiftFlush) {
+    return std::find_if(sortedShifts.begin(), sortedShifts.end(), [shift](const Recording shiftFlush) {
              // improve auto formatter
-             return shift == shiftFlush.first;
+             return shift == shiftFlush.m_shift;
            }) != sortedShifts.end();
   };
   const auto getShiftRecorder = [this](const Frequency shift) {

sources/radio/sdr_device.h

@@ -24,7 +24,7 @@ class SdrDevice {
   ~SdrDevice();
 
   void setFrequencyRange(FrequencyRange frequencyRange);
-  void updateRecordings(const std::vector<FrequencyFlush> sortedShifts);
+  void updateRecordings(const std::vector<Recording> sortedShifts);
 
  private:
   Frequency getFrequency() const;