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

cleaned up a bit

Browse Source
This commit is contained in:
bernhard.trinnes 2020-04-01 17:12:02 +02:00
parent 4295d4d6bf
commit b6df43f7d5
2 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
netatmo/integrationpluginnetatmo.cpp
View File

@ -42,16 +42,6 @@ IntegrationPluginNetatmo::IntegrationPluginNetatmo()
} }
IntegrationPluginNetatmo::~IntegrationPluginNetatmo()
{
}
void IntegrationPluginNetatmo::init()
{
}
void IntegrationPluginNetatmo::startPairing(ThingPairingInfo *info) void IntegrationPluginNetatmo::startPairing(ThingPairingInfo *info)
{ {
info->finish(Thing::ThingErrorNoError, QT_TR_NOOP("Please enter the login credentials for your Netatmo account.")); info->finish(Thing::ThingErrorNoError, QT_TR_NOOP("Please enter the login credentials for your Netatmo account."));
@ -65,7 +55,6 @@ void IntegrationPluginNetatmo::confirmPairing(ThingPairingInfo *info, const QStr
authentication->setPassword(password); authentication->setPassword(password);
authentication->setScope("read_station read_thermostat write_thermostat"); authentication->setScope("read_station read_thermostat write_thermostat");
// Update thing connected state based on OAuth connected state
connect(authentication, &OAuth2::authenticationChanged, info, [this, info, username, password, authentication](){ connect(authentication, &OAuth2::authenticationChanged, info, [this, info, username, password, authentication](){
if (authentication->authenticated()) { if (authentication->authenticated()) {
pluginStorage()->beginGroup(info->thingId().toString()); pluginStorage()->beginGroup(info->thingId().toString());
@ -88,11 +77,6 @@ void IntegrationPluginNetatmo::setupThing(ThingSetupInfo *info)
if (thing->thingClassId() == netatmoConnectionThingClassId) { if (thing->thingClassId() == netatmoConnectionThingClassId) {
qCDebug(dcNetatmo) << "Setup netatmo connection" << thing->name() << thing->params(); qCDebug(dcNetatmo) << "Setup netatmo connection" << thing->name() << thing->params();
if (!m_pluginTimer) {
m_pluginTimer = hardwareManager()->pluginTimerManager()->registerTimer(600);
connect(m_pluginTimer, &PluginTimer::timeout, this, &IntegrationPluginNetatmo::onPluginTimer);
}
QString username; QString username;
QString password; QString password;
@ -215,7 +199,7 @@ void IntegrationPluginNetatmo::thingRemoved(Thing *thing)
} }
if (myThings().isEmpty() && m_pluginTimer) { if (myThings().isEmpty() && m_pluginTimer) {
m_pluginTimer->deleteLater(); hardwareManager()->pluginTimerManager()->unregisterTimer(m_pluginTimer);
m_pluginTimer = nullptr; m_pluginTimer = nullptr;
} }
} }
@ -233,6 +217,11 @@ void IntegrationPluginNetatmo::postSetupThing(Thing *thing)
m_outdoorDevices.key(thing)->updateStates(m_outdoorStationInitData.take(stationId)); m_outdoorDevices.key(thing)->updateStates(m_outdoorStationInitData.take(stationId));
} }
} }
if (!m_pluginTimer) {
m_pluginTimer = hardwareManager()->pluginTimerManager()->registerTimer(600);
connect(m_pluginTimer, &PluginTimer::timeout, this, &IntegrationPluginNetatmo::onPluginTimer);
}
} }
void IntegrationPluginNetatmo::refreshData(Thing *thing, const QString &token) void IntegrationPluginNetatmo::refreshData(Thing *thing, const QString &token)

3
netatmo/integrationpluginnetatmo.h
View File

@ -48,9 +48,7 @@ class IntegrationPluginNetatmo : public IntegrationPlugin
public: public:
explicit IntegrationPluginNetatmo(); explicit IntegrationPluginNetatmo();
~IntegrationPluginNetatmo();
void init() override;
void startPairing(ThingPairingInfo *info) override; void startPairing(ThingPairingInfo *info) override;
void confirmPairing(ThingPairingInfo *info, const QString &username, const QString &secret) override; void confirmPairing(ThingPairingInfo *info, const QString &username, const QString &secret) override;
void setupThing(ThingSetupInfo *info) override; void setupThing(ThingSetupInfo *info) override;
@ -80,7 +78,6 @@ private slots:
void onNetworkReplyFinished(); void onNetworkReplyFinished();
void onIndoorStatesChanged(); void onIndoorStatesChanged();
void onOutdoorStatesChanged(); void onOutdoorStatesChanged();
}; };
#endif // INTEGRATIONPLUGINNETATMO_H #endif // INTEGRATIONPLUGINNETATMO_H