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

Enable AIS-B decoding and display

Browse Source 
Implement decoding for AIS messages 18 and 24A 24B
clean up display of text messages by removing the trailing null
character '@'
This commit is contained in:
Arne Luehrs 2022-08-15 13:56:40 +08:00
parent 5096f91986
commit 1e14ca4df1
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,6 +82,12 @@ static std::string mid(
} }
} }
static std::string text(const std::string &text) {
size_t end = text.find_last_not_of("@");
return (end == std::string::npos) ? "" : text.substr(0, end + 1);
}
static std::string navigational_status(const unsigned int value) { static std::string navigational_status(const unsigned int value) {
switch(value) { switch(value) {
case 0: return "under way w/engine"; case 0: return "under way w/engine";
@ -244,9 +250,9 @@ void RecentEntriesTable<AISRecentEntries>::draw(
) { ) {
std::string line = ais::format::mmsi(entry.mmsi) + " "; std::string line = ais::format::mmsi(entry.mmsi) + " ";
if( !entry.name.empty() ) { if( !entry.name.empty() ) {
line += entry.name; line += ais::format::text(entry.name);
} else { } else {
line += entry.call_sign; line += ais::format::text(entry.call_sign);
} }
line.resize(target_rect.width() / 8, ' '); line.resize(target_rect.width() / 8, ' ');
@ -267,7 +273,7 @@ AISRecentEntryDetailView::AISRecentEntryDetailView(NavigationView& nav) {
button_see_map.on_select = [this, &nav](Button&) { button_see_map.on_select = [this, &nav](Button&) {
geomap_view = nav.push<GeoMapView>( geomap_view = nav.push<GeoMapView>(
entry_.name, ais::format::text(entry_.name),
0, 0,
GeoPos::alt_unit::METERS, GeoPos::alt_unit::METERS,
ais::format::latlon_float(entry_.last_position.latitude.normalized()), ais::format::latlon_float(entry_.last_position.latitude.normalized()),
@ -328,8 +334,8 @@ void AISRecentEntryDetailView::paint(Painter& painter) {
field_rect = draw_field(painter, field_rect, s, "MMSI", ais::format::mmsi(entry_.mmsi)); field_rect = draw_field(painter, field_rect, s, "MMSI", ais::format::mmsi(entry_.mmsi));
field_rect = draw_field(painter, field_rect, s, "Ctry", ais::format::mid(entry_.mmsi)); field_rect = draw_field(painter, field_rect, s, "Ctry", ais::format::mid(entry_.mmsi));
field_rect = draw_field(painter, field_rect, s, "Name", entry_.name); field_rect = draw_field(painter, field_rect, s, "Name", ais::format::text(entry_.name));
field_rect = draw_field(painter, field_rect, s, "Call", entry_.call_sign); field_rect = draw_field(painter, field_rect, s, "Call", ais::format::text(entry_.call_sign));
field_rect = draw_field(painter, field_rect, s, "Dest", entry_.destination); field_rect = draw_field(painter, field_rect, s, "Dest", entry_.destination);
field_rect = draw_field(painter, field_rect, s, "Last", to_string_datetime(entry_.last_position.timestamp)); field_rect = draw_field(painter, field_rect, s, "Last", to_string_datetime(entry_.last_position.timestamp));
field_rect = draw_field(painter, field_rect, s, "Pos ", ais::format::latlon(entry_.last_position.latitude, entry_.last_position.longitude)); field_rect = draw_field(painter, field_rect, s, "Pos ", ais::format::latlon(entry_.last_position.latitude, entry_.last_position.longitude));