Expose instance clock_manager in portapack.hpp.

This commit is contained in:
Jared Boone 2016-01-29 15:21:33 -08:00
parent a03a72474d
commit 0cf839bc93
3 changed files with 3 additions and 11 deletions

View File

@ -61,9 +61,7 @@ ClockManager clock_manager {
i2c0, clock_generator i2c0, clock_generator
}; };
ReceiverModel receiver_model { ReceiverModel receiver_model;
clock_manager
};
TemperatureLogger temperature_logger; TemperatureLogger temperature_logger;

View File

@ -29,6 +29,7 @@
#include "lcd_ili9341.hpp" #include "lcd_ili9341.hpp"
#include "radio.hpp" #include "radio.hpp"
#include "clock_manager.hpp"
#include "temperature_logger.hpp" #include "temperature_logger.hpp"
namespace portapack { namespace portapack {
@ -43,6 +44,7 @@ extern SPI ssp1;
extern wolfson::wm8731::WM8731 audio_codec; extern wolfson::wm8731::WM8731 audio_codec;
extern si5351::Si5351 clock_generator; extern si5351::Si5351 clock_generator;
extern ClockManager clock_manager;
extern ReceiverModel receiver_model; extern ReceiverModel receiver_model;

View File

@ -25,7 +25,6 @@
#include <cstdint> #include <cstdint>
#include <cstddef> #include <cstddef>
#include "clock_manager.hpp"
#include "message.hpp" #include "message.hpp"
#include "rf_path.hpp" #include "rf_path.hpp"
#include "max2837.hpp" #include "max2837.hpp"
@ -43,12 +42,6 @@ public:
ERT = 6, ERT = 6,
}; };
constexpr ReceiverModel(
ClockManager& clock_manager
) : clock_manager(clock_manager)
{
}
rf::Frequency tuning_frequency() const; rf::Frequency tuning_frequency() const;
void set_tuning_frequency(rf::Frequency f); void set_tuning_frequency(rf::Frequency f);
@ -101,7 +94,6 @@ private:
.decimation_factor = 1, .decimation_factor = 1,
}; };
volume_t headphone_volume_ { -43.0_dB }; volume_t headphone_volume_ { -43.0_dB };
ClockManager& clock_manager;
int32_t tuning_offset(); int32_t tuning_offset();