From ed358c7d38b027931ddb33635e573694779599c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Mon, 16 May 2016 11:18:10 +0200 Subject: [PATCH] finish index, primary and critical definitions for plugins --- .../commandlauncher/deviceplugincommandlauncher.cpp | 2 +- .../commandlauncher/deviceplugincommandlauncher.json | 1 + plugins/deviceplugins/datetime/deviceplugindatetime.json | 1 + plugins/deviceplugins/denon/deviceplugindenon.json | 1 + plugins/deviceplugins/dollhouse/deviceplugindollhouse.json | 1 + plugins/deviceplugins/lircd/devicepluginlircd.cpp | 2 +- .../openweathermap/devicepluginopenweathermap.json | 1 + .../deviceplugins/orderbutton/devicepluginorderbutton.json | 1 + .../deviceplugins/philipshue/devicepluginphilipshue.json | 6 ++++++ plugins/deviceplugins/plantcare/devicepluginplantcare.json | 1 + .../deviceplugins/udpcommander/devicepluginudpcommander.cpp | 2 +- plugins/deviceplugins/unitec/devicepluginunitec.json | 1 + plugins/deviceplugins/wakeonlan/devicepluginwakeonlan.json | 1 + plugins/deviceplugins/wemo/devicepluginwemo.json | 2 ++ .../deviceplugins/wifidetector/devicepluginwifidetector.cpp | 3 ++- .../wifidetector/devicepluginwifidetector.json | 1 + plugins/deviceplugins/ws2812/devicepluginws2812.json | 2 +- server/guhcore.cpp | 2 -- 18 files changed, 24 insertions(+), 7 deletions(-) diff --git a/plugins/deviceplugins/commandlauncher/deviceplugincommandlauncher.cpp b/plugins/deviceplugins/commandlauncher/deviceplugincommandlauncher.cpp index 0206a304..a7d16c1a 100644 --- a/plugins/deviceplugins/commandlauncher/deviceplugincommandlauncher.cpp +++ b/plugins/deviceplugins/commandlauncher/deviceplugincommandlauncher.cpp @@ -25,7 +25,7 @@ \brief Plugin for system commands. \ingroup plugins - \ingroup guh-plugins + \ingroup guh-plugins-maker The application and script launcher plugin allows you to execute bash commands and start bash scripts. diff --git a/plugins/deviceplugins/commandlauncher/deviceplugincommandlauncher.json b/plugins/deviceplugins/commandlauncher/deviceplugincommandlauncher.json index a125a4f5..8adf4b27 100644 --- a/plugins/deviceplugins/commandlauncher/deviceplugincommandlauncher.json +++ b/plugins/deviceplugins/commandlauncher/deviceplugincommandlauncher.json @@ -13,6 +13,7 @@ "name": "Application launcher", "createMethods": ["user"], "primaryActionTypeId": "cf52b41d-3108-423c-8907-ca5b4d97cac5", + "primaryStateTypeId": "28d7e933-ff05-4f4c-95a0-482689543de5", "basicTags": [ "Service", "Actuator" diff --git a/plugins/deviceplugins/datetime/deviceplugindatetime.json b/plugins/deviceplugins/datetime/deviceplugindatetime.json index ab93fa47..009d1eda 100644 --- a/plugins/deviceplugins/datetime/deviceplugindatetime.json +++ b/plugins/deviceplugins/datetime/deviceplugindatetime.json @@ -301,6 +301,7 @@ "Actuator", "Time" ], + "primaryActionTypeId": "436e9923-6eff-444e-bde7-a61228a4d748", "createMethods": ["user"], "paramTypes": [ { diff --git a/plugins/deviceplugins/denon/deviceplugindenon.json b/plugins/deviceplugins/denon/deviceplugindenon.json index 57709a73..46e68c79 100644 --- a/plugins/deviceplugins/denon/deviceplugindenon.json +++ b/plugins/deviceplugins/denon/deviceplugindenon.json @@ -14,6 +14,7 @@ "name": "AVR X1000", "createMethods": ["user"], "criticalStateTypeId": "4d1790bf-28c6-4c1f-8892-ba1a0ef140f5", + "primaryActionTypeId": "1cdb6b54-6831-4900-95b2-c78f64497701", "deviceIcon": "Hifi", "basicTags": [ "Device", diff --git a/plugins/deviceplugins/dollhouse/deviceplugindollhouse.json b/plugins/deviceplugins/dollhouse/deviceplugindollhouse.json index 196fe7a5..23682b8e 100644 --- a/plugins/deviceplugins/dollhouse/deviceplugindollhouse.json +++ b/plugins/deviceplugins/dollhouse/deviceplugindollhouse.json @@ -39,6 +39,7 @@ "deviceClassId": "b4dd5f10-36d4-4232-867a-6d3b04a08bad", "createMethods": ["auto"], "criticalStateTypeId": "93c539b4-50d8-431e-8be4-5ebba89452b7", + "primaryActionTypeId": "f6ac30a0-77b8-4f1f-8c44-4c2e6d542663", "basicTags": [ "Device", "Lighting" diff --git a/plugins/deviceplugins/lircd/devicepluginlircd.cpp b/plugins/deviceplugins/lircd/devicepluginlircd.cpp index 53502421..485be2a5 100644 --- a/plugins/deviceplugins/lircd/devicepluginlircd.cpp +++ b/plugins/deviceplugins/lircd/devicepluginlircd.cpp @@ -25,7 +25,7 @@ \brief Plugin for the LIRC infrared daemon. \ingroup plugins - \ingroup guh-plugins + \ingroup guh-plugins-maker This plugin allows to interact with \l{http://www.lirc.org/}{LIRC} daemon and controll commonly used remote controls. If lircd (LIRC daemon) is configured on your system, guh will connect to the lirc daemon and all configured remote diff --git a/plugins/deviceplugins/openweathermap/devicepluginopenweathermap.json b/plugins/deviceplugins/openweathermap/devicepluginopenweathermap.json index 00bc42de..f3340050 100644 --- a/plugins/deviceplugins/openweathermap/devicepluginopenweathermap.json +++ b/plugins/deviceplugins/openweathermap/devicepluginopenweathermap.json @@ -20,6 +20,7 @@ ], "createMethods": ["discovery"], "primaryStateTypeId": "6013402f-b5b1-46b3-8490-f0c20d62fe61", + "primaryActionTypeId": "cfbc6504-d86f-4856-8dfa-97b6fbb385e4", "discoveryParamTypes": [ { "name": "location", diff --git a/plugins/deviceplugins/orderbutton/devicepluginorderbutton.json b/plugins/deviceplugins/orderbutton/devicepluginorderbutton.json index 468d31fc..c953b062 100644 --- a/plugins/deviceplugins/orderbutton/devicepluginorderbutton.json +++ b/plugins/deviceplugins/orderbutton/devicepluginorderbutton.json @@ -26,6 +26,7 @@ "Device", "Gateway" ], + "criticalStateTypeId": "783e74ee-ffd6-4dd7-ade5-3a961452cf15", "paramTypes": [ { "name": "host", diff --git a/plugins/deviceplugins/philipshue/devicepluginphilipshue.json b/plugins/deviceplugins/philipshue/devicepluginphilipshue.json index 9da2e135..588bb542 100644 --- a/plugins/deviceplugins/philipshue/devicepluginphilipshue.json +++ b/plugins/deviceplugins/philipshue/devicepluginphilipshue.json @@ -19,6 +19,7 @@ "Lighting" ], "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": [ @@ -139,6 +140,8 @@ "Lighting", "Actuator" ], + "criticalStateTypeId": "19bb8d10-1b28-4ba3-99b7-a634138dcfde", + "primaryActionTypeId": "90aaffe5-6a76-47d2-a14a-550f60390245", "createMethods": ["auto"], "paramTypes": [ { @@ -289,6 +292,8 @@ "Actuator", "Lighting" ], + "criticalStateTypeId": "19bb8d10-1b28-4ba3-99b7-a634138dcfde", + "primaryActionTypeId": "90aaffe5-6a76-47d2-a14a-550f60390245", "createMethods": ["auto"], "paramTypes": [ { @@ -403,6 +408,7 @@ "Device", "Sensor" ], + "criticalStateTypeId": "19bb8d10-1b28-4ba3-99b7-a634138dcfde", "createMethods": ["auto"], "paramTypes": [ { diff --git a/plugins/deviceplugins/plantcare/devicepluginplantcare.json b/plugins/deviceplugins/plantcare/devicepluginplantcare.json index 7baede00..44f08126 100644 --- a/plugins/deviceplugins/plantcare/devicepluginplantcare.json +++ b/plugins/deviceplugins/plantcare/devicepluginplantcare.json @@ -26,6 +26,7 @@ "Device", "Gateway" ], + "criticalStateTypeId": "8384e07b-8b91-492a-b6c8-e72b325ba0b4", "paramTypes": [ { "name": "host", diff --git a/plugins/deviceplugins/udpcommander/devicepluginudpcommander.cpp b/plugins/deviceplugins/udpcommander/devicepluginudpcommander.cpp index 9a5f09f9..af3f609a 100644 --- a/plugins/deviceplugins/udpcommander/devicepluginudpcommander.cpp +++ b/plugins/deviceplugins/udpcommander/devicepluginudpcommander.cpp @@ -24,7 +24,7 @@ \brief Plugin for catching UDP commands from the network. \ingroup plugins - \ingroup guh-plugins + \ingroup guh-plugins-maker This plugin allows to receive UDP packages over a certain UDP port and generates an \l{Event} if the message content matches the \l{Param} command. diff --git a/plugins/deviceplugins/unitec/devicepluginunitec.json b/plugins/deviceplugins/unitec/devicepluginunitec.json index 016a4b97..a047335f 100644 --- a/plugins/deviceplugins/unitec/devicepluginunitec.json +++ b/plugins/deviceplugins/unitec/devicepluginunitec.json @@ -18,6 +18,7 @@ ], "idName": "switch", "createMethods": ["user"], + "primaryActionTypeId": "3ca1ebc2-bb8e-4429-9664-a7bc4569e73b", "paramTypes": [ { "name": "channel", diff --git a/plugins/deviceplugins/wakeonlan/devicepluginwakeonlan.json b/plugins/deviceplugins/wakeonlan/devicepluginwakeonlan.json index cdbb0442..6923b174 100644 --- a/plugins/deviceplugins/wakeonlan/devicepluginwakeonlan.json +++ b/plugins/deviceplugins/wakeonlan/devicepluginwakeonlan.json @@ -16,6 +16,7 @@ "Device", "Actuator" ], + "primaryActionTypeId": "fb9b9d87-218f-4f0d-9e16-39f8a105029a", "createMethods": ["user"], "paramTypes": [ { diff --git a/plugins/deviceplugins/wemo/devicepluginwemo.json b/plugins/deviceplugins/wemo/devicepluginwemo.json index 5ae6ac04..3d23f5ba 100644 --- a/plugins/deviceplugins/wemo/devicepluginwemo.json +++ b/plugins/deviceplugins/wemo/devicepluginwemo.json @@ -17,6 +17,8 @@ "Device", "Actuator" ], + "criticalStateTypeId": "ec2f5b49-585c-4455-a233-b7aa4c608dbc", + "primaryActionTypeId": "7166c4f6-f68c-4188-8f7c-2205d72a5a6d", "createMethods": ["discovery"], "paramTypes": [ { diff --git a/plugins/deviceplugins/wifidetector/devicepluginwifidetector.cpp b/plugins/deviceplugins/wifidetector/devicepluginwifidetector.cpp index f427aacc..0e1d7702 100644 --- a/plugins/deviceplugins/wifidetector/devicepluginwifidetector.cpp +++ b/plugins/deviceplugins/wifidetector/devicepluginwifidetector.cpp @@ -25,7 +25,8 @@ \brief Plugin to monitor devices in the local network. \ingroup plugins - \ingroup guh-plugins + \ingroup guh-plugins-maker + This plugin allows to find and monitor network devices in your local network by using the MAC address. diff --git a/plugins/deviceplugins/wifidetector/devicepluginwifidetector.json b/plugins/deviceplugins/wifidetector/devicepluginwifidetector.json index fd228ba2..42d8ce78 100644 --- a/plugins/deviceplugins/wifidetector/devicepluginwifidetector.json +++ b/plugins/deviceplugins/wifidetector/devicepluginwifidetector.json @@ -17,6 +17,7 @@ "Device", "Sensor" ], + "primaryStateTypeId": "cb43e1b5-4f61-4538-bfa2-c33055c542cf", "createMethods": ["user", "discovery"], "paramTypes": [ { diff --git a/plugins/deviceplugins/ws2812/devicepluginws2812.json b/plugins/deviceplugins/ws2812/devicepluginws2812.json index 7bd8da4f..742b4a45 100644 --- a/plugins/deviceplugins/ws2812/devicepluginws2812.json +++ b/plugins/deviceplugins/ws2812/devicepluginws2812.json @@ -26,6 +26,7 @@ "Device", "Gateway" ], + "criticalStateTypeId": "08091cde-983d-42f7-bdd7-d89c312ccbed", "paramTypes": [ { "name": "host", @@ -145,7 +146,6 @@ "type": "QColor", "defaultValue": "#000000", "writable": true - } ] } diff --git a/server/guhcore.cpp b/server/guhcore.cpp index 84d2b398..220ff476 100644 --- a/server/guhcore.cpp +++ b/server/guhcore.cpp @@ -463,8 +463,6 @@ void GuhCore::gotEvent(const Event &event) void GuhCore::onDateTimeChanged(const QDateTime &dateTime) { - qCDebug(dcTimeManager) << dateTime.toString("dd.MM.yyyy hh:mm"); - QList actions; foreach (const Rule &rule, m_ruleEngine->evaluateTime(dateTime)) { // TimeEvent based