TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2024-12-14 04:04:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #477 from zigad/bugfix-#473

Browse Source 
Fix ADS-B not updating Altitude in Map #473
This commit is contained in:
Erwin Ried 2022-01-24 09:26:05 +01:00 committed by GitHub
commit ea251a87c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/application/apps/ais_app.cpp
View File

@ -240,7 +240,7 @@ AISRecentEntryDetailView::AISRecentEntryDetailView(NavigationView& nav) {
void AISRecentEntryDetailView::update_position() { void AISRecentEntryDetailView::update_position() {
if (send_updates) if (send_updates)
geomap_view->update_position(ais::format::latlon_float(entry_.last_position.latitude.normalized()), ais::format::latlon_float(entry_.last_position.longitude.normalized()), (float)entry_.last_position.true_heading); geomap_view->update_position(ais::format::latlon_float(entry_.last_position.latitude.normalized()), ais::format::latlon_float(entry_.last_position.longitude.normalized()), (float)entry_.last_position.true_heading, 0);
} }
void AISRecentEntryDetailView::focus() { void AISRecentEntryDetailView::focus() {

2
firmware/application/apps/ui_adsb_rx.cpp
View File

@ -261,7 +261,7 @@ void ADSBRxDetailsView::update(const AircraftRecentEntry& entry) {
text_frame_pos_odd.set(to_string_hex_array(entry_copy.frame_pos_odd.get_raw_data(), 14)); text_frame_pos_odd.set(to_string_hex_array(entry_copy.frame_pos_odd.get_raw_data(), 14));
if (send_updates) if (send_updates)
geomap_view->update_position(entry_copy.pos.latitude, entry_copy.pos.longitude, entry_copy.velo.heading); geomap_view->update_position(entry_copy.pos.latitude, entry_copy.pos.longitude, entry_copy.velo.heading, entry_copy.pos.altitude);
} }
ADSBRxDetailsView::~ADSBRxDetailsView() { ADSBRxDetailsView::~ADSBRxDetailsView() {

2
firmware/application/apps/ui_aprs_rx.cpp
View File

@ -351,7 +351,7 @@ void APRSDetailsView::update() {
} }
if (send_updates) if (send_updates)
geomap_view->update_position(entry_copy.pos.latitude, entry_copy.pos.longitude, 0); geomap_view->update_position(entry_copy.pos.latitude, entry_copy.pos.longitude, 0, 0);
} }
APRSDetailsView::~APRSDetailsView() { APRSDetailsView::~APRSDetailsView() {

4
firmware/application/ui/ui_geomap.cpp
View File

@ -253,14 +253,16 @@ void GeoMapView::focus() {
nav_.display_modal("No map", "No world_map.bin file in\n/ADSB/ directory", ABORT, nullptr); nav_.display_modal("No map", "No world_map.bin file in\n/ADSB/ directory", ABORT, nullptr);
} }
void GeoMapView::update_position(float lat, float lon, uint16_t angle) { void GeoMapView::update_position(float lat, float lon, uint16_t angle, int32_t altitude) {
lat_ = lat; lat_ = lat;
lon_ = lon; lon_ = lon;
altitude_ = altitude;
// Stupid hack to avoid an event loop // Stupid hack to avoid an event loop
geopos.set_report_change(false); geopos.set_report_change(false);
geopos.set_lat(lat_); geopos.set_lat(lat_);
geopos.set_lon(lon_); geopos.set_lon(lon_);
geopos.set_altitude(altitude_);
geopos.set_report_change(true); geopos.set_report_change(true);
geomap.set_angle(angle); geomap.set_angle(angle);

2
firmware/application/ui/ui_geomap.hpp
View File

@ -177,7 +177,7 @@ public:
void focus() override; void focus() override;
void update_position(float lat, float lon, uint16_t angle); void update_position(float lat, float lon, uint16_t angle, int32_t altitude);
std::string title() const override { return "Map view"; }; std::string title() const override { return "Map view"; };