Revert "Issue #93 Reduce update offset for 5 Hz updates and rename me…

…mber" This reverts commit 8dc206d.
swift-project · Jan 15, 2024 · 20b8e98 · 20b8e98
1 parent 6cfa485
commit 20b8e98
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/blackcore/fsd/fsdclient.cpp b/src/blackcore/fsd/fsdclient.cpp
@@ -1916,9 +1916,9 @@ namespace BlackCore::Fsd
         const qint64 avgTimeMs = this->averageOffsetTimeMs(callsign, count, 3); // latest average
         qint64 offsetTime = CFsdSetup::c_positionTimeOffsetMsec;
 
-        if (avgTimeMs < CFsdSetup::c_minimumPositionTimeOffsetMsec && count >= 3)
+        if (avgTimeMs < CFsdSetup::c_interimPositionTimeOffsetMsec && count >= 3)
         {
-            offsetTime = CFsdSetup::c_minimumPositionTimeOffsetMsec;
+            offsetTime = CFsdSetup::c_interimPositionTimeOffsetMsec;
         }
 
         return m_additionalOffsetTime + offsetTime;

diff --git a/src/blackmisc/network/fsdsetup.h b/src/blackmisc/network/fsdsetup.h
@@ -58,8 +58,8 @@ namespace BlackMisc::Network
         //! @{
         //! Offset times basically telling when to expect the next value from network plus some reserve
         //! \remark related to CNetworkVatlib::c_updatePostionIntervalMsec / c_updateInterimPostionIntervalMsec
-        static constexpr qint64 c_positionTimeOffsetMsec = 6000; //!< offset time for received position updates Ref T297
-        static constexpr qint64 c_minimumPositionTimeOffsetMsec = 700; //!< offset time for vatsim high frequency position updates
+        static constexpr qint64 c_positionTimeOffsetMsec = 6000;        //!< offset time for received position updates Ref T297
+        static constexpr qint64 c_interimPositionTimeOffsetMsec = 1500; //!< offset time for received interim position updates Ref T297
         //! @}
 
         //! Default constructor.

diff --git a/src/blackmisc/simulation/interpolatorspline.cpp b/src/blackmisc/simulation/interpolatorspline.cpp
@@ -126,7 +126,7 @@ namespace BlackMisc::Simulation
         }
 
         // set some default values
-        const qint64 os = qMax(CFsdSetup::c_minimumPositionTimeOffsetMsec, m_s[2].getTimeOffsetMs());
+        const qint64 os = qMax(CFsdSetup::c_interimPositionTimeOffsetMsec, m_s[2].getTimeOffsetMs());
         m_s[0].addMsecs(-os); // oldest, Ref T297 default offset time to fill data
         m_s[2].addMsecs(os); // latest, Ref T297 default offset time to fill data
         if (m_currentSituations.isEmpty()) { return false; }