Browse Source

Fix trailing white space.

chirpmodem-v8.1.0
Jon Beniston 3 weeks ago
parent
commit
fc6d29aceb
  1. 2
      plugins/channelrx/demodacars/acarsaero.h
  2. 2
      plugins/channelrx/demodacars/acarsdemodgui.cpp
  3. 2
      plugins/channelrx/demodacars/acarsdemodsettings.h
  4. 114
      plugins/channelrx/demodacars/acarsdemodworker.cpp
  5. 18
      plugins/channelrx/demodacars/readme.md
  6. 8
      plugins/channelrx/demodadsb/adsbdemodtrackerdecode.cpp
  7. 10
      plugins/feature/aircraft/readme.md
  8. 2
      plugins/feature/map/czml.cpp
  9. 24
      plugins/samplesource/remotetcpinput/remotetcpinputtcphandler.cpp
  10. 2
      sdrbase/util/acarsmessage.cpp
  11. 2
      sdrbase/util/aircraft3dmodels.h
  12. 354
      sdrbase/util/do219.h
  13. 18
      sdrgui/gui/acarsmessageview.cpp
  14. 2
      sdrgui/gui/levelmeter.h
  15. 2
      sdrgui/gui/profiledialog.cpp

2
plugins/channelrx/demodacars/acarsaero.h

@ -44,7 +44,7 @@
#include "acarshfdl.h" #include "acarshfdl.h"
// Inmarsat Classic Aero (aviation SATCOM) receiver, ICAO Annex 10 Volume III and // Inmarsat Classic Aero (aviation SATCOM) receiver, ICAO Annex 10 Volume III and
// ARINC 741. // ARINC 741.
// //
// Aero is the L band satellite protocol for ACARS, the complement to HFDL for oceanic // Aero is the L band satellite protocol for ACARS, the complement to HFDL for oceanic
// aircraft. Three data rates are in scope: // aircraft. Three data rates are in scope:

2
plugins/channelrx/demodacars/acarsdemodgui.cpp

@ -1372,7 +1372,7 @@ void AcarsDemodGUI::tick()
nbMagsqSamples); nbMagsqSamples);
// Only update labels that can be seen, to avoid unncessary compositing // Only update labels that can be seen, to avoid unncessary compositing
if (m_tickCount % 4 == 0) if (m_tickCount % 4 == 0)
{ {
if (!ui->channelPower->visibleRegion().isEmpty()) { if (!ui->channelPower->visibleRegion().isEmpty()) {
ui->channelPower->setText(QString::number(powDbAvg, 'f', 1)); ui->channelPower->setText(QString::number(powDbAvg, 'f', 1));

2
plugins/channelrx/demodacars/acarsdemodsettings.h

@ -37,7 +37,7 @@ struct AcarsDemodSettings
VDL2 = 1, //!< VDL Mode 2: 10500 baud D8PSK, ACARS over AVLC VDL2 = 1, //!< VDL Mode 2: 10500 baud D8PSK, ACARS over AVLC
HFDL = 2, //!< HFDL: 1800 baud M-PSK on a 1440 Hz subcarrier, ACARS over MPDU/LPDU HFDL = 2, //!< HFDL: 1800 baud M-PSK on a 1440 Hz subcarrier, ACARS over MPDU/LPDU
Aero = 3, //!< Inmarsat Classic Aero: L band satellite, ACARS over signal units Aero = 3, //!< Inmarsat Classic Aero: L band satellite, ACARS over signal units
Iridium = 4, //!< Iridium: L band satellite, burst DQPSK from low earth orbit. Iridium = 4, //!< Iridium: L band satellite, burst DQPSK from low earth orbit.
ModeCount ModeCount
}; };

114
plugins/channelrx/demodacars/acarsdemodworker.cpp

@ -37,7 +37,7 @@
#ifdef _MSC_VER #ifdef _MSC_VER
// For libacars/asn1/asn_system.h // For libacars/asn1/asn_system.h
#define ASSUMESTDTYPES #define ASSUMESTDTYPES
#define ssize_t SSIZE_T #define ssize_t SSIZE_T
#endif #endif
#include <libacars/asn1/FANSATCDownlinkMessage.h> #include <libacars/asn1/FANSATCDownlinkMessage.h>
@ -77,58 +77,58 @@ MESSAGE_CLASS_DEFINITION(AcarsDemodWorker::MsgReplayPacket, Message)
// Convert CPDCL altitude in to feet // Convert CPDCL altitude in to feet
static int cpdlcAltitude(FANSAltitude_t altitude) static int cpdlcAltitude(FANSAltitude_t altitude)
{ {
switch(altitude.present) switch(altitude.present)
{ {
case FANSAltitude_PR_altitudeQNH: case FANSAltitude_PR_altitudeQNH:
return altitude.choice.altitudeQNH * 10; return altitude.choice.altitudeQNH * 10;
case FANSAltitude_PR_altitudeQNHMeters: case FANSAltitude_PR_altitudeQNHMeters:
return Units::metresToIntegerFeet(altitude.choice.altitudeQNHMeters); return Units::metresToIntegerFeet(altitude.choice.altitudeQNHMeters);
case FANSAltitude_PR_altitudeQFE: case FANSAltitude_PR_altitudeQFE:
return altitude.choice.altitudeQFE * 10; return altitude.choice.altitudeQFE * 10;
case FANSAltitude_PR_altitudeQFEMeters: case FANSAltitude_PR_altitudeQFEMeters:
return Units::metresToIntegerFeet(altitude.choice.altitudeQFEMeters); return Units::metresToIntegerFeet(altitude.choice.altitudeQFEMeters);
case FANSAltitude_PR_altitudeGNSSFeet: case FANSAltitude_PR_altitudeGNSSFeet:
return altitude.choice.altitudeGNSSFeet; return altitude.choice.altitudeGNSSFeet;
case FANSAltitude_PR_altitudeGNSSMeters: case FANSAltitude_PR_altitudeGNSSMeters:
return Units::metresToIntegerFeet(altitude.choice.altitudeGNSSMeters); return Units::metresToIntegerFeet(altitude.choice.altitudeGNSSMeters);
case FANSAltitude_PR_altitudeFlightLevel: case FANSAltitude_PR_altitudeFlightLevel:
return altitude.choice.altitudeFlightLevel * 100; return altitude.choice.altitudeFlightLevel * 100;
case FANSAltitude_PR_altitudeFlightLevelMetric: case FANSAltitude_PR_altitudeFlightLevelMetric:
return Units::metresToIntegerFeet(altitude.choice.altitudeFlightLevelMetric * 10.0); return Units::metresToIntegerFeet(altitude.choice.altitudeFlightLevelMetric * 10.0);
case FANSAltitude_PR_NOTHING: /* No components present */ case FANSAltitude_PR_NOTHING: /* No components present */
default: default:
return -1; return -1;
} }
} }
static double cpdlcCoordinate(long degrees, long *tenthsofminutes) static double cpdlcCoordinate(long degrees, long *tenthsofminutes)
{ {
double result = (double)degrees; double result = (double)degrees;
if(tenthsofminutes != NULL) { if(tenthsofminutes != NULL) {
result += (double)(*tenthsofminutes) / 10.0f / 60.0f; result += (double)(*tenthsofminutes) / 10.0f / 60.0f;
} }
return result; return result;
} }
// Extract lat, lon, alt from FANSPositionReport // Extract lat, lon, alt from FANSPositionReport
static bool cpdlcExtractPosition(FANSPositionReport_t rpt, double &latitude, double &longitude, int &altitude) static bool cpdlcExtractPosition(FANSPositionReport_t rpt, double &latitude, double &longitude, int &altitude)
{ {
// FANSPositionCurrent_t can contain various types of position data (fix name, navaid, etc). // FANSPositionCurrent_t can contain various types of position data (fix name, navaid, etc).
// We want only latitude/longitude coordinates. // We want only latitude/longitude coordinates.
FANSPositionCurrent_t pos = rpt.positioncurrent; FANSPositionCurrent_t pos = rpt.positioncurrent;
if(pos.present != FANSPosition_PR_latitudeLongitude) { if(pos.present != FANSPosition_PR_latitudeLongitude) {
return false; return false;
} }
FANSLatitudeLongitude_t latlon = pos.choice.latitudeLongitude; FANSLatitudeLongitude_t latlon = pos.choice.latitudeLongitude;
latitude = cpdlcCoordinate(latlon.latitude.latitudeDegrees, latlon.latitude.minutesLatLon); latitude = cpdlcCoordinate(latlon.latitude.latitudeDegrees, latlon.latitude.minutesLatLon);
if(latlon.latitude.latitudeDirection == FANSLatitudeDirection_south) { if(latlon.latitude.latitudeDirection == FANSLatitudeDirection_south) {
latitude = -latitude; latitude = -latitude;
} }
longitude = cpdlcCoordinate(latlon.longitude.longitudeDegrees, latlon.longitude.minutesLatLon); longitude = cpdlcCoordinate(latlon.longitude.longitudeDegrees, latlon.longitude.minutesLatLon);
if(latlon.longitude.longitudeDirection == FANSLongitudeDirection_west) { if(latlon.longitude.longitudeDirection == FANSLongitudeDirection_west) {
longitude = -longitude; longitude = -longitude;
} }
altitude = cpdlcAltitude(rpt.altitude); altitude = cpdlcAltitude(rpt.altitude);
return true; return true;
} }
@ -960,16 +960,16 @@ void AcarsDemodWorker::processAcarsMessage(QByteArray messageBytes, QDateTime re
la_adsc_msg_t *adsc = (la_adsc_msg_t *)adscNode->data; la_adsc_msg_t *adsc = (la_adsc_msg_t *)adscNode->data;
if (adsc && !adsc->err) if (adsc && !adsc->err)
{ {
la_list *l = adsc->tag_list; la_list *l = adsc->tag_list;
la_adsc_basic_report_t *rpt = NULL; la_adsc_basic_report_t *rpt = NULL;
while(l != NULL) while(l != NULL)
{ {
la_adsc_tag_t *tag_struct = (la_adsc_tag_t *)l->data; la_adsc_tag_t *tag_struct = (la_adsc_tag_t *)l->data;
uint8_t t = tag_struct->tag; uint8_t t = tag_struct->tag;
// Look for a Basic Report // Look for a Basic Report
if(t == 7 || t == 9 || t == 10 || t == 18 || t == 19 || t == 20) if(t == 7 || t == 9 || t == 10 || t == 18 || t == 19 || t == 20)
{ {
rpt = (la_adsc_basic_report_t *)tag_struct->data; rpt = (la_adsc_basic_report_t *)tag_struct->data;
e.m_hasPosition = true; e.m_hasPosition = true;
e.m_hasAltitude = true; e.m_hasAltitude = true;
e.m_latitude = rpt->lat; e.m_latitude = rpt->lat;
@ -982,9 +982,9 @@ void AcarsDemodWorker::processAcarsMessage(QByteArray messageBytes, QDateTime re
report.m_altitudeValid = true; report.m_altitudeValid = true;
report.m_altitudeFt = rpt->alt; report.m_altitudeFt = rpt->alt;
report.m_documentKind = AircraftReport::PositionReport; report.m_documentKind = AircraftReport::PositionReport;
break; break;
} }
l = la_list_next(l); l = la_list_next(l);
} }
} }
} }
@ -1006,7 +1006,7 @@ void AcarsDemodWorker::processAcarsMessage(QByteArray messageBytes, QDateTime re
int altitudeFt; int altitudeFt;
if(dm->aTCDownlinkmsgelementid.present == FANSATCDownlinkMsgElementId_PR_dM48PositionReport) if(dm->aTCDownlinkmsgelementid.present == FANSATCDownlinkMsgElementId_PR_dM48PositionReport)
{ {
positionValid = cpdlcExtractPosition(dm->aTCDownlinkmsgelementid.choice.dM48PositionReport, latitude, longitude, altitudeFt); positionValid = cpdlcExtractPosition(dm->aTCDownlinkmsgelementid.choice.dM48PositionReport, latitude, longitude, altitudeFt);
} }
else else
{ {
@ -1044,8 +1044,8 @@ void AcarsDemodWorker::processAcarsMessage(QByteArray messageBytes, QDateTime re
} }
} }
la_proto_tree_destroy(node); la_proto_tree_destroy(node);
} }
else else
{ {
e.m_textDecode = "Failed to la_acars_parse_and_reassemble"; e.m_textDecode = "Failed to la_acars_parse_and_reassemble";

18
plugins/channelrx/demodacars/readme.md

@ -8,10 +8,10 @@ These packets can contain flight plans and other operational data as well as sta
ACARS uses MSK modulation at 2,400 baud, which is then AM modulated on to the VHF carrier. ACARS uses MSK modulation at 2,400 baud, which is then AM modulated on to the VHF carrier.
In Europe, the main ACARS frequencies are: In Europe, the main ACARS frequencies are:
- 131.525 MHz (SITA - Europe secondary) - 131.525 MHz (SITA - Europe secondary)
- 131.725 MHz (SITA - Europe primary) - 131.725 MHz (SITA - Europe primary)
- 131.825 MHz (ARINC/Collins) - 131.825 MHz (ARINC/Collins)
VDL Mode 2 uses D8PSK modulation at 10,500 baud (bit rate 31,500 bps). It can contain ACARS or ATN packets. VDL Mode 2 uses D8PSK modulation at 10,500 baud (bit rate 31,500 bps). It can contain ACARS or ATN packets.
VDL Mode 2 frequencies in Europe are: VDL Mode 2 frequencies in Europe are:
@ -24,7 +24,7 @@ VDL Mode 2 frequencies in Europe are:
- 136.900 MHz - 136.900 MHz
- 136.975 MHz (SITA & ARINC, the common signalling channel) - 136.975 MHz (SITA & ARINC, the common signalling channel)
HFDL uses M-PSK at 1,800 baud and frequencies are between 2 and 21 MHz. The active frequencies vary with propagation, and the HFDL uses M-PSK at 1,800 baud and frequencies are between 2 and 21 MHz. The active frequencies vary with propagation, and the
frequencies in use are reported in squitters transmitted by the ground stations. These are combined by the demodulator and frequencies in use are reported in squitters transmitted by the ground stations. These are combined by the demodulator and
displayed in the Ground Station Table dialog. You can find an initial frequency to try on: https://hfdl.observer/ displayed in the Ground Station Table dialog. You can find an initial frequency to try on: https://hfdl.observer/
@ -82,7 +82,7 @@ Average total power in dB relative to a +/- 1.0 amplitude signal received in the
<h3>4: Mode and Aero rate</h3> <h3>4: Mode and Aero rate</h3>
Selects the demodulator: ACARS, VDL-2, HFDL, Aero or Iridium - and, in Aero mode Selects the demodulator: ACARS, VDL-2, HFDL, Aero or Iridium - and, in Aero mode
only, the rate and channel selector appears beside it. only, the rate and channel selector appears beside it.
Changing either resets the demodulator and sets a default RF bandwidth. Changing either resets the demodulator and sets a default RF bandwidth.
Each demodulator runs at its own fixed channel sample rate, which the channelizer is Each demodulator runs at its own fixed channel sample rate, which the channelizer is
@ -100,7 +100,7 @@ set to when the mode is selected.
<h3>5: RF Bandwidth</h3> <h3>5: RF Bandwidth</h3>
This specifies the bandwidth of a LPF that is applied to the input signal to limit the RF bandwidth. This specifies the bandwidth of a LPF that is applied to the input signal to limit the RF bandwidth.
A default value is automatically set when selecting the Mode, and in Aero mode the rate A default value is automatically set when selecting the Mode, and in Aero mode the rate
and channel, from the combo boxes (4): and channel, from the combo boxes (4):
@ -227,7 +227,7 @@ parts have arrived - and the selected block.
* Block Seq. - For multipart downlinks, the block sequence character used to order the blocks. * Block Seq. - For multipart downlinks, the block sequence character used to order the blocks.
* Flight - For downlinks, the six-character flight identifier carried in the message text header. * Flight - For downlinks, the six-character flight identifier carried in the message text header.
* Message - The ACARS message payload after the standard downlink header fields and any recognized sublabel have been removed. * Message - The ACARS message payload after the standard downlink header fields and any recognized sublabel have been removed.
* Message Decode - A structured, human-readable decode of the message payload. * Message Decode - A structured, human-readable decode of the message payload.
Selecting the row displays the full multi-line Selecting the row displays the full multi-line
decode below the table. decode below the table.
* ATC - Air Traffic Control communication extracted from supported ARINC 622/CPDLC messages. * ATC - Air Traffic Control communication extracted from supported ARINC 622/CPDLC messages.
@ -246,7 +246,7 @@ have no ACARS header, so only the following columns are used:
* Date/Time - The receiver's local date and time when the frame was received. * Date/Time - The receiver's local date and time when the frame was received.
* Dir - The transmission direction. An up arrow is an uplink to an aircraft; a down arrow is a downlink from an aircraft. * Dir - The transmission direction. An up arrow is an uplink to an aircraft; a down arrow is a downlink from an aircraft.
* GS - Ground Station Id. * GS - Ground Station Id.
* GS Decode - Ground Station name. * GS Decode - Ground Station name.
* Registration - The aircraft side of the link. VDL-2 link frames identify aircraft by their 24-bit ICAO address (the same address the aircraft transmits in Mode S / ADS-B) rather than by registration, so the registration is looked up from the OpenSky database (14); when the address is not in the database, the address itself is shown in hexadecimal. Frames between ground stations show `GS` followed by the ground station's address, and broadcasts show `All`. * Registration - The aircraft side of the link. VDL-2 link frames identify aircraft by their 24-bit ICAO address (the same address the aircraft transmits in Mode S / ADS-B) rather than by registration, so the registration is looked up from the OpenSky database (14); when the address is not in the database, the address itself is shown in hexadecimal. Frames between ground stations show `GS` followed by the ground station's address, and broadcasts show `All`.
* Label - The AVLC frame type: `I` (information), `UI`, `XID` (link management, including GSIF ground station broadcasts), `TEST`, or the supervisory types `RR`, `RNR`, `REJ`, `SREJ`, `DM`, `DISC`, `UA`, `FRMR`. * Label - The AVLC frame type: `I` (information), `UI`, `XID` (link management, including GSIF ground station broadcasts), `TEST`, or the supervisory types `RR`, `RNR`, `REJ`, `SREJ`, `DM`, `DISC`, `UA`, `FRMR`.
@ -260,7 +260,7 @@ have no ACARS header, so only the following columns are used:
<h3>HFDL Frames</h3> <h3>HFDL Frames</h3>
HFDL frames that are not carrying an ACARS message use the same columns as the VDL-2 link frames. HFDL frames that are not carrying an ACARS message use the same columns as the VDL-2 link frames.
<h3>Aero Signal Units</h3> <h3>Aero Signal Units</h3>
@ -271,7 +271,7 @@ units that are not carrying an ACARS message use only the following columns:
* Dir - The transmission direction. An up arrow is a transmission from the ground earth * Dir - The transmission direction. An up arrow is a transmission from the ground earth
station on a P channel; a down arrow is a transmission from an aircraft on an R or T station on a P channel; a down arrow is a transmission from an aircraft on an R or T
channel. channel.
* GS - Ground Earth Station (GES) Id. * GS - Ground Earth Station (GES) Id.
* GS Decode - Satellite name, for example 'AOR-E'. See frequency table above. * GS Decode - Satellite name, for example 'AOR-E'. See frequency table above.
* Registration - The aircraft, when the signal unit names one. The AES ID is the * Registration - The aircraft, when the signal unit names one. The AES ID is the
aircraft's 24-bit ICAO address - the same address it transmits in Mode S / ADS-B. aircraft's 24-bit ICAO address - the same address it transmits in Mode S / ADS-B.

8
plugins/channelrx/demodadsb/adsbdemodtrackerdecode.cpp

@ -1488,10 +1488,10 @@ void ADSBDemodTracker::handleADSB(
} }
} }
else if (tc == 29) else if (tc == 29)
{ {
if (aircraft->m_adsbVersionValid && (aircraft->m_adsbVersion == 0)) if (aircraft->m_adsbVersionValid && (aircraft->m_adsbVersion == 0))
{ {
// Trajectory Change Point - according to the spec this shouldn't be transmitted // Trajectory Change Point - according to the spec this shouldn't be transmitted
} }
else if (aircraft->m_adsbVersionValid && (aircraft->m_adsbVersion == 1)) else if (aircraft->m_adsbVersionValid && (aircraft->m_adsbVersion == 1))
{ {
@ -1499,7 +1499,7 @@ void ADSBDemodTracker::handleADSB(
} }
else if (aircraft->m_adsbVersionValid && (aircraft->m_adsbVersion == 2)) else if (aircraft->m_adsbVersionValid && (aircraft->m_adsbVersion == 2))
{ {
// Target state and status // Target state and status
//bool selAltitudeType = (data[5] >> 7) & 0x1; //bool selAltitudeType = (data[5] >> 7) & 0x1;
int selAltitudeFix = ((data[5] & 0x7f) << 4) | ((data[6] >> 4) & 0xf); int selAltitudeFix = ((data[5] & 0x7f) << 4) | ((data[6] >> 4) & 0xf);
if (selAltitudeFix != 0) if (selAltitudeFix != 0)
@ -3983,7 +3983,7 @@ QList<SWGSDRangel::SWGMapAnimation *> * ADSBDemodTracker::animate(QDateTime date
const int gearDownHeight = 2000; // Above the runway, as most operators fly it const int gearDownHeight = 2000; // Above the runway, as most operators fly it
const int gearDownAirspeed = 180; // Indicated, which is what a crew flies to const int gearDownAirspeed = 180; // Indicated, which is what a crew flies to
const int gearDownSpeed = 150; // Groundspeed, the last resort const int gearDownSpeed = 150; // Groundspeed, the last resort
const int gearDownVerticalRate = -300; // A settled descent. const int gearDownVerticalRate = -300; // A settled descent.
const int gearUpAltitude = 200; const int gearUpAltitude = 200;
const int gearUpVerticalRate = 1000; const int gearUpVerticalRate = 1000;

10
plugins/feature/aircraft/readme.md

@ -107,11 +107,11 @@ an ATC style; when unchecked just the callsign or registration is shown.
<h3>6: Statistics</h3> <h3>6: Statistics</h3>
The statistics table can be shown and hidden with the statistic button. The statistics table can be shown and hidden with the statistic button.
Right click the button to reset the records. Right click the button to reset the records.
Every figure is given twice, side by side: for this session and for all time, each with Every figure is given twice, side by side: for this session and for all time, each with
who set it and when. who set it and when.
* **Maximum range**, one row per protocol - the furthest aircraft heard on ADS-B, ACARS, * **Maximum range**, one row per protocol - the furthest aircraft heard on ADS-B, ACARS,
VDL-2, HFDL and Aero. Per protocol rather than as one figure because the protocols are VDL-2, HFDL and Aero. Per protocol rather than as one figure because the protocols are
@ -195,7 +195,7 @@ Click to open the settings dialog.
This allows aircraft to be kept forever, but only their This allows aircraft to be kept forever, but only their
recent flights - which hold the tracks, profiles and ACARS documents, so are most of the recent flights - which hold the tracks, profiles and ACARS documents, so are most of the
database. An aircraft's most recent flight is always kept. Zero keeps flights for as long database. An aircraft's most recent flight is always kept. Zero keeps flights for as long
as their aircraft. as their aircraft.
* ADS-B position for (mins) - how long an aircraft stays on the Map after its last ADS-B * ADS-B position for (mins) - how long an aircraft stays on the Map after its last ADS-B
position position
* ACARS position for (mins) - the same for a position from ACARS, VDL-2, HFDL, Aero or Iridium. * ACARS position for (mins) - the same for a position from ACARS, VDL-2, HFDL, Aero or Iridium.
@ -210,7 +210,7 @@ Unticked ones are ignored.
**Use airline callsigns in Map labels** - writes the flight on the Map the way it is **Use airline callsigns in Map labels** - writes the flight on the Map the way it is
spoken on the radio rather than the way it is transmitted: SPEEDBIRD 123 instead of spoken on the radio rather than the way it is transmitted: SPEEDBIRD 123 instead of
BAW123, using the airline's radio callsign from the airline database. BAW123, using the airline's radio callsign from the airline database.
**Show the maximum range record on the Map** - keeps the aircraft that set the all time **Show the maximum range record on the Map** - keeps the aircraft that set the all time
maximum range record permanently on the Map, drawn at the position it was in when it set maximum range record permanently on the Map, drawn at the position it was in when it set
@ -221,7 +221,7 @@ reset, or this is turned off.
**Favour airline livery over aircraft type (3D map)** - when no 3D model exists of the **Favour airline livery over aircraft type (3D map)** - when no 3D model exists of the
right type in the right livery, prefer a similar aircraft in the correct livery over an right type in the right livery, prefer a similar aircraft in the correct livery over an
exact type in the wrong one. exact type in the wrong one.
**Livery aircraft icons (2D map)** - display aircraft on the 2D map using icons showing **Livery aircraft icons (2D map)** - display aircraft on the 2D map using icons showing
their airline's livery, instead of black icons. their airline's livery, instead of black icons.

2
plugins/feature/map/czml.cpp

@ -34,7 +34,7 @@
const QStringList CZML::m_heightReferences = {"NONE", "CLAMP_TO_GROUND", "RELATIVE_TO_GROUND", "CLIP_TO_GROUND"}; const QStringList CZML::m_heightReferences = {"NONE", "CLAMP_TO_GROUND", "RELATIVE_TO_GROUND", "CLIP_TO_GROUND"};
// Using CLAMP_TO_GROUND on a label, billboard or point, results in all of them being visible through the globe. // Using CLAMP_TO_GROUND on a label, billboard or point, results in all of them being visible through the globe.
// So use CLIP_TO_GROUND instead. // So use CLIP_TO_GROUND instead.
// A single CLAMP_TO_GROUND label, billboard or point latches _shaderDisableDepthDistance // A single CLAMP_TO_GROUND label, billboard or point latches _shaderDisableDepthDistance
// on the Cesium collection it lands in, which recompiles every item in that collection // on the Cesium collection it lands in, which recompiles every item in that collection
// onto Cesium's manual globe-depth path. That path discards nothing beyond // onto Cesium's manual globe-depth path. That path discards nothing beyond

24
plugins/samplesource/remotetcpinput/remotetcpinputtcphandler.cpp

@ -270,23 +270,23 @@ void RemoteTCPInputTCPHandler::cleanup(bool threadStopped)
{ {
if (m_webSocket) if (m_webSocket)
{ {
if (threadStopped) { if (threadStopped) {
delete m_webSocket; delete m_webSocket;
} else { } else {
m_webSocket->deleteLater(); m_webSocket->deleteLater();
} }
m_webSocket = nullptr; m_webSocket = nullptr;
} }
if (m_tcpSocket) if (m_tcpSocket)
{ {
if (threadStopped) { if (threadStopped) {
delete m_tcpSocket; delete m_tcpSocket;
} else { } else {
m_tcpSocket->deleteLater(); m_tcpSocket->deleteLater();
} }
m_tcpSocket = nullptr; m_tcpSocket = nullptr;
} }
} }
m_compressedData.clear(); m_compressedData.clear();
m_uncompressedData.clear(); m_uncompressedData.clear();
@ -919,7 +919,7 @@ FLAC__StreamDecoderWriteStatus RemoteTCPInputTCPHandler::flacWrite(const FLAC__S
int nbSamples = frame->header.blocksize; int nbSamples = frame->header.blocksize;
if (nbSamples > (int) m_converterBufferNbSamples) if (nbSamples > (int) m_converterBufferNbSamples)
{ {
if (m_converterBuffer) if (m_converterBuffer)
{ {
delete[] m_converterBuffer; delete[] m_converterBuffer;
m_converterBuffer = nullptr; m_converterBuffer = nullptr;
@ -1049,7 +1049,7 @@ void RemoteTCPInputTCPHandler::processDecompressedZlibData(const char *inBuf, in
// Ensure conversion buffer is large enough - FIXME: Don't use this buffer - just write in to FIFO // Ensure conversion buffer is large enough - FIXME: Don't use this buffer - just write in to FIFO
if (nbSamples > (int) m_converterBufferNbSamples) if (nbSamples > (int) m_converterBufferNbSamples)
{ {
if (m_converterBuffer) if (m_converterBuffer)
{ {
delete[] m_converterBuffer; delete[] m_converterBuffer;
m_converterBuffer = nullptr; m_converterBuffer = nullptr;
@ -2323,7 +2323,7 @@ void RemoteTCPInputTCPHandler::processUncompressedData(const char *inBuf, int nb
// Ensure conversion buffer is large enough // Ensure conversion buffer is large enough
if (nbSamples > (int) m_converterBufferNbSamples) if (nbSamples > (int) m_converterBufferNbSamples)
{ {
if (m_converterBuffer) if (m_converterBuffer)
{ {
delete[] m_converterBuffer; delete[] m_converterBuffer;
m_converterBuffer = nullptr; m_converterBuffer = nullptr;

2
sdrbase/util/acarsmessage.cpp

@ -247,7 +247,7 @@ AcarsMessage *AcarsMessage::decodeBlock(const QByteArray &message, const QString
if (!uplink) { if (!uplink) {
start += 10; // Skip msg num and flight start += 10; // Skip msg num and flight
} }
QString text; QString text;
qsizetype textSize = message.length() - start - 1 - 2 - 1; qsizetype textSize = message.length() - start - 1 - 2 - 1;
if (textSize > 0) { if (textSize > 0) {

2
sdrbase/util/aircraft3dmodels.h

@ -202,7 +202,7 @@ private:
mutable QMutex m_modelInfoMutex; mutable QMutex m_modelInfoMutex;
mutable bool m_modelInfoLoaded = false; mutable bool m_modelInfoLoaded = false;
mutable QHash<QString, ModelInfo> m_modelInfo; // Model path to what its glTF says mutable QHash<QString, ModelInfo> m_modelInfo; // Model path to what its glTF says
mutable QHash<QString, QString> m_modelInfoStamp; // Model path to the size/mtime it was read at mutable QHash<QString, QString> m_modelInfoStamp; // Model path to the size/mtime it was read at
mutable QHash<QString, qint64> m_modelInfoCheckedMs; // When each model was last stat()ed. mutable QHash<QString, qint64> m_modelInfoCheckedMs; // When each model was last stat()ed.
mutable QElapsedTimer m_modelInfoClock; mutable QElapsedTimer m_modelInfoClock;
static constexpr qint64 m_modelInfoRecheckMs = 30000; static constexpr qint64 m_modelInfoRecheckMs = 30000;

354
sdrbase/util/do219.h

File diff suppressed because it is too large Load Diff

18
sdrgui/gui/acarsmessageview.cpp

@ -78,7 +78,7 @@ static const QHash<QString, QString>& builtInAcronyms()
{"SDU", "Satellite Data Unit"}, {"SDU", "Satellite Data Unit"},
{"SID", "Standard Instrument Departure"}, {"SID", "Standard Instrument Departure"},
{"SMI", "Standard Message Identifier"}, {"SMI", "Standard Message Identifier"},
{"STAR", "Standard Terminal Arrival Route"}, {"STAR", "Standard Terminal Arrival Route"},
{"SITA", "Society Internationale de Telecommunications Aeronautiques"}, {"SITA", "Society Internationale de Telecommunications Aeronautiques"},
{"TCAS", "Traffic Alert/Collision Avoidance System"}, {"TCAS", "Traffic Alert/Collision Avoidance System"},
{"TEI", "Text Element Identifier"}, {"TEI", "Text Element Identifier"},
@ -90,7 +90,7 @@ static const QHash<QString, QString>& builtInAcronyms()
{"VFR", "Visual Flight Rules"}, {"VFR", "Visual Flight Rules"},
{"WILCO", "Will Comply"}, {"WILCO", "Will Comply"},
{"WXRQ", "Weather Request"}, {"WXRQ", "Weather Request"},
// METAR // METAR
{"SKC", "No Cloud/Sky Clear"}, {"SKC", "No Cloud/Sky Clear"},
{"NCD", "No Cloud Detected"}, {"NCD", "No Cloud Detected"},
@ -113,7 +113,7 @@ static const QHash<QString, QString>& builtInAcronyms()
{"KT", "Knots"}, {"KT", "Knots"},
{"CAVOK", "Ceiling and Visibilty OK"}, {"CAVOK", "Ceiling and Visibilty OK"},
{"NR", "Not Reported"}, {"NR", "Not Reported"},
// TEI codes from ARINC 620 Append B // TEI codes from ARINC 620 Append B
{"AC", "Estimated time approach clearance"}, {"AC", "Estimated time approach clearance"},
{"AD", "Aerodrome of concern or arrival"}, {"AD", "Aerodrome of concern or arrival"},
@ -179,8 +179,8 @@ static const QHash<QString, QString>& builtInAcronyms()
{"WX", "Weather report"}, {"WX", "Weather report"},
{"WI", "Weather"}, {"WI", "Weather"},
{"ZW", "Zero fuel weight"}, {"ZW", "Zero fuel weight"},
// SMIs from ARINC 620 Table C-2 // SMIs from ARINC 620 Table C-2
{"HJK", "Hijack Situation Report"}, {"HJK", "Hijack Situation Report"},
{"AVR", "Voice Contact Request"}, {"AVR", "Voice Contact Request"},
{"GVR", "Voice Go-ahead"}, {"GVR", "Voice Go-ahead"},
@ -248,11 +248,11 @@ static const QHash<QString, QString>& builtInAcronyms()
{"APR", "LRU Configuration Report/Request"}, {"APR", "LRU Configuration Report/Request"},
{"MED", "Media Advisory"}, {"MED", "Media Advisory"},
{"TEB", "Turbulence Event Report"}, {"TEB", "Turbulence Event Report"},
// HFDL // HFDL
{"GS", "Ground Station"}, {"GS", "Ground Station"},
// Loadsheet // Loadsheet
{"DOW", "Dry Operating Weight"}, {"DOW", "Dry Operating Weight"},
{"ZFW", "Zero Fuel Weight"}, {"ZFW", "Zero Fuel Weight"},
{"ZFWT", "Zero Fuel Weight Total"}, {"ZFWT", "Zero Fuel Weight Total"},
@ -283,7 +283,7 @@ AcarsMessageView::AcarsMessageView(QWidget *parent) :
{ {
setMouseTracking(true); setMouseTracking(true);
} }
bool AcarsMessageView::event(QEvent *event) bool AcarsMessageView::event(QEvent *event)
{ {
if (event->type() == QEvent::ToolTip) if (event->type() == QEvent::ToolTip)
@ -346,4 +346,4 @@ QString AcarsMessageView::explanation(const QString& text) const
} }
return QString(); return QString();
} }

2
sdrgui/gui/levelmeter.h

@ -96,7 +96,7 @@ protected slots:
void redrawTimerExpired(); void redrawTimerExpired();
protected: protected:
/** Repaint only if the meter would actually look different. */ /** Repaint only if the meter would actually look different. */
void requestUpdate(); void requestUpdate();
/** Position of a level in pixels, as the renders below compute it */ /** Position of a level in pixels, as the renders below compute it */

2
sdrgui/gui/profiledialog.cpp

@ -30,7 +30,7 @@ ProfileDialog::ProfileDialog(QWidget* parent) :
ui(new Ui::ProfileDialog) ui(new Ui::ProfileDialog)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->table->setItemDelegate(new FastItemDelegate(ui->table)); ui->table->setItemDelegate(new FastItemDelegate(ui->table));
ui->table->setItemDelegateForColumn(COL_TOTAL, new NanoSecondsDelegate()); ui->table->setItemDelegateForColumn(COL_TOTAL, new NanoSecondsDelegate());

Loading…
Cancel
Save