From 01741f3c7cb7b439a8d1effc7340d59f7584e31b Mon Sep 17 00:00:00 2001 From: Jared Boone Date: Wed, 13 Jan 2016 17:05:19 -0800 Subject: [PATCH] Rename AISModel to AISLogger. That's really what it is. Also move receiver initialization to AISView. It'll eventually move further out to an AISApp, once I figure out what an App looks like... --- firmware/application/ais_app.cpp | 23 ++++++++++------------- firmware/application/ais_app.hpp | 8 ++++---- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/firmware/application/ais_app.cpp b/firmware/application/ais_app.cpp index 6c8109c54..3d71207d3 100644 --- a/firmware/application/ais_app.cpp +++ b/firmware/application/ais_app.cpp @@ -80,20 +80,12 @@ static std::string navigational_status(const unsigned int value) { } /* namespace format */ } /* namespace ais */ -AISModel::AISModel() { - receiver_model.set_baseband_configuration({ - .mode = 3, - .sampling_rate = 2457600, - .decimation_factor = 1, - }); - receiver_model.set_baseband_bandwidth(1750000); - +AISLogger::AISLogger() { log_file.open_for_append("ais.txt"); } -bool AISModel::on_packet(const ais::Packet& packet) { +void AISLogger::on_packet(const ais::Packet& packet) { // TODO: Unstuff here, not in baseband! - if( log_file.is_ready() ) { std::string entry; entry.reserve((packet.length() + 3) / 4); @@ -105,8 +97,6 @@ bool AISModel::on_packet(const ais::Packet& packet) { log_file.write_entry(packet.received_at(), entry); } - - return true; } namespace ui { @@ -119,11 +109,18 @@ AISView::AISView() { const auto message = static_cast(p); const ais::Packet packet { message->packet }; if( packet.is_valid() ) { - this->model.on_packet(packet); + this->logger.on_packet(packet); this->on_packet(packet); } } ); + + receiver_model.set_baseband_configuration({ + .mode = 3, + .sampling_rate = 2457600, + .decimation_factor = 1, + }); + receiver_model.set_baseband_bandwidth(1750000); } AISView::~AISView() { diff --git a/firmware/application/ais_app.hpp b/firmware/application/ais_app.hpp index e7e20052c..249be1306 100644 --- a/firmware/application/ais_app.hpp +++ b/firmware/application/ais_app.hpp @@ -63,11 +63,11 @@ struct AISRecentEntry { } }; -class AISModel { +class AISLogger { public: - AISModel(); + AISLogger(); - bool on_packet(const ais::Packet& packet); + void on_packet(const ais::Packet& packet); private: LogFile log_file; @@ -88,7 +88,7 @@ public: bool on_encoder(const EncoderEvent event) override; private: - AISModel model; + AISLogger logger; using EntryKey = ais::MMSI; EntryKey selected_key;