From 0cf839bc939b808861cd6dd5682d5038008e6f01 Mon Sep 17 00:00:00 2001 From: Jared Boone Date: Fri, 29 Jan 2016 15:21:33 -0800 Subject: [PATCH] Expose instance clock_manager in portapack.hpp. --- firmware/application/portapack.cpp | 4 +--- firmware/application/portapack.hpp | 2 ++ firmware/application/receiver_model.hpp | 8 -------- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/firmware/application/portapack.cpp b/firmware/application/portapack.cpp index e9460c508..6621a5b85 100644 --- a/firmware/application/portapack.cpp +++ b/firmware/application/portapack.cpp @@ -61,9 +61,7 @@ ClockManager clock_manager { i2c0, clock_generator }; -ReceiverModel receiver_model { - clock_manager -}; +ReceiverModel receiver_model; TemperatureLogger temperature_logger; diff --git a/firmware/application/portapack.hpp b/firmware/application/portapack.hpp index cbe0b6657..886c4a436 100644 --- a/firmware/application/portapack.hpp +++ b/firmware/application/portapack.hpp @@ -29,6 +29,7 @@ #include "lcd_ili9341.hpp" #include "radio.hpp" +#include "clock_manager.hpp" #include "temperature_logger.hpp" namespace portapack { @@ -43,6 +44,7 @@ extern SPI ssp1; extern wolfson::wm8731::WM8731 audio_codec; extern si5351::Si5351 clock_generator; +extern ClockManager clock_manager; extern ReceiverModel receiver_model; diff --git a/firmware/application/receiver_model.hpp b/firmware/application/receiver_model.hpp index ac3ce913e..d76f46701 100644 --- a/firmware/application/receiver_model.hpp +++ b/firmware/application/receiver_model.hpp @@ -25,7 +25,6 @@ #include #include -#include "clock_manager.hpp" #include "message.hpp" #include "rf_path.hpp" #include "max2837.hpp" @@ -43,12 +42,6 @@ public: ERT = 6, }; - constexpr ReceiverModel( - ClockManager& clock_manager - ) : clock_manager(clock_manager) - { - } - rf::Frequency tuning_frequency() const; void set_tuning_frequency(rf::Frequency f); @@ -101,7 +94,6 @@ private: .decimation_factor = 1, }; volume_t headphone_volume_ { -43.0_dB }; - ClockManager& clock_manager; int32_t tuning_offset();