From b499380448756624f739dc6427e5606c19e5f451 Mon Sep 17 00:00:00 2001 From: heurist1 Date: Fri, 29 Oct 2021 16:59:52 +0100 Subject: [PATCH] Keep items with loc above those without Removed fixsbt and added a new state of signal without position. Positions stay higher than non positions. --- .gitignore | 3 +- firmware/application/apps/ui_adsb_rx.cpp | 30 +- firmware/application/apps/ui_adsb_rx.hpp | 15 +- firmware/application/apps/ui_adsb_rx.hpp.bak | 301 ------------------- firmware/baseband/proc_adsbrx.cpp | 8 - 5 files changed, 17 insertions(+), 340 deletions(-) delete mode 100644 firmware/application/apps/ui_adsb_rx.hpp.bak diff --git a/.gitignore b/.gitignore index 9b4042e3f..4be2070d8 100644 --- a/.gitignore +++ b/.gitignore @@ -63,4 +63,5 @@ CMakeFiles/ # Host OS leftovers .DS_Store -/firmware/CMakeCache.txt \ No newline at end of file +/firmware/CMakeCache.txt +*.bak diff --git a/firmware/application/apps/ui_adsb_rx.cpp b/firmware/application/apps/ui_adsb_rx.cpp index e17e90b2a..7196117bc 100644 --- a/firmware/application/apps/ui_adsb_rx.cpp +++ b/firmware/application/apps/ui_adsb_rx.cpp @@ -46,11 +46,10 @@ void RecentEntriesTable::draw( auto entry_age = entry.age; // Color decay for flights not being updated anymore - // FIXSBT this had been a switch on entry.age_state, did I change this or 1.40 if (entry_age < ADSB_DECAY_A) { aged_color = 0x10; target_color = Color::green(); - } else if ((entry_age >= ADSB_DECAY_A) && (entry_age < ADSB_DECAY_B)) { + } else if (entry_age < ADSB_DECAY_B) { aged_color = 0x07; target_color = Color::light_grey(); } else { @@ -204,6 +203,8 @@ void ADSBRxView::focus() { } ADSBRxView::~ADSBRxView() { + receiver_model.set_tuning_frequency(prevFreq); + rtc_time::signal_tick_second -= signal_token_tick_second; receiver_model.disable(); baseband::shutdown(); @@ -216,6 +217,7 @@ AircraftRecentEntry ADSBRxView::find_or_create_entry(uint32_t ICAO_address) { if (it == std::end(recent)){ recent.emplace_front(ICAO_address); // Add it truncate_entries(recent); // Truncate the list + sort_entries_by_state(); it = find(recent, ICAO_address); // Find it again } return *it; @@ -293,14 +295,6 @@ void ADSBRxView::on_frame(const ADSBFrameMessage * message) { entry.set_info_string(str_info); logentry+=log_info + " "; - // we only want to update the details view if the frame - // we received has the same ICAO address, i.e. belongs to - // the same aircraft: - // FIXSBT does this still cause too many refreshes - //if(send_updates && details_view->get_current_entry().ICAO_address == ICAO_address) { - //if (send_updates && detailed_entry_key == ICAO_address) { - // details_view->update(entry); - //} } } else if(msg_type == AIRBORNE_VEL && msg_sub >= VEL_GND_SUBSONIC && msg_sub <= VEL_AIR_SUPERSONIC){ entry.set_frame_velo(frame); @@ -308,12 +302,6 @@ void ADSBRxView::on_frame(const ADSBFrameMessage * message) { " Hdg:" + to_string_dec_uint(entry.velo.heading) + " Spd: "+ to_string_dec_int(entry.velo.speed); - // same here: - // FIXSBT does this still cause too many refreshes - //if (send_updates && details_view->get_current_entry().ICAO_address == ICAO_address) { - //if (send_updates && detailed_entry_key == ICAO_address) { - // details_view->update(entry); - //} } } replace_entry(entry); @@ -338,12 +326,6 @@ void ADSBRxView::on_tick_second() { if (send_updates && (entry.key() == detailed_entry_key)) // Check if the ICAO address match details_view->update(entry); } - // FIXSBT following block is new, check if it is required - //else - //{ - // if ((entry.age == ADSB_DECAY_A) || (entry.age == ADSB_DECAY_B)) - // recent_entries_view.set_dirty(); - //} } // Sort the list if it is being displayed @@ -379,9 +361,7 @@ ADSBRxView::ADSBRxView(NavigationView& nav) { on_tick_second(); }; - // Initialise the CRC tables - // FIXSBT is this used - //dump1090Crc.modesChecksumInit(1); + prevFreq = receiver_model.tuning_frequency(); baseband::set_adsb(); diff --git a/firmware/application/apps/ui_adsb_rx.hpp b/firmware/application/apps/ui_adsb_rx.hpp index 09d32f4db..9a5a93eb7 100644 --- a/firmware/application/apps/ui_adsb_rx.hpp +++ b/firmware/application/apps/ui_adsb_rx.hpp @@ -74,7 +74,7 @@ struct AircraftRecentEntry { uint32_t ICAO_address { }; uint16_t hits { 0 }; - uint16_t age_state { 0 }; + uint16_t age_state { 1 }; uint32_t age { 0 }; adsb_pos pos { false, 0, 0, 0 }; adsb_vel velo { false, 0, 999, 0 }; @@ -133,7 +133,14 @@ struct AircraftRecentEntry { void inc_age() { age++; - age_state = (age < ADSB_DECAY_A) ? 0 : (age < ADSB_DECAY_B) ? 1 : 2; + if (age < ADSB_DECAY_A) + { + age_state = pos.valid ? 0 : 1; + } + else + { + age_state = (age < ADSB_DECAY_B) ? 2 : 3; + } } }; @@ -249,6 +256,7 @@ public: void sort_entries_by_state(); private: + rf::Frequency prevFreq; std::unique_ptr logger { }; void on_frame(const ADSBFrameMessage * message); void on_tick_second(); @@ -302,9 +310,6 @@ private: this->on_frame(message); } }; - - // FIXSBT is this used - //Dump1090Crc dump1090Crc; }; } /* namespace ui */ diff --git a/firmware/application/apps/ui_adsb_rx.hpp.bak b/firmware/application/apps/ui_adsb_rx.hpp.bak deleted file mode 100644 index bbc4e1778..000000000 --- a/firmware/application/apps/ui_adsb_rx.hpp.bak +++ /dev/null @@ -1,301 +0,0 @@ -/* - * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc. - * Copyright (C) 2017 Furrtek - * - * This file is part of PortaPack. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. - */ - -#include "ui.hpp" - -#include "ui_receiver.hpp" -#include "ui_geomap.hpp" -#include "ui_font_fixed_8x16.hpp" - -#include "file.hpp" -#include "recent_entries.hpp" -#include "log_file.hpp" -#include "adsb.hpp" -#include "message.hpp" - -#include "crc.hpp" - -using namespace adsb; - -namespace ui { - -#define ADSB_DECAY_A 10 // In seconds -#define ADSB_DECAY_B 30 -#define ADSB_DECAY_C 60 // Can be used for removing old entries, RecentEntries already caps to 64 - -#define AIRCRAFT_ID_L 1 // aircraft ID message type (lowest type id) -#define AIRCRAFT_ID_H 4 // aircraft ID message type (highest type id) - -#define SURFACE_POS_L 5 // surface position (lowest type id) -#define SURFACE_POS_H 8 // surface position (highest type id) - -#define AIRBORNE_POS_BARO_L 9 // airborne position (lowest type id) -#define AIRBORNE_POS_BARO_H 18 // airborne position (highest type id) - -#define AIRBORNE_VEL 19 // airborne velocities - -#define AIRBORNE_POS_GPS_L 20 // airborne position (lowest type id) -#define AIRBORNE_POS_GPS_H 22 // airborne position (highest type id) - -#define RESERVED_L 23 // reserved for other uses -#define RESERVED_H 31 // reserved for other uses - -#define VEL_GND_SUBSONIC 1 -#define VEL_GND_SUPERSONIC 2 -#define VEL_AIR_SUBSONIC 3 -#define VEL_AIR_SUPERSONIC 4 - -#define O_E_FRAME_TIMEOUT 20 // timeout between odd and even frames - -struct AircraftRecentEntry { - using Key = uint32_t; - - static constexpr Key invalid_key = 0xffffffff; - - uint32_t ICAO_address { }; - uint16_t hits { 0 }; - // FXSBT did I add age_state or 1.40 - uint16_t age_state { 0 }; - uint32_t age { 0 }; - adsb_pos pos { false, 0, 0, 0 }; - adsb_vel velo { false, 0, 999, 0 }; - ADSBFrame frame_pos_even { }; - ADSBFrame frame_pos_odd { }; - - std::string callsign { " " }; - std::string time_string { "" }; - std::string info_string { "" }; - - AircraftRecentEntry( - const uint32_t ICAO_address - ) : ICAO_address { ICAO_address } - { - } - - Key key() const { - return ICAO_address; - } - - void set_callsign(std::string& new_callsign) { - callsign = new_callsign; - } - - void inc_hit() { - hits++; - } - - void set_frame_pos(ADSBFrame& frame, uint32_t parity) { - if (!parity) - frame_pos_even = frame; - else - frame_pos_odd = frame; - - if (!frame_pos_even.empty() && !frame_pos_odd.empty()) { - // FIXSBT shouldn't need 20 s - if (abs(frame_pos_even.get_rx_timestamp() - frame_pos_odd.get_rx_timestamp()) < O_E_FRAME_TIMEOUT) - pos = decode_frame_pos(frame_pos_even, frame_pos_odd); - } - } - - void set_frame_velo(ADSBFrame& frame){ - velo = decode_frame_velo(frame); - } - - void set_info_string(std::string& new_info_string) { - info_string = new_info_string; - } - - void set_time_string(std::string& new_time_string) { - time_string = new_time_string; - } - - void reset_age() { - age = 0; - } - - void inc_age() { - age++; - age_state = (age < ADSB_DECAY_A) ? 0 : (age < ADSB_DECAY_B) ? 1 : 2; - } -}; - -using AircraftRecentEntries = RecentEntries; - -class ADSBLogger { -public: - Optional append(const std::filesystem::path& filename) { - return log_file.append(filename); - } - void log_str(std::string& logline); - -private: - LogFile log_file { }; -}; - - -class ADSBRxDetailsView : public View { -public: - ADSBRxDetailsView(NavigationView&, const AircraftRecentEntry& entry, const std::function on_close); - ~ADSBRxDetailsView(); - - ADSBRxDetailsView(const ADSBRxDetailsView&) = delete; - ADSBRxDetailsView(ADSBRxDetailsView&&) = delete; - ADSBRxDetailsView& operator=(const ADSBRxDetailsView&) = delete; - ADSBRxDetailsView& operator=(ADSBRxDetailsView&&) = delete; - - void focus() override; - - void update(const AircraftRecentEntry& entry); - - std::string title() const override { return "Details"; }; - -private: - AircraftRecentEntry entry_copy { 0 }; - std::function on_close_ { }; - GeoMapView* geomap_view { nullptr }; - bool send_updates { false }; - File db_file { }; - - Labels labels { - { { 0 * 8, 1 * 16 }, "Callsign:", Color::light_grey() }, - { { 0 * 8, 2 * 16 }, "Last seen:", Color::light_grey() }, - { { 0 * 8, 3 * 16 }, "Airline:", Color::light_grey() }, - { { 0 * 8, 5 * 16 }, "Country:", Color::light_grey() }, - { { 0 * 8, 13 * 16 }, "Even position frame:", Color::light_grey() }, - { { 0 * 8, 15 * 16 }, "Odd position frame:", Color::light_grey() } - }; - - Text text_callsign { - { 9 * 8, 1 * 16, 8 * 8, 16 }, - "-" - }; - - Text text_last_seen { - { 11 * 8, 2 * 16, 19 * 8, 16 }, - "-" - }; - - Text text_airline { - { 0 * 8, 4 * 16, 30 * 8, 16 }, - "-" - }; - - Text text_country { - { 8 * 8, 5 * 16, 22 * 8, 16 }, - "-" - }; - - Text text_infos { - { 0 * 8, 6 * 16, 30 * 8, 16 }, - "-" - }; - - Text text_info2 { - {0*8, 7*16, 30*8, 16}, - "-" - }; - - Text text_frame_pos_even { - { 0 * 8, 14 * 16, 30 * 8, 16 }, - "-" - }; - Text text_frame_pos_odd { - { 0 * 8, 16 * 16, 30 * 8, 16 }, - "-" - }; - - Button button_see_map { - { 8 * 8, 9 * 16, 14 * 8, 3 * 16 }, - "See on map" - }; -}; - -class ADSBRxView : public View { -public: - ADSBRxView(NavigationView& nav); - ~ADSBRxView(); - - ADSBRxView(const ADSBRxView&) = delete; - ADSBRxView(ADSBRxView&&) = delete; - ADSBRxView& operator=(const ADSBRxView&) = delete; - ADSBRxView& operator=(ADSBRxView&&) = delete; - - void focus() override; - - std::string title() const override { return "ADS-B receive"; }; - - void replace_entry(AircraftRecentEntry & entry); - AircraftRecentEntry find_or_create_entry(uint32_t ICAO_address); - void sort_entries_by_state(); - -private: - std::unique_ptr logger { }; - void on_frame(const ADSBFrameMessage * message); - void on_tick_second(); - - const RecentEntriesColumns columns { { - { "ICAO", 6 }, - { "Callsign", 9 }, - { "Hits", 4 }, - { "Time", 8 } - } }; - AircraftRecentEntries recent { }; - RecentEntriesView> recent_entries_view { columns, recent }; - - SignalToken signal_token_tick_second { }; - ADSBRxDetailsView* details_view { nullptr }; - uint32_t detailed_entry_key { 0 }; - bool send_updates { false }; - - Labels labels { - { { 0 * 8, 0 * 8 }, "LNA: VGA: AMP:", Color::light_grey() } - }; - - LNAGainField field_lna { - { 4 * 8, 0 * 16 } - }; - - VGAGainField field_vga { - { 11 * 8, 0 * 16 } - }; - - RFAmpField field_rf_amp { - { 18 * 8, 0 * 16 } - }; - - RSSI rssi { - { 20 * 8, 4, 10 * 8, 8 }, - }; - - MessageHandlerRegistration message_handler_frame { - Message::ID::ADSBFrame, - [this](Message* const p) { - const auto message = static_cast(p); - this->on_frame(message); - } - }; - - // FIXSBT is this used - //Dump1090Crc dump1090Crc; -}; - -} /* namespace ui */ diff --git a/firmware/baseband/proc_adsbrx.cpp b/firmware/baseband/proc_adsbrx.cpp index 4f3eb56c5..5a933bb12 100644 --- a/firmware/baseband/proc_adsbrx.cpp +++ b/firmware/baseband/proc_adsbrx.cpp @@ -87,8 +87,6 @@ void ADSBRXProcessor::execute(const buffer_c8_t& buffer) { // Look for preamble // Shift - // FIXSBT make this a ring buffer - // FIXSBT store level in int16 for quick compare to preamble for (c = 0; c < (ADSB_PREAMBLE_LENGTH - 1); c++) { shifter[c] = shifter[c + 1]; @@ -132,12 +130,6 @@ void ADSBRXProcessor::execute(const buffer_c8_t& buffer) { bit_count = 0; frame.clear(); - // Compute preamble pulses power to set thresholds - //threshold = (shifter[0] + shifter[2] + shifter[7] + shifter[9]) / 4; - // FIXSBT other use max * 0.2 - // FIXSBT threshold_high and threshold_low should be ditched - //threshold_high = threshold * 1.414f; // +3dB - //threshold_low = threshold * 0.707f; // -3dB } // 11-14 low } // 4 & 5 high } // Check for preamble pattern