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

Merge PR #190: Update navigationpad interface

pull/208/head
Jenkins 2019-09-02 18:01:50 +02:00
parent ef91351242 9cfa2f0581
commit aec53b19b4
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

@ -571,6 +571,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());
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",
"actions": [
{
"name": "navigateMenu"
},
{
"name": "navigateInfo"
"name": "navigate",
"params": [
{
"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",
"actions": [
{
"name": "navigateUp"
},
{
"name": "navigateDown"
},
{
"name": "navigateLeft"
},
{
"name": "navigateRight"
},
{
"name": "navigateOk"
},
{
"name": "navigateBack"
"name": "navigate",
"params": [
{
"name": "to",
"type": "QString",
"allowedValues": [
"up",
"down",
"left",
"right",
"enter",
"back"
]
}
]
}
]
}