From 49d6cda73161bf75b984737433ef98168d602d3f Mon Sep 17 00:00:00 2001 From: Jared Boone Date: Tue, 19 Jul 2016 17:11:32 -0700 Subject: [PATCH] Move BasebandConfiguration to receiver_model.hpp. That's the only place it's being used now -- it's no longer moving between cores. --- firmware/application/receiver_model.hpp | 21 +++++++++++++++++++++ firmware/common/message.hpp | 21 --------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/firmware/application/receiver_model.hpp b/firmware/application/receiver_model.hpp index ad664700..e9ab0efb 100644 --- a/firmware/application/receiver_model.hpp +++ b/firmware/application/receiver_model.hpp @@ -30,6 +30,27 @@ #include "max2837.hpp" #include "volume.hpp" +struct BasebandConfiguration { + int32_t mode; + uint32_t sampling_rate; + size_t decimation_factor; + + constexpr BasebandConfiguration( + int32_t mode, + uint32_t sampling_rate, + size_t decimation_factor = 1 + ) : mode { mode }, + sampling_rate { sampling_rate }, + decimation_factor { decimation_factor } + { + } + + constexpr BasebandConfiguration( + ) : BasebandConfiguration { -1, 0, 1 } + { + } +}; + class ReceiverModel { public: enum class Mode : int32_t { diff --git a/firmware/common/message.hpp b/firmware/common/message.hpp index 1e560ba4..a4030b5f 100644 --- a/firmware/common/message.hpp +++ b/firmware/common/message.hpp @@ -191,27 +191,6 @@ public: AudioStatistics statistics; }; -struct BasebandConfiguration { - int32_t mode; - uint32_t sampling_rate; - size_t decimation_factor; - - constexpr BasebandConfiguration( - int32_t mode, - uint32_t sampling_rate, - size_t decimation_factor = 1 - ) : mode { mode }, - sampling_rate { sampling_rate }, - decimation_factor { decimation_factor } - { - } - - constexpr BasebandConfiguration( - ) : BasebandConfiguration { -1, 0, 1 } - { - } -}; - class SpectrumStreamingConfigMessage : public Message { public: enum class Mode : uint32_t {