Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-01-13 08:19:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Rename AISModel to AISLogger.

Browse Source 
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...
This commit is contained in:
Jared Boone 2016-01-13 17:05:19 -08:00
parent 8c34e116af
commit 01741f3c7c
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
firmware/application/ais_app.cpp
View File

@ -80,20 +80,12 @@ static std::string navigational_status(const unsigned int value) {
} /* namespace format */ } /* namespace format */
} /* namespace ais */ } /* namespace ais */
AISModel::AISModel() { AISLogger::AISLogger() {
receiver_model.set_baseband_configuration({
.mode = 3,
.sampling_rate = 2457600,
.decimation_factor = 1,
});
receiver_model.set_baseband_bandwidth(1750000);
log_file.open_for_append("ais.txt"); 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! // TODO: Unstuff here, not in baseband!
if( log_file.is_ready() ) { if( log_file.is_ready() ) {
std::string entry; std::string entry;
entry.reserve((packet.length() + 3) / 4); 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); log_file.write_entry(packet.received_at(), entry);
} }
return true;
} }
namespace ui { namespace ui {
@ -119,11 +109,18 @@ AISView::AISView() {
const auto message = static_cast<const AISPacketMessage*>(p); const auto message = static_cast<const AISPacketMessage*>(p);
const ais::Packet packet { message->packet }; const ais::Packet packet { message->packet };
if( packet.is_valid() ) { if( packet.is_valid() ) {
this->model.on_packet(packet); this->logger.on_packet(packet);
this->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() { AISView::~AISView() {

8
firmware/application/ais_app.hpp
View File

@ -63,11 +63,11 @@ struct AISRecentEntry {
} }
}; };
class AISModel { class AISLogger {
public: public:
AISModel(); AISLogger();
bool on_packet(const ais::Packet& packet); void on_packet(const ais::Packet& packet);
private: private:
LogFile log_file; LogFile log_file;
@ -88,7 +88,7 @@ public:
bool on_encoder(const EncoderEvent event) override; bool on_encoder(const EncoderEvent event) override;
private: private:
AISModel model; AISLogger logger;
using EntryKey = ais::MMSI; using EntryKey = ais::MMSI;
EntryKey selected_key; EntryKey selected_key;