diff --git a/FileSets/.DS_Store b/FileSets/.DS_Store index 013041f..6fd4c7d 100644 Binary files a/FileSets/.DS_Store and b/FileSets/.DS_Store differ diff --git a/FileSets/v3.00/PageSettingsGeneral.qml b/FileSets/v3.00/PageSettingsGeneral.qml index 11dcf3e..0e75930 120000 --- a/FileSets/v3.00/PageSettingsGeneral.qml +++ b/FileSets/v3.00/PageSettingsGeneral.qml @@ -1 +1 @@ -../v3.20~8/PageSettingsGeneral.qml \ No newline at end of file +../v3.20~34/PageSettingsGeneral.qml \ No newline at end of file diff --git a/FileSets/v3.00/PageSettingsShutdown.qml b/FileSets/v3.00/PageSettingsShutdown.qml index c3727a3..e68655c 120000 --- a/FileSets/v3.00/PageSettingsShutdown.qml +++ b/FileSets/v3.00/PageSettingsShutdown.qml @@ -1 +1 @@ -../v3.20~8/PageSettingsShutdown.qml \ No newline at end of file +../v3.20~34/PageSettingsShutdown.qml \ No newline at end of file diff --git a/FileSets/v3.00~32/PageSettingsGeneral.qml b/FileSets/v3.00~32/PageSettingsGeneral.qml index 11dcf3e..0e75930 120000 --- a/FileSets/v3.00~32/PageSettingsGeneral.qml +++ b/FileSets/v3.00~32/PageSettingsGeneral.qml @@ -1 +1 @@ -../v3.20~8/PageSettingsGeneral.qml \ No newline at end of file +../v3.20~34/PageSettingsGeneral.qml \ No newline at end of file diff --git a/FileSets/v3.00~32/PageSettingsShutdown.qml b/FileSets/v3.00~32/PageSettingsShutdown.qml index c3727a3..e68655c 120000 --- a/FileSets/v3.00~32/PageSettingsShutdown.qml +++ b/FileSets/v3.00~32/PageSettingsShutdown.qml @@ -1 +1 @@ -../v3.20~8/PageSettingsShutdown.qml \ No newline at end of file +../v3.20~34/PageSettingsShutdown.qml \ No newline at end of file diff --git a/FileSets/v3.01/PageSettingsGeneral.qml b/FileSets/v3.01/PageSettingsGeneral.qml index 11dcf3e..0e75930 120000 --- a/FileSets/v3.01/PageSettingsGeneral.qml +++ b/FileSets/v3.01/PageSettingsGeneral.qml @@ -1 +1 @@ -../v3.20~8/PageSettingsGeneral.qml \ No newline at end of file +../v3.20~34/PageSettingsGeneral.qml \ No newline at end of file diff --git a/FileSets/v3.01/PageSettingsShutdown.qml b/FileSets/v3.01/PageSettingsShutdown.qml index c3727a3..e68655c 120000 --- a/FileSets/v3.01/PageSettingsShutdown.qml +++ b/FileSets/v3.01/PageSettingsShutdown.qml @@ -1 +1 @@ -../v3.20~8/PageSettingsShutdown.qml \ No newline at end of file +../v3.20~34/PageSettingsShutdown.qml \ No newline at end of file diff --git a/FileSets/v3.10/PageSettingsGeneral.qml b/FileSets/v3.10/PageSettingsGeneral.qml index 11dcf3e..0e75930 120000 --- a/FileSets/v3.10/PageSettingsGeneral.qml +++ b/FileSets/v3.10/PageSettingsGeneral.qml @@ -1 +1 @@ -../v3.20~8/PageSettingsGeneral.qml \ No newline at end of file +../v3.20~34/PageSettingsGeneral.qml \ No newline at end of file diff --git a/FileSets/v3.10/PageSettingsShutdown.qml b/FileSets/v3.10/PageSettingsShutdown.qml index c3727a3..e68655c 120000 --- a/FileSets/v3.10/PageSettingsShutdown.qml +++ b/FileSets/v3.10/PageSettingsShutdown.qml @@ -1 +1 @@ -../v3.20~8/PageSettingsShutdown.qml \ No newline at end of file +../v3.20~34/PageSettingsShutdown.qml \ No newline at end of file diff --git a/FileSets/v3.11/PageSettingsGeneral.qml b/FileSets/v3.11/PageSettingsGeneral.qml index 11dcf3e..0e75930 120000 --- a/FileSets/v3.11/PageSettingsGeneral.qml +++ b/FileSets/v3.11/PageSettingsGeneral.qml @@ -1 +1 @@ -../v3.20~8/PageSettingsGeneral.qml \ No newline at end of file +../v3.20~34/PageSettingsGeneral.qml \ No newline at end of file diff --git a/FileSets/v3.11/PageSettingsShutdown.qml b/FileSets/v3.11/PageSettingsShutdown.qml index c3727a3..e68655c 120000 --- a/FileSets/v3.11/PageSettingsShutdown.qml +++ b/FileSets/v3.11/PageSettingsShutdown.qml @@ -1 +1 @@ -../v3.20~8/PageSettingsShutdown.qml \ No newline at end of file +../v3.20~34/PageSettingsShutdown.qml \ No newline at end of file diff --git a/FileSets/v3.12/PageSettingsGeneral.qml b/FileSets/v3.12/PageSettingsGeneral.qml index abb6f53..0e75930 120000 --- a/FileSets/v3.12/PageSettingsGeneral.qml +++ b/FileSets/v3.12/PageSettingsGeneral.qml @@ -1 +1 @@ -../v3.20~33/PageSettingsGeneral.qml \ No newline at end of file +../v3.20~34/PageSettingsGeneral.qml \ No newline at end of file diff --git a/FileSets/v3.12/PageSettingsShutdown.qml b/FileSets/v3.12/PageSettingsShutdown.qml index 2b0ffff..e68655c 120000 --- a/FileSets/v3.12/PageSettingsShutdown.qml +++ b/FileSets/v3.12/PageSettingsShutdown.qml @@ -1 +1 @@ -../v3.20~33/PageSettingsShutdown.qml \ No newline at end of file +../v3.20~34/PageSettingsShutdown.qml \ No newline at end of file diff --git a/FileSets/v3.13/PageSettingsGeneral.qml b/FileSets/v3.13/PageSettingsGeneral.qml index abb6f53..0e75930 120000 --- a/FileSets/v3.13/PageSettingsGeneral.qml +++ b/FileSets/v3.13/PageSettingsGeneral.qml @@ -1 +1 @@ -../v3.20~33/PageSettingsGeneral.qml \ No newline at end of file +../v3.20~34/PageSettingsGeneral.qml \ No newline at end of file diff --git a/FileSets/v3.13/PageSettingsShutdown.qml b/FileSets/v3.13/PageSettingsShutdown.qml index 2b0ffff..e68655c 120000 --- a/FileSets/v3.13/PageSettingsShutdown.qml +++ b/FileSets/v3.13/PageSettingsShutdown.qml @@ -1 +1 @@ -../v3.20~33/PageSettingsShutdown.qml \ No newline at end of file +../v3.20~34/PageSettingsShutdown.qml \ No newline at end of file diff --git a/FileSets/v3.20~14/PageSettingsGeneral.qml b/FileSets/v3.20~14/PageSettingsGeneral.qml index abb6f53..0e75930 120000 --- a/FileSets/v3.20~14/PageSettingsGeneral.qml +++ b/FileSets/v3.20~14/PageSettingsGeneral.qml @@ -1 +1 @@ -../v3.20~33/PageSettingsGeneral.qml \ No newline at end of file +../v3.20~34/PageSettingsGeneral.qml \ No newline at end of file diff --git a/FileSets/v3.20~14/PageSettingsShutdown.qml b/FileSets/v3.20~14/PageSettingsShutdown.qml index 2b0ffff..e68655c 120000 --- a/FileSets/v3.20~14/PageSettingsShutdown.qml +++ b/FileSets/v3.20~14/PageSettingsShutdown.qml @@ -1 +1 @@ -../v3.20~33/PageSettingsShutdown.qml \ No newline at end of file +../v3.20~34/PageSettingsShutdown.qml \ No newline at end of file diff --git a/FileSets/v3.20~17/PageSettingsGeneral.qml b/FileSets/v3.20~17/PageSettingsGeneral.qml index abb6f53..0e75930 120000 --- a/FileSets/v3.20~17/PageSettingsGeneral.qml +++ b/FileSets/v3.20~17/PageSettingsGeneral.qml @@ -1 +1 @@ -../v3.20~33/PageSettingsGeneral.qml \ No newline at end of file +../v3.20~34/PageSettingsGeneral.qml \ No newline at end of file diff --git a/FileSets/v3.20~17/PageSettingsShutdown.qml b/FileSets/v3.20~17/PageSettingsShutdown.qml index 2b0ffff..e68655c 120000 --- a/FileSets/v3.20~17/PageSettingsShutdown.qml +++ b/FileSets/v3.20~17/PageSettingsShutdown.qml @@ -1 +1 @@ -../v3.20~33/PageSettingsShutdown.qml \ No newline at end of file +../v3.20~34/PageSettingsShutdown.qml \ No newline at end of file diff --git a/FileSets/v3.20~18/PageSettingsGeneral.qml b/FileSets/v3.20~18/PageSettingsGeneral.qml index abb6f53..0e75930 120000 --- a/FileSets/v3.20~18/PageSettingsGeneral.qml +++ b/FileSets/v3.20~18/PageSettingsGeneral.qml @@ -1 +1 @@ -../v3.20~33/PageSettingsGeneral.qml \ No newline at end of file +../v3.20~34/PageSettingsGeneral.qml \ No newline at end of file diff --git a/FileSets/v3.20~18/PageSettingsShutdown.qml b/FileSets/v3.20~18/PageSettingsShutdown.qml index 2b0ffff..e68655c 120000 --- a/FileSets/v3.20~18/PageSettingsShutdown.qml +++ b/FileSets/v3.20~18/PageSettingsShutdown.qml @@ -1 +1 @@ -../v3.20~33/PageSettingsShutdown.qml \ No newline at end of file +../v3.20~34/PageSettingsShutdown.qml \ No newline at end of file diff --git a/FileSets/v3.20~26/PageSettingsGeneral.qml b/FileSets/v3.20~26/PageSettingsGeneral.qml index abb6f53..0e75930 120000 --- a/FileSets/v3.20~26/PageSettingsGeneral.qml +++ b/FileSets/v3.20~26/PageSettingsGeneral.qml @@ -1 +1 @@ -../v3.20~33/PageSettingsGeneral.qml \ No newline at end of file +../v3.20~34/PageSettingsGeneral.qml \ No newline at end of file diff --git a/FileSets/v3.20~26/PageSettingsShutdown.qml b/FileSets/v3.20~26/PageSettingsShutdown.qml index 2b0ffff..e68655c 120000 --- a/FileSets/v3.20~26/PageSettingsShutdown.qml +++ b/FileSets/v3.20~26/PageSettingsShutdown.qml @@ -1 +1 @@ -../v3.20~33/PageSettingsShutdown.qml \ No newline at end of file +../v3.20~34/PageSettingsShutdown.qml \ No newline at end of file diff --git a/FileSets/v3.20~29/PageSettingsGeneral.qml b/FileSets/v3.20~29/PageSettingsGeneral.qml index abb6f53..0e75930 120000 --- a/FileSets/v3.20~29/PageSettingsGeneral.qml +++ b/FileSets/v3.20~29/PageSettingsGeneral.qml @@ -1 +1 @@ -../v3.20~33/PageSettingsGeneral.qml \ No newline at end of file +../v3.20~34/PageSettingsGeneral.qml \ No newline at end of file diff --git a/FileSets/v3.20~29/PageSettingsShutdown.qml b/FileSets/v3.20~29/PageSettingsShutdown.qml index 2b0ffff..e68655c 120000 --- a/FileSets/v3.20~29/PageSettingsShutdown.qml +++ b/FileSets/v3.20~29/PageSettingsShutdown.qml @@ -1 +1 @@ -../v3.20~33/PageSettingsShutdown.qml \ No newline at end of file +../v3.20~34/PageSettingsShutdown.qml \ No newline at end of file diff --git a/FileSets/v3.20~30/PageSettingsGeneral.qml b/FileSets/v3.20~30/PageSettingsGeneral.qml index abb6f53..0e75930 120000 --- a/FileSets/v3.20~30/PageSettingsGeneral.qml +++ b/FileSets/v3.20~30/PageSettingsGeneral.qml @@ -1 +1 @@ -../v3.20~33/PageSettingsGeneral.qml \ No newline at end of file +../v3.20~34/PageSettingsGeneral.qml \ No newline at end of file diff --git a/FileSets/v3.20~30/PageSettingsShutdown.qml b/FileSets/v3.20~30/PageSettingsShutdown.qml index 2b0ffff..e68655c 120000 --- a/FileSets/v3.20~30/PageSettingsShutdown.qml +++ b/FileSets/v3.20~30/PageSettingsShutdown.qml @@ -1 +1 @@ -../v3.20~33/PageSettingsShutdown.qml \ No newline at end of file +../v3.20~34/PageSettingsShutdown.qml \ No newline at end of file diff --git a/FileSets/v3.20~33/LINKS_ONLY b/FileSets/v3.20~33/LINKS_ONLY new file mode 100644 index 0000000..e69de29 diff --git a/FileSets/v3.20~33/PageSettingsGeneral.qml b/FileSets/v3.20~33/PageSettingsGeneral.qml deleted file mode 100644 index 6282275..0000000 --- a/FileSets/v3.20~33/PageSettingsGeneral.qml +++ /dev/null @@ -1,127 +0,0 @@ -//////// Modified to add Shutdown command - -import QtQuick 1.1 -import com.victron.velib 1.0 -import "utils.js" as Utils - -MbPage -{ - id: root - property string bindPrefix: "com.victronenergy.settings" - - model: VisibleItemModel { - MbItemOptions { - id: accessLevelSelect - description: qsTr("Access level") - bind: Utils.path(bindPrefix, "/Settings/System/AccessLevel") - magicKeys: true - writeAccessLevel: User.AccessUser - possibleValues: [ - MbOption { description: qsTr("User"); value: User.AccessUser; password: "ZZZ" }, - MbOption { description: qsTr("User & Installer"); value: User.AccessInstaller; password: "ZZZ" }, - MbOption { description: qsTr("Superuser"); value: User.AccessSuperUser; readonly: true }, - MbOption { description: qsTr("Service"); value: User.AccessService; readonly: true } - ] - - // touch version to get super user - property bool pulledDown: listview.contentY < -60 - Timer { - running: accessLevelSelect.pulledDown - interval: 5000 - onTriggered: if (user.accessLevel >= User.AccessInstaller) accessLevelSelect.item.setValue(User.AccessSuperUser) - } - - // change to super user mode if the right button is pressed for a while - property int repeatCount - onFocusChanged: repeatCount = 0 - - function open() { - if (user.accessLevel >= User.AccessInstaller && ++repeatCount > 60) { - if (accessLevelSelect.value !== User.AccessSuperUser) - accessLevelSelect.item.setValue(User.AccessSuperUser) - repeatCount = 0 - } - } - } - - MbEditBox { - description: "Set root password" - showAccessLevel: User.AccessSuperUser - onEditDone: { - if (newValue.length < 6) { - toast.createToast("Please enter at least 6 characters") - } else { - toast.createToast(vePlatform.setRootPassword(newValue)) - item.value = "" - } - } - } - - MbSwitch { - name: qsTr("SSH on LAN") - showAccessLevel: User.AccessSuperUser - bind: "com.victronenergy.settings/Settings/System/SSHLocal" - } - - MbSwitch { - id: remoteSupportOnOff - name: qsTr("Remote support") - bind: "com.victronenergy.settings/Settings/System/RemoteSupport" - } - - MbItemValue { - description: qsTr("Remote support tunnel") - item.value: remotePort.item.valid && remotePort.item.value !== 0 ? qsTr("Online") : qsTr("Offline") - show: remoteSupportOnOff.item.value - } - - MbItemValue { - id: remotePort - description: qsTr("Remote support IP and port") - item.bind: "com.victronenergy.settings/Settings/System/RemoteSupportIpAndPort" - show: remoteSupportOnOff.item.value - } - - MbOK { - id: reboot - description: qsTr("Reboot?") - writeAccessLevel: User.AccessUser - onClicked: { - toast.createToast(qsTr("Rebooting..."), 10000, "icon-restart-active") - vePlatform.reboot() - } - } -//////// add for Shutdown command - MbSubMenu - { - description: qsTr("Shutdown") - subpage: Component { PageSettingsShutdown {} } - property VBusItem shutdownItem: VBusItem { bind: Utils.path("com.victronenergy.shutdown", "/Shutdown") } - show: shutdownItem.valid - } - - MbSwitch { - property VBusItem hasBuzzer: VBusItem {bind: "com.victronenergy.system/Buzzer/State"} - name: qsTr("Audible alarm") - bind: Utils.path(bindPrefix, "/Settings/Alarm/Audible") - show: hasBuzzer.valid - } - - MbItemOptions { - id: demoOnOff - description: qsTr("Demo mode") - bind: Utils.path(bindPrefix, "/Settings/Gui/DemoMode") - possibleValues: [ - MbOption { description: qsTr("Disabled"); value: 0 }, - MbOption { description: qsTr("ESS demo"); value: 1 }, - MbOption { description: qsTr("Boat/Motorhome demo 1"); value: 2 }, - MbOption { description: qsTr("Boat/Motorhome demo 2"); value: 3 } - ] - } - - MbItemText { - text: qsTr("Starting demo mode will change some settings and the user interface will be unresponsive for a moment.") - wrapMode: Text.WordWrap - } - } -} diff --git a/FileSets/v3.20~33/PageSettingsGeneral.qml b/FileSets/v3.20~33/PageSettingsGeneral.qml new file mode 120000 index 0000000..0e75930 --- /dev/null +++ b/FileSets/v3.20~33/PageSettingsGeneral.qml @@ -0,0 +1 @@ +../v3.20~34/PageSettingsGeneral.qml \ No newline at end of file diff --git a/FileSets/v3.20~33/PageSettingsShutdown.qml b/FileSets/v3.20~33/PageSettingsShutdown.qml deleted file mode 100644 index 3141897..0000000 --- a/FileSets/v3.20~33/PageSettingsShutdown.qml +++ /dev/null @@ -1,61 +0,0 @@ -/////// new menu for system shutdown - -import QtQuick 1.1 -import "utils.js" as Utils -import com.victron.velib 1.0 - -MbPage -{ - id: root - title: qsTr("System Shutdown") - VBusItem { id: shutdownItem; bind: Utils.path("com.victronenergy.shutdown", "/Shutdown") } - VBusItem { id: externalShutdown; bind: Utils.path("com.victronenergy.shutdown", "/ExtShutdownPresent") } - property bool externalShutdownPresent: externalShutdown.valid && externalShutdown.value == 1 - - model: VisibleItemModel - { - - MbItemText - { - text: qsTr("NOTE: GX device must be power cycled to restart it after shutting down") - wrapMode: Text.WordWrap - horizontalAlignment: Text.AlignLeft - show: shutdownItem.valid - } - MbItemText - { - text: qsTr("ShutdownMonitor not running") - wrapMode: Text.WordWrap - horizontalAlignment: Text.AlignLeft - show: !shutdownItem.valid - } - MbSwitch - { - id: externalShutdownSwitch - name: qsTr("Enable shutdown pin on Raspberry PI") - bind: Utils.path("com.victronenergy.settings", "/Settings/ShutdownMonitor/ExternalSwitch") - writeAccessLevel: User.AccessInstaller - show: externalShutdownPresent - } - MbItemText - { - text: qsTr("NOTE: Shutdown pin is GPIO #16 (pin36)\n Take low to shutdown") - wrapMode: Text.WordWrap - horizontalAlignment: Text.AlignLeft - show: externalShutdownPresent - } - MbOK - { - id: shutdown - description: qsTr("Shutdown?") - writeAccessLevel: User.AccessUser - onClicked: - { - toast.createToast(qsTr("Shutting down..."), 10000, "icon-restart-active") - if (shutdownItem.valid) - shutdownItem.setValue (1) - } - show: shutdownItem.valid - } - } -} diff --git a/FileSets/v3.20~33/PageSettingsShutdown.qml b/FileSets/v3.20~33/PageSettingsShutdown.qml new file mode 120000 index 0000000..e68655c --- /dev/null +++ b/FileSets/v3.20~33/PageSettingsShutdown.qml @@ -0,0 +1 @@ +../v3.20~34/PageSettingsShutdown.qml \ No newline at end of file diff --git a/FileSets/v3.20~34/COMPLETE b/FileSets/v3.20~34/COMPLETE new file mode 100644 index 0000000..e69de29 diff --git a/FileSets/v3.20~34/PageSettingsGeneral.qml b/FileSets/v3.20~34/PageSettingsGeneral.qml new file mode 100644 index 0000000..6282275 --- /dev/null +++ b/FileSets/v3.20~34/PageSettingsGeneral.qml @@ -0,0 +1,127 @@ +//////// Modified to add Shutdown command + +import QtQuick 1.1 +import com.victron.velib 1.0 +import "utils.js" as Utils + +MbPage +{ + id: root + property string bindPrefix: "com.victronenergy.settings" + + model: VisibleItemModel { + MbItemOptions { + id: accessLevelSelect + description: qsTr("Access level") + bind: Utils.path(bindPrefix, "/Settings/System/AccessLevel") + magicKeys: true + writeAccessLevel: User.AccessUser + possibleValues: [ + MbOption { description: qsTr("User"); value: User.AccessUser; password: "ZZZ" }, + MbOption { description: qsTr("User & Installer"); value: User.AccessInstaller; password: "ZZZ" }, + MbOption { description: qsTr("Superuser"); value: User.AccessSuperUser; readonly: true }, + MbOption { description: qsTr("Service"); value: User.AccessService; readonly: true } + ] + + // touch version to get super user + property bool pulledDown: listview.contentY < -60 + Timer { + running: accessLevelSelect.pulledDown + interval: 5000 + onTriggered: if (user.accessLevel >= User.AccessInstaller) accessLevelSelect.item.setValue(User.AccessSuperUser) + } + + // change to super user mode if the right button is pressed for a while + property int repeatCount + onFocusChanged: repeatCount = 0 + + function open() { + if (user.accessLevel >= User.AccessInstaller && ++repeatCount > 60) { + if (accessLevelSelect.value !== User.AccessSuperUser) + accessLevelSelect.item.setValue(User.AccessSuperUser) + repeatCount = 0 + } + } + } + + MbEditBox { + description: "Set root password" + showAccessLevel: User.AccessSuperUser + onEditDone: { + if (newValue.length < 6) { + toast.createToast("Please enter at least 6 characters") + } else { + toast.createToast(vePlatform.setRootPassword(newValue)) + item.value = "" + } + } + } + + MbSwitch { + name: qsTr("SSH on LAN") + showAccessLevel: User.AccessSuperUser + bind: "com.victronenergy.settings/Settings/System/SSHLocal" + } + + MbSwitch { + id: remoteSupportOnOff + name: qsTr("Remote support") + bind: "com.victronenergy.settings/Settings/System/RemoteSupport" + } + + MbItemValue { + description: qsTr("Remote support tunnel") + item.value: remotePort.item.valid && remotePort.item.value !== 0 ? qsTr("Online") : qsTr("Offline") + show: remoteSupportOnOff.item.value + } + + MbItemValue { + id: remotePort + description: qsTr("Remote support IP and port") + item.bind: "com.victronenergy.settings/Settings/System/RemoteSupportIpAndPort" + show: remoteSupportOnOff.item.value + } + + MbOK { + id: reboot + description: qsTr("Reboot?") + writeAccessLevel: User.AccessUser + onClicked: { + toast.createToast(qsTr("Rebooting..."), 10000, "icon-restart-active") + vePlatform.reboot() + } + } +//////// add for Shutdown command + MbSubMenu + { + description: qsTr("Shutdown") + subpage: Component { PageSettingsShutdown {} } + property VBusItem shutdownItem: VBusItem { bind: Utils.path("com.victronenergy.shutdown", "/Shutdown") } + show: shutdownItem.valid + } + + MbSwitch { + property VBusItem hasBuzzer: VBusItem {bind: "com.victronenergy.system/Buzzer/State"} + name: qsTr("Audible alarm") + bind: Utils.path(bindPrefix, "/Settings/Alarm/Audible") + show: hasBuzzer.valid + } + + MbItemOptions { + id: demoOnOff + description: qsTr("Demo mode") + bind: Utils.path(bindPrefix, "/Settings/Gui/DemoMode") + possibleValues: [ + MbOption { description: qsTr("Disabled"); value: 0 }, + MbOption { description: qsTr("ESS demo"); value: 1 }, + MbOption { description: qsTr("Boat/Motorhome demo 1"); value: 2 }, + MbOption { description: qsTr("Boat/Motorhome demo 2"); value: 3 } + ] + } + + MbItemText { + text: qsTr("Starting demo mode will change some settings and the user interface will be unresponsive for a moment.") + wrapMode: Text.WordWrap + } + } +} diff --git a/FileSets/v3.20~33/PageSettingsGeneral.qml.orig b/FileSets/v3.20~34/PageSettingsGeneral.qml.orig similarity index 100% rename from FileSets/v3.20~33/PageSettingsGeneral.qml.orig rename to FileSets/v3.20~34/PageSettingsGeneral.qml.orig diff --git a/FileSets/v3.20~34/PageSettingsShutdown.qml b/FileSets/v3.20~34/PageSettingsShutdown.qml new file mode 100644 index 0000000..3141897 --- /dev/null +++ b/FileSets/v3.20~34/PageSettingsShutdown.qml @@ -0,0 +1,61 @@ +/////// new menu for system shutdown + +import QtQuick 1.1 +import "utils.js" as Utils +import com.victron.velib 1.0 + +MbPage +{ + id: root + title: qsTr("System Shutdown") + VBusItem { id: shutdownItem; bind: Utils.path("com.victronenergy.shutdown", "/Shutdown") } + VBusItem { id: externalShutdown; bind: Utils.path("com.victronenergy.shutdown", "/ExtShutdownPresent") } + property bool externalShutdownPresent: externalShutdown.valid && externalShutdown.value == 1 + + model: VisibleItemModel + { + + MbItemText + { + text: qsTr("NOTE: GX device must be power cycled to restart it after shutting down") + wrapMode: Text.WordWrap + horizontalAlignment: Text.AlignLeft + show: shutdownItem.valid + } + MbItemText + { + text: qsTr("ShutdownMonitor not running") + wrapMode: Text.WordWrap + horizontalAlignment: Text.AlignLeft + show: !shutdownItem.valid + } + MbSwitch + { + id: externalShutdownSwitch + name: qsTr("Enable shutdown pin on Raspberry PI") + bind: Utils.path("com.victronenergy.settings", "/Settings/ShutdownMonitor/ExternalSwitch") + writeAccessLevel: User.AccessInstaller + show: externalShutdownPresent + } + MbItemText + { + text: qsTr("NOTE: Shutdown pin is GPIO #16 (pin36)\n Take low to shutdown") + wrapMode: Text.WordWrap + horizontalAlignment: Text.AlignLeft + show: externalShutdownPresent + } + MbOK + { + id: shutdown + description: qsTr("Shutdown?") + writeAccessLevel: User.AccessUser + onClicked: + { + toast.createToast(qsTr("Shutting down..."), 10000, "icon-restart-active") + if (shutdownItem.valid) + shutdownItem.setValue (1) + } + show: shutdownItem.valid + } + } +} diff --git a/FileSets/v3.20~33/PageSettingsShutdown.qml.orig b/FileSets/v3.20~34/PageSettingsShutdown.qml.orig similarity index 100% rename from FileSets/v3.20~33/PageSettingsShutdown.qml.orig rename to FileSets/v3.20~34/PageSettingsShutdown.qml.orig diff --git a/changes b/changes index a57bb31..b25e114 100644 --- a/changes +++ b/changes @@ -1,3 +1,6 @@ +v2.8: + fixed: bad file sets for v3.11, 3.12 ... + v2.7: add support for v3.12, 3.13, 3.20~33 (others) diff --git a/version b/version index 6354a50..0414f0c 100644 --- a/version +++ b/version @@ -1 +1 @@ -v2.7 +v2.8