flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-21 04:45:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

[FSD] Verify we really have FSD ICAO data

Browse Source 
Problem: Sometime there are aircraft without ICAO daza

* check that we really have received ICAO data
* if not, query data again
* if nothing helps, use data as best guessed (by flightplan data)
This commit is contained in:
Klaus Basan
2019-11-12 18:04:24 +01:00
committed by Mat Sutcliffe
parent e9f8be013c
commit 0fd1e34d03
2 changed files with 76 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/blackcore/airspacemonitor.h
View File

@@ -161,7 +161,8 @@ namespace BlackCore
ReceivedFsInnPacket = 1 << 1, //!< FsInn pcket received
ReadyForMatchingSent = 1 << 2, //!< Read for matching sending
RecursiveCall = 1 << 3, //!< recursion
ReceivedAll = ReceivedIcaoCodes | ReceivedFsInnPacket
ReceivedAll = ReceivedIcaoCodes | ReceivedFsInnPacket,
Verified = 1 << 4, //!< verified already
};
Q_DECLARE_FLAGS(MatchingReadiness, MatchingReadinessFlag)
@@ -224,6 +225,9 @@ namespace BlackCore
return *this;
}
//! Reset timestamp to now
void resetTimestampToNow() { ts = QDateTime::currentMSecsSinceEpoch(); }
//! Set the flag
Readiness &setFlag(MatchingReadinessFlag flag)
{
@@ -233,12 +237,18 @@ namespace BlackCore
return *this;
}
//! Received all data
//! Received all data?
bool receivedAll() const { return readyness.testFlag(ReceivedIcaoCodes) && readyness.testFlag(ReceivedFsInnPacket); }
//! Was matching ready sent?
//! Received ICAO codes?
bool receivedIcaoCodes() const { return readyness.testFlag(ReceivedIcaoCodes); }
//! Was matching already sent?
bool wasMatchingSent() const { return readyness.testFlag(ReadyForMatchingSent); }
//! Was verifed?
bool wasVerified() const { return readyness.testFlag(Verified); }
//! currnt age in ms
qint64 getAgeMs() const
{
@@ -265,7 +275,13 @@ namespace BlackCore
CAirspaceAnalyzer *m_analyzer = nullptr; //!< owned analyzer
bool m_bookingsRequested = false; //!< bookings have been requested, it can happen we receive an BlackCore::Vatsim::CVatsimBookingReader::atcBookingsReadUnchanged signal
QTimer m_processTimer;
static constexpr int ProcessInterval = 50; // in ms
static constexpr int ProcessIntervalMs = 50; // in ms
// model matching times
static constexpr qint64 MMCheckAgainMs = 2000;
static constexpr qint64 MMMaxAgeMs = MMCheckAgainMs * 3;
static constexpr qint64 MMMaxAgeThresholdMs = MMCheckAgainMs * 10;
static constexpr qint64 MMVerifyMs = MMCheckAgainMs * 12;
//! Processing by timer
void process();
@@ -351,6 +367,10 @@ namespace BlackCore
//! \sa reverseLookupModelWithFlightplanData
void sendReadyForModelMatching(const BlackMisc::Aviation::CCallsign &callsign, MatchingReadinessFlag rf);
//! Make sure we got ICAO data
//! \remark did we get any responses for ICAO data (standard, FsInn)
void verifyReceivedIcaoData(const BlackMisc::Aviation::CCallsign &callsign);
//! Reverse lookup, if available flight plan data are considered
//! \remark this is where a model is created based on network data
//! \ingroup reverselookup