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

Merge PR #94: All Plugins: Update to API changes in core.

Browse Source
This commit is contained in:
Jenkins 2019-04-12 13:42:43 +02:00
commit 2a4a29b35e
46 changed files with 104 additions and 643 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
avahimonitor/devicepluginavahimonitor.cpp
View File

@ -49,6 +49,7 @@
#include <QDebug>
#include <QStringList>
#include <QNetworkInterface>
#include <QDateTime>
DevicePluginAvahiMonitor::DevicePluginAvahiMonitor()
{
@ -100,7 +101,8 @@ void DevicePluginAvahiMonitor::onServiceEntryAdded(const AvahiServiceEntry &serv
{
foreach (Device *device, myDevices()) {
if (device->paramValue(avahiDeviceServiceParamTypeId).toString() == serviceEntry.name()) {
device->setStateValue(avahiOnlineStateTypeId, true);
device->setStateValue(avahiIsPresentStateTypeId, true);
device->setStateValue(avahiLastSeenTimeStateTypeId, QDateTime::currentDateTime());
}
}
}
@ -109,7 +111,7 @@ void DevicePluginAvahiMonitor::onServiceEntryRemoved(const AvahiServiceEntry &se
{
foreach (Device *device, myDevices()) {
if (device->paramValue(avahiDeviceServiceParamTypeId).toString() == serviceEntry.name()) {
device->setStateValue(avahiOnlineStateTypeId, false);
device->setStateValue(avahiIsPresentStateTypeId, false);
}
}
}

20
avahimonitor/devicepluginavahimonitor.json
View File

@ -12,12 +12,7 @@
"id": "97f0154d-6945-49b8-bd65-0a8cea0c6652",
"displayName": "Avahi Monitor",
"name": "avahi",
"deviceIcon": "Network",
"primaryStateTypeId": "b5616fd3-da12-4613-9576-6516b2267180",
"basicTags": [
"Device",
"Sensor"
],
"interfaces": ["presencesensor"],
"createMethods": ["discovery"],
"paramTypes": [
{
@ -38,11 +33,20 @@
"stateTypes": [
{
"id": "b5616fd3-da12-4613-9576-6516b2267180",
"displayName": "online",
"name": "online",
"name": "isPresent",
"displayName": "Online",
"type": "bool",
"defaultValue": false,
"displayNameEvent": "online changed"
},
{
"id": "4a570e58-d227-4af8-a64e-c018b9d84474",
"name": "lastSeenTime",
"displayName": "Last seen time",
"displayNameEvent": "Last seen time changed",
"type": "int",
"unit": "UnixTime",
"defaultValue": 0
}
]
}

9
awattar/devicepluginawattar.json
View File

@ -56,7 +56,6 @@
"displayNameEvent": "current market price changed",
"type": "double",
"unit": "EuroCentPerKiloWattHour",
"graphRelevant": true,
"defaultValue": 0
},
{
@ -66,7 +65,6 @@
"displayNameEvent": "average deviation changed",
"type": "int",
"unit": "Percentage",
"graphRelevant": true,
"defaultValue": 0
},
{
@ -76,8 +74,6 @@
"displayNameEvent": "valid until changed",
"unit": "UnixTime",
"type": "int",
"ruleRelevant": false,
"eventRuleRelevant": false,
"defaultValue": 0
},
{
@ -87,7 +83,6 @@
"displayNameEvent": "average market price [+/- 12 h] changed",
"type": "double",
"unit": "EuroCentPerKiloWattHour",
"graphRelevant": true,
"defaultValue": 0
},
{
@ -97,8 +92,6 @@
"displayNameEvent": "lowest market price [+/- 12 h] changed",
"type": "double",
"unit": "EuroCentPerKiloWattHour",
"ruleRelevant": false,
"eventRuleRelevant": false,
"defaultValue": 0
},
{
@ -108,8 +101,6 @@
"displayNameEvent": "highest market price [+/- 12 h] changed",
"type": "double",
"unit": "EuroCentPerKiloWattHour",
"ruleRelevant": false,
"eventRuleRelevant": false,
"defaultValue": 0
}
]

4
commandlauncher/deviceplugincommandlauncher.cpp
View File

@ -143,7 +143,7 @@ DeviceManager::DeviceError DevicePluginCommandLauncher::executeAction(Device *de
// Application
if (device->deviceClassId() == applicationDeviceClassId ) {
// execute application...
if (action.actionTypeId() == applicationExecuteActionTypeId) {
if (action.actionTypeId() == applicationTriggerActionTypeId) {
// check if we already have started the application
if (m_applications.values().contains(device)) {
if (m_applications.key(device)->state() == QProcess::Running) {
@ -178,7 +178,7 @@ DeviceManager::DeviceError DevicePluginCommandLauncher::executeAction(Device *de
// Script
if (device->deviceClassId() == scriptDeviceClassId ) {
// execute script...
if (action.actionTypeId() == scriptExecuteActionTypeId) {
if (action.actionTypeId() == scriptTriggerActionTypeId) {
// check if we already have started the script
if (m_scripts.values().contains(device)) {
if (m_scripts.key(device)->state() == QProcess::Running) {

27
commandlauncher/deviceplugincommandlauncher.json
View File

@ -13,12 +13,7 @@
"name": "application",
"displayName": "Application launcher",
"createMethods": ["user"],
"primaryActionTypeId": "cf52b41d-3108-423c-8907-ca5b4d97cac5",
"primaryStateTypeId": "28d7e933-ff05-4f4c-95a0-482689543de5",
"basicTags": [
"Service",
"Actuator"
],
"interfaces": ["outputtrigger"],
"paramTypes": [
{
"id": "79e54f91-2771-459a-9cb0-1d37759d2e33",
@ -32,7 +27,7 @@
{
"id": "28d7e933-ff05-4f4c-95a0-482689543de5",
"name": "running",
"displayName": "running",
"displayName": "Running",
"displayNameEvent": "running changed",
"type": "bool",
"defaultValue": false
@ -41,13 +36,13 @@
"actionTypes": [
{
"id": "cf52b41d-3108-423c-8907-ca5b4d97cac5",
"name": "execute",
"displayName": "execute"
"name": "trigger",
"displayName": "Execute"
},
{
"id": "d21b1fed-1dd9-4c5a-a64e-0c6ba94059be",
"name": "kill",
"displayName": "kill"
"displayName": "Kill"
}
]
},
@ -55,12 +50,8 @@
"id": "96044325-a6fb-47c9-9117-f29c3b327978",
"name": "script",
"displayName": "Bashscript launcher",
"basicTags": [
"Service",
"Actuator"
],
"createMethods": ["user"],
"primaryActionTypeId": "cf52b41d-3108-423c-8907-ca5b4d97cac5",
"interfaces": ["outputtrigger"],
"paramTypes": [
{
"id": "391cf4af-ccb4-4ec0-9711-00c1b53a3c4c",
@ -83,13 +74,13 @@
"actionTypes": [
{
"id": "cf52b41d-3108-423c-8907-ca5b4d97cac5",
"name": "execute",
"displayName": "execute"
"name": "trigger",
"displayName": "Execute"
},
{
"id": "d21b1fed-1dd9-4c5a-a64e-0c6ba94059be",
"name": "kill",
"displayName": "kill"
"displayName": "Kill"
}
]
}

6
conrad/devicepluginconrad.json
View File

@ -12,12 +12,6 @@
"id": "2bb14180-aa5d-4999-992d-e6d464cff486",
"name": "conradShutter",
"displayName": "Shutter (RSM900R)",
"deviceIcon": "Blinds",
"basicTags": [
"Device",
"Actuator",
"Shading"
],
"createMethods": ["user"],
"paramTypes": [ ],
"actionTypes": [

38
datetime/deviceplugindatetime.json
View File

@ -12,12 +12,7 @@
"id": "fbf665fb-9aca-423f-a5f2-924e50ebe6ca",
"name": "today",
"displayName": "Today",
"deviceIcon": "Time",
"interfaces": [ "daylightsensor" ],
"basicTags": [
"Service",
"Time"
],
"createMethods": ["user"],
"paramTypes": [ ],
"stateTypes": [
@ -27,8 +22,6 @@
"displayName": "timezone",
"displayNameEvent": "timezone changed",
"type": "QString",
"ruleRelevant": false,
"eventRuleRelevant": false,
"defaultValue": "-"
},
{
@ -37,8 +30,6 @@
"displayName": "city",
"displayNameEvent": "city changed",
"type": "QString",
"ruleRelevant": false,
"eventRuleRelevant": false,
"defaultValue": "-"
},
{
@ -47,8 +38,6 @@
"displayName": "country",
"displayNameEvent": "country changed",
"type": "QString",
"ruleRelevant": false,
"eventRuleRelevant": false,
"defaultValue": "-"
},
{
@ -58,7 +47,6 @@
"displayNameEvent": "day changed",
"type": "int",
"defaultValue": 1,
"eventRuleRelevant": false,
"minValue": 1,
"maxValue": 31
},
@ -69,7 +57,6 @@
"displayNameEvent": "month changed",
"type": "int",
"defaultValue": 1,
"eventRuleRelevant": false,
"minValue": 1,
"maxValue": 12
},
@ -78,8 +65,6 @@
"name": "monthName",
"displayName": "month name",
"displayNameEvent": "month name changed",
"ruleRelevant": false,
"eventRuleRelevant": false,
"type": "QString",
"defaultValue": "-"
},
@ -88,7 +73,6 @@
"name": "year",
"displayName": "year",
"displayNameEvent": "year changed",
"eventRuleRelevant": false,
"type": "int",
"defaultValue": "1970"
},
@ -98,7 +82,6 @@
"displayName": "weekday",
"displayNameEvent": "weekday changed",
"type": "int",
"eventRuleRelevant": false,
"defaultValue": 1,
"minValue": 1,
"maxValue": 7
@ -108,8 +91,6 @@
"name": "weekdayName",
"displayName": "weekday name",
"displayNameEvent": "weekday name changed",
"ruleRelevant": false,
"eventRuleRelevant": false,
"type": "QString",
"defaultValue": "-"
},
@ -119,7 +100,6 @@
"displayName": "weekend",
"displayNameEvent": "weekend changed",
"type": "bool",
"eventRuleRelevant": false,
"defaultValue": false
},
{
@ -129,7 +109,6 @@
"displayNameEvent": "dusk changed",
"unit": "UnixTime",
"type": "int",
"eventRuleRelevant": false,
"defaultValue": 0
},
{
@ -139,7 +118,6 @@
"displayNameEvent": "sunrise changed",
"unit": "UnixTime",
"type": "int",
"eventRuleRelevant": false,
"defaultValue": 0
},
{
@ -149,7 +127,6 @@
"displayNameEvent": "noon changed",
"unit": "UnixTime",
"type": "int",
"eventRuleRelevant": false,
"defaultValue": 0
},
{
@ -159,7 +136,6 @@
"displayNameEvent": "dawn changed",
"unit": "UnixTime",
"type": "int",
"eventRuleRelevant": false,
"defaultValue": 0
},
{
@ -169,7 +145,6 @@
"displayNameEvent": "sunset changed",
"unit": "UnixTime",
"type": "int",
"eventRuleRelevant": false,
"defaultValue": 0
},
{
@ -213,12 +188,6 @@
"id": "3f3c7ecc-9915-4e4e-95a1-e11f4f9d174d",
"name": "alarm",
"displayName": "Alarm",
"deviceIcon": "Time",
"basicTags": [
"Service",
"Actuator",
"Time"
],
"createMethods": ["user"],
"paramTypes": [
{
@ -329,13 +298,6 @@
"id": "805c8948-e663-4ba6-aa67-df7446ed7098",
"name": "countdown",
"displayName": "Countdown",
"deviceIcon": "Time",
"basicTags": [
"Service",
"Actuator",
"Time"
],
"primaryActionTypeId": "436e9923-6eff-444e-bde7-a61228a4d748",
"createMethods": ["user"],
"paramTypes": [
{

4
debian/changelog vendored
View File

@ -1,3 +1,7 @@
nymea-plugins (0.12.0) UNRELEASED; urgency=medium
-- Michael Zanetti <michael.zanetti@guh.io> Fri, 22 Mar 2019 00:52:48 +0100
nymea-plugins (0.10.3) xenial; urgency=medium
[ Simon Stürz ]

7
denon/deviceplugindenon.json
View File

@ -13,13 +13,6 @@
"name": "AVRX1000",
"displayName": "AVR X1000",
"createMethods": ["user"],
"criticalStateTypeId": "4d1790bf-28c6-4c1f-8892-ba1a0ef140f5",
"primaryActionTypeId": "1cdb6b54-6831-4900-95b2-c78f64497701",
"deviceIcon": "Hifi",
"basicTags": [
"Device",
"Multimedia"
],
"paramTypes": [
{
"id": "a54b98b4-b78f-41dd-a257-14425c6cf9ab",

12
dweetio/deviceplugindweetio.json
View File

@ -13,12 +13,7 @@
"name": "post",
"displayName": "Post",
"createMethods": ["user"],
"criticalStateTypeId": "4d1790bf-28c6-4c1f-8892-ba1a0ef140f5",
"deviceIcon": "Network",
"interfaces": [],
"basicTags": [
"Service"
],
"paramTypes": [
{
"id": "b50b3682-fb2e-4185-b7aa-31741648d9bb",
@ -75,12 +70,7 @@
"name": "get",
"displayName": "Get",
"createMethods": ["user"],
"criticalStateTypeId": "4d1790bf-28c6-4c1f-8892-ba1a0ef140f5",
"deviceIcon": "Network",
"interfaces": [],
"basicTags": [
"Service"
],
"interfaces": ["connectable"],
"paramTypes": [
{
"id": "b50b3682-fb2e-4185-b7aa-31741648d9bb",

18
elgato/devicepluginelgato.json
View File

@ -12,9 +12,7 @@
"id": "164f9602-90ee-4693-bda3-9cafae37603e",
"name": "avea",
"displayName": "Avea",
"deviceIcon": "LightBulb",
"basicTags": ["Device", "Actuator", "Lighting"],
"interfaces": ["connectable", "light", "colorlight"],
"interfaces": ["connectable", "light", "colorlight", "colortemperaturelight"],
"createMethods": ["discovery"],
"paramTypes": [
{
@ -60,10 +58,8 @@
"displayNameAction": "Set brightness",
"type": "int",
"defaultValue": 100,
"ruleRelevant": false,
"minValue": 0,
"maxValue": 100,
"eventRuleRelevant": false,
"writable": true
},
{
@ -73,8 +69,6 @@
"displayNameEvent": "Color changed",
"displayNameAction": "Set color",
"type": "QColor",
"ruleRelevant": false,
"eventRuleRelevant": false,
"defaultValue": "#000000",
"writable": true
},
@ -99,10 +93,8 @@
"displayNameAction": "Set white",
"type": "int",
"defaultValue": 0,
"ruleRelevant": false,
"minValue": 0,
"maxValue": 4095,
"eventRuleRelevant": false,
"writable": true
},
{
@ -113,10 +105,8 @@
"displayNameAction": "Set red",
"type": "int",
"defaultValue": 0,
"ruleRelevant": false,
"minValue": 0,
"maxValue": 4095,
"eventRuleRelevant": false,
"writable": true
},
{
@ -127,10 +117,8 @@
"displayNameAction": "Set green",
"type": "int",
"defaultValue": 0,
"ruleRelevant": false,
"minValue": 0,
"maxValue": 4095,
"eventRuleRelevant": false,
"writable": true
},
{
@ -141,10 +129,8 @@
"displayNameAction": "Set blue",
"type": "int",
"defaultValue": 0,
"ruleRelevant": false,
"minValue": 0,
"maxValue": 4095,
"eventRuleRelevant": false,
"writable": true
},
{
@ -155,10 +141,8 @@
"displayNameAction": "Set fade",
"type": "int",
"defaultValue": 0,
"ruleRelevant": false,
"minValue": 0,
"maxValue": 1000,
"eventRuleRelevant": false,
"writable": true
}
]

6
elro/devicepluginelro.json
View File

@ -12,13 +12,7 @@
"id": "308ae6e6-38b3-4b3a-a513-3199da2764f8",
"name": "elroSocket",
"displayName": "Elro Power Socket",
"deviceIcon": "Socket",
"basicTags": [
"Device",
"Actuator"
],
"createMethods": ["user"],
"primaryActionTypeId": "31c9758e-6567-4f89-85bb-29e1a7c55d44",
"paramTypes": [
{
"id": "66b2a017-658a-46d9-9e98-33aaed6345ad",

12
eq-3/deviceplugineq-3.cpp
View File

@ -265,8 +265,8 @@ DeviceManager::DeviceError DevicePluginEQ3::executeAction(Device *device, const
QByteArray rfAddress = device->paramValue(wallThermostateDeviceRfParamTypeId).toByteArray();
int roomId = device->paramValue(wallThermostateDeviceRoomParamTypeId).toInt();
if (action.actionTypeId() == wallThermostateDesiredTemperatureActionTypeId){
cube->setDeviceSetpointTemp(rfAddress, roomId, action.param(wallThermostateDesiredTemperatureActionDesiredTemperatureParamTypeId).value().toDouble(), action.id());
if (action.actionTypeId() == wallThermostateTargetTemperatureActionTypeId){
cube->setDeviceSetpointTemp(rfAddress, roomId, action.param(wallThermostateTargetTemperatureActionTargetTemperatureParamTypeId).value().toDouble(), action.id());
} else if (action.actionTypeId() == wallThermostateSetAutoModeActionTypeId){
cube->setDeviceAutoMode(rfAddress, roomId, action.id());
} else if (action.actionTypeId() == wallThermostateSetManualModeActionTypeId){
@ -496,21 +496,21 @@ void DevicePluginEQ3::wallThermostatDataUpdated()
foreach (WallThermostat *wallThermostat, cube->wallThermostatList()) {
foreach (Device *device, deviceManager()->findConfiguredDevices(wallThermostateDeviceClassId)){
if(device->paramValue(wallThermostateDeviceSerialParamTypeId).toString() == wallThermostat->serialNumber()){
device->setStateValue(wallThermostateComfortTempStateTypeId, wallThermostat->comfortTemp());
device->setStateValue(wallThermostateComfortTemperatureStateTypeId, wallThermostat->comfortTemp());
device->setStateValue(wallThermostateEcoTempStateTypeId, wallThermostat->ecoTemp());
device->setStateValue(wallThermostateMaxSetpointTempStateTypeId, wallThermostat->maxSetPointTemp());
device->setStateValue(wallThermostateMinSetpointTempStateTypeId, wallThermostat->minSetPointTemp());
device->setStateValue(wallThermostateErrorOccurredStateTypeId, wallThermostat->errorOccurred());
device->setStateValue(wallThermostateInitializedStateTypeId, wallThermostat->initialized());
device->setStateValue(wallThermostateBatteryLowStateTypeId, wallThermostat->batteryLow());
device->setStateValue(wallThermostateBatteryCriticalStateTypeId, wallThermostat->batteryLow());
device->setStateValue(wallThermostateLinkStatusOKStateTypeId, wallThermostat->linkStatusOK());
device->setStateValue(wallThermostatePanelLockedStateTypeId, wallThermostat->panelLocked());
device->setStateValue(wallThermostateGatewayKnownStateTypeId, wallThermostat->gatewayKnown());
device->setStateValue(wallThermostateDtsActiveStateTypeId, wallThermostat->dtsActive());
device->setStateValue(wallThermostateDeviceModeStateTypeId, wallThermostat->deviceMode());
device->setStateValue(wallThermostateDeviceModeStringStateTypeId, wallThermostat->deviceModeString());
device->setStateValue(wallThermostateDesiredTemperatureStateTypeId, wallThermostat->setpointTemperature());
device->setStateValue(wallThermostateCurrentTemperatureStateTypeId, wallThermostat->currentTemperature());
device->setStateValue(wallThermostateTargetTemperatureStateTypeId, wallThermostat->setpointTemperature());
device->setStateValue(wallThermostateTemperatureStateTypeId, wallThermostat->currentTemperature());
}
}
}

66
eq-3/deviceplugineq-3.json
View File

@ -12,15 +12,7 @@
"id": "1e892268-8bd7-442c-a001-bd4e2e6b2949",
"name": "cube",
"displayName": "Max! Cube LAN Gateway",
"deviceIcon": "Gateway",
"criticalStateTypeId": "d0a9a369-cf8c-47c4-a12e-f2d076bf12fd",
"interfaces": ["gateway"],
"basicTags": [
"Device",
"Gateway",
"Heating",
"Energy"
],
"createMethods": ["discovery"],
"paramTypes": [
{
@ -65,8 +57,6 @@
"displayName": "portal enabled",
"displayNameEvent": "portal enabled changed",
"type": "bool",
"ruleRelevant": false,
"eventRuleRelevant": false,
"defaultValue": false
}
]
@ -75,14 +65,7 @@
"id": "ffbfec5d-06e8-4082-b62b-92cc5c3e8c4e",
"name": "wallThermostate",
"displayName": "Max! Wall Thermostat",
"deviceIcon": "Thermometer",
"primaryStateTypeId": "852e7708-db1d-42d1-96e4-19c13598262c",
"basicTags": [
"Device",
"Heating",
"Energy",
"Sensor"
],
"interfaces": ["thermostat", "temperaturesensor", "battery"],
"createMethods": ["auto"],
"paramTypes": [
{
@ -157,7 +140,7 @@
"stateTypes": [
{
"id": "850380ee-a787-43e7-adb8-768a21a6e64d",
"name": "comfortTemp",
"name": "comfortTemperature",
"displayName": "comfort temperature",
"displayNameEvent": "confort temperature changed",
"type": "double",
@ -171,8 +154,6 @@
"displayNameEvent": "eco temperature changed",
"type": "double",
"unit": "DegreeCelsius",
"ruleRelevant": false,
"eventRuleRelevant": false,
"defaultValue": 0
},
{
@ -182,8 +163,6 @@
"displayNameEvent": "max setpoint changed",
"type": "double",
"unit": "DegreeCelsius",
"ruleRelevant": false,
"eventRuleRelevant": false,
"defaultValue": 0
},
{
@ -193,8 +172,6 @@
"displayNameEvent": "min setpoint changed",
"type": "double",
"unit": "DegreeCelsius",
"ruleRelevant": false,
"eventRuleRelevant": false,
"defaultValue": 0
},
{
@ -215,9 +192,9 @@
},
{
"id": "53b89f32-8894-4290-92a0-6a470c6b69ab",
"name": "batteryLow",
"displayName": "battery low",
"displayNameEvent": "battery low changed",
"name": "batteryCritical",
"displayName": "Battery low",
"displayNameEvent": "Battery low changed",
"type": "bool",
"defaultValue": false
},
@ -235,8 +212,6 @@
"displayName": "panel locked",
"displayNameEvent": "panel locked changed",
"type": "bool",
"ruleRelevant": false,
"eventRuleRelevant": false,
"defaultValue": false
},
{
@ -245,8 +220,6 @@
"displayName": "gateway known",
"displayNameEvent": "gateway known changed",
"type": "bool",
"ruleRelevant": false,
"eventRuleRelevant": false,
"defaultValue": false
},
{
@ -255,8 +228,6 @@
"displayName": "dts active",
"displayNameEvent": "dts active changed",
"type": "bool",
"ruleRelevant": false,
"eventRuleRelevant": false,
"defaultValue": false
},
{
@ -277,7 +248,7 @@
},
{
"id": "579aa8c6-8814-491b-9e7c-b98108c323d1",
"name": "desiredTemperature",
"name": "targetTemperature",
"displayName": "desired temperature",
"displayNameEvent": "desired temperature changed",
"displayNameAction": "Set desired temperature",
@ -288,7 +259,7 @@
},
{
"id": "852e7708-db1d-42d1-96e4-19c13598262c",
"name": "currentTemperature",
"name": "temperature",
"displayName": "current temperature",
"displayNameEvent": "current temperature changed",
"unit": "DegreeCelsius",
@ -301,13 +272,6 @@
"id": "f80d9481-4827-45ee-a013-b97b22412d92",
"name": "radiatorThermostate",
"displayName": "Max! Radiator Thermostat",
"deviceIcon": "Thermometer",
"basicTags": [
"Device",
"Heating",
"Energy",
"Actuator"
],
"createMethods": ["auto"],
"paramTypes": [
{
@ -391,8 +355,6 @@
"displayNameEvent": "max setpoint changed",
"unit": "DegreeCelsius",
"type": "double",
"ruleRelevant": false,
"eventRuleRelevant": false,
"defaultValue": 0
},
{
@ -402,8 +364,6 @@
"displayNameEvent": "min setpoint changed",
"unit": "DegreeCelsius",
"type": "double",
"ruleRelevant": false,
"eventRuleRelevant": false,
"defaultValue": 0
},
{
@ -444,8 +404,6 @@
"displayName": "panel locked",
"displayNameEvent": "pannel locked changed",
"type": "bool",
"ruleRelevant": false,
"eventRuleRelevant": false,
"defaultValue": false
},
{
@ -454,8 +412,6 @@
"displayName": "gateway known",
"displayNameEvent": "gateway known changed",
"type": "bool",
"ruleRelevant": false,
"eventRuleRelevant": false,
"defaultValue": false
},
{
@ -464,8 +420,6 @@
"displayName": "dts active",
"displayNameEvent": "dts active changed",
"type": "bool",
"ruleRelevant": false,
"eventRuleRelevant": false,
"defaultValue": false
},
{
@ -528,8 +482,6 @@
"displayNameEvent": "boost duration changed",
"unit": "Seconds",
"type": "int",
"ruleRelevant": false,
"eventRuleRelevant": false,
"defaultValue": 0
},
{
@ -538,9 +490,7 @@
"displayName": "discalc weekday",
"displayNameEvent": "discalc weekday changed",
"type": "QString",
"defaultValue": "",
"ruleRelevant": false,
"eventRuleRelevant": false
"defaultValue": ""
},
{
"id": "e78235ee-affc-41e3-a463-9f0512b4a6c3",

17
genericelements/deviceplugingenericelements.json
View File

@ -12,12 +12,6 @@
"id": "c0f511f9-70f5-499b-bd70-2c0e9ddd68c4",
"name": "toggleButton",
"displayName": "Toggle Button",
"deviceIcon": "Switch",
"primaryActionTypeId": "b5e90567-54aa-49bd-a78a-3c19fb38aaf5",
"basicTags": [
"Device",
"Actuator"
],
"createMethods": ["user"],
"paramTypes": [ ],
"stateTypes": [
@ -37,12 +31,6 @@
"id": "820b2f2d-0d92-48c8-8fd4-f94ce8fc4103",
"name": "button",
"displayName": "Button",
"deviceIcon": "Switch",
"primaryActionTypeId": "01f38af1-b2ab-4ec3-844e-ef52f0f229a9",
"basicTags": [
"Device",
"Actuator"
],
"createMethods": ["user"],
"paramTypes": [ ],
"actionTypes": [
@ -64,11 +52,6 @@
"id": "430d188c-476d-4825-a9bd-86dfa3094b56",
"name": "onOffButton",
"displayName": "ON/OFF Button",
"deviceIcon": "Switch",
"basicTags": [
"Device",
"Actuator"
],
"createMethods": ["user"],
"paramTypes": [ ],
"actionTypes": [

8
gpio/deviceplugingpio.json
View File

@ -12,8 +12,6 @@
"id": "3885c520-e202-4435-88f6-3c35c362b2e6",
"displayName": "GPIO Output",
"name": "gpioOutputRpi",
"deviceIcon": "Switch",
"basicTags": ["Device", "Actuator"],
"createMethods": ["discovery"],
"paramTypes": [
{
@ -55,8 +53,6 @@
"id": "6aff228b-0410-4ef9-9593-51e8639aacea",
"displayName": "GPIO Input",
"name": "gpioInputRpi",
"deviceIcon": "Power",
"basicTags": ["Device", "Sensor"],
"createMethods": ["discovery"],
"paramTypes": [
{
@ -103,8 +99,6 @@
"id": "75d54a59-f9b0-4bc4-a86c-6b1fc47e0663",
"displayName": "GPIO Output",
"name": "gpioOutputBbb",
"deviceIcon": "Switch",
"basicTags": ["Device", "Actuator"],
"createMethods": ["discovery"],
"paramTypes": [
{
@ -146,8 +140,6 @@
"id": "ffd2aa29-55cc-4824-ba95-c311784f7824",
"displayName": "GPIO Input",
"name": "gpioInputBbb",
"deviceIcon": "Power",
"basicTags": ["Device", "Sensor"],
"createMethods": ["discovery"],
"paramTypes": [
{

12
httpcommander/devicepluginhttpcommander.json
View File

@ -12,11 +12,7 @@
"id": "b101abdf-86fd-4d2e-a657-ee76044235bd",
"name": "httpPostCommander",
"displayName": "HTTP post commander",
"deviceIcon": "Network",
"createMethods": ["user"],
"basicTags": [
"Service"
],
"interfaces": ["connectable"],
"paramTypes": [
{
@ -74,12 +70,8 @@
"id": "05bf65f5-ff13-43e3-b6ae-77019e79d8a1",
"name": "httpPutCommander",
"displayName": "HTTP put commander",
"deviceIcon": "Network",
"createMethods": ["user"],
"interfaces": ["connectable"],
"basicTags": [
"Service"
],
"paramTypes": [
{
"id": "1a3fcb23-931b-4ba1-b134-c49b656c76f7",
@ -136,11 +128,7 @@
"id": "8f3f6dde-9db3-4237-800b-bb7f804098c9",
"name": "httpGetCommander",
"displayName": "HTTP get",
"deviceIcon": "Network",
"createMethods": ["user"],
"basicTags": [
"Service"
],
"interfaces": ["connectable"],
"paramTypes": [
{

6
intertechno/devicepluginintertechno.json
View File

@ -13,12 +13,6 @@
"name": "switch",
"displayName": "Intertechno switch",
"createMethods": ["user"],
"deviceIcon": "Switch",
"primaryActionTypeId": "df19fb51-c3cd-4b95-8d88-ebbb535f4789",
"basicTags": [
"Device",
"Actuator"
],
"paramTypes": [
{
"id": "c4e2ec44-5e8e-4168-9f6d-a905ea3329c9",

5
keba/devicepluginkeba.json
View File

@ -12,13 +12,8 @@
"id": "900dacec-cae7-4a37-95ba-501846368ea2",
"name": "wallbox",
"displayName": "Keba KeContact P30",
"deviceIcon": "Energy",
"createMethods": ["user"],
"interfaces": [],
"criticalStateTypeId": "b1a574a6-46b6-44ea-a0bb-9b4de3198967",
"basicTags": [
"Energy"
],
"paramTypes":[
{
"id": "730cd3d3-5f0e-4028-a8c2-ced7574f13f3",

13
kodi/devicepluginkodi.json
View File

@ -12,15 +12,8 @@
"id": "d09953e3-c5bd-415b-973b-0d0bf2be3f69",
"name": "kodi",
"displayName": "Kodi",
"deviceIcon": "Tv",
"interfaces": ["mediaplayer", "extendedmediacontroller", "extendedvolumecontroller", "mediametadataprovider", "shufflerepeat"],
"basicTags": [
"Service",
"Multimedia",
"Actuator"
],
"interfaces": ["mediaplayer", "extendedmediacontroller", "extendedvolumecontroller", "mediametadataprovider", "shufflerepeat", "connectable"],
"createMethods": ["user", "discovery"],
"criticalStateTypeId": "09dfbd40-c97c-4a20-9ecd-f80e389a4864",
"paramTypes": [
{
"id": "1a897065-57c6-49b3-bac9-1e5db27859e5",
@ -53,8 +46,6 @@
"displayNameAction": "Set mute",
"type": "bool",
"defaultValue": true,
"ruleRelevant": false,
"eventRuleRelevant": false,
"writable": true
},
{
@ -67,8 +58,6 @@
"type": "int",
"minValue": 0,
"maxValue": 100,
"ruleRelevant": false,
"eventRuleRelevant": false,
"defaultValue": 50,
"writable": true
},

7
leynew/devicepluginleynew.json
View File

@ -12,13 +12,6 @@
"id": "6b1f8f37-7eb4-46c4-9f15-a6eb4904999c",
"name": "rfController",
"displayName": "RF Controller (LN-CON-RF20B)",
"deviceIcon": "LightBulb",
"primaryActionTypeId": "35495871-3b80-458b-b60d-5dc614c9fbf1",
"basicTags": [
"Device",
"Actuator",
"Lighting"
],
"createMethods": ["user"],
"paramTypes": [
{

7
lgsmarttv/devicepluginlgsmarttv.json
View File

@ -12,7 +12,6 @@
"id": "1d41b5a8-74ff-4a12-b365-c7bbe610848f",
"name": "lgSmartTv",
"displayName": "LG Smart Tv",
"deviceIcon": "Tv",
"createMethods": [ "discovery" ],
"setupMethod": "displayPin",
"interfaces": ["connectable"],
@ -83,8 +82,6 @@
"displayName": "volume",
"displayNameEvent": "Volume changed",
"type": "int",
"ruleRelevant": false,
"eventRuleRelevant": false,
"unit": "Percentage",
"defaultValue": 0
},
@ -133,8 +130,6 @@
"name": "tvInputSourceIndex",
"displayName": "input source index",
"displayNameEvent": "input source index changed",
"ruleRelevant": false,
"eventRuleRelevant": false,
"type": "int",
"defaultValue": 0
},
@ -143,8 +138,6 @@
"name": "tvInputSourceLabelName",
"displayName": "input source",
"displayNameEvent": "input source changed",
"ruleRelevant": false,
"eventRuleRelevant": false,
"type": "QString",
"defaultValue": "-"
}

15
mailnotification/devicepluginmailnotification.json
View File

@ -12,11 +12,6 @@
"id": "f4844c97-7ca6-4349-904e-ff9749a9fe74",
"name": "customMail",
"displayName": "Custom mail",
"deviceIcon": "Mail",
"basicTags": [
"Service",
"Notification"
],
"createMethods": ["user"],
"paramTypes": [
{
@ -112,11 +107,6 @@
"id": "3869884a-1592-4b8f-84a7-994be18ff555",
"name": "googleMail",
"displayName": "Google mail",
"deviceIcon": "Mail",
"basicTags": [
"Service",
"Notification"
],
"createMethods": ["user"],
"paramTypes": [
{
@ -176,11 +166,6 @@
"id": "59409e8f-0c83-414f-abd5-bbbf2758acba",
"name": "yahooMail",
"displayName": "Yahoo mail",
"deviceIcon": "Mail",
"basicTags": [
"Service",
"Notification"
],
"createMethods": ["user"],
"paramTypes": [
{

36
netatmo/devicepluginnetatmo.json
View File

@ -12,14 +12,7 @@
"id": "728d5a67-27a3-400e-b83c-2765f5196f69",
"name": "netatmoConnection",
"displayName": "Netatmo Connection",
"criticalStateTypeId": "2f79bc1d-27ed-480a-b583-728363c83ea6",
"deviceIcon": "Network",
"interfaces": ["gateway"],
"basicTags": [
"Service",
"Gateway",
"Weather"
],
"createMethods": ["user"],
"paramTypes": [
{
@ -52,14 +45,7 @@
"id": "1c809049-04f2-4710-99f5-6ed379a2934f",
"name": "indoor",
"displayName": "Indoor Station",
"deviceIcon": "Thermometer",
"basicTags": [
"Device",
"Weather",
"Sensor"
],
"interfaces": ["temperaturesensor", "humiditysensor", "pressuresensor", "noisesensor", "co2sensor"],
"primaryStateTypeId": "3cb25538-e463-40ae-92f9-8f34f0c06b92",
"createMethods": ["auto"],
"paramTypes": [
{
@ -86,8 +72,6 @@
"displayNameEvent": "last update changed",
"unit": "UnixTime",
"type": "int",
"ruleRelevant": false,
"eventRuleRelevant": false,
"defaultValue": 0
},
{
@ -96,7 +80,6 @@
"displayName": "temperature",
"displayNameEvent": "temperature changed",
"unit": "DegreeCelsius",
"graphRelevant": true,
"type": "double",
"defaultValue": 0
},
@ -123,7 +106,6 @@
"name": "humidity",
"displayName": "humidity",
"displayNameEvent": "humidity changed",
"graphRelevant": true,
"unit": "Percentage",
"type": "double",
"defaultValue": 0,
@ -136,7 +118,6 @@
"displayName": "pressure",
"displayNameEvent": "pressure changed",
"unit": "MilliBar",
"graphRelevant": true,
"type": "double",
"defaultValue": 0
},
@ -145,7 +126,6 @@
"name": "noise",
"displayName": "noise",
"displayNameEvent": "noise changed",
"graphRelevant": true,
"unit": "Dezibel",
"type": "double",
"defaultValue": 0
@ -155,7 +135,6 @@
"name": "co2",
"displayName": "co2",
"displayNameEvent": "co2 changed",
"graphRelevant": true,
"unit": "PartsPerMillion",
"type": "double",
"defaultValue": 0
@ -165,8 +144,6 @@
"name": "wifiStrength",
"displayName": "wifi signal strength",
"displayNameEvent": "wifi signal strength changed",
"ruleRelevant": false,
"eventRuleRelevant": false,
"unit": "Percentage",
"type": "int",
"defaultValue": 0
@ -177,14 +154,7 @@
"id": "6cc01d62-7317-4ec4-8ac4-a4cab762c179",
"name": "outdoor",
"displayName": "Outdoor Station",
"deviceIcon": "Thermometer",
"basicTags": [
"Device",
"Weather",
"Sensor"
],
"interfaces": ["temperaturesensor", "humiditysensor", "batterylevel"],
"primaryStateTypeId": "3cb25538-e463-40ae-92f9-8f34f0c06b92",
"createMethods": ["auto"],
"paramTypes": [
{
@ -218,8 +188,6 @@
"displayName": "last update",
"displayNameEvent": "last update changed",
"unit": "UnixTime",
"ruleRelevant": false,
"eventRuleRelevant": false,
"type": "int",
"defaultValue": 0
},
@ -228,7 +196,6 @@
"name": "temperature",
"displayName": "temperature",
"displayNameEvent": "temperature changed",
"graphRelevant": true,
"unit": "DegreeCelsius",
"type": "double",
"defaultValue": 0
@ -256,7 +223,6 @@
"name": "humidity",
"displayName": "humidity",
"displayNameEvent": "humidity changed",
"graphRelevant": true,
"unit": "Percentage",
"type": "double",
"defaultValue": 0,
@ -269,8 +235,6 @@
"displayName": "signal strength",
"displayNameEvent": "signal strength changed",
"unit": "Percentage",
"ruleRelevant": false,
"eventRuleRelevant": false,
"type": "int",
"defaultValue": 0
},

6
networkdetector/devicepluginnetworkdetector.json
View File

@ -12,13 +12,7 @@
"id": "bd216356-f1ec-4324-9785-6982d2174e17",
"name": "networkDevice",
"displayName": "Network Device",
"deviceIcon": "Network",
"basicTags": [
"Device",
"Sensor"
],
"interfaces": [ "presencesensor" ],
"primaryStateTypeId": "cb43e1b5-4f61-4538-bfa2-c33055c542cf",
"createMethods": ["user", "discovery"],
"paramTypes": [
{

15
openweathermap/devicepluginopenweathermap.json
View File

@ -12,16 +12,8 @@
"id": "985195aa-17ad-4530-88a4-cdd753d747d7",
"name": "openweathermap",
"displayName": "Weather",
"deviceIcon": "Weather",
"basicTags": [
"Service",
"Weather",
"Sensor"
],
"interfaces": ["weather"],
"createMethods": ["discovery"],
"primaryStateTypeId": "6013402f-b5b1-46b3-8490-f0c20d62fe61",
"primaryActionTypeId": "cfbc6504-d86f-4856-8dfa-97b6fbb385e4",
"discoveryParamTypes": [
{
"id": "f370b076-a783-4b46-85b2-6f4a9dba55d8",
@ -78,8 +70,6 @@
"displayName": "last update",
"displayNameEvent": "last update changed",
"unit": "UnixTime",
"ruleRelevant": false,
"eventRuleRelevant": false,
"type": "int",
"defaultValue": 0
},
@ -89,7 +79,6 @@
"displayName": "temperature",
"displayNameEvent": "temperature changed",
"unit": "DegreeCelsius",
"graphRelevant": true,
"type": "double",
"defaultValue": 0
},
@ -125,7 +114,6 @@
"name": "pressure",
"displayName": "pressure",
"displayNameEvent": "pressure changed",
"graphRelevant": true,
"unit": "HectoPascal",
"type": "double",
"defaultValue": 0
@ -136,7 +124,6 @@
"displayName": "wind speed",
"displayNameEvent": "wind speed changed",
"unit": "MeterPerSecond",
"graphRelevant": true,
"type": "double",
"defaultValue": 0
},
@ -155,7 +142,6 @@
"displayName": "cloudiness",
"displayNameEvent": "cloudiness changed",
"unit": "Percentage",
"graphRelevant": true,
"type": "int",
"defaultValue": 0
},
@ -165,7 +151,6 @@
"displayName": "visibility",
"displayNameEvent": "visibility changed",
"unit": "Meter",
"graphRelevant": true,
"type": "int",
"defaultValue": 0
},

5
orderbutton/devicepluginorderbutton.json
View File

@ -24,11 +24,6 @@
"name": "orderbutton",
"createMethods": ["discovery"],
"interfaces": ["gateway"],
"basicTags": [
"Device",
"Gateway"
],
"criticalStateTypeId": "783e74ee-ffd6-4dd7-ade5-3a961452cf15",
"paramTypes": [
{
"id": "53a00a7b-e168-4917-86b5-d4329a0a720c",

8
osdomotics/devicepluginosdomotics.json
View File

@ -13,10 +13,6 @@
"name": "rplRouter",
"displayName": "RPL Router",
"interfaces": ["gateway"],
"basicTags": [
"Device",
"Gateway"
],
"createMethods": ["user"],
"paramTypes": [
{
@ -51,10 +47,6 @@
"id": "4454e05e-ac0a-4b10-b9dd-56a1475895d7",
"name": "merkurNode",
"displayName": "Merkur Node",
"basicTags": [
"Device",
"Actuator"
],
"createMethods": ["auto"],
"paramTypes": [
{

60
philipshue/devicepluginphilipshue.json
View File

@ -12,15 +12,8 @@
"id": "642aa4c7-19aa-45ed-ba06-aa1ae6c9edf7",
"name": "bridge",
"displayName": "Hue gateway",
"deviceIcon": "Gateway",
"interfaces": ["gateway", "connectable"],
"basicTags": [
"Device",
"Gateway",
"Lighting"
],
"interfaces": ["gateway"],
"createMethods": ["discovery"],
"criticalStateTypeId": "15794d26-fde8-4a61-8f83-d7830534975f",
"setupMethod": "pushButton",
"pairingInfo": "Please press the button on the Hue Bridge within 30 seconds before you continue",
"paramTypes": [
@ -84,8 +77,6 @@
"name": "apiVersion",
"displayName": "api version",
"displayNameEvent": "api version changed",
"ruleRelevant": false,
"eventRuleRelevant": false,
"defaultValue": "-",
"type": "QString"
},
@ -94,8 +85,6 @@
"name": "softwareVersion",
"displayName": "software version",
"displayNameEvent": "software version changed",
"ruleRelevant": false,
"eventRuleRelevant": false,
"defaultValue": "-",
"type": "QString"
},
@ -104,7 +93,6 @@
"name": "updateStatus",
"displayName": "update status",
"displayNameEvent": "update status changed",
"ruleRelevant": false,
"type": "QString",
"defaultValue": "Up to date",
"possibleValues": [
@ -145,15 +133,7 @@
"id": "0edba26c-96ab-44fb-a6a2-c0574d19630e",
"name": "colorLight",
"displayName": "Hue color light",
"deviceIcon": "LightBulb",
"interfaces": ["colorlight", "connectable"],
"basicTags": [
"Device",
"Lighting",
"Actuator"
],
"criticalStateTypeId": "19bb8d10-1b28-4ba3-99b7-a634138dcfde",
"primaryActionTypeId": "90aaffe5-6a76-47d2-a14a-550f60390245",
"interfaces": ["colorlight", "colortemperaturelight", "connectable"],
"createMethods": ["auto"],
"paramTypes": [
{
@ -213,8 +193,6 @@
"type": "int",
"unit": "Mired",
"defaultValue": 170,
"ruleRelevant": false,
"eventRuleRelevant": false,
"minValue": 153,
"maxValue": 500,
"writable": true
@ -226,11 +204,8 @@
"displayNameEvent": "color changed",
"displayNameAction": "Set color",
"type": "QColor",
"ruleRelevant": false,
"eventRuleRelevant": false,
"defaultValue": "#000000",
"writable": true
},
{
"id": "90e91f64-a208-468c-a5a2-7f47e08859e2",
@ -239,8 +214,6 @@
"displayNameEvent": "brightness changed",
"displayNameAction": "Set brigtness",
"type": "int",
"ruleRelevant": false,
"eventRuleRelevant": false,
"unit": "Percentage",
"defaultValue": 0,
"minValue": 0,
@ -254,8 +227,6 @@
"displayName": "effect",
"displayNameEvent": "effect changed",
"displayNameAction": "Set effect",
"ruleRelevant": false,
"eventRuleRelevant": false,
"type": "QString",
"defaultValue": "none",
"possibleValues": [
@ -289,13 +260,7 @@
"id": "35f749f7-b60a-4922-bd25-1bdd2eddcbe3",
"name": "colorTemperatureLight",
"displayName": "Hue color temperature light",
"deviceIcon": "LightBulb",
"interfaces": ["colortemperaturelight", "connectable"],
"basicTags": [
"Device",
"Lighting",
"Actuator"
],
"createMethods": ["auto"],
"paramTypes": [
{
@ -355,8 +320,6 @@
"type": "int",
"unit": "Mired",
"defaultValue": 170,
"ruleRelevant": false,
"eventRuleRelevant": false,
"minValue": 153,
"maxValue": 500,
"writable": true
@ -368,8 +331,6 @@
"displayNameEvent": "brightness changed",
"displayNameAction": "Set brigtness",
"type": "int",
"ruleRelevant": false,
"eventRuleRelevant": false,
"unit": "Percentage",
"defaultValue": 0,
"minValue": 0,
@ -401,15 +362,7 @@
"id": "4fa568ef-7a3a-422b-b0c0-206d37cb4eed",
"name": "dimmableLight",
"displayName": "Hue dimmable light",
"deviceIcon": "LightBulb",
"interfaces": ["dimmablelight", "connectable"],
"basicTags": [
"Device",
"Actuator",
"Lighting"
],
"criticalStateTypeId": "19bb8d10-1b28-4ba3-99b7-a634138dcfde",
"primaryActionTypeId": "90aaffe5-6a76-47d2-a14a-550f60390245",
"createMethods": ["auto"],
"paramTypes": [
{
@ -467,8 +420,6 @@
"displayNameEvent": "brightness changed",
"displayNameAction": "Set brightness",
"type": "int",
"ruleRelevant": false,
"eventRuleRelevant": false,
"unit": "Percentage",
"defaultValue": 0,
"minValue": 0,
@ -501,13 +452,7 @@
"id": "bb482d39-67ef-46dc-88e9-7b181d642b28",
"name": "remote",
"displayName": "Hue Remote",
"deviceIcon": "Switch",
"interfaces": ["longpressmultibutton", "batterylevel", "connectable"],
"basicTags": [
"Device",
"Sensor"
],
"criticalStateTypeId": "19bb8d10-1b28-4ba3-99b7-a634138dcfde",
"createMethods": ["auto"],
"paramTypes": [
{
@ -643,7 +588,6 @@
"id": "2b8c1fb8-67ee-42e9-947b-16e0a09f0d4e",
"name": "tap",
"displayName": "Hue Tap",
"deviceIcon": "Switch",
"interfaces": ["simplemultibutton", "connectable"],
"createMethods": ["auto"],
"paramTypes": [

6
plantcare/devicepluginplantcare.json
View File

@ -24,11 +24,6 @@
"name": "plantCare",
"createMethods": ["discovery"],
"interfaces": ["gateway"],
"basicTags": [
"Device",
"Gateway"
],
"criticalStateTypeId": "8384e07b-8b91-492a-b6c8-e72b325ba0b4",
"paramTypes": [
{
"id": "7ab5f794-459f-45f5-855e-40a76f494e20",
@ -54,7 +49,6 @@
"displayName": "moisture",
"displayNameEvent": "moisture changed",
"type": "int",
"graphRelevant": true,
"unit": "Percentage",
"defaultValue": 0
},

2
remotessh/devicepluginremotessh.json
View File

@ -12,9 +12,7 @@
"id": "a4f12741-4f30-40ca-a319-7f15e9c0c43a",
"name": "reverseSsh",
"displayName": "Reverse SSH",
"deviceIcon": "Network",
"createMethods": ["user"],
"basicTags": ["Service"],
"interfaces": ["connectable"],
"paramTypes": [
{

10
senic/devicepluginsenic.cpp
View File

@ -195,7 +195,7 @@ void DevicePluginSenic::onButtonPressed()
{
Nuimo *nuimo = static_cast<Nuimo *>(sender());
Device *device = m_nuimos.value(nuimo);
emitEvent(Event(nuimoClickedEventTypeId, device->id()));
emitEvent(Event(nuimoPressedEventTypeId, device->id(), ParamList() << Param(nuimoPressedEventButtonNameParamTypeId, "•")));
}
void DevicePluginSenic::onButtonReleased()
@ -210,16 +210,16 @@ void DevicePluginSenic::onSwipeDetected(const Nuimo::SwipeDirection &direction)
switch (direction) {
case Nuimo::SwipeDirectionLeft:
emitEvent(Event(nuimoSwipeLeftEventTypeId, device->id()));
emitEvent(Event(nuimoPressedEventTypeId, device->id(), ParamList() << Param(nuimoPressedEventButtonNameParamTypeId, "←")));
break;
case Nuimo::SwipeDirectionRight:
emitEvent(Event(nuimoSwipeRightEventTypeId, device->id()));
emitEvent(Event(nuimoPressedEventTypeId, device->id(), ParamList() << Param(nuimoPressedEventButtonNameParamTypeId, "→")));
break;
case Nuimo::SwipeDirectionUp:
emitEvent(Event(nuimoSwipeUpEventTypeId, device->id()));
emitEvent(Event(nuimoPressedEventTypeId, device->id(), ParamList() << Param(nuimoPressedEventButtonNameParamTypeId, "↑")));
break;
case Nuimo::SwipeDirectionDown:
emitEvent(Event(nuimoSwipeDownEventTypeId, device->id()));
emitEvent(Event(nuimoPressedEventTypeId, device->id(), ParamList() << Param(nuimoPressedEventButtonNameParamTypeId, "↓")));
break;
}
}

41
senic/devicepluginsenic.json
View File

@ -12,12 +12,8 @@
"id": "315ece51-053e-49f9-831f-b09f9f27fb9f",
"name": "nuimo",
"displayName": "Nuimo",
"deviceIcon": "Switch",
"basicTags": [
"Device",
"Sensor"
],
"createMethods": ["discovery"],
"interfaces": [ "simplemultibutton", "connectable"],
"paramTypes": [
{
"id": "db67d1e6-26fa-44ed-ad55-c6aef45ea2ea",
@ -119,29 +115,18 @@
],
"eventTypes": [
{
"id": "5b9e08e8-7a6c-4311-9db6-82547847708c",
"name": "clicked",
"displayName": "clicked"
},
{
"id": "2be36aa0-e2fe-4192-81c5-cf0bb7f08dd4",
"name": "swipeLeft",
"displayName": "Swipe left"
},
{
"id": "81fb61ab-6d3d-4c1b-85fe-3dbd5c8dead7",
"name": "swipeRight",
"displayName": "Swipe right"
},
{
"id": "ab5c575b-b265-491c-93ca-ad9212374bc1",
"name": "swipeUp",
"displayName": "Swipe up"
},
{
"id": "4d97cf28-1030-4a30-bed5-411102dd4b9b",
"name": "swipeDown",
"displayName": "Swipe down"
"id": "24649eb2-47d1-4a2b-8c09-1f074382e2c4",
"name": "pressed",
"displayName": "Button pressed",
"paramTypes": [
{
"id": "8ed643c0-1b8a-4709-8abf-717cf213f4a4",
"name": "buttonName",
"displayName": "Button name",
"type": "QString",
"allowedValues": ["•", "←", "↑", "→", "↓"]
}
]
}
]
}

4
serialportcommander/devicepluginserialportcommander.json
View File

@ -13,12 +13,8 @@
"id": "540566d8-a2a6-4ce2-9a1e-a66a989e6199",
"name": "serialPortCommander",
"displayName": "Serial port commander",
"deviceIcon": "Network",
"createMethods": ["user", "discovery"],
"interfaces": ["outputtrigger", "inputtrigger"],
"basicTags": [
"Device"
],
"paramTypes": [
{
"id": "ed49f7d8-ab18-4c37-9b80-1004b75dcb91",

78
simulation/devicepluginsimulation.json
View File

@ -13,11 +13,7 @@
"name": "simpleButton",
"displayName": "Simple Button",
"createMethods": ["user"],
"deviceIcon": "Switch",
"interfaces": ["simplebutton", "outputtrigger"],
"basicTags": [
"Device"
],
"paramTypes": [ ],
"actionTypes": [
{
@ -39,10 +35,6 @@
"name": "alternativeButton",
"displayName": "Power Button",
"createMethods": ["user"],
"deviceIcon": "Switch",
"basicTags": [
"Device"
],
"paramTypes": [ ],
"stateTypes": [
{
@ -62,12 +54,7 @@
"name": "temperatureSensor",
"displayName": "Temperature sensor",
"createMethods": ["user"],
"deviceIcon": "Thermometer",
"interfaces": ["temperaturesensor", "humiditysensor", "batterylevel", "connectable"],
"basicTags": [
"Device",
"Sensor"
],
"paramTypes": [ ],
"stateTypes": [
{
@ -125,11 +112,6 @@
"displayName": "Motion Detector",
"createMethods": ["user"],
"interfaces": ["battery", "connectable"],
"deviceIcon": "MotionDetectors",
"basicTags": [
"Device",
"Sensor"
],
"paramTypes": [ ],
"stateTypes": [
{
@ -174,12 +156,7 @@
"name": "heating",
"displayName": "Heating",
"createMethods": ["user"],
"deviceIcon": "Radiator",
"interfaces": ["extendedheating"],
"basicTags": [
"Device",
"Actuator"
],
"paramTypes": [ ],
"stateTypes": [
{
@ -213,12 +190,7 @@
"name": "evCharger",
"displayName": "EV Charging Station",
"createMethods": ["user"],
"deviceIcon": "Energy",
"interfaces": ["extendedevcharger"],
"basicTags": [
"Device",
"Actuator"
],
"paramTypes": [ ],
"stateTypes": [
{
@ -295,7 +267,6 @@
"name": "garageGate",
"displayName": "Garage gate",
"createMethods": ["user"],
"deviceIcon": "Garage",
"interfaces": [ "garagegate", "light" ],
"paramTypes": [ ],
"stateTypes": [
@ -468,7 +439,6 @@
"name": "rollerShutter",
"displayName": "Roller Shutter",
"createMethods": ["user"],
"deviceIcon": "RollerShutter",
"interfaces": ["extendedshutter"],
"paramTypes": [ ],
"stateTypes": [
@ -517,12 +487,7 @@
"name": "colorBulb",
"displayName": "Color Bulb",
"createMethods": ["user"],
"deviceIcon": "LightBulb",
"interfaces": ["colorlight"],
"basicTags": [
"Device",
"Actuator"
],
"paramTypes": [ ],
"stateTypes": [
{
@ -544,8 +509,6 @@
"type": "int",
"unit": "Mired",
"defaultValue": 170,
"ruleRelevant": false,
"eventRuleRelevant": false,
"minValue": 153,
"maxValue": 500,
"writable": true
@ -557,8 +520,6 @@
"displayNameEvent": "Color changed",
"displayNameAction": "Set color",
"type": "QColor",
"ruleRelevant": false,
"eventRuleRelevant": false,
"defaultValue": "#000000",
"writable": true
},
@ -569,8 +530,6 @@
"displayNameEvent": "Brightness changed",
"displayNameAction": "Set brigtness",
"type": "int",
"ruleRelevant": false,
"eventRuleRelevant": false,
"unit": "Percentage",
"defaultValue": 0,
"minValue": 0,
@ -605,11 +564,6 @@
"displayName": "Finger Print Sensor",
"createMethods": ["user"],
"interfaces": ["fingerprintreader", "connectable"],
"deviceIcon": "Network",
"basicTags": [
"Device",
"Sensor"
],
"paramTypes": [ ],
"stateTypes": [
{
@ -719,11 +673,7 @@
"name": "smartMeter",
"displayName": "Smart Meter",
"createMethods": ["user"],
"deviceIcon": "Energy",
"interfaces": ["extendedsmartmeterconsumer", "extendedsmartmeterproducer", "connectable" ],
"basicTags": [
"Device"
],
"paramTypes": [ ],
"stateTypes": [
{
@ -796,11 +746,7 @@
"name": "battery",
"displayName": "Battery",
"createMethods": ["user"],
"deviceIcon": "Battery",
"interfaces": ["battery", "connectable"],
"basicTags": [
"Device"
],
"paramTypes": [ ],
"stateTypes": [
{
@ -829,7 +775,6 @@
"displayNameEvent": "Charging amount changed",
"type": "double",
"unit": "KiloWatt",
"eventRuleRelevant": false,
"defaultValue": 0.70
},
{
@ -860,11 +805,7 @@
"name": "heatingRod",
"displayName": "Heating Rod",
"createMethods": ["user"],
"deviceIcon": "Thermometer",
"interfaces": ["connectable", "extendedheating", "temperaturesensor"],
"basicTags": [
"Device"
],
"paramTypes": [ ],
"stateTypes": [
{
@ -921,12 +862,6 @@
"id": "7f1696e3-3145-421e-9a42-5bd3b2fd0e2c",
"name": "netatmoIndoor",
"displayName": "Netatmo Indoor Station",
"deviceIcon": "Thermometer",
"basicTags": [
"Device",
"Weather",
"Sensor"
],
"interfaces": ["temperaturesensor", "humiditysensor", "pressuresensor"],
"createMethods": ["user"],
"paramTypes": [ ],
@ -938,8 +873,6 @@
"displayNameEvent": "Last update changed",
"unit": "UnixTime",
"type": "int",
"ruleRelevant": false,
"eventRuleRelevant": false,
"defaultValue": 0
},
{
@ -948,7 +881,6 @@
"displayName": "Temperature",
"displayNameEvent": "Temperature changed",
"unit": "DegreeCelsius",
"graphRelevant": true,
"type": "double",
"defaultValue": 22.7
},
@ -957,7 +889,6 @@
"name": "humidity",
"displayName": "Humidity",
"displayNameEvent": "Humidity changed",
"graphRelevant": true,
"unit": "Percentage",
"type": "double",
"defaultValue": 37,
@ -970,7 +901,6 @@
"displayName": "Pressure",
"displayNameEvent": "Pressure changed",
"unit": "MilliBar",
"graphRelevant": true,
"type": "double",
"defaultValue": 1006
},
@ -979,7 +909,6 @@
"name": "noise",
"displayName": "Noise",
"displayNameEvent": "Noise changed",
"graphRelevant": true,
"unit": "Dezibel",
"type": "int",
"defaultValue": 68
@ -989,7 +918,6 @@
"name": "co2",
"displayName": "CO2",
"displayNameEvent": "CO2 changed",
"graphRelevant": true,
"unit": "PartsPerMillion",
"type": "int",
"defaultValue": 350
@ -999,8 +927,6 @@
"name": "wifiStrength",
"displayName": "Wifi signal strength",
"displayNameEvent": "Wifi signal strength changed",
"ruleRelevant": false,
"eventRuleRelevant": false,
"unit": "Percentage",
"type": "int",
"defaultValue": 87
@ -1012,9 +938,7 @@
"name": "gardenSensor",
"displayName": "Garden sensor",
"createMethods": ["user"],
"deviceIcon": "Thermometer",
"interfaces": ["temperaturesensor", "battery", "connectable"],
"basicTags": ["Device", "Sensor" ],
"paramTypes": [ ],
"stateTypes": [
{
@ -1080,8 +1004,6 @@
"name": "waterValve",
"displayName": "Water valve",
"createMethods": ["user"],
"deviceIcon": "None",
"basicTags": ["Device", "Actuator"],
"paramTypes": [ ],
"stateTypes": [
{

16
snapd/devicepluginsnapd.json
View File

@ -33,8 +33,6 @@
"displayName": "Update manager",
"createMethods": [ "auto" ],
"interfaces": [ "system" ],
"basicTags": [ "Gateway" ],
"deviceIcon": "Gateway",
"paramTypes": [ ],
"actionTypes": [
{
@ -83,8 +81,6 @@
"displayNameEvent": "Last automatic system update time changed",
"unit": "UnixTime",
"type": "int",
"ruleRelevant": false,
"eventRuleRelevant": false,
"defaultValue": 0
},
{
@ -94,8 +90,6 @@
"displayNameEvent": "Next automatic system update time changed",
"unit": "UnixTime",
"type": "int",
"ruleRelevant": false,
"eventRuleRelevant": false,
"defaultValue": 0
},
{
@ -104,8 +98,6 @@
"displayName": "Status",
"displayNameEvent": "Status changed",
"type": "QString",
"ruleRelevant": false,
"eventRuleRelevant": false,
"defaultValue": "-"
}
]
@ -115,9 +107,7 @@
"name": "snap",
"displayName": "Snap",
"createMethods": [ "auto" ],
"basicTags": [ "Gateway" ],
"interfaces": ["system"],
"deviceIcon": "Network",
"paramTypes": [
{
"id": "4f38614d-8be0-48dc-a24d-cee9ff1f2a89",
@ -170,8 +160,6 @@
"displayNameEvent": "Channel changed",
"displayNameAction": "Set channel",
"type": "QString",
"ruleRelevant": false,
"eventRuleRelevant": false,
"defaultValue": "stable",
"writable": true,
"possibleValues": [
@ -187,8 +175,6 @@
"displayName": "Version",
"displayNameEvent": "Version changed",
"type": "QString",
"ruleRelevant": false,
"eventRuleRelevant": false,
"defaultValue": "-"
},
{
@ -197,8 +183,6 @@
"displayName": "Revision",
"displayNameEvent": "Revision changed",
"type": "QString",
"ruleRelevant": false,
"eventRuleRelevant": false,
"defaultValue": "-"
}
]

14
tcpcommander/deviceplugintcpcommander.cpp
View File

@ -59,7 +59,7 @@ DeviceManager::DeviceError DevicePluginTcpCommander::executeAction(Device *devic
{
if (device->deviceClassId() == tcpOutputDeviceClassId) {
if (action.actionTypeId() == tcpOutputOutputDataActionTypeId) {
if (action.actionTypeId() == tcpOutputTriggerActionTypeId) {
int port = device->paramValue(tcpOutputDevicePortParamTypeId).toInt();
QHostAddress address= QHostAddress(device->paramValue(tcpOutputDeviceIpv4addressParamTypeId).toString());
QTcpSocket *tcpSocket = m_tcpSockets.key(device);
@ -98,7 +98,7 @@ void DevicePluginTcpCommander::onTcpSocketConnected()
qDebug(dcTCPCommander()) << device->name() << "Setup finished" ;
emit deviceSetupFinished(device, DeviceManager::DeviceSetupStatusSuccess);
} else {
QByteArray data = device->paramValue(tcpOutputOutputDataActionOutputDataAreaParamTypeId).toByteArray();
QByteArray data = device->paramValue(tcpOutputTriggerActionOutputDataAreaParamTypeId).toByteArray();
tcpSocket->write(data);
}
device->setStateValue(tcpOutputConnectedStateTypeId, true);
@ -170,24 +170,24 @@ void DevicePluginTcpCommander::onTcpServerTextMessageReceived(QByteArray data)
qDebug(dcTCPCommander()) << "is exactly";
if (data == device->paramValue(tcpInputDeviceInputDataParamTypeId)) {
qDebug(dcTCPCommander()) << "comparison successful";
emitEvent(Event(tcpInputCommandReceivedEventTypeId, device->id()));
emitEvent(Event(tcpInputTriggeredEventTypeId, device->id()));
}
} else if (device->paramValue(tcpInputDeviceComparisionParamTypeId).toString() == "Contains") {
if (data.contains(device->paramValue(tcpInputDeviceInputDataParamTypeId).toByteArray())) {
emitEvent(Event(tcpInputCommandReceivedEventTypeId, device->id()));
emitEvent(Event(tcpInputTriggeredEventTypeId, device->id()));
}
} else if (device->paramValue(tcpInputDeviceComparisionParamTypeId) == "Contains not") {
if (!data.contains(device->paramValue(tcpInputDeviceInputDataParamTypeId).toByteArray()))
emitEvent(Event(tcpInputCommandReceivedEventTypeId, device->id()));
emitEvent(Event(tcpInputTriggeredEventTypeId, device->id()));
} else if (device->paramValue(tcpInputDeviceComparisionParamTypeId) == "Starts with") {
if (data.startsWith(device->paramValue(tcpInputDeviceInputDataParamTypeId).toByteArray()))
emitEvent(Event(tcpInputCommandReceivedEventTypeId, device->id()));
emitEvent(Event(tcpInputTriggeredEventTypeId, device->id()));
} else if (device->paramValue(tcpInputDeviceComparisionParamTypeId) == "Ends with") {
if (data.endsWith(device->paramValue(tcpInputDeviceInputDataParamTypeId).toByteArray()))
emitEvent(Event(tcpInputCommandReceivedEventTypeId, device->id()));
emitEvent(Event(tcpInputTriggeredEventTypeId, device->id()));
}
}

27
tcpcommander/deviceplugintcpcommander.json
View File

@ -12,13 +12,8 @@
"id": "c67d059f-694f-47cb-8e1d-9e3e6d014c1a",
"name": "tcpOutput",
"displayName": "TCP Output",
"deviceIcon": "Network",
"createMethods": ["user"],
"basicTags": [
"Service"
],
"criticalStateTypeId": "725b541a-9e0c-4634-81eb-e415c0b8f025",
"primaryStateTypeId": "725b541a-9e0c-4634-81eb-e415c0b8f025",
"interfaces": ["outputtrigger", "connectable"],
"paramTypes": [
{
"id": "2a3fcb23-931b-4ba1-b134-c49b656c76f7",
@ -49,7 +44,7 @@
"actionTypes": [
{
"id": "6bc52462-b192-46a4-a6df-92cc5a479c89",
"name": "outputData",
"name": "trigger",
"displayName": "Send Data",
"paramTypes": [
{
@ -67,12 +62,8 @@
"id": "bc40e84a-69c4-4fd2-beb0-bd65f19aa8ff",
"name": "tcpInput",
"displayName": "TCP Input",
"deviceIcon": "Network",
"createMethods": ["user"],
"basicTags": [
"Service"
],
"primaryStateTypeId": "725b541a-9e0c-4634-81eb-e415c0b8f025",
"interfaces": ["inputtrigger", "connectable"],
"paramTypes": [
{
"id": "bee8b151-815a-4159-9d8a-42b76e99b42c",
@ -125,8 +116,16 @@
"eventTypes": [
{
"id": "6d7c6df6-cb61-4d9e-b0d7-37c43911ca4b",
"name": "commandReceived",
"displayName": "Command Received"
"name": "triggered",
"displayName": "Command Received",
"paramTypes": [
{
"id": "97d7ee8c-d9db-40b4-9855-4ceecd64c411",
"name": "data",
"displayName": "Data",
"type": "QString"
}
]
}
]
}

4
udpcommander/devicepluginudpcommander.json
View File

@ -12,9 +12,7 @@
"id": "6ecd5a8d-595a-4520-85e3-dcc9679edf66",
"displayName": "UDP Receiver",
"name": "udpReceiver",
"deviceIcon": "Network",
"interfaces": ["inputtrigger"],
"basicTags": ["Service", "Sensor"],
"createMethods": ["user"],
"paramTypes": [
{
@ -47,8 +45,6 @@
"id": "31b00639-8904-4522-84ed-54c46a54c63c",
"name": "udpCommander",
"displayName": "UDP Commander",
"deviceIcon": "Network",
"basicTags": ["Service", "Sensor"],
"interfaces": ["outputtrigger"],
"createMethods": ["user"],
"paramTypes": [

17
unipi/devicepluginunipi.json
View File

@ -21,10 +21,8 @@
"id": "58f9db7f-fd33-45af-8c98-047b67ae5267",
"name": "relayOutput",
"displayName": "Relay output",
"deviceIcon": "Power",
"createMethods": ["discovery"],
"interfaces": ["power"],
"basicTags": ["Device"],
"paramTypes": [
{
"id": "7a09e3ad-452c-4bf4-a00c-f8114ed9a7a1",
@ -50,10 +48,8 @@
"id": "0bec278a-98f1-416b-b496-6d00740f178a",
"name": "digitalInput",
"displayName": "Digital input",
"deviceIcon": "Switch",
"createMethods": ["discovery"],
"interfaces": [ ],
"basicTags": ["Sensor"],
"paramTypes": [
{
"id": "9c84d9b8-fdc7-41c1-9559-08f061ffc7a6",
@ -77,10 +73,8 @@
"id": "71e03d00-1b62-412b-b55d-ab90ad2eddff",
"name": "dimmerSwitch",
"displayName": "Dimmer switch",
"deviceIcon": "Switch",
"createMethods": ["discovery"],
"interfaces": ["longpressbutton"],
"basicTags": ["Sensor"],
"paramTypes": [
{
"id": "2344dedb-3e21-4f59-a016-0fc6233a38ac",
@ -130,10 +124,8 @@
"id": "f3a3c5ed-461a-4ca8-930b-df3af821b9e0",
"name": "digitalOutput",
"displayName": "Digital output",
"deviceIcon": "Power",
"createMethods": ["discovery"],
"interfaces": ["power"],
"basicTags": ["Device"],
"paramTypes": [
{
"id": "c01d5bde-de5d-42c5-b462-79745827875a",
@ -159,10 +151,8 @@
"id": "9094a69f-f475-4050-a345-5ab52cb19774",
"name": "analogOutput",
"displayName": "Analog output",
"deviceIcon": "Power",
"createMethods": ["discovery"],
"interfaces": [ ],
"basicTags": ["Device"],
"paramTypes": [
{
"id": "46e606cc-67ee-4891-bc39-8fb0565c87da",
@ -191,10 +181,8 @@
"id": "06abd6a4-e655-4243-bc9c-9bd4ef5be2e6",
"name": "analogInput",
"displayName": "Analog Input",
"deviceIcon": "Power",
"createMethods": ["discovery"],
"interfaces": [ ],
"basicTags": ["Sensor"],
"paramTypes": [
{
"id": "cc6eb664-9fd2-457d-9d0d-0eb9703db4a2",
@ -219,10 +207,8 @@
"id": "eadddc99-ce7d-4169-a2f9-a829fa105ad2",
"name": "blind",
"displayName": "Blind",
"deviceIcon": "Blinds",
"createMethods": ["discovery"],
"interfaces": ["blind"],
"basicTags": ["Actuator"],
"paramTypes": [
{
"id": "7878ef4b-2395-4995-b17d-b69cb7d280e1",
@ -288,10 +274,8 @@
"id": "34fc941e-3465-4618-acf6-dda9c7242e27",
"name": "light",
"displayName": "Light",
"deviceIcon": "LightBulb",
"createMethods": ["discovery"],
"interfaces": ["light"],
"basicTags": ["Actuator"],
"paramTypes": [
{
"id": "e1375def-edd6-4886-8e87-73cf3ebc819d",
@ -324,7 +308,6 @@
"id": "4f0b3cfd-603a-47ec-9719-2db7eeae1143",
"name": "temperatureSensor",
"displayName": "Temperature sensor",
"deviceIcon": "Thermometer",
"createMethods": ["discovery"],
"interfaces": ["temperaturesensor", "connectable"],
"paramTypes": [

6
unitec/devicepluginunitec.json
View File

@ -11,14 +11,8 @@
{
"id": "8468a15d-ecc0-43b6-98ca-e1e4ac9e2df3",
"displayName": "Unitec switch (48111)",
"deviceIcon": "Switch",
"basicTags": [
"Device",
"Actuator"
],
"name": "switch",
"createMethods": ["user"],
"primaryActionTypeId": "3ca1ebc2-bb8e-4429-9664-a7bc4569e73b",
"paramTypes": [
{
"id": "2cb59323-bc01-477c-ac0d-312b25c53463",

2
wakeonlan/devicepluginwakeonlan.cpp
View File

@ -60,7 +60,7 @@ DevicePluginWakeOnLan::DevicePluginWakeOnLan()
DeviceManager::DeviceError DevicePluginWakeOnLan::executeAction(Device *device, const Action &action)
{
if(action.actionTypeId() == wolWolActionTypeId){
if(action.actionTypeId() == wolTriggerActionTypeId){
qCDebug(dcWakeOnLan) << "Wake up" << device->name();
wakeup(device->paramValue(wolDeviceMacParamTypeId).toString());
}

11
wakeonlan/devicepluginwakeonlan.json
View File

@ -12,13 +12,8 @@
"id": "3c8f2447-dcd0-4882-8c09-99e579e4d24c",
"name": "wol",
"displayName": "Wake On Lan",
"deviceIcon": "Network",
"basicTags": [
"Device",
"Actuator"
],
"primaryActionTypeId": "fb9b9d87-218f-4f0d-9e16-39f8a105029a",
"createMethods": ["user"],
"interfaces": ["outputtrigger"],
"paramTypes": [
{
"id": "e2ba04ac-9fe1-4f9d-8152-024c27030cde",
@ -31,8 +26,8 @@
"actionTypes": [
{
"id": "fb9b9d87-218f-4f0d-9e16-39f8a105029a",
"name": "wol",
"displayName": "wake up device"
"name": "trigger",
"displayName": "Wake up device"
}
]
}

12
wemo/devicepluginwemo.cpp
View File

@ -104,7 +104,7 @@ DeviceManager::DeviceError DevicePluginWemo::executeAction(Device *device, const
// Set power
if (action.actionTypeId() == wemoSwitchPowerActionTypeId) {
// Check if wemo device is reachable
if (device->stateValue(wemoSwitchReachableStateTypeId).toBool()) {
if (device->stateValue(wemoSwitchConnectedStateTypeId).toBool()) {
// setPower returns false, if the curent powerState is already the new powerState
if (setPower(device, action.param(wemoSwitchPowerActionPowerParamTypeId).value().toBool(), action.id())) {
return DeviceManager::DeviceErrorAsync;
@ -180,12 +180,12 @@ void DevicePluginWemo::processRefreshData(const QByteArray &data, Device *device
{
if (data.contains("<BinaryState>0</BinaryState>")) {
device->setStateValue(wemoSwitchPowerStateTypeId, false);
device->setStateValue(wemoSwitchReachableStateTypeId, true);
device->setStateValue(wemoSwitchConnectedStateTypeId, true);
} else if (data.contains("<BinaryState>1</BinaryState>")) {
device->setStateValue(wemoSwitchPowerStateTypeId, true);
device->setStateValue(wemoSwitchReachableStateTypeId, true);
device->setStateValue(wemoSwitchConnectedStateTypeId, true);
} else {
device->setStateValue(wemoSwitchReachableStateTypeId, false);
device->setStateValue(wemoSwitchConnectedStateTypeId, false);
}
}
@ -193,10 +193,10 @@ void DevicePluginWemo::processSetPowerData(const QByteArray &data, Device *devic
{
if (data.contains("<BinaryState>1</BinaryState>") || data.contains("<BinaryState>0</BinaryState>")) {
emit actionExecutionFinished(actionId, DeviceManager::DeviceErrorNoError);
device->setStateValue(wemoSwitchReachableStateTypeId, true);
device->setStateValue(wemoSwitchConnectedStateTypeId, true);
refresh(device);
} else {
device->setStateValue(wemoSwitchReachableStateTypeId, false);
device->setStateValue(wemoSwitchConnectedStateTypeId, false);
emit actionExecutionFinished(actionId, DeviceManager::DeviceErrorHardwareNotAvailable);
}
}

19
wemo/devicepluginwemo.json
View File

@ -12,13 +12,7 @@
"id": "69d97d3b-a8e6-42f3-afc0-ca8a53eb7cce",
"name": "wemoSwitch",
"displayName": "WeMo Switch",
"deviceIcon": "Socket",
"basicTags": [
"Device",
"Actuator"
],
"criticalStateTypeId": "ec2f5b49-585c-4455-a233-b7aa4c608dbc",
"primaryActionTypeId": "7166c4f6-f68c-4188-8f7c-2205d72a5a6d",
"interfaces": ["powersocket", "connectable"],
"createMethods": ["discovery"],
"paramTypes": [
{
@ -53,8 +47,8 @@
{
"id": "7166c4f6-f68c-4188-8f7c-2205d72a5a6d",
"name": "power",
"displayName": "power",
"displayNameEvent": "power changed",
"displayName": "Power",
"displayNameEvent": "Power changed",
"displayNameAction": "Set power",
"type": "bool",
"defaultValue": false,
@ -62,10 +56,9 @@
},
{
"id": "ec2f5b49-585c-4455-a233-b7aa4c608dbc",
"name": "reachable",
"displayName": "reachable",
"displayNameEvent": "reachable changed",
"name": "reachable",
"name": "connected",
"displayName": "Reachable",
"displayNameEvent": "Reachable changed",
"type": "bool",
"defaultValue": false
}

23
ws2812/devicepluginws2812.json
View File

@ -24,11 +24,6 @@
"name": "ws2812",
"createMethods": ["discovery"],
"interfaces": ["gateway"],
"basicTags": [
"Device",
"Gateway"
],
"criticalStateTypeId": "08091cde-983d-42f7-bdd7-d89c312ccbed",
"paramTypes": [
{
"id": "ccf1f6b1-54c4-46c1-b978-6abcf3fad882",
@ -63,8 +58,6 @@
"displayNameEvent": "color changed",
"displayNameAction": "set color",
"type": "QColor",
"ruleRelevant": false,
"eventRuleRelevant": false,
"defaultValue": "#000000",
"writable": true
@ -79,8 +72,6 @@
"unit": "Percentage",
"defaultValue": 0,
"minValue": 0,
"ruleRelevant": false,
"eventRuleRelevant": false,
"maxValue": 100,
"writable": true
},
@ -94,8 +85,6 @@
"defaultValue": 240,
"minValue": 0,
"maxValue": 240,
"ruleRelevant": false,
"eventRuleRelevant": false,
"writable": true
},
{
@ -108,8 +97,6 @@
"defaultValue": 60,
"minValue": 60,
"maxValue": 240,
"ruleRelevant": false,
"eventRuleRelevant": false,
"writable": true
},
{
@ -120,8 +107,6 @@
"displayNameAction": "set effect mode",
"type": "QString",
"writable": true,
"ruleRelevant": false,
"eventRuleRelevant": false,
"possibleValues": [
"Off",
"Color On",
@ -143,11 +128,8 @@
"displayNameAction": "set tricolore color 1",
"name": "tcolor1",
"type": "QColor",
"ruleRelevant": false,
"eventRuleRelevant": false,
"defaultValue": "#000000",
"writable": true
},
{
"id": "dd4ad65b-007a-4eae-8ce0-b76d6cbf093e",
@ -156,11 +138,8 @@
"displayNameAction": "set tricolore color 2",
"name": "tcolor2",
"type": "QColor",
"ruleRelevant": false,
"eventRuleRelevant": false,
"defaultValue": "#000000",
"writable": true
},
{
"id": "97c83be0-7ba7-4758-b52b-d997a80bfbe5",
@ -169,8 +148,6 @@
"displayNameAction": "set tricolore color 3",
"name": "tcolor3",
"type": "QColor",
"ruleRelevant": false,
"eventRuleRelevant": false,
"defaultValue": "#000000",
"writable": true
}