ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update naviationpad interface

pull/190/head
Michael Zanetti 2019-07-21 01:29:44 +02:00
parent 09fb3ef4c5
commit 9cfa2f0581
3 changed files with 39 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libnymea/devices/pluginmetadata.cpp
View File

@ -527,6 +527,12 @@ void PluginMetadata::parse(const QJsonObject &jsonObject)
qCWarning(dcPluginMetadata()) << "DeviceClass" << deviceClass.name() << "claims to implement interface" << value.toString() << "but param" << paramType.name() << "is of wrong type:" << QVariant::typeToName(paramType.type()) << "expected:" << QVariant::typeToName(ifaceActionParamType.type()); qCWarning(dcPluginMetadata()) << "DeviceClass" << deviceClass.name() << "claims to implement interface" << value.toString() << "but param" << paramType.name() << "is of wrong type:" << QVariant::typeToName(paramType.type()) << "expected:" << QVariant::typeToName(ifaceActionParamType.type());
hasError = true; hasError = true;
} }
foreach (const QVariant &allowedValue, ifaceActionParamType.allowedValues()) {
if (!paramType.allowedValues().contains(allowedValue)) {
qCWarning(dcPluginMetadata()) << "DeviceClass" << deviceClass.name() << "claims to implement interface" << value.toString() << "but param" << paramType.name() << "is missing allowed value" << allowedValue;
hasError = true;
}
}
} }
} }
} }

22
libnymea/interfaces/extendednavigationpad.json
View File

@ -3,10 +3,24 @@
"extends": "navigationpad", "extends": "navigationpad",
"actions": [ "actions": [
{ {
"name": "navigateMenu" "name": "navigate",
}, "params": [
{ {
"name": "navigateInfo" "name": "to",
"type": "QString",
"allowedValues": [
"up",
"down",
"left",
"right",
"enter",
"back",
"menu",
"info",
"home"
]
}
]
} }
] ]
} }

31
libnymea/interfaces/navigationpad.json
View File

@ -3,22 +3,21 @@
"extends": "media", "extends": "media",
"actions": [ "actions": [
{ {
"name": "navigateUp" "name": "navigate",
}, "params": [
{ {
"name": "navigateDown" "name": "to",
}, "type": "QString",
{ "allowedValues": [
"name": "navigateLeft" "up",
}, "down",
{ "left",
"name": "navigateRight" "right",
}, "enter",
{ "back"
"name": "navigateOk" ]
}, }
{ ]
"name": "navigateBack"
} }
] ]
} }