ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix timer manager

pull/135/head
Michael Zanetti 2017-12-21 17:08:37 +01:00
parent 044b7958ea
commit b2db373c34
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libguh-core/guhcore.cpp
View File

@ -484,6 +484,7 @@ void GuhCore::init() {
connect(m_timeManager, &TimeManager::dateTimeChanged, this, &GuhCore::onDateTimeChanged);
connect(m_timeManager, &TimeManager::tick, m_deviceManager, &DeviceManager::timeTick);
connect(m_timeManager, &TimeManager::tick, m_hardwareManager, &HardwareManagerImplementation::timeTick);
m_logger->logSystemEvent(m_timeManager->currentDateTime(), true);

22
libguh-core/hardware/plugintimermanagerimplementation.h
View File

@ -40,15 +40,9 @@ class PluginTimerImplementation : public PluginTimer
public:
explicit PluginTimerImplementation(int intervall, QObject *parent = nullptr);
int interval() const;
int currentTick() const;
bool running() const;
signals:
void timeout();
void currentTickChanged(const int &currentTick);
void runningChanged(const bool &running);
void pausedChanged(const bool &paused);
int interval() const override;
int currentTick() const override;
bool running() const override;
private:
int m_interval;
@ -64,11 +58,11 @@ private:
void tick();
public slots:
void reset();
void start();
void stop();
void pause();
void resume();
void reset() override;
void start() override;
void stop() override;
void pause() override;
void resume() override;
};