ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change createMethods and setup method parsing toLower()

Browse Source
This commit is contained in:
Simon Stürz 2018-04-04 13:40:51 +02:00 committed by Michael Zanetti
parent 0d24b5ced9
commit b66a2a170c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libnymea/plugin/deviceplugin.cpp
View File

@ -612,11 +612,11 @@ void DevicePlugin::loadMetaData()
createMethods |= DeviceClass::CreateMethodUser; createMethods |= DeviceClass::CreateMethodUser;
} else { } else {
foreach (const QJsonValue &createMethodValue, deviceClassObject.value("createMethods").toArray()) { foreach (const QJsonValue &createMethodValue, deviceClassObject.value("createMethods").toArray()) {
if (createMethodValue.toString().toUpper() == "Discovery") { if (createMethodValue.toString().toLower() == "discovery") {
createMethods |= DeviceClass::CreateMethodDiscovery; createMethods |= DeviceClass::CreateMethodDiscovery;
} else if (createMethodValue.toString().toUpper() == "Auto") { } else if (createMethodValue.toString().toLower() == "auto") {
createMethods |= DeviceClass::CreateMethodAuto; createMethods |= DeviceClass::CreateMethodAuto;
} else if (createMethodValue.toString().toUpper() == "User") { } else if (createMethodValue.toString().toLower() == "user") {
createMethods |= DeviceClass::CreateMethodUser; createMethods |= DeviceClass::CreateMethodUser;
} else { } else {
qCWarning(dcDeviceManager()) << "Unknown createMehtod" << createMethodValue.toString() << "in deviceClass " qCWarning(dcDeviceManager()) << "Unknown createMehtod" << createMethodValue.toString() << "in deviceClass "
@ -658,13 +658,13 @@ void DevicePlugin::loadMetaData()
DeviceClass::SetupMethod setupMethod = DeviceClass::SetupMethodJustAdd; DeviceClass::SetupMethod setupMethod = DeviceClass::SetupMethodJustAdd;
if (deviceClassObject.contains("setupMethod")) { if (deviceClassObject.contains("setupMethod")) {
QString setupMethodString = deviceClassObject.value("setupMethod").toString(); QString setupMethodString = deviceClassObject.value("setupMethod").toString();
if (setupMethodString.toUpper() == "PushButton") { if (setupMethodString.toLower() == "pushbutton") {
setupMethod = DeviceClass::SetupMethodPushButton; setupMethod = DeviceClass::SetupMethodPushButton;
} else if (setupMethodString.toUpper() == "DisplayPin") { } else if (setupMethodString.toLower() == "displaypin") {
setupMethod = DeviceClass::SetupMethodDisplayPin; setupMethod = DeviceClass::SetupMethodDisplayPin;
} else if (setupMethodString.toUpper() == "EnterPin") { } else if (setupMethodString.toLower() == "enterpin") {
setupMethod = DeviceClass::SetupMethodEnterPin; setupMethod = DeviceClass::SetupMethodEnterPin;
} else if (setupMethodString.toUpper() == "JustAdd") { } else if (setupMethodString.toLower() == "justadd") {
setupMethod = DeviceClass::SetupMethodJustAdd; setupMethod = DeviceClass::SetupMethodJustAdd;
} else { } else {
qCWarning(dcDeviceManager()) << "Unknown setupMehtod" << setupMethod << "in deviceClass" qCWarning(dcDeviceManager()) << "Unknown setupMehtod" << setupMethod << "in deviceClass"