From 791b2a97628718a2378b2f86707316dc109198c3 Mon Sep 17 00:00:00 2001 From: Jared Boone Date: Tue, 10 Nov 2015 15:07:20 -0800 Subject: [PATCH] Remove now-unused FSKConfiguration message. --- firmware/application/receiver_model.cpp | 27 ------------------------- firmware/application/receiver_model.hpp | 2 -- firmware/common/message.hpp | 23 --------------------- 3 files changed, 52 deletions(-) diff --git a/firmware/application/receiver_model.cpp b/firmware/application/receiver_model.cpp index dbc9ec9ac..e1914ba97 100644 --- a/firmware/application/receiver_model.cpp +++ b/firmware/application/receiver_model.cpp @@ -180,10 +180,6 @@ void ReceiverModel::update_baseband_configuration() { BasebandConfigurationMessage message { baseband_configuration }; shared_memory.baseband_queue.push(message); - if( baseband_configuration.mode == 3 ) { - update_fsk_configuration(); - } - radio::streaming_enable(); } @@ -193,26 +189,3 @@ void ReceiverModel::update_headphone_volume() { audio_codec.set_headphone_volume(headphone_volume_); } - -static constexpr FSKConfiguration fsk_configuration_ais = { - .symbol_rate = 9600, - .access_code = 0b0101010101111110, - .access_code_length = 16, - .access_code_tolerance = 0, - .unstuffing_pattern = 0b111110, - .unstuffing_length = 6, -}; - -static constexpr FSKConfiguration fsk_configuration_tpms_a = { - .symbol_rate = 19200, - .access_code = 0b0101010101010101010101010110, - .access_code_length = 28, - .access_code_tolerance = 1, - .unstuffing_pattern = 0, - .unstuffing_length = 0, -}; - -void ReceiverModel::update_fsk_configuration() { - FSKConfigurationMessage message { fsk_configuration_ais }; - shared_memory.baseband_queue.push(message); -} diff --git a/firmware/application/receiver_model.hpp b/firmware/application/receiver_model.hpp index 9fc7aefdf..5b91c1536 100644 --- a/firmware/application/receiver_model.hpp +++ b/firmware/application/receiver_model.hpp @@ -97,8 +97,6 @@ private: void update_vga(); void update_baseband_configuration(); void update_headphone_volume(); - - void update_fsk_configuration(); }; #endif/*__RECEIVER_MODEL_H__*/ diff --git a/firmware/common/message.hpp b/firmware/common/message.hpp index 07fdd2698..b58e6ad60 100644 --- a/firmware/common/message.hpp +++ b/firmware/common/message.hpp @@ -43,7 +43,6 @@ public: ChannelSpectrum = 3, AudioStatistics = 4, BasebandConfiguration = 5, - FSKConfiguration = 6, Shutdown = 8, AISPacket = 7, MAX @@ -195,28 +194,6 @@ public: ChannelSpectrum spectrum; }; -struct FSKConfiguration { - uint32_t symbol_rate; - uint32_t access_code; - size_t access_code_length; - size_t access_code_tolerance; - uint32_t unstuffing_pattern; - size_t unstuffing_length; -}; - -static_assert(sizeof(FSKConfiguration) == (6 * 4), "sizeof(FSKConfiguration) is wild"); - -class FSKConfigurationMessage : public Message { - constexpr FSKConfigurationMessage( - FSKConfiguration configuration - ) : Message { ID::FSKConfiguration }, - configuration(configuration) - { - } - - FSKConfiguration configuration; -}; - #include struct AISPacket {