From c268cfebec93d6ef675354acc8fb7c1f1471ba9f Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Mon, 16 Nov 2020 23:41:55 +0100 Subject: [PATCH] fixes --- nymea-app/ui/system/ZigbeeAddNetworkPage.qml | 2 +- nymea-app/ui/system/ZigbeeNetworkInfoPage.qml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/nymea-app/ui/system/ZigbeeAddNetworkPage.qml b/nymea-app/ui/system/ZigbeeAddNetworkPage.qml index ad1b9379..7ae1b1b7 100644 --- a/nymea-app/ui/system/ZigbeeAddNetworkPage.qml +++ b/nymea-app/ui/system/ZigbeeAddNetworkPage.qml @@ -211,7 +211,7 @@ SettingsPageBase { } onAccepted: { - d.addNetwork(serialPortOptionsDialog.serialPort, baudRateComboBox.currentValue, backendModel.get(backendComboBox.currentIndex).backendValue) + d.addNetwork(serialPortOptionsDialog.serialPort, baudRateComboBox.currentText, backendModel.get(backendComboBox.currentIndex).backendValue) } } } diff --git a/nymea-app/ui/system/ZigbeeNetworkInfoPage.qml b/nymea-app/ui/system/ZigbeeNetworkInfoPage.qml index 512d1517..6c10ac62 100644 --- a/nymea-app/ui/system/ZigbeeNetworkInfoPage.qml +++ b/nymea-app/ui/system/ZigbeeNetworkInfoPage.qml @@ -97,7 +97,6 @@ SettingsPageBase { } ColumnLayout { - anchors { left: parent.left; right: parent.right } Button { Layout.fillWidth: true @@ -117,7 +116,7 @@ SettingsPageBase { Layout.rightMargin: app.margins text: qsTr("Factory reset controller") onClicked: { - engine.zigbeeManager.factoryResetNetwork(root.network.networkUuid) + root.zigbeeManager.factoryResetNetwork(root.network.networkUuid) pageStack.pop() } }