TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-08-13 20:35:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename AIS packet handler variables for consistency with spec.

Browse Source
This commit is contained in:
Jared Boone
2015-11-09 14:35:06 -08:00
parent 850c847bbf
commit 0b522abbc1
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
firmware/common/ais_baseband.cpp
View File

@@ -296,28 +296,32 @@ static std::string ais_format_navigational_status(const unsigned int value) {
} }
} }
decoded_packet packet_decode(const std::bitset<1024>& data, const size_t data_length) { decoded_packet packet_decode(const std::bitset<1024>& payload, const size_t payload_length) {
if( data_length < 38 ) { // TODO: Unstuff here, not in baseband!
return { "short " + ui::to_string_dec_uint(data_length, 3), "" };
const size_t data_and_fcs_length = payload_length;
if( data_and_fcs_length < 38 ) {
return { "short " + ui::to_string_dec_uint(data_and_fcs_length, 3), "" };
} }
const size_t extra_bits = data_length & 7; const size_t extra_bits = data_and_fcs_length & 7;
if( extra_bits != 0 ) { if( extra_bits != 0 ) {
return { "extra bits " + ui::to_string_dec_uint(data_length, 3), "" }; return { "extra bits " + ui::to_string_dec_uint(data_and_fcs_length, 3), "" };
} }
FieldReader field { data }; FieldReader field { payload };
const auto message_id = field.read(0, 6); const auto message_id = field.read(0, 6);
const size_t payload_length = data_length - 16; const size_t data_length = data_and_fcs_length - 16;
PacketLengthValidator packet_length_valid; PacketLengthValidator packet_length_valid;
if( !packet_length_valid(message_id, payload_length) ) { if( !packet_length_valid(message_id, data_length) ) {
return { "bad length " + ui::to_string_dec_uint(payload_length, 3), "" }; return { "bad length " + ui::to_string_dec_uint(data_length, 3), "" };
} }
CRCCheck crc_ok; CRCCheck crc_ok;
if( !crc_ok(data, payload_length) ) { if( !crc_ok(payload, data_length) ) {
return { "crc", "" }; return { "crc", "" };
} }