From b0ad41ff04246806557a2616ed6e04f247d37349 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Fri, 4 Feb 2022 23:55:42 +0000 Subject: [PATCH] Fix linux warnings --- plugins/channelrx/demodadsb/adsbdemodgui.cpp | 7 +++---- plugins/channelrx/demodadsb/adsbdemodgui.h | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/plugins/channelrx/demodadsb/adsbdemodgui.cpp b/plugins/channelrx/demodadsb/adsbdemodgui.cpp index 90abab4f3..74f422a2e 100644 --- a/plugins/channelrx/demodadsb/adsbdemodgui.cpp +++ b/plugins/channelrx/demodadsb/adsbdemodgui.cpp @@ -866,7 +866,7 @@ void ADSBDemodGUI::handleADSB( float correlationOnes, bool updateModel) { - const char idMap[] = "?ABCDEFGHIJKLMNOPQRSTUVWXYZ????? ????????????-??0123456789??????"; + const char idMap[] = "#ABCDEFGHIJKLMNOPQRSTUVWXYZ##### ############-##0123456789######"; const QString categorySetA[] = { QStringLiteral("None"), QStringLiteral("Light"), @@ -1659,7 +1659,7 @@ void ADSBDemodGUI::handleADSB( if (aircraft->m_positionValid) { // Check to see if we need to start any animations - QList *animations = animate(dateTime, aircraft, prevAltitudeValid, prevAltitude); + QList *animations = animate(dateTime, aircraft); // Update map displayed in channel if (updateModel) { @@ -1685,7 +1685,7 @@ void ADSBDemodGUI::handleADSB( } } -QList * ADSBDemodGUI::animate(QDateTime dateTime, Aircraft *aircraft, bool prevAltitudeValid, int prevAltitude) +QList * ADSBDemodGUI::animate(QDateTime dateTime, Aircraft *aircraft) { QList *animations = new QList(); @@ -1695,7 +1695,6 @@ QList * ADSBDemodGUI::animate(QDateTime dateTime const int accelerationHeight = 1500; const int flapsRetractAltitude = 2000; const int flapsCleanSpeed = 200; - const int flapsFullSpeed = 170; bool debug = false; diff --git a/plugins/channelrx/demodadsb/adsbdemodgui.h b/plugins/channelrx/demodadsb/adsbdemodgui.h index 51d5aece1..d04d6921e 100644 --- a/plugins/channelrx/demodadsb/adsbdemodgui.h +++ b/plugins/channelrx/demodadsb/adsbdemodgui.h @@ -838,7 +838,7 @@ private: float correlation, float correlationOnes, bool updateModel); - QList *animate(QDateTime dateTime, Aircraft *aircraft, bool prevAltitudeValid, int prevAltitude); + QList *animate(QDateTime dateTime, Aircraft *aircraft); SWGSDRangel::SWGMapAnimation *gearAnimation(QDateTime startDateTime, bool up); SWGSDRangel::SWGMapAnimation *flapsAnimation(QDateTime startDateTime, float currentFlaps, float flaps); SWGSDRangel::SWGMapAnimation *slatsAnimation(QDateTime startDateTime, bool retract);