ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

guhTimer -> nymeaTimer

Browse Source
This commit is contained in:
Michael Zanetti 2018-03-06 19:56:57 +01:00
parent 4156e0abaa
commit b46eea1d61
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libnymea-core/time/timemanager.cpp
View File

@ -48,13 +48,13 @@ TimeManager::TimeManager(const QByteArray &timeZone, QObject *parent) :
setTimeZone(timeZone);
m_guhTimer = new QTimer(this);
m_guhTimer->setInterval(1000);
m_guhTimer->setSingleShot(false);
m_nymeaTimer = new QTimer(this);
m_nymeaTimer->setInterval(1000);
m_nymeaTimer->setSingleShot(false);
connect(m_guhTimer, &QTimer::timeout, this, &TimeManager::guhTimeout);
connect(m_nymeaTimer, &QTimer::timeout, this, &TimeManager::nymeaTimeout);
m_guhTimer->start();
m_nymeaTimer->start();
}
/*! Returns the time zone of this \l{TimeManager}. */
@ -111,23 +111,23 @@ void TimeManager::stopTimer()
{
qCWarning(dcTimeManager()) << "TimeManager timer stopped. You should only see this in tests.";
// Stop clock (used for testing)
m_guhTimer->stop();
m_nymeaTimer->stop();
}
void TimeManager::setTime(const QDateTime &dateTime)
{
qCWarning(dcTimeManager()) << "TimeManager time changed" << dateTime.toString("dd.MM.yyyy hh:mm:ss") << "You should only see this in tests.";
// This method will only be called for testing to set the guhIO intern time
// This method will only be called for testing to set the internal time
emit tick();
emit dateTimeChanged(dateTime);
}
void TimeManager::guhTimeout()
void TimeManager::nymeaTimeout()
{
// tick for deviceManager
emit tick();
// Minute based guh time
// Minute based nymea time
QDateTime utcDateTime = QDateTime::currentDateTimeUtc();
if (m_dateTime.time().minute() != utcDateTime.toTimeZone(m_timeZone).time().minute()) {
m_dateTime = utcDateTime;

4
libnymea-core/time/timemanager.h
View File

@ -49,14 +49,14 @@ public:
private:
QTimeZone m_timeZone;
QDateTime m_dateTime;
QTimer *m_guhTimer;
QTimer *m_nymeaTimer;
signals:
void tick();
void dateTimeChanged(const QDateTime &dateTime);
private slots:
void guhTimeout();
void nymeaTimeout();
};

2
libnymea/devicemanager.cpp
View File

@ -995,7 +995,7 @@ DeviceManager::DeviceError DeviceManager::executeAction(const Action &action)
return DeviceErrorDeviceNotFound;
}
/*! Centralized time tick for the GuhTimer resource. Ticks every second. */
/*! Centralized time tick for the NymeaTimer resource. Ticks every second. */
void DeviceManager::timeTick()
{