thooge/esp32-nmea2000-obp60
1
0
Fork 0
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git synced 2026-02-11 15:13:06 +01:00
Code Releases Activity

more parameters for AIS type 21

Browse Source
This commit is contained in:
wellenvogel
2025-09-21 19:32:02 +02:00
parent 6e0d56316b
commit e578b428c9
3 changed files with 35 additions and 33 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) */

3
lib/aisparser/ais_decoder.h
View File

@@ -297,7 +297,8 @@ namespace AIS
bool assigned, unsigned int repeat, bool raim) = 0;
virtual void onType21(unsigned int _uMmsi, unsigned int _uAidType, const std::string &_strName, bool _bPosAccuracy, int _iPosLon, int _iPosLat,
unsigned int _uToBow, unsigned int _uToStern, unsigned int _uToPort, unsigned int _uToStarboard) = 0;
unsigned int _uToBow, unsigned int _uToStern, unsigned int _uToPort, unsigned int _uToStarboard,
unsigned int repeat,unsigned int timestamp, bool raim, bool virtualAton, bool offPosition) = 0;
virtual void onType24A(unsigned int _uMsgType, unsigned int _repeat, unsigned int _uMmsi, const std::string &_strName) = 0;