Skip to content

Fix: Add custom config 1 and 2 to mobile view. #433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: Add custom config 1 and 2 to mobile view. #433

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 85 additions & 3 deletions mobile/main.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,8 @@ ApplicationWindow {
(uiHwPage.visible ? 1 : 0) +
(uiAppPage.visible ? 1 : 0) +
(confCustomButton.visible ? 1 : 0) +
(confCustomButton1.visible ? 1 : 0) +
(confCustomButton2.visible ? 1 : 0) +
(confPageMotor.visible ? 1 : 0) +
(confPageApp.visible ? 1 : 0)))

Expand Down Expand Up @@ -576,13 +578,27 @@ ApplicationWindow {
width: tabBar.buttonWidth
}

TabButton {
TabButton {
id: confCustomButton
visible: confCustomPage.visible
text: "Custom Cfg"
width: tabBar.buttonWidth
}

TabButton {
id: confCustomButton1
visible: confCustomPage1.visible
text: "Custom Cfg 1"
width: tabBar.buttonWidth
}

TabButton {
id: confCustomButton2
visible: confCustomPage2.visible
text: "Custom Cfg 2"
width: tabBar.buttonWidth
}

Page {
id: confPageMotor
visible: false
Expand Down Expand Up @@ -633,6 +649,40 @@ ApplicationWindow {
}
}

Page {
id: confCustomPage1
visible: false

Loader {
id: confCustomLoader1
anchors.fill: parent
asynchronous: true
sourceComponent: ConfigPageCustom {
anchors.fill: parent
anchors.leftMargin: 10
anchors.rightMargin: 10
confInd: 1
}
}
}

Page {
id: confCustomPage2
visible: false

Loader {
id: confCustomLoader2
anchors.fill: parent
asynchronous: true
sourceComponent: ConfigPageCustom {
anchors.fill: parent
anchors.leftMargin: 10
anchors.rightMargin: 10
confInd: 2
}
}
}

footer: Rectangle {
id: connectedRect
clip: true
Expand Down Expand Up @@ -1028,9 +1078,41 @@ ApplicationWindow {
confCustomButton.parent = null
}
}

if (confCustomLoader1.status == Loader.Ready) {
stop()

if (VescIf.isPortConnected() && VescIf.customConfig(1) !== null) {
mainSwipeView.insertItem(4, confCustomPage1)
tabBar.insertItem(4, confCustomButton1)
confCustomPage1.visible = true
confCustomLoader1.item.reloadConfig()
confCustomButton1.text = VescIf.customConfig(1).getLongName("hw_name")
} else {
confCustomPage1.visible = false
confCustomPage1.parent = null
confCustomButton1.parent = null
}
}

if (confCustomLoader2.status == Loader.Ready) {
stop()

if (VescIf.isPortConnected() && VescIf.customConfig(2) !== null) {
mainSwipeView.insertItem(4, confCustomPage2)
tabBar.insertItem(4, confCustomButton2)
confCustomPage2.visible = true
confCustomLoader2.item.reloadConfig()
confCustomButton2.text = VescIf.customConfig(2).getLongName("hw_name")
} else {
confCustomPage2.visible = false
confCustomPage2.parent = null
confCustomButton2.parent = null
}
}
}
}

function updateConfCustom () {
confCustomTimer.start()
}
Expand Down Expand Up @@ -1228,4 +1310,4 @@ ApplicationWindow {
VescIf.disconnectPort()
}
}
}
}