From 2aa8ae0d1f3d851a7f86500e94a46724f85bc51f Mon Sep 17 00:00:00 2001 From: Jared Boone Date: Fri, 14 Aug 2015 16:46:32 -0700 Subject: [PATCH] Move FSKPacket message handler to ReceiverView. --- firmware/application/main.cpp | 5 ----- firmware/application/ui_receiver.cpp | 7 +++++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/firmware/application/main.cpp b/firmware/application/main.cpp index d1fc410d..8bce016c 100755 --- a/firmware/application/main.cpp +++ b/firmware/application/main.cpp @@ -458,11 +458,6 @@ int main(void) { ui::Painter painter; EventDispatcher event_dispatcher { &system_view, painter, context }; -context.message_map[Message::ID::FSKPacket] = [](const Message* const p) { - const auto message = static_cast(p); - (void)message; -}; - m4txevent_interrupt_enable(); m4_init(portapack::spi_flash::baseband, portapack::spi_flash::m4_text_ram_base); diff --git a/firmware/application/ui_receiver.cpp b/firmware/application/ui_receiver.cpp index 80b7b96f..6cc3b5c0 100644 --- a/firmware/application/ui_receiver.cpp +++ b/firmware/application/ui_receiver.cpp @@ -480,9 +480,16 @@ ReceiverView::ReceiverView( }; receiver_model.enable(); + + context().message_map[Message::ID::FSKPacket] = [](const Message* const p) { + const auto message = static_cast(p); + (void)message; + }; } ReceiverView::~ReceiverView() { + context().message_map[Message::ID::FSKPacket] = nullptr; + // TODO: Manipulating audio codec here, and in ui_receiver.cpp. Good to do // both? audio_codec.headphone_mute();