thooge/esp32-nmea2000-obp60
1
0
Fork 0
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git synced 2026-03-28 18:06:37 +01:00
Code Releases Activity

Integrate many changes from master

Browse Source
This commit is contained in:
Thomas Hooge
2026-03-18 13:29:57 +01:00
parent b2e67880d3
commit caf833e6ac
107 changed files with 8565 additions and 2688 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/aisparser/ais_decoder.cpp
View File

@@ -627,7 +627,7 @@ void AisDecoder::decodeType21(PayloadBuffer &_buffer, unsigned int _uMsgType, in
}
// decode message fields (binary buffer has to go through all fields, but some fields are not used)
_buffer.getUnsignedValue(2); // repeatIndicator
auto repeat=_buffer.getUnsignedValue(2); // repeatIndicator
auto mmsi = _buffer.getUnsignedValue(30);
auto aidType = _buffer.getUnsignedValue(5);
auto name = _buffer.getString(120);
@@ -640,11 +640,11 @@ void AisDecoder::decodeType21(PayloadBuffer &_buffer, unsigned int _uMsgType, in
auto toStarboard = _buffer.getUnsignedValue(6);
_buffer.getUnsignedValue(4); // epfd type
_buffer.getUnsignedValue(6); // timestamp
_buffer.getBoolValue(); // off position
auto timestamp=_buffer.getUnsignedValue(6); // timestamp
auto offPosition=_buffer.getBoolValue(); // off position
_buffer.getUnsignedValue(8); // reserved
_buffer.getBoolValue(); // RAIM
_buffer.getBoolValue(); // virtual aid
auto raim=_buffer.getBoolValue(); // RAIM
auto virtualAton=_buffer.getBoolValue(); // virtual aid
_buffer.getBoolValue(); // assigned mode
_buffer.getUnsignedValue(1); // spare
@@ -654,7 +654,9 @@ void AisDecoder::decodeType21(PayloadBuffer &_buffer, unsigned int _uMsgType, in
nameExt = _buffer.getString(88);
}
onType21(mmsi, aidType, name + nameExt, posAccuracy, posLon, posLat, toBow, toStern, toPort, toStarboard);
onType21(mmsi, aidType, name + nameExt, posAccuracy, posLon, posLat,
toBow, toStern, toPort, toStarboard,
repeat,timestamp, raim, virtualAton, offPosition);
}
/* decode Voyage Report and Static Data (type nibble already pulled from buffer) */