diff --git a/firmware/application/apps/ui_adsb_rx.cpp b/firmware/application/apps/ui_adsb_rx.cpp index 1d9ec7808..e17e90b2a 100644 --- a/firmware/application/apps/ui_adsb_rx.cpp +++ b/firmware/application/apps/ui_adsb_rx.cpp @@ -60,10 +60,19 @@ void RecentEntriesTable::draw( std::string entry_string = "\x1B"; entry_string += aged_color; +#if false entry_string += to_string_hex(entry.ICAO_address, 6) + " " + entry.callsign + " " + (entry.hits <= 999 ? to_string_dec_uint(entry.hits, 4) : "999+") + " " + entry.time_string; +#else + entry_string += + (entry.callsign[0]!=' ' ? entry.callsign + " " : to_string_hex(entry.ICAO_address, 6) + " ") + + to_string_dec_int(entry.pos.altitude,5) + " " + + to_string_dec_int(entry.velo.speed,3) + " " + + (entry.hits <= 999 ? to_string_dec_uint(entry.hits, 3) + " " : "1k+ ") + + to_string_dec_uint(entry.age, 3); +#endif painter.draw_string( target_rect.location(), diff --git a/firmware/application/apps/ui_adsb_rx.hpp b/firmware/application/apps/ui_adsb_rx.hpp index e9d97c791..09d32f4db 100644 --- a/firmware/application/apps/ui_adsb_rx.hpp +++ b/firmware/application/apps/ui_adsb_rx.hpp @@ -126,7 +126,7 @@ struct AircraftRecentEntry { void set_time_string(std::string& new_time_string) { time_string = new_time_string; } - + void reset_age() { age = 0; } @@ -254,10 +254,18 @@ private: void on_tick_second(); const RecentEntriesColumns columns { { +#if false { "ICAO", 6 }, { "Callsign", 9 }, { "Hits", 4 }, { "Time", 8 } +#else + { "ICAO/Call", 9 }, + { "Alt", 6 }, + { "Spd", 4 }, + { "Hits", 4 }, + { "Age", 4 } +#endif } }; AircraftRecentEntries recent { }; RecentEntriesView> recent_entries_view { columns, recent };