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

Improved FSX/P3D time sync

Browse Source
This commit is contained in:
Klaus Basan
2018-11-01 20:07:45 +01:00
parent 3c77405b22
commit e98a420d5d
3 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
View File

@@ -2016,15 +2016,23 @@ namespace BlackSimPlugin
return lla; return lla;
} }
void CSimulatorFsxCommon::synchronizeTime(const CTime &zuluTimeSim, const CTime &localTimeSim) void CSimulatorFsxCommon::synchronizeTime(const DataDefinitionSimEnvironment *simEnv)
{ {
if (!m_simTimeSynced) { return; } if (!m_simTimeSynced) { return; }
if (!this->isConnected()) { return; } if (!this->isConnected()) { return; }
if (m_syncDeferredCounter > 0) if (m_syncTimeDeferredCounter > 0)
{ {
--m_syncDeferredCounter; --m_syncTimeDeferredCounter;
return; // wait some time before we snyc again
} }
Q_UNUSED(localTimeSim);
const int zh = simEnv->zuluTimeSeconds / 3600;
const int zm = (simEnv->zuluTimeSeconds - (zh * 3600)) / 60;
const CTime zuluTimeSim(zh, zm);
// const int lh = simEnv->localTimeSeconds / 3600;
// const int lm = (simEnv->localTimeSeconds - (lh * 3600)) / 60;
// const CTime localTimeSim(lh, lm);
// Q_UNUSED(localTimeSim);
QDateTime myDateTime = QDateTime::currentDateTimeUtc(); QDateTime myDateTime = QDateTime::currentDateTimeUtc();
if (!m_syncTimeOffset.isZeroEpsilonConsidered()) if (!m_syncTimeOffset.isZeroEpsilonConsidered())
@@ -2038,7 +2046,12 @@ namespace BlackSimPlugin
const int targetMins = myTime.hour() * 60 + myTime.minute(); const int targetMins = myTime.hour() * 60 + myTime.minute();
const int simMins = zuluTimeSim.valueInteger(CTimeUnit::min()); const int simMins = zuluTimeSim.valueInteger(CTimeUnit::min());
const int diffMins = qAbs(targetMins - simMins); const int diffMins = qAbs(targetMins - simMins);
if (diffMins < 2) { return; } if (diffMins < 2)
{
// checked and no relevant difference
m_syncTimeDeferredCounter = 10; // wait some time to check again
return;
}
const HRESULT hr1 = SimConnect_TransmitClientEvent(m_hSimConnect, 0, EventSetTimeZuluHours, h, SIMCONNECT_GROUP_PRIORITY_STANDARD, SIMCONNECT_EVENT_FLAG_GROUPID_IS_PRIORITY); const HRESULT hr1 = SimConnect_TransmitClientEvent(m_hSimConnect, 0, EventSetTimeZuluHours, h, SIMCONNECT_GROUP_PRIORITY_STANDARD, SIMCONNECT_EVENT_FLAG_GROUPID_IS_PRIORITY);
const HRESULT hr2 = SimConnect_TransmitClientEvent(m_hSimConnect, 0, EventSetTimeZuluMinutes, m, SIMCONNECT_GROUP_PRIORITY_STANDARD, SIMCONNECT_EVENT_FLAG_GROUPID_IS_PRIORITY); const HRESULT hr2 = SimConnect_TransmitClientEvent(m_hSimConnect, 0, EventSetTimeZuluMinutes, m, SIMCONNECT_GROUP_PRIORITY_STANDARD, SIMCONNECT_EVENT_FLAG_GROUPID_IS_PRIORITY);
@@ -2048,7 +2061,7 @@ namespace BlackSimPlugin
} }
else else
{ {
m_syncDeferredCounter = 5; // allow some time to sync m_syncTimeDeferredCounter = 5; // allow some time to sync
CLogMessage(this).info("Synchronized time to UTC: '%1'") << myTime.toString(); CLogMessage(this).info("Synchronized time to UTC: '%1'") << myTime.toString();
} }
} }

2
src/plugins/simulator/fsxcommon/simulatorfsxcommon.h
View File

@@ -475,7 +475,7 @@ namespace BlackSimPlugin
CSimConnectObject getSimObjectForObjectId(DWORD objectId) const; CSimConnectObject getSimObjectForObjectId(DWORD objectId) const;
//! Sync time with user's computer //! Sync time with user's computer
void synchronizeTime(const BlackMisc::PhysicalQuantities::CTime &zuluTimeSim, const BlackMisc::PhysicalQuantities::CTime &localTimeSim); void synchronizeTime(const DataDefinitionSimEnvironment *simEnv);
//! Request data for a CSimConnectObject (aka remote aircraft) //! Request data for a CSimConnectObject (aka remote aircraft)
bool requestPositionDataForSimObject(const CSimConnectObject &simObject, SIMCONNECT_PERIOD period = SIMCONNECT_PERIOD_SECOND); bool requestPositionDataForSimObject(const CSimConnectObject &simObject, SIMCONNECT_PERIOD period = SIMCONNECT_PERIOD_SECOND);

11
src/plugins/simulator/fsxcommon/simulatorfsxsimconnectproc.cpp
View File

@@ -253,16 +253,7 @@ namespace BlackSimPlugin
case CSimConnectDefinitions::RequestSimEnvironment: case CSimConnectDefinitions::RequestSimEnvironment:
{ {
const DataDefinitionSimEnvironment *simEnv = reinterpret_cast<const DataDefinitionSimEnvironment *>(&pObjData->dwData); const DataDefinitionSimEnvironment *simEnv = reinterpret_cast<const DataDefinitionSimEnvironment *>(&pObjData->dwData);
if (simulatorFsxP3D->isTimeSynchronized()) simulatorFsxP3D->synchronizeTime(simEnv);
{
const int zh = simEnv->zuluTimeSeconds / 3600;
const int zm = (simEnv->zuluTimeSeconds - (zh * 3600)) / 60;
const CTime zulu(zh, zm);
const int lh = simEnv->localTimeSeconds / 3600;
const int lm = (simEnv->localTimeSeconds - (lh * 3600)) / 60;
const CTime local(lh, lm);
simulatorFsxP3D->synchronizeTime(zulu, local);
}
break; break;
} }
default: default: