From 4756ebe54fdd0a91da64192252c267a096e0789e Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Thu, 16 Nov 2017 12:50:45 +0100
Subject: [PATCH] update plugins according to new id generation mechanism

---
 genericelements/deviceplugingenericelements.cpp  | 8 ++++----
 genericelements/deviceplugingenericelements.json | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/genericelements/deviceplugingenericelements.cpp b/genericelements/deviceplugingenericelements.cpp
index 7357a37..4a0feaf 100644
--- a/genericelements/deviceplugingenericelements.cpp
+++ b/genericelements/deviceplugingenericelements.cpp
@@ -83,16 +83,16 @@ DeviceManager::DeviceError DevicePluginGenericElements::executeAction(Device *de
 {
     // Toggle Button
     if (device->deviceClassId() == toggleButtonDeviceClassId ) {
-        if (action.actionTypeId() == stateActionTypeId) {
-            device->setStateValue(stateStateTypeId, !device->stateValue(stateStateTypeId).toBool());
+        if (action.actionTypeId() == toggleButtonStateActionTypeId) {
+            device->setStateValue(toggleButtonStateStateTypeId, !device->stateValue(toggleButtonStateStateTypeId).toBool());
             return DeviceManager::DeviceErrorNoError;
         }
         return DeviceManager::DeviceErrorActionTypeNotFound;
     }
     // Button
     if (device->deviceClassId() == buttonDeviceClassId ) {
-        if (action.actionTypeId() == buttonPressActionTypeId) {
-            emit emitEvent(Event(buttonPressedEventTypeId, device->id()));
+        if (action.actionTypeId() == buttonButtonPressActionTypeId) {
+            emit emitEvent(Event(buttonButtonPressedEventTypeId, device->id()));
             return DeviceManager::DeviceErrorNoError;
         }
         return DeviceManager::DeviceErrorActionTypeNotFound;
diff --git a/genericelements/deviceplugingenericelements.json b/genericelements/deviceplugingenericelements.json
index b9e1087..9d63848 100644
--- a/genericelements/deviceplugingenericelements.json
+++ b/genericelements/deviceplugingenericelements.json
@@ -74,24 +74,24 @@
                     "actionTypes": [
                         {
                             "id": "892596d2-0863-4807-97da-469b9f7003f2",
-                            "name": "onOffButtonOn",
+                            "name": "on",
                             "displayName": "press ON"
                         },
                         {
                             "id": "a8d64050-0b58-4ccf-b052-77ce2b7368ad",
-                            "name": "onOffButtonOff",
+                            "name": "off",
                             "displayName": "press OFF"
                         }
                     ],
                     "eventTypes": [
                         {
                             "id": "4eeba6a2-e4c7-4a2e-8360-2797d98114e6",
-                            "name": "onOffButtonOn",
+                            "name": "on",
                             "displayName": "ON pressed"
                         },
                         {
                             "id": "b636c5f3-2eb0-4682-96d4-88a4aa9d2c12",
-                            "name": "onOffButtonOff",
+                            "name": "off",
                             "displayName": "OFF pressed"
                         }
                     ]