VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-25 09:18:54 -05:00
Code Issues Projects Releases Wiki Activity

Hopefully fix decoding of Class B messages. Add ship type.

Browse Source
This commit is contained in:
Jon Beniston 2021-05-11 10:04:58 +01:00
parent 93aefd6de3
commit 8612f124f0
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sdrbase/util/ais.cpp
View File

@ -531,7 +531,7 @@ AISStandardClassBPositionReport::AISStandardClassBPositionReport(QByteArray ba)
m_longitudeAvailable = longitude != 0x6791ac0;
m_longitude = longitude / 60.0f / 10000.0f;
int32_t latitude = ((ba[10] & 0x3) << 24) | ((ba[11] & 0xff) << 16) | ((ba[12] & 0xff) << 8) | (ba[13] & 0xff);
int32_t latitude = ((ba[10] & 0x7) << 24) | ((ba[11] & 0xff) << 16) | ((ba[12] & 0xff) << 8) | (ba[13] & 0xff);
latitude = (latitude << 5) >> 5;
m_latitudeAvailable = latitude != 0x3412140;
m_latitude = latitude / 60.0f / 10000.0f;
@ -540,10 +540,10 @@ AISStandardClassBPositionReport::AISStandardClassBPositionReport(QByteArray ba)
m_courseAvailable = cog != 3600;
m_course = cog * 0.1f;
m_heading = ((ba[15] & 0xf) << 5) | ((ba[17] >> 3) & 0x1f);
m_heading = ((ba[15] & 0xf) << 5) | ((ba[16] >> 3) & 0x1f);
m_headingAvailable = m_heading != 511;
m_timeStamp = ((ba[17] & 0x7) << 3) | ((ba[18] >> 5) & 0x7);
m_timeStamp = ((ba[16] & 0x7) << 3) | ((ba[17] >> 5) & 0x7);
}
QString AISStandardClassBPositionReport::toString()
@ -571,7 +571,7 @@ AISExtendedClassBPositionReport::AISExtendedClassBPositionReport(QByteArray ba)
m_longitudeAvailable = longitude != 0x6791ac0;
m_longitude = longitude / 60.0f / 10000.0f;
int32_t latitude = ((ba[10] & 0x3) << 24) | ((ba[11] & 0xff) << 16) | ((ba[12] & 0xff) << 8) | (ba[13] & 0xff);
int32_t latitude = ((ba[10] & 0x7) << 24) | ((ba[11] & 0xff) << 16) | ((ba[12] & 0xff) << 8) | (ba[13] & 0xff);
latitude = (latitude << 5) >> 5;
m_latitudeAvailable = latitude != 0x3412140;
m_latitude = latitude / 60.0f / 10000.0f;
@ -580,23 +580,26 @@ AISExtendedClassBPositionReport::AISExtendedClassBPositionReport(QByteArray ba)
m_courseAvailable = cog != 3600;
m_course = cog * 0.1f;
m_heading = ((ba[15] & 0xf) << 5) | ((ba[17] >> 3) & 0x1f);
m_heading = ((ba[15] & 0xf) << 5) | ((ba[16] >> 3) & 0x1f);
m_headingAvailable = m_heading != 511;
m_timeStamp = ((ba[17] & 0x7) << 3) | ((ba[18] >> 5) & 0x7);
m_timeStamp = ((ba[16] & 0x7) << 3) | ((ba[17] >> 5) & 0x7);
m_name = AISMessage::getString(ba, 18, 1, 20);
m_name = AISMessage::getString(ba, 17, 1, 20);
m_type = ((ba[32] & 1) << 7) | ((ba[33] >> 1) & 0x3f);
}
QString AISExtendedClassBPositionReport::toString()
{
return QString("Lat: %1%5 Lon: %2%5 Speed: %3 knts Course: %4%5 Name: %6")
return QString("Lat: %1%5 Lon: %2%5 Speed: %3 knts Course: %4%5 Name: %6 Type: %7")
.arg(m_latitude)
.arg(m_longitude)
.arg(m_speedOverGround)
.arg(m_course)
.arg(QChar(0xb0))
.arg(m_name);
.arg(m_name)
.arg(typeToString(m_type));
}
AISDatalinkManagement::AISDatalinkManagement(QByteArray ba) :

1
sdrbase/util/ais.h
View File

@ -276,6 +276,7 @@ public:
int m_heading; // Degrees
int m_timeStamp;
QString m_name;
quint8 m_type;
AISExtendedClassBPositionReport(const QByteArray ba);
virtual QString getType() override { return "Extended Class B equipment position report"; }