Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-05-06 08:45:01 -04:00
Code Issues Projects Releases Packages Wiki Activity

Started working on radiosonde RX

Browse source 
Removed some warnings
Better handling of absent map file in GeoMap ?
This commit is contained in:
furrtek 2017-10-05 05:38:45 +01:00
parent 34b99042ef
commit d3222c27ca
18 changed files with 621 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

18
firmware/application/ui_geomap.cpp
View file

@ -173,9 +173,8 @@ void GeoMap::move(const float lon, const float lat) {
bool GeoMap::init() {
auto result = map_file.open("ADSB/world_map.bin");
if (result.is_valid()) {
if (result.is_valid())
return false;
}
map_file.read(&map_width, 2);
map_file.read(&map_height, 2);
@ -210,9 +209,9 @@ void GeoMap::draw_bearing(const Point origin, const uint32_t angle, uint32_t siz
}
void GeoMapView::focus() {
if (!file_error) {
geopos.focus();
} else
geopos.focus();
if (!file_error)
nav_.display_modal("No map", "No world_map.bin file in\n/ADSB/ directory", ABORT, nullptr);
}
@ -226,10 +225,7 @@ void GeoMapView::update_position(float lat, float lon) {
}
void GeoMapView::setup() {
add_children({
&geopos,
&geomap
});
add_child(&geomap);
geopos.set_altitude(altitude_);
geopos.set_lat(lat_);
@ -282,6 +278,8 @@ GeoMapView::GeoMapView(
{
mode_ = DISPLAY;
add_child(&geopos);
file_error = !geomap.init();
if (file_error) return;
@ -308,6 +306,8 @@ GeoMapView::GeoMapView(
{
mode_ = PROMPT;
add_child(&geopos);
file_error = !geomap.init();
if (file_error) return;