VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-05-01 11:53:58 -04:00
Code Issues Projects Releases Wiki Activity

Fix warnings

Browse Source
This commit is contained in:
Jon Beniston 2026-01-06 13:47:05 +00:00
parent ab728a6d9d
commit c86603fb8b
3 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
plugins/channelrx/demodinmarsat/inmarsatdemodgui.cpp
View File

@ -393,7 +393,8 @@ static QString formatFreqMHz(std::string string)
return formatFreqMHz(QString::fromStdString(string));
}
static const QStringList navAreas = {
// https://en.wikipedia.org/wiki/NAVAREA
const QStringList MultipartMessage::m_navAreas = {
"0",
"I United Kingdom",
"II France",
@ -419,7 +420,7 @@ static const QStringList navAreas = {
};
// We use flags from ADS-B demod
static const QStringList navAreaFlags = {
const QStringList MultipartMessage::m_navAreaFlags = {
"",
"united_kingdom",
"france",
@ -444,7 +445,7 @@ static const QStringList navAreaFlags = {
"russia"
};
static QString decodeAddress(QString messageType, QString addressHex, float *latitude, float *longitude, QList<QGeoCoordinate> *coordinates, QIcon **icon)
QString MultipartMessage::decodeAddress(QString messageType, QString addressHex, float *latitude, float *longitude, QList<QGeoCoordinate> *coordinates, QIcon **icon)
{
bool ok;
int messageTypeNum = messageType.toInt(&ok);
@ -457,12 +458,12 @@ static QString decodeAddress(QString messageType, QString addressHex, float *lat
{
// Navarea
int navArea = addressHex.left(2).toInt(&ok, 16);
if (ok && (navArea > 0) && (navArea < navAreas.size()))
if (ok && (navArea > 0) && (navArea < m_navAreas.size()))
{
if (icon) {
*icon = AircraftInformation::getFlagIcon(navAreaFlags[navArea]);
*icon = AircraftInformation::getFlagIcon(m_navAreaFlags[navArea]);
}
return QString("NAVAREA %1").arg(navAreas[navArea]);
return QString("NAVAREA %1").arg(m_navAreas[navArea]);
}
else
{
@ -476,12 +477,12 @@ static QString decodeAddress(QString messageType, QString addressHex, float *lat
QByteArray addressBytes = QByteArray::fromHex(addressHex.toLatin1());
// Navarea - TBD B1/B2
int navArea = addressBytes[0];
if ((navArea > 0) && (navArea < navAreas.size()))
if ((navArea > 0) && (navArea < m_navAreas.size()))
{
if (icon) {
*icon = AircraftInformation::getFlagIcon(navAreaFlags[navArea]);
*icon = AircraftInformation::getFlagIcon(m_navAreaFlags[navArea]);
}
return QString("NAVAREA %1").arg(navAreas[navArea]);
return QString("NAVAREA %1").arg(m_navAreas[navArea]);
}
else
{
@ -789,7 +790,7 @@ void InmarsatDemodGUI::packetReceived(const QByteArray& bytes, QDateTime dateTim
priorityItem->setText(QString::fromStdString(frame.decoding_result.packetVars["priorityText"]));
QIcon *icon = nullptr;
addressItem->setText(decodeAddress(
addressItem->setText(MultipartMessage::decodeAddress(
QString::fromStdString(frame.decoding_result.packetVars["messageType"]),
QString::fromStdString(frame.decoding_result.packetVars["addressHex"]),
nullptr,

6
plugins/channelrx/demodinmarsat/inmarsatdemodgui.h
View File

@ -52,8 +52,6 @@ namespace Ui {
}
class InmarsatDemodGUI;
QString decodeAddress(QString messageType, QString addressHex, float *latitude = nullptr, float *longitude = nullptr, QList<QGeoCoordinate> *coordinates = nullptr, QIcon **icon = nullptr);
struct MessagePart {
int m_part;
int m_packet;
@ -79,6 +77,8 @@ public:
float getLongitude() const { return m_addressCoordinates.size() > 0 ? m_longitude : m_messageCoordinates[0].longitude(); }
QList<QGeoCoordinate>& getCoordinates() { return m_addressCoordinates.size() > 0 ? m_addressCoordinates : m_messageCoordinates; }
static QString decodeAddress(QString messageType, QString addressHex, float *latitude = nullptr, float *longitude = nullptr, QList<QGeoCoordinate> *coordinates = nullptr, QIcon **icon = nullptr);
private:
QDateTime m_dateTime;
@ -94,6 +94,8 @@ private:
QList<QGeoCoordinate> m_messageCoordinates;
static QRegularExpression m_re;
static const QStringList m_navAreas;
static const QStringList m_navAreaFlags;
void parseMessage();
};

12
plugins/channelrx/demodinmarsat/readme.md
View File

@ -6,14 +6,16 @@ This plugin can be used to demodulate Inmarsat C data packets. They are transmit
The packets are BPSK modulated with a symbol rate of 1,200 symbols/s and a data rate of 600 bit/s.
Satellites / frequencies are:
Satellites and corresponding frequencies are:
| Region | Id | Satellite | Longitude | Frequency |
|---------------------|-------|---------------------------|-----------|--------------|
| Atlantic Ocean West | AOR-W | Inmarsat-4 F3 | 98W | 1,537.70 MHz |
| Atlantic Ocean East | AOR-E | Inmarsat-3 F5 | 54W | 1,541.45 MHz |
| Pacific Ocean | POR | Inmarsat-4 F1 | 178E | 1,541.45 MHz |
| Indian Ocean | IOR | Inmarsat-4A F4 / Alphasat | 25E | 1,537.10 MHz |
| Atlantic Ocean West | AOR-W | Inmarsat 4-F3 | 98W | 1,537.70 MHz |
| Atlantic Ocean East | AOR-E | Inmarsat 3-F5 | 54W | 1,541.45 MHz |
| Pacific Ocean | POR | Inmarsat 4-F1 | 178E | 1,541.45 MHz |
| Indian Ocean | IOR | Inmarsat 4A-F4 / Alphasat | 25E | 1,537.10 MHz |
The direction from your anntenna to the satellites can be determined in the [Satellite Tracker Feature](../../feature/satellitetracker/readme.md):
Messages containing coordinates in the address or message fields can be displayed on the [Map Feature](../../feature/map/readme.md):