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

AIS-related namespace cleanup.

Browse source
This commit is contained in:
Jared Boone 2015-12-08 15:53:17 -08:00
parent 37d7d5b273
commit 3e0acc9988
4 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
firmware/application/ais_app.cpp
View file

@ -39,13 +39,13 @@ static std::string latlon_normalized(const int32_t normalized) {
}
static std::string mmsi(
const baseband::ais::MMSI& mmsi
const ais::MMSI& mmsi
) {
return to_string_dec_uint(mmsi, 9, '0');
}
static std::string datetime(
const baseband::ais::DateTime& datetime
const ais::DateTime& datetime
) {
return to_string_dec_uint(datetime.year, 4, '0') + "/" +
to_string_dec_uint(datetime.month, 2, '0') + "/" +
@ -89,7 +89,7 @@ AISModel::AISModel() {
log_file.open_for_append("ais.txt");
}
bool AISModel::on_packet(const baseband::ais::Packet& packet) {
bool AISModel::on_packet(const ais::Packet& packet) {
// TODO: Unstuff here, not in baseband!
if( !packet.is_valid() ) {
@ -122,7 +122,7 @@ void AISView::on_show() {
const auto message = static_cast<const AISPacketMessage*>(p);
rtc::RTC datetime;
rtcGetTime(&RTCD1, &datetime);
const baseband::ais::Packet packet { datetime, message->packet };
const ais::Packet packet { datetime, message->packet };
if( this->model.on_packet(packet) ) {
this->on_packet(packet);
}
@ -143,7 +143,7 @@ void AISView::truncate_entries() {
}
}
void AISView::on_packet(const baseband::ais::Packet& packet) {
void AISView::on_packet(const ais::Packet& packet) {
const auto source_id = packet.source_id();
auto matching_recent = std::find_if(recent.begin(), recent.end(),
[source_id](const AISView::RecentEntry& entry) { return entry.mmsi == source_id; }