From 57b3a0bcb8bbacc83253d614d48fb6819c7297dd Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 6 May 2014 13:51:53 +0200 Subject: [PATCH] refs #171, added support for custom packages --- src/blackcore/context_network_impl.h | 10 +++++++++- src/blackcore/network_vatlib.cpp | 11 ++++++++++- src/blackcore/network_vatlib.h | 26 ++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/src/blackcore/context_network_impl.h b/src/blackcore/context_network_impl.h index 7e4800e0f..886b7593b 100644 --- a/src/blackcore/context_network_impl.h +++ b/src/blackcore/context_network_impl.h @@ -173,6 +173,15 @@ namespace BlackCore return this->getRuntime()->getIContextSettings()->getNetworkSettings(); } + //! Send FsInn custom package + void sendFsipiCustomPackage(const BlackMisc::Aviation::CCallsign &recipientCallsign) const; + + //! Send FsInn custom package + void sendFsipirCustomPackage(const BlackMisc::Aviation::CCallsign &recipientCallsign) const; + + //! Custom package data based on own aircraft / model + QStringList createFsipiCustomPackageData() const; + private slots: //! ATC bookings received void psReceivedBookings(BlackMisc::Aviation::CAtcStationList bookedStations); @@ -242,7 +251,6 @@ namespace BlackCore //! Server reply received void psFsdServerReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &host); - }; } diff --git a/src/blackcore/network_vatlib.cpp b/src/blackcore/network_vatlib.cpp index a1513132c..ca5102310 100644 --- a/src/blackcore/network_vatlib.cpp +++ b/src/blackcore/network_vatlib.cpp @@ -24,7 +24,6 @@ namespace BlackCore using namespace BlackMisc::Network; using namespace BlackMisc; - void exceptionDispatcher(const char *caller); CNetworkVatlib::CNetworkVatlib(QObject *parent) @@ -757,6 +756,16 @@ namespace BlackCore catch (...) { exceptionDispatcher(Q_FUNC_INFO); } } + QStringList CNetworkVatlib::createFsipiCustomPackageData(const QString &unknown01, const QString &airlineIcao, const QString &aircraftIcao, const QString &magicNumber1, const QString &magicNumber2, const QString &magicNumber3, const QString &magicNumber4, const QString &combinedType, const QString &modelString) + { + + QStringList data; + data << unknown01 << airlineIcao << aircraftIcao + << magicNumber1 << magicNumber2 << magicNumber3 << magicNumber4 + << combinedType << modelString; + return data; + } + /********************************** * * * * * * * * * * * * * * * * * * * ************************************/ /********************************** shimlib callbacks ************************************/ /********************************** * * * * * * * * * * * * * * * * * * * ************************************/ diff --git a/src/blackcore/network_vatlib.h b/src/blackcore/network_vatlib.h index c56d1ee63..ce8d12c6c 100644 --- a/src/blackcore/network_vatlib.h +++ b/src/blackcore/network_vatlib.h @@ -81,6 +81,32 @@ namespace BlackCore virtual void sendMetarQuery(const QString &airportICAO) override; virtual void sendWeatherDataQuery(const QString &airportICAO) override; + // some helper methods + + //! + + + /*! + * \brief Create the data load for FSIPI(R) packages / FsInn + * \details FSIPI(R) queries + *
+ * index 0 .. 0/1 ??? + * 1 .. MQT, GEC, DLH -> Airline ICAO, most of the time empty + * 2 .. AIRCRAFT ICAO "B747" + * 3 .. 10.64195 + * 4 .. 1.06080: + * 5 .. 5825.00000 + * 6 .. 4.DD89CCB6.EC9BB7D7 + * 7 .. 3-letter combined L2J + * 8 .. Model string + *
+ * \remarks This helper here has more or less the function of documenting the package, + * it is nothing but a little string concatenating + */ + static QStringList createFsipiCustomPackageData(const QString &unknown01, const QString &airlineDesignator, const QString &aircraftDesignator, + const QString &magicNumber1, const QString &magicNumber2, const QString &magicNumber3, const QString &magicNumber4, + const QString &combinedType, const QString &modelString); + private slots: void replyToFrequencyQuery(const BlackMisc::Aviation::CCallsign &callsign); void replyToNameQuery(const BlackMisc::Aviation::CCallsign &callsign);