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

gateway now inherits connectable

Browse Source
This commit is contained in:
Michael Zanetti 2018-10-25 12:07:38 +02:00
parent cd34fd80a2
commit ff6c8f1ce0
10 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
netatmo/devicepluginnetatmo.cpp
View File

@ -66,13 +66,13 @@ void DevicePluginNetatmo::init()
DeviceManager::DeviceSetupStatus DevicePluginNetatmo::setupDevice(Device *device) DeviceManager::DeviceSetupStatus DevicePluginNetatmo::setupDevice(Device *device)
{ {
if (device->deviceClassId() == connectionDeviceClassId) { if (device->deviceClassId() == netatmoConnectionDeviceClassId) {
qCDebug(dcNetatmo) << "Setup netatmo connection" << device->name() << device->params(); qCDebug(dcNetatmo) << "Setup netatmo connection" << device->name() << device->params();
OAuth2 *authentication = new OAuth2("561c015d49c75f0d1cce6e13", "GuvKkdtu7JQlPD47qTTepRR9hQ0CUPAj4Tae3Ohcq", this); OAuth2 *authentication = new OAuth2("561c015d49c75f0d1cce6e13", "GuvKkdtu7JQlPD47qTTepRR9hQ0CUPAj4Tae3Ohcq", this);
authentication->setUrl(QUrl("https://api.netatmo.net/oauth2/token")); authentication->setUrl(QUrl("https://api.netatmo.net/oauth2/token"));
authentication->setUsername(device->paramValue(connectionDeviceUsernameParamTypeId).toString()); authentication->setUsername(device->paramValue(netatmoConnectionDeviceUsernameParamTypeId).toString());
authentication->setPassword(device->paramValue(connectionDevicePasswordParamTypeId).toString()); authentication->setPassword(device->paramValue(netatmoConnectionDevicePasswordParamTypeId).toString());
authentication->setScope("read_station read_thermostat write_thermostat"); authentication->setScope("read_station read_thermostat write_thermostat");
m_authentications.insert(authentication, device); m_authentications.insert(authentication, device);
@ -109,7 +109,7 @@ DeviceManager::DeviceSetupStatus DevicePluginNetatmo::setupDevice(Device *device
void DevicePluginNetatmo::deviceRemoved(Device *device) void DevicePluginNetatmo::deviceRemoved(Device *device)
{ {
if (device->deviceClassId() == connectionDeviceClassId) { if (device->deviceClassId() == netatmoConnectionDeviceClassId) {
OAuth2 * authentication = m_authentications.key(device); OAuth2 * authentication = m_authentications.key(device);
m_authentications.remove(authentication); m_authentications.remove(authentication);
authentication->deleteLater(); authentication->deleteLater();
@ -252,7 +252,7 @@ void DevicePluginNetatmo::onNetworkReplyFinished()
// check HTTP status code // check HTTP status code
if (status != 200) { if (status != 200) {
qCWarning(dcNetatmo) << "Device list reply HTTP error:" << status << reply->errorString(); qCWarning(dcNetatmo) << "Device list reply HTTP error:" << status << reply->errorString();
device->setStateValue(connectionAvailableStateTypeId, false); device->setStateValue(netatmoConnectionConnectedStateTypeId, false);
reply->deleteLater(); reply->deleteLater();
return; return;
} }
@ -282,7 +282,7 @@ void DevicePluginNetatmo::onAuthenticationChanged()
return; return;
// set the available state // set the available state
device->setStateValue(connectionAvailableStateTypeId, authentication->authenticated()); device->setStateValue(netatmoConnectionConnectedStateTypeId, authentication->authenticated());
// check if this is was a setup athentication // check if this is was a setup athentication
if (m_asyncSetups.contains(device)) { if (m_asyncSetups.contains(device)) {

4
netatmo/devicepluginnetatmo.json
View File

@ -10,7 +10,7 @@
"deviceClasses": [ "deviceClasses": [
{ {
"id": "728d5a67-27a3-400e-b83c-2765f5196f69", "id": "728d5a67-27a3-400e-b83c-2765f5196f69",
"name": "connection", "name": "netatmoConnection",
"displayName": "Netatmo Connection", "displayName": "Netatmo Connection",
"criticalStateTypeId": "2f79bc1d-27ed-480a-b583-728363c83ea6", "criticalStateTypeId": "2f79bc1d-27ed-480a-b583-728363c83ea6",
"deviceIcon": "Network", "deviceIcon": "Network",
@ -40,7 +40,7 @@
"stateTypes": [ "stateTypes": [
{ {
"id": "2f79bc1d-27ed-480a-b583-728363c83ea6", "id": "2f79bc1d-27ed-480a-b583-728363c83ea6",
"name": "available", "name": "connected",
"displayName": "available", "displayName": "available",
"displayNameEvent": "available changed", "displayNameEvent": "available changed",
"type": "bool", "type": "bool",

8
orderbutton/devicepluginorderbutton.cpp
View File

@ -122,7 +122,7 @@ DeviceManager::DeviceError DevicePluginOrderButton::executeAction(Device *device
qCDebug(dcOrderButton) << "Execute action" << device->name() << action.params(); qCDebug(dcOrderButton) << "Execute action" << device->name() << action.params();
// Check if the device is reachable // Check if the device is reachable
if (!device->stateValue(orderbuttonReachableStateTypeId).toBool()) { if (!device->stateValue(orderbuttonConnectedStateTypeId).toBool()) {
qCWarning(dcOrderButton) << "Device not reachable."; qCWarning(dcOrderButton) << "Device not reachable.";
return DeviceManager::DeviceErrorHardwareNotAvailable; return DeviceManager::DeviceErrorHardwareNotAvailable;
} }
@ -273,7 +273,7 @@ void DevicePluginOrderButton::enableNotifications(Device *device)
void DevicePluginOrderButton::setReachable(Device *device, const bool &reachable) void DevicePluginOrderButton::setReachable(Device *device, const bool &reachable)
{ {
if (device->stateValue(orderbuttonReachableStateTypeId).toBool() != reachable) { if (device->stateValue(orderbuttonConnectedStateTypeId).toBool() != reachable) {
if (!reachable) { if (!reachable) {
// Warn just once that the device is not reachable // Warn just once that the device is not reachable
qCWarning(dcOrderButton()) << device->name() << "reachable changed" << reachable; qCWarning(dcOrderButton()) << device->name() << "reachable changed" << reachable;
@ -291,7 +291,7 @@ void DevicePluginOrderButton::setReachable(Device *device, const bool &reachable
} }
} }
device->setStateValue(orderbuttonReachableStateTypeId, reachable); device->setStateValue(orderbuttonConnectedStateTypeId, reachable);
} }
bool DevicePluginOrderButton::deviceAlreadyAdded(const QHostAddress &address) bool DevicePluginOrderButton::deviceAlreadyAdded(const QHostAddress &address)
@ -377,7 +377,7 @@ void DevicePluginOrderButton::coapReplyFinished(CoapReply *reply)
// Check CoAP reply error // Check CoAP reply error
if (reply->error() != CoapReply::NoError) { if (reply->error() != CoapReply::NoError) {
if (device->stateValue(orderbuttonReachableStateTypeId).toBool()) if (device->stateValue(orderbuttonConnectedStateTypeId).toBool())
qCWarning(dcOrderButton) << "Ping device" << reply->request().url().toString() << "reply finished with error" << reply->errorString(); qCWarning(dcOrderButton) << "Ping device" << reply->request().url().toString() << "reply finished with error" << reply->errorString();
setReachable(device, false); setReachable(device, false);

2
orderbutton/devicepluginorderbutton.json
View File

@ -58,7 +58,7 @@
}, },
{ {
"id": "783e74ee-ffd6-4dd7-ade5-3a961452cf15", "id": "783e74ee-ffd6-4dd7-ade5-3a961452cf15",
"name": "reachable", "name": "connected",
"displayNameEvent": "reachable changed", "displayNameEvent": "reachable changed",
"displayName": "reachable", "displayName": "reachable",
"type": "bool", "type": "bool",

11
osdomotics/devicepluginosdomotics.json
View File

@ -34,6 +34,17 @@
"type": "QString", "type": "QString",
"inputType": "IPv6Address" "inputType": "IPv6Address"
} }
],
"stateTypes": [
{
"id": "2389b6c4-31ad-4058-bcc9-c2feb0c041d8",
"name": "connected",
"displayName": "Connected",
"displayNameEvent": "Connected changed",
"type": "bool",
"defaultValue": true
}
] ]
}, },
{ {

8
plantcare/devicepluginplantcare.cpp
View File

@ -123,7 +123,7 @@ DeviceManager::DeviceError DevicePluginPlantCare::executeAction(Device *device,
qCDebug(dcPlantCare) << "Execute action" << device->name() << action.params(); qCDebug(dcPlantCare) << "Execute action" << device->name() << action.params();
// Check if the device is reachable // Check if the device is reachable
if (!device->stateValue(plantCareReachableStateTypeId).toBool()) { if (!device->stateValue(plantCareConnectedStateTypeId).toBool()) {
qCWarning(dcPlantCare) << "Device not reachable."; qCWarning(dcPlantCare) << "Device not reachable.";
return DeviceManager::DeviceErrorHardwareNotAvailable; return DeviceManager::DeviceErrorHardwareNotAvailable;
} }
@ -316,7 +316,7 @@ void DevicePluginPlantCare::enableNotifications(Device *device)
void DevicePluginPlantCare::setReachable(Device *device, const bool &reachable) void DevicePluginPlantCare::setReachable(Device *device, const bool &reachable)
{ {
if (device->stateValue(plantCareReachableStateTypeId).toBool() != reachable) { if (device->stateValue(plantCareConnectedStateTypeId).toBool() != reachable) {
if (!reachable) { if (!reachable) {
// Warn just once that the device is not reachable // Warn just once that the device is not reachable
qCWarning(dcPlantCare()) << device->name() << "reachable changed" << reachable; qCWarning(dcPlantCare()) << device->name() << "reachable changed" << reachable;
@ -335,7 +335,7 @@ void DevicePluginPlantCare::setReachable(Device *device, const bool &reachable)
} }
} }
device->setStateValue(plantCareReachableStateTypeId, reachable); device->setStateValue(plantCareConnectedStateTypeId, reachable);
} }
bool DevicePluginPlantCare::deviceAlreadyAdded(const QHostAddress &address) bool DevicePluginPlantCare::deviceAlreadyAdded(const QHostAddress &address)
@ -421,7 +421,7 @@ void DevicePluginPlantCare::coapReplyFinished(CoapReply *reply)
// Check CoAP reply error // Check CoAP reply error
if (reply->error() != CoapReply::NoError) { if (reply->error() != CoapReply::NoError) {
if (device->stateValue(plantCareReachableStateTypeId).toBool()) if (device->stateValue(plantCareConnectedStateTypeId).toBool())
qCWarning(dcPlantCare) << "Ping device" << reply->request().url().toString() << "reply finished with error" << reply->errorString(); qCWarning(dcPlantCare) << "Ping device" << reply->request().url().toString() << "reply finished with error" << reply->errorString();
setReachable(device, false); setReachable(device, false);

2
plantcare/devicepluginplantcare.json
View File

@ -88,7 +88,7 @@
}, },
{ {
"id": "8384e07b-8b91-492a-b6c8-e72b325ba0b4", "id": "8384e07b-8b91-492a-b6c8-e72b325ba0b4",
"name": "reachable", "name": "connected",
"displayName": "reachable", "displayName": "reachable",
"displayNameEvent": "reachable changed", "displayNameEvent": "reachable changed",
"type": "bool", "type": "bool",

1
snapd/devicepluginsnapd.json
View File

@ -115,6 +115,7 @@
"displayName": "Snap", "displayName": "Snap",
"createMethods": [ "auto" ], "createMethods": [ "auto" ],
"basicTags": [ "Gateway" ], "basicTags": [ "Gateway" ],
"interfaces": ["system"],
"deviceIcon": "Network", "deviceIcon": "Network",
"paramTypes": [ "paramTypes": [
{ {

8
ws2812/devicepluginws2812.cpp
View File

@ -128,7 +128,7 @@ DeviceManager::DeviceError DevicePluginWs2812::executeAction(Device *device, con
qCDebug(dcWs2812) << "Execute action" << device->name() << action.params(); qCDebug(dcWs2812) << "Execute action" << device->name() << action.params();
// Check if the device is reachable // Check if the device is reachable
if (!device->stateValue(ws2812ReachableStateTypeId).toBool()) { if (!device->stateValue(ws2812ConnectedStateTypeId).toBool()) {
qCWarning(dcWs2812) << "Device not reachable."; qCWarning(dcWs2812) << "Device not reachable.";
return DeviceManager::DeviceErrorHardwareNotAvailable; return DeviceManager::DeviceErrorHardwareNotAvailable;
} }
@ -468,7 +468,7 @@ void DevicePluginWs2812::enableNotifications(Device *device)
void DevicePluginWs2812::setReachable(Device *device, const bool &reachable) void DevicePluginWs2812::setReachable(Device *device, const bool &reachable)
{ {
if (device->stateValue(ws2812ReachableStateTypeId).toBool() != reachable) { if (device->stateValue(ws2812ConnectedStateTypeId).toBool() != reachable) {
if (!reachable) { if (!reachable) {
// Warn just once that the device is not reachable // Warn just once that the device is not reachable
qCWarning(dcWs2812()) << device->name() << "reachable changed" << reachable; qCWarning(dcWs2812()) << device->name() << "reachable changed" << reachable;
@ -487,7 +487,7 @@ void DevicePluginWs2812::setReachable(Device *device, const bool &reachable)
} }
} }
device->setStateValue(ws2812ReachableStateTypeId, reachable); device->setStateValue(ws2812ConnectedStateTypeId, reachable);
} }
bool DevicePluginWs2812::deviceAlreadyAdded(const QHostAddress &address) bool DevicePluginWs2812::deviceAlreadyAdded(const QHostAddress &address)
@ -573,7 +573,7 @@ void DevicePluginWs2812::coapReplyFinished(CoapReply *reply)
// Check CoAP reply error // Check CoAP reply error
if (reply->error() != CoapReply::NoError) { if (reply->error() != CoapReply::NoError) {
if (device->stateValue(ws2812ReachableStateTypeId).toBool()) if (device->stateValue(ws2812ConnectedStateTypeId).toBool())
qCWarning(dcWs2812) << "Ping device" << reply->request().url().toString() << "reply finished with error" << reply->errorString(); qCWarning(dcWs2812) << "Ping device" << reply->request().url().toString() << "reply finished with error" << reply->errorString();
setReachable(device, false); setReachable(device, false);

2
ws2812/devicepluginws2812.json
View File

@ -50,7 +50,7 @@
}, },
{ {
"id": "08091cde-983d-42f7-bdd7-d89c312ccbed", "id": "08091cde-983d-42f7-bdd7-d89c312ccbed",
"name": "reachable", "name": "connected",
"displayName": "reachable", "displayName": "reachable",
"displayNameEvent": "reachable changed", "displayNameEvent": "reachable changed",
"type": "bool", "type": "bool",