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

play around with hue refresh timers

Browse Source
This commit is contained in:
Michael Zanetti 2018-03-14 19:49:23 +01:00
parent 87ada72557
commit 2332e76764
2 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
philipshue/devicepluginphilipshue.cpp
View File

@ -63,13 +63,38 @@ DevicePluginPhilipsHue::DevicePluginPhilipsHue()
DevicePluginPhilipsHue::~DevicePluginPhilipsHue() DevicePluginPhilipsHue::~DevicePluginPhilipsHue()
{ {
hardwareManager()->pluginTimerManager()->unregisterTimer(m_pluginTimer); hardwareManager()->pluginTimerManager()->unregisterTimer(m_pluginTimer1Sec);
hardwareManager()->pluginTimerManager()->unregisterTimer(m_pluginTimer5Sec);
hardwareManager()->pluginTimerManager()->unregisterTimer(m_pluginTimer15Sec);
} }
void DevicePluginPhilipsHue::init() void DevicePluginPhilipsHue::init()
{ {
m_pluginTimer = hardwareManager()->pluginTimerManager()->registerTimer(5); m_pluginTimer1Sec = hardwareManager()->pluginTimerManager()->registerTimer(1);
connect(m_pluginTimer, &PluginTimer::timeout, this, &DevicePluginPhilipsHue::onPluginTimer); connect(m_pluginTimer1Sec, &PluginTimer::timeout, this, [this]() {
// refresh sensors every second
if (m_remotes.isEmpty()) {
return;
}
foreach (HueBridge *bridge, m_bridges.keys()) {
refreshSensors(bridge);
}
});
m_pluginTimer5Sec = hardwareManager()->pluginTimerManager()->registerTimer(5);
connect(m_pluginTimer5Sec, &PluginTimer::timeout, this, [this]() {
// refresh lights every 5 seconds
foreach (HueBridge *bridge, m_bridges.keys()) {
refreshLights(bridge);
}
});
m_pluginTimer15Sec = hardwareManager()->pluginTimerManager()->registerTimer(15);
connect(m_pluginTimer15Sec, &PluginTimer::timeout, this, [this]() {
// refresh bridges every 15 seconds
foreach (Device *device, m_bridges.values()) {
refreshBridge(device);
}
});
} }
DeviceManager::DeviceError DevicePluginPhilipsHue::discoverDevices(const DeviceClassId &deviceClassId, const ParamList &params) DeviceManager::DeviceError DevicePluginPhilipsHue::discoverDevices(const DeviceClassId &deviceClassId, const ParamList &params)
@ -656,13 +681,6 @@ void DevicePluginPhilipsHue::onRemoteButtonEvent(const int &buttonCode)
emitEvent(Event(id, m_remotes.value(remote)->id(), ParamList() << param)); emitEvent(Event(id, m_remotes.value(remote)->id(), ParamList() << param));
} }
void DevicePluginPhilipsHue::onPluginTimer()
{
foreach (Device *device, m_bridges.values()) {
refreshBridge(device);
}
}
void DevicePluginPhilipsHue::onUpnpDiscoveryFinished() void DevicePluginPhilipsHue::onUpnpDiscoveryFinished()
{ {
qCDebug(dcPhilipsHue()) << "Upnp discovery finished"; qCDebug(dcPhilipsHue()) << "Upnp discovery finished";
@ -1032,10 +1050,6 @@ void DevicePluginPhilipsHue::processBridgeRefreshResponse(Device *device, const
default: default:
break; break;
} }
// do lights/sensor update right after successful bridge update
HueBridge *bridge = m_bridges.key(device);
refreshLights(bridge);
} }
void DevicePluginPhilipsHue::processLightsRefreshResponse(Device *device, const QByteArray &data) void DevicePluginPhilipsHue::processLightsRefreshResponse(Device *device, const QByteArray &data)
@ -1070,9 +1084,6 @@ void DevicePluginPhilipsHue::processLightsRefreshResponse(Device *device, const
} }
} }
} }
if (!m_remotes.isEmpty())
refreshSensors(m_bridges.key(device));
} }
void DevicePluginPhilipsHue::processSensorsRefreshResponse(Device *device, const QByteArray &data) void DevicePluginPhilipsHue::processSensorsRefreshResponse(Device *device, const QByteArray &data)

5
philipshue/devicepluginphilipshue.h
View File

@ -59,14 +59,15 @@ private slots:
void lightStateChanged(); void lightStateChanged();
void remoteStateChanged(); void remoteStateChanged();
void onRemoteButtonEvent(const int &buttonCode); void onRemoteButtonEvent(const int &buttonCode);
void onPluginTimer();
private slots: private slots:
void onUpnpDiscoveryFinished(); void onUpnpDiscoveryFinished();
void networkManagerReplyReady(); void networkManagerReplyReady();
private: private:
PluginTimer *m_pluginTimer = nullptr; PluginTimer *m_pluginTimer1Sec = nullptr;
PluginTimer *m_pluginTimer5Sec = nullptr;
PluginTimer *m_pluginTimer15Sec = nullptr;
QHash<QNetworkReply *, PairingInfo *> m_pairingRequests; QHash<QNetworkReply *, PairingInfo *> m_pairingRequests;
QHash<QNetworkReply *, PairingInfo *> m_informationRequests; QHash<QNetworkReply *, PairingInfo *> m_informationRequests;