From 2d349e28b1afd7956dd0782251e2606b27639443 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Thu, 29 Mar 2018 09:30:50 +0200 Subject: [PATCH] Adjust mock plugins with new plugin info generation --- libnymea/plugin/deviceplugin.cpp | 6 +++--- libnymea/types/paramtype.cpp | 2 +- plugins/mock/devicepluginmock.cpp | 28 ++++++++++++++-------------- plugins/mock/devicepluginmock.json | 2 +- plugins/nymea-generateplugininfo | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/libnymea/plugin/deviceplugin.cpp b/libnymea/plugin/deviceplugin.cpp index 68b823a2..fc63bcb5 100644 --- a/libnymea/plugin/deviceplugin.cpp +++ b/libnymea/plugin/deviceplugin.cpp @@ -539,7 +539,7 @@ void DevicePlugin::loadMetaData() // Note: The DevicePlugin has no type class, so we define the json properties here QStringList pluginMandatoryJsonProperties = QStringList() << "id" << "name" << "displayName" << "vendors"; - QStringList pluginJsonProperties = QStringList() << "id" << "name" << "displayName" << "vendors" << "paramtypes"; + QStringList pluginJsonProperties = QStringList() << "id" << "name" << "displayName" << "vendors" << "paramTypes"; QPair verificationResult = verifyFields(pluginJsonProperties, pluginMandatoryJsonProperties, m_metaData); @@ -561,8 +561,8 @@ void DevicePlugin::loadMetaData() QJsonObject vendorObject = vendorJson.toObject(); // Note: The Vendor has no type class, so we define the json properties here - QStringList vendorMandatoryJsonProperties = QStringList() << "id" << "name" << "displayName"; - QStringList vendorJsonProperties = QStringList() << "id" << "name" << "displayName"; + QStringList vendorMandatoryJsonProperties = QStringList() << "id" << "name" << "displayName" << "deviceClasses"; + QStringList vendorJsonProperties = QStringList() << "id" << "name" << "displayName" << "deviceClasses"; QPair verificationResult = verifyFields(vendorJsonProperties, vendorMandatoryJsonProperties, vendorObject); diff --git a/libnymea/types/paramtype.cpp b/libnymea/types/paramtype.cpp index 2ccbab13..1bef2320 100644 --- a/libnymea/types/paramtype.cpp +++ b/libnymea/types/paramtype.cpp @@ -221,7 +221,7 @@ QStringList ParamType::jsonProperties() /*! Returns a list of mandatory JSON properties a ParamType JSON definition must have. */ QStringList ParamType::mandatoryJsonProperties() { - return QStringList() << "id" << "name" << "displayName" << "type" << "defaultValue"; + return QStringList() << "id" << "name" << "displayName" << "type"; } /*! Writes the name, type, defaultValue, min value, max value and readOnly of the given \a paramType to \a dbg. */ diff --git a/plugins/mock/devicepluginmock.cpp b/plugins/mock/devicepluginmock.cpp index dd419d2e..0a72aa18 100644 --- a/plugins/mock/devicepluginmock.cpp +++ b/plugins/mock/devicepluginmock.cpp @@ -251,7 +251,7 @@ DeviceManager::DeviceError DevicePluginMock::executeAction(Device *device, const return DeviceManager::DeviceErrorNoError; } else if (device->deviceClassId() == mockPushButtonDeviceClassId) { if (action.actionTypeId() == mockPushButtonColorActionTypeId) { - QString colorString = action.param(mockPushButtonColorStateParamTypeId).value().toString(); + QString colorString = action.param(mockPushButtonColorActionParamTypeId).value().toString(); QColor color(colorString); if (!color.isValid()) { qCWarning(dcMockDevice) << "Invalid color parameter"; @@ -260,16 +260,16 @@ DeviceManager::DeviceError DevicePluginMock::executeAction(Device *device, const device->setStateValue(mockPushButtonColorStateTypeId, colorString); return DeviceManager::DeviceErrorNoError; } else if (action.actionTypeId() == mockPushButtonPercentageActionTypeId) { - device->setStateValue(mockPushButtonPercentageStateTypeId, action.param(mockPushButtonPercentageStateParamTypeId).value().toInt()); + device->setStateValue(mockPushButtonPercentageStateTypeId, action.param(mockPushButtonPercentageActionParamTypeId).value().toInt()); return DeviceManager::DeviceErrorNoError; } else if (action.actionTypeId() == mockPushButtonAllowedValuesActionTypeId) { - device->setStateValue(mockPushButtonAllowedValuesStateTypeId, action.param(mockPushButtonAllowedValuesStateParamTypeId).value().toString()); + device->setStateValue(mockPushButtonAllowedValuesStateTypeId, action.param(mockPushButtonAllowedValuesActionParamTypeId).value().toString()); return DeviceManager::DeviceErrorNoError; } else if (action.actionTypeId() == mockPushButtonDoubleActionTypeId) { - device->setStateValue(mockPushButtonDoubleStateTypeId, action.param(mockPushButtonDoubleStateParamTypeId).value().toDouble()); + device->setStateValue(mockPushButtonDoubleStateTypeId, action.param(mockPushButtonDoubleActionParamTypeId).value().toDouble()); return DeviceManager::DeviceErrorNoError; } else if (action.actionTypeId() == mockPushButtonBoolActionTypeId) { - device->setStateValue(mockPushButtonBoolStateTypeId, action.param(mockPushButtonBoolStateParamTypeId).value().toBool()); + device->setStateValue(mockPushButtonBoolStateTypeId, action.param(mockPushButtonBoolActionParamTypeId).value().toBool()); return DeviceManager::DeviceErrorNoError; } else if (action.actionTypeId() == mockPushButtonTimeoutActionTypeId) { return DeviceManager::DeviceErrorAsync; @@ -277,7 +277,7 @@ DeviceManager::DeviceError DevicePluginMock::executeAction(Device *device, const return DeviceManager::DeviceErrorActionTypeNotFound; } else if (device->deviceClassId() == mockDisplayPinDeviceClassId) { if (action.actionTypeId() == mockDisplayPinColorActionTypeId) { - QString colorString = action.param(mockDisplayPinColorStateParamTypeId).value().toString(); + QString colorString = action.param(mockDisplayPinColorActionParamTypeId).value().toString(); QColor color(colorString); if (!color.isValid()) { qCWarning(dcMockDevice) << "Invalid color parameter"; @@ -286,30 +286,30 @@ DeviceManager::DeviceError DevicePluginMock::executeAction(Device *device, const device->setStateValue(mockDisplayPinColorStateTypeId, colorString); return DeviceManager::DeviceErrorNoError; } else if (action.actionTypeId() == mockDisplayPinPercentageActionTypeId) { - device->setStateValue(mockDisplayPinPercentageStateTypeId, action.param(mockDisplayPinPercentageStateParamTypeId).value().toInt()); + device->setStateValue(mockDisplayPinPercentageStateTypeId, action.param(mockDisplayPinPercentageActionParamTypeId).value().toInt()); return DeviceManager::DeviceErrorNoError; } else if (action.actionTypeId() == mockDisplayPinAllowedValuesActionTypeId) { - device->setStateValue(mockDisplayPinAllowedValuesStateTypeId, action.param(mockDisplayPinAllowedValuesStateParamTypeId).value().toString()); + device->setStateValue(mockDisplayPinAllowedValuesStateTypeId, action.param(mockDisplayPinAllowedValuesActionParamTypeId).value().toString()); return DeviceManager::DeviceErrorNoError; } else if (action.actionTypeId() == mockDisplayPinDoubleActionTypeId) { - device->setStateValue(mockDisplayPinDoubleStateTypeId, action.param(mockDisplayPinDoubleStateParamTypeId).value().toDouble()); + device->setStateValue(mockDisplayPinDoubleStateTypeId, action.param(mockDisplayPinDoubleActionParamTypeId).value().toDouble()); return DeviceManager::DeviceErrorNoError; } else if (action.actionTypeId() == mockDisplayPinBoolActionTypeId) { - device->setStateValue(mockDisplayPinBoolStateTypeId, action.param(mockDisplayPinBoolStateParamTypeId).value().toBool()); + device->setStateValue(mockDisplayPinBoolStateTypeId, action.param(mockDisplayPinBoolActionParamTypeId).value().toBool()); return DeviceManager::DeviceErrorNoError; } else if (action.actionTypeId() == mockDisplayPinTimeoutActionTypeId) { return DeviceManager::DeviceErrorAsync; } return DeviceManager::DeviceErrorActionTypeNotFound; } else if (device->deviceClassId() == mockParentDeviceClassId) { - if (action.actionTypeId() == mockParentBoolValueActionTypeId) { - device->setStateValue(mockParentBoolValueStateTypeId, action.param(mockParentBoolValueStateParamTypeId).value().toBool()); + if (action.actionTypeId() == mockParentBoolValueParentActionTypeId) { + device->setStateValue(mockParentBoolValueParentStateTypeId, action.param(mockParentBoolValueParentActionParamTypeId).value().toBool()); return DeviceManager::DeviceErrorNoError; } return DeviceManager::DeviceErrorActionTypeNotFound; } else if (device->deviceClassId() == mockChildDeviceClassId) { - if (action.actionTypeId() == mockChildBoolValueActionTypeId) { - device->setStateValue(mockChildBoolValueStateTypeId, action.param(mockChildBoolValueStateParamTypeId).value().toBool()); + if (action.actionTypeId() == mockChildBoolValueParentActionTypeId) { + device->setStateValue(mockChildBoolValueParentStateTypeId, action.param(mockChildBoolValueParentActionParamTypeId).value().toBool()); return DeviceManager::DeviceErrorNoError; } return DeviceManager::DeviceErrorActionTypeNotFound; diff --git a/plugins/mock/devicepluginmock.json b/plugins/mock/devicepluginmock.json index 216071e5..cbad53ff 100644 --- a/plugins/mock/devicepluginmock.json +++ b/plugins/mock/devicepluginmock.json @@ -1,5 +1,5 @@ { - "name": "MockDevice", + "name": "mockDevice", "displayName": "Mock Devices", "id": "727a4a9a-c187-446f-aadf-f1b2220607d1", "paramTypes": [ diff --git a/plugins/nymea-generateplugininfo b/plugins/nymea-generateplugininfo index ff1bb457..c81fa384 100755 --- a/plugins/nymea-generateplugininfo +++ b/plugins/nymea-generateplugininfo @@ -210,7 +210,7 @@ def extractStateTypes(stateTypes, deviceClassName): if not variableName in variableNames: variableNames.append(variableName) printInfo('Define ParamTypeId %s for autocreated ActionType %s = %s' % (variableName, variableName, stateType['id'])) - addTranslationString(stateType['displayName'], 'The name of the autocreated ParamType of the writable StateType (%s) of DeviceClass %s' % (stateType['$ + addTranslationString(stateType['displayName'], 'The name of the autocreated ParamType of the writable StateType (%s) of DeviceClass %s' % (stateType['id'], deviceClassName)) if args.filetype is 'i': writeToFile('ParamTypeId %s = ParamTypeId(\"%s\");' % (variableName, stateType['id'])) createExternDefinition('ParamTypeId', variableName)