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

Fix min api check for modbus config

Browse Source
This commit is contained in:
Michael Zanetti 2021-06-07 22:18:11 +02:00
parent 783e2566d2
commit b2c0f1b744
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
nymea-app/ui/SettingsPage.qml
View File

@ -152,23 +152,6 @@ Page {
}
}
Pane {
Layout.fillWidth: true
Material.elevation: layout.isGrid ? 1 : 0
visible: engine.jsonRpcClient.ensureServerVersion("5.3")
padding: 0
NymeaSwipeDelegate {
width: parent.width
iconName: "../images/zigbee.svg"
text: qsTr("ZigBee")
subText: qsTr("Configure ZigBee networks")
prominentSubText: false
wrapTexts: false
onClicked: pageStack.push(Qt.resolvedUrl("system/ZigbeeSettingsPage.qml"))
}
}
Pane {
Layout.fillWidth: true
Material.elevation: layout.isGrid ? 1 : 0
@ -189,7 +172,24 @@ Page {
Pane {
Layout.fillWidth: true
Material.elevation: layout.isGrid ? 1 : 0
visible: engine.jsonRpcClient.ensureServerVersion("5.4")
visible: engine.jsonRpcClient.ensureServerVersion("5.3")
padding: 0
NymeaSwipeDelegate {
width: parent.width
iconName: "../images/zigbee.svg"
text: qsTr("ZigBee")
subText: qsTr("Configure ZigBee networks")
prominentSubText: false
wrapTexts: false
onClicked: pageStack.push(Qt.resolvedUrl("system/ZigbeeSettingsPage.qml"))
}
}
Pane {
Layout.fillWidth: true
Material.elevation: layout.isGrid ? 1 : 0
visible: engine.jsonRpcClient.ensureServerVersion("5.6")
padding: 0
NymeaSwipeDelegate {

2
nymea-app/ui/system/ModbusRtuReconfigureMasterPage.qml
View File

@ -141,7 +141,7 @@ SettingsPageBase {
NymeaSwipeDelegate {
Layout.fillWidth: true
text: qsTr("Description")
subText: serialPort.description
subText: serialPort.description.length > 0 ? serialPort.description : qsTr("Unknown")
progressive: false
prominentSubText: false
}