diff --git a/FileSets/PackageManagerMenu.txt b/FileSets/PackageManagerMenu.txt new file mode 100644 index 0000000..757d041 --- /dev/null +++ b/FileSets/PackageManagerMenu.txt @@ -0,0 +1,8 @@ +//////// added for PackageManager + MbSubMenu + { + description: qsTr("Package manager") + subpage: Component { PageSettingsPackageManager {} } + } + } +} diff --git a/FileSets/v2.66/PageSettingsPackageManager.qml b/FileSets/PageSettingsPackageManager.qml similarity index 98% rename from FileSets/v2.66/PageSettingsPackageManager.qml rename to FileSets/PageSettingsPackageManager.qml index 7aeb707..2397c54 100644 --- a/FileSets/v2.66/PageSettingsPackageManager.qml +++ b/FileSets/PageSettingsPackageManager.qml @@ -9,6 +9,7 @@ MbPage { title: qsTr("Package manager") property string settingsPrefix: "com.victronenergy.settings/Settings/PackageManager" property string servicePrefix: "com.victronenergy.packageManager" + property string bindVrmloggerPrefix: "com.victronenergy.logger" VBusItem { id: downloadStatus; bind: Utils.path(servicePrefix, "/GitHubUpdateStatus") } VBusItem { id: installStatus; bind: Utils.path(servicePrefix, "/InstallStatus") } VBusItem { id: mediaStatus; bind: Utils.path(servicePrefix, "/MediaUpdateStatus") } diff --git a/FileSets/PageSettingsPackageManager.qml.ALT_ORIG b/FileSets/PageSettingsPackageManager.qml.ALT_ORIG deleted file mode 100644 index a5c1771..0000000 --- a/FileSets/PageSettingsPackageManager.qml.ALT_ORIG +++ /dev/null @@ -1 +0,0 @@ -/opt/victronenergy/gui/qml/PageSettingsLogger.qml diff --git a/FileSets/fileList b/FileSets/fileList deleted file mode 100644 index a1651f0..0000000 --- a/FileSets/fileList +++ /dev/null @@ -1,2 +0,0 @@ -/opt/victronenergy/gui/qml/PageSettings.qml -/opt/victronenergy/gui/qml/PageSettingsPackageManager.qml diff --git a/FileSets/v2.66/PageSettings.qml b/FileSets/v2.66/PageSettings.qml deleted file mode 100644 index 9a8359b..0000000 --- a/FileSets/v2.66/PageSettings.qml +++ /dev/null @@ -1,197 +0,0 @@ -//////// modified for package version and control -import QtQuick 1.1 -import com.victron.velib 1.0 -import net.connman 0.1 -import "utils.js" as Utils - -MbPage { - title: qsTr("Settings") - property string bindPrefix: "com.victronenergy.settings" - property VBusItem relay0Item: VBusItem {bind: "com.victronenergy.system/Relay/0/State"} - property bool hasRelay0: relay0Item.valid - - model: VisualItemModel { - MbSubMenu { - id: generalItem - description: qsTr("General") - subpage: Component { - PageSettingsGeneral { - title: generalItem.description - } - } - } - - MbSubMenu { - description: qsTr("Firmware") - subpage: Component { - PageSettingsFirmware { - title: qsTr("Firmware") - } - } - } - - MbSubMenu { - description: qsTr("Date & Time") - subpage: Component { - PageTzInfo { - title: qsTr("Date & Time") - } - } - } - - MbSubMenu { - description: qsTr("Remote Console") - subpage: Component { PageSettingsRemoteConsole {} } - } - - MbSubMenu { - id: systemSetupItem - description: qsTr("System setup") - subpage: Component { - PageSettingsSystem { - title: systemSetupItem.description - } - } - } - - MbSubMenu { - id: dvcc - description: qsTr("DVCC") - subpage: Component { - PageSettingsDVCC { - title: dvcc.description - } - } - } - - MbSubMenu { - id: displayItem - description: qsTr("Display & language") - subpage: Component { - PageSettingsDisplay { - title: displayItem.description - } - } - } - - MbSubMenu { - id: vrmLoggerItem - description: qsTr("VRM online portal") - subpage: Component { - PageSettingsLogger { - title: vrmLoggerItem.description - } - } - } - - MbSubMenu { - VBusItem { - id: systemType - bind: "com.victronenergy.system/SystemType" - } - description: systemType.value === "Hub-4" ? systemType.value : qsTr("ESS") - subpage: Component { PageSettingsHub4 {} } - } - - MbSubMenu { - description: qsTr("Energy meters") - subpage: Component { PageSettingsCGwacsOverview {} } - } - - MbSubMenu { - description: qsTr("PV inverters") - subpage: Component { PageSettingsFronius {} } - } - - MbSubMenu { - show: App.withQwacs - description: qsTr("Wireless AC sensors") - subpage: Component { PageSettingsQwacs {} } - } - - MbSubMenu { - description: qsTr("Modbus TCP devices") - subpage: Component { PageSettingsModbus {} } - } - - MbSubMenu { - id: ethernetItem - description: qsTr("Ethernet") - subpage: Component { PageSettingsTcpIp { showLinkLocal: true } } - } - - MbSubMenu { - description: qsTr("Wi-Fi") - subpage: vePlatform.hasHostAccessPoint ? wifiWithAP : wifiWithoutAP - Component { id: wifiWithoutAP; PageSettingsWifi {} } - Component { id: wifiWithAP; PageSettingsWifiWithAccessPoint {} } - } - - MbSubMenu { - description: qsTr("GSM modem") - subpage: Component { PageSettingsGsm {} } - } - - MbSubMenu { - description: qsTr("Bluetooth") - subpage: Component { PageSettingsBluetooth {} } - show: Connman.technologyList.indexOf("bluetooth") !== -1 - } - - MbSubMenu { - description: qsTr("GPS") - subpage: Component { PageSettingsGpsList {} } - } - - MbSubMenu { - description: qsTr("Generator start/stop") - subpage: Component { PageRelayGenerator {} } - show: hasRelay0 - } - - MbSubMenu { - description: qsTr("Tank pump") - subpage: Component { PageSettingsTankPump {} } - } - - MbSubMenu { - description: qsTr("Relay") - subpage: Component { PageSettingsRelay {} } - show: hasRelay0 - } - - MbSubMenu { - description: qsTr("Services") - subpage: Component { PageSettingsServices {} } - } - - MbSubMenu { - // TODO: Find a better way to check if - // analog inputs are available on the device - property VBusItem analogIoSettings: VBusItem { - bind: Utils.path(bindPrefix, - "/Settings/AnalogInput/Resistive/1/Function2") - } - property VBusItem digitalIoSettings: VBusItem { - bind: Utils.path(bindPrefix, - "/Settings/DigitalInput/1/Type") - } - description: qsTr("I/O") - subpage: Component { PageSettingsIo {} } - show: analogIoSettings.valid || digitalIoSettings.valid - } - -//////// added for package control and version display - MbSubMenu - { - description: qsTr("Package manager") - subpage: Component { PageSettingsPackageManager {} } - } - - MbSubMenu { - description: qsTr("Debug") - subpage: Component { PageDebug {} } - show: user.accessLevel >= User.AccessService - } - } -} diff --git a/FileSets/v2.66/PageSettings.qml.orig b/FileSets/v2.66/PageSettings.qml.orig deleted file mode 100644 index 01e4ebc..0000000 --- a/FileSets/v2.66/PageSettings.qml.orig +++ /dev/null @@ -1,189 +0,0 @@ -import QtQuick 1.1 -import com.victron.velib 1.0 -import net.connman 0.1 -import "utils.js" as Utils - -MbPage { - title: qsTr("Settings") - property string bindPrefix: "com.victronenergy.settings" - property VBusItem relay0Item: VBusItem {bind: "com.victronenergy.system/Relay/0/State"} - property bool hasRelay0: relay0Item.valid - - model: VisualItemModel { - MbSubMenu { - id: generalItem - description: qsTr("General") - subpage: Component { - PageSettingsGeneral { - title: generalItem.description - } - } - } - - MbSubMenu { - description: qsTr("Firmware") - subpage: Component { - PageSettingsFirmware { - title: qsTr("Firmware") - } - } - } - - MbSubMenu { - description: qsTr("Date & Time") - subpage: Component { - PageTzInfo { - title: qsTr("Date & Time") - } - } - } - - MbSubMenu { - description: qsTr("Remote Console") - subpage: Component { PageSettingsRemoteConsole {} } - } - - MbSubMenu { - id: systemSetupItem - description: qsTr("System setup") - subpage: Component { - PageSettingsSystem { - title: systemSetupItem.description - } - } - } - - MbSubMenu { - id: dvcc - description: qsTr("DVCC") - subpage: Component { - PageSettingsDVCC { - title: dvcc.description - } - } - } - - MbSubMenu { - id: displayItem - description: qsTr("Display & language") - subpage: Component { - PageSettingsDisplay { - title: displayItem.description - } - } - } - - MbSubMenu { - id: vrmLoggerItem - description: qsTr("VRM online portal") - subpage: Component { - PageSettingsLogger { - title: vrmLoggerItem.description - } - } - } - - MbSubMenu { - VBusItem { - id: systemType - bind: "com.victronenergy.system/SystemType" - } - description: systemType.value === "Hub-4" ? systemType.value : qsTr("ESS") - subpage: Component { PageSettingsHub4 {} } - } - - MbSubMenu { - description: qsTr("Energy meters") - subpage: Component { PageSettingsCGwacsOverview {} } - } - - MbSubMenu { - description: qsTr("PV inverters") - subpage: Component { PageSettingsFronius {} } - } - - MbSubMenu { - show: App.withQwacs - description: qsTr("Wireless AC sensors") - subpage: Component { PageSettingsQwacs {} } - } - - MbSubMenu { - description: qsTr("Modbus TCP devices") - subpage: Component { PageSettingsModbus {} } - } - - MbSubMenu { - id: ethernetItem - description: qsTr("Ethernet") - subpage: Component { PageSettingsTcpIp { showLinkLocal: true } } - } - - MbSubMenu { - description: qsTr("Wi-Fi") - subpage: vePlatform.hasHostAccessPoint ? wifiWithAP : wifiWithoutAP - Component { id: wifiWithoutAP; PageSettingsWifi {} } - Component { id: wifiWithAP; PageSettingsWifiWithAccessPoint {} } - } - - MbSubMenu { - description: qsTr("GSM modem") - subpage: Component { PageSettingsGsm {} } - } - - MbSubMenu { - description: qsTr("Bluetooth") - subpage: Component { PageSettingsBluetooth {} } - show: Connman.technologyList.indexOf("bluetooth") !== -1 - } - - MbSubMenu { - description: qsTr("GPS") - subpage: Component { PageSettingsGpsList {} } - } - - MbSubMenu { - description: qsTr("Generator start/stop") - subpage: Component { PageRelayGenerator {} } - show: hasRelay0 - } - - MbSubMenu { - description: qsTr("Tank pump") - subpage: Component { PageSettingsTankPump {} } - } - - MbSubMenu { - description: qsTr("Relay") - subpage: Component { PageSettingsRelay {} } - show: hasRelay0 - } - - MbSubMenu { - description: qsTr("Services") - subpage: Component { PageSettingsServices {} } - } - - MbSubMenu { - // TODO: Find a better way to check if - // analog inputs are available on the device - property VBusItem analogIoSettings: VBusItem { - bind: Utils.path(bindPrefix, - "/Settings/AnalogInput/Resistive/1/Function2") - } - property VBusItem digitalIoSettings: VBusItem { - bind: Utils.path(bindPrefix, - "/Settings/DigitalInput/1/Type") - } - description: qsTr("I/O") - subpage: Component { PageSettingsIo {} } - show: analogIoSettings.valid || digitalIoSettings.valid - } - - MbSubMenu { - description: qsTr("Debug") - subpage: Component { PageDebug {} } - show: user.accessLevel >= User.AccessService - } - } -} diff --git a/FileSets/v2.66/PageSettingsPackageManager.qml.orig b/FileSets/v2.66/PageSettingsPackageManager.qml.orig deleted file mode 100644 index fbea1e9..0000000 --- a/FileSets/v2.66/PageSettingsPackageManager.qml.orig +++ /dev/null @@ -1,242 +0,0 @@ -import QtQuick 1.1 -import com.victron.velib 1.0 -import "utils.js" as Utils - -MbPage -{ - id: root - property string bindSettingsPrefix: "com.victronenergy.settings" - property string bindVrmloggerPrefix: "com.victronenergy.logger" - property VBusItem errorText: VBusItem { bind: Utils.path(bindVrmloggerPrefix, "/Vrm/ConnectionErrorMessage") } - - model: VisualItemModel { - - MbItemOptions { - id: loggerMode - description: qsTr("Logging enabled") - bind: Utils.path(bindSettingsPrefix, "/Settings/Vrmlogger/Logmode") - possibleValues: [ - MbOption { description: qsTr("Disabled"); value: 0 }, - MbOption { description: qsTr("Enabled"); value: 1 } - ] - } - - MbItemValue { - description: qsTr("VRM Portal ID") - item.value: vePlatform.uniqueId - } - - MbItemOptions { - description: qsTr("Log interval") - bind: Utils.path(bindSettingsPrefix, "/Settings/Vrmlogger/LogInterval") - possibleValues: [ - MbOption { description: qsTr("1 min"); value: 60 }, - MbOption { description: qsTr("5 min"); value: 300 }, - MbOption { description: qsTr("10 min"); value: 600 }, - MbOption { description: qsTr("15 min"); value: 900 }, - MbOption { description: qsTr("30 min"); value: 1800 }, - MbOption { description: qsTr("1 hour"); value: 3600 }, - MbOption { description: qsTr("2 hours"); value: 7200 }, - MbOption { description: qsTr("4 hours"); value: 14400 }, - MbOption { description: qsTr("12 hours"); value: 43200 }, - MbOption { description: qsTr("1 day"); value: 86400 } - ] - show: loggerMode.valid && loggerMode.value > 0 - } - - MbSwitch { - name: qsTr("Use secure connection (HTTPS)") - bind: Utils.path(bindSettingsPrefix, "/Settings/Vrmlogger/HttpsEnabled") - } - - MbItemValue { - id: lastcontact - description: qsTr("Last contact") - item.bind: Utils.path(bindVrmloggerPrefix, "/Vrm/TimeLastContact") - show: loggerMode.value === 1 - } - - MbItemOptions { - id: networkError - description: qsTr("Connection error") - bind: Utils.path(bindVrmloggerPrefix, "/Vrm/ConnectionError") - readonly: true - possibleValues: [ - MbOption { description: qsTr("No error"); value: 0 }, - MbOption { description: "#150 " + qsTr("Unexpected response text"); value: 150 }, - MbOption { description: "#151 " + qsTr("Unexpected HTTP response"); value: 151 }, - MbOption { description: "#152 " + qsTr("Connection timeout"); value: 152 }, - MbOption { description: "#153 " + qsTr("Connection error"); value: 153 }, - MbOption { description: "#154 " + qsTr("DNS failure"); value: 154 }, - MbOption { description: "#155 " + qsTr("Routing error"); value: 155 }, - MbOption { description: "#159 " + qsTr("Unknown error"); value: 159 } - ] - } - - MbItemText { - wrapMode: Text.Wrap - horizontalAlignment: Text.AlignLeft - text: qsTr("Error message") + ': ' + errorText.value - show: errorText.valid && errorText.value.length - } - - MbSwitch { - name: qsTr("VRM two-way communication") - bind: "com.victronenergy.settings/Settings/Services/MqttVrm" - } - - MbSwitch { - name: qsTr("Reboot device when no contact") - bind: "com.victronenergy.settings/Settings/Watchdog/VrmTimeout" - valueFalse: 0 - valueTrue: 3600 - onEditDone: if (newValue > 0) listview.positionViewAtIndex(currentIndex + 2, ListView.Contain) - } - - MbEditBoxTime { - description: qsTr("No contact reset delay (hh:mm)") - item { - bind: "com.victronenergy.settings/Settings/Watchdog/VrmTimeout" - min: 60 - } - show: item.valid && item.value > 0 - } - - MbItemValue { - id: bufferLocation - - property int internal: 0 - property int beingTransfered: 1 - property int external: 2 - - description: qsTr("Storage location") - item.text: locationToText(vBufferLocation.value) - - function locationToText(s) - { - switch (s) { - case internal: - return qsTr("Internal storage"); - case beingTransfered: - return qsTr("Transferring"); - case external: - return qsTr("External storage"); - default: - return qsTr("No buffer active"); - } - } - - VBusItem { - id: vBufferLocation - bind: Utils.path(bindVrmloggerPrefix, "/Buffer/Location") - } - } - - MbItemValue { - id: bufferErrorState - - property int noError: 0 - property int outOfSpaceError: 1 - property int ioError: 2 - property int mountError: 3 - property int firmwareImageError: 4 - property int notWritableError: 5 - - description: qsTr("Error") - item.text: errorToText(vBufferErrorState.value) - show: vBufferErrorState.value != 0 - - - function errorToText(error) - { - switch (error) - { - case noError: - return qsTr("No Error"); - case outOfSpaceError: - return qsTr("No space left on storage"); - case ioError: - return qsTr("IO error"); - case mountError: - return qsTr("Mount error"); - case firmwareImageError: - return qsTr("Contains firmware image. Not using."); - case notWritableError: - return qsTr("SD card / USB stick not writable"); - default: - return qsTr("Unknown error"); - } - } - - VBusItem { - id: vBufferErrorState - bind: Utils.path(bindVrmloggerPrefix, "/Buffer/ErrorState") - } - } - - MbItemValue { - description: qsTr("Free disk space") - item { - bind: Utils.path(bindVrmloggerPrefix, "/Buffer/FreeDiskSpace") - text: Utils.qtyToString(item.value, qsTr("byte"), qsTr("bytes")) - } - } - - MbOK { - property int notMounted: 0 - property int mounted: 1 - property int unmountRequested: 2 - property int unmountBusy: 3 - - function mountStateToText(s) - { - switch (s) { - case mounted: - return qsTr("Press to eject"); - case unmountRequested: - case unmountBusy: - return qsTr("Ejecting, please wait"); - default: - return qsTr("No storage found"); - } - } - - VBusItem { - id: vMountState - bind: Utils.path(bindVrmloggerPrefix, "/Storage/MountState") - } - description: qsTr("microSD / USB") - value: mountStateToText(vMountState.value) - writeAccessLevel: User.AccessUser - onClicked: vMountState.setValue(unmountRequested); - editable: vMountState.value === mounted - cornerMark: false - } - - MbItemValue { - description: qsTr("Stored records") - item { - bind: Utils.path(bindVrmloggerPrefix, "/Buffer/Count") - text: Utils.qtyToString(item.value, qsTr("item"), qsTr("records")) - } - } - - MbItemValue { - id: oldestBacklogItemAge - description: qsTr("Oldest record age") - item.bind: Utils.path(bindVrmloggerPrefix, "/Buffer/OldestTimestamp") - } - } - - // update every second to turn timestamp into time ago - Timer { - interval: 1000 - running: true - repeat: true - triggeredOnStart: true - onTriggered: { - lastcontact.item.text = Utils.timeAgo(lastcontact.item.value) - oldestBacklogItemAge.item.text = Utils.timeAgo(oldestBacklogItemAge.item.value) - } - } -} diff --git a/FileSets/v2.73/PageSettings.qml b/FileSets/v2.73/PageSettings.qml deleted file mode 100644 index 22a3ad8..0000000 --- a/FileSets/v2.73/PageSettings.qml +++ /dev/null @@ -1,188 +0,0 @@ -//////// modified for package version and control -import QtQuick 1.1 -import com.victron.velib 1.0 -import net.connman 0.1 -import "utils.js" as Utils - -MbPage { - title: qsTr("Settings") - property string bindPrefix: "com.victronenergy.settings" - property VBusItem relay0Item: VBusItem {bind: "com.victronenergy.system/Relay/0/State"} - property bool hasRelay0: relay0Item.valid - - model: VisualItemModel { - MbSubMenu { - id: generalItem - description: qsTr("General") - subpage: Component { - PageSettingsGeneral { - title: generalItem.description - } - } - } - - MbSubMenu { - description: qsTr("Firmware") - subpage: Component { - PageSettingsFirmware { - title: qsTr("Firmware") - } - } - } - - MbSubMenu { - description: qsTr("Date & Time") - subpage: Component { - PageTzInfo { - title: qsTr("Date & Time") - } - } - } - - MbSubMenu { - description: qsTr("Remote Console") - subpage: Component { PageSettingsRemoteConsole {} } - } - - MbSubMenu { - id: systemSetupItem - description: qsTr("System setup") - subpage: Component { - PageSettingsSystem { - title: systemSetupItem.description - } - } - } - - MbSubMenu { - id: dvcc - description: qsTr("DVCC") - subpage: Component { - PageSettingsDVCC { - title: dvcc.description - } - } - } - - MbSubMenu { - id: displayItem - description: qsTr("Display & language") - subpage: Component { - PageSettingsDisplay { - title: displayItem.description - } - } - } - - MbSubMenu { - id: vrmLoggerItem - description: qsTr("VRM online portal") - subpage: Component { - PageSettingsLogger { - title: vrmLoggerItem.description - } - } - } - - MbSubMenu { - VBusItem { - id: systemType - bind: "com.victronenergy.system/SystemType" - } - description: systemType.value === "Hub-4" ? systemType.value : qsTr("ESS") - subpage: Component { PageSettingsHub4 {} } - } - - MbSubMenu { - description: qsTr("Energy meters") - subpage: Component { PageSettingsCGwacsOverview {} } - } - - MbSubMenu { - description: qsTr("PV inverters") - subpage: Component { PageSettingsFronius {} } - } - - MbSubMenu { - show: App.withQwacs - description: qsTr("Wireless AC sensors") - subpage: Component { PageSettingsQwacs {} } - } - - MbSubMenu { - description: qsTr("Modbus TCP devices") - subpage: Component { PageSettingsModbus {} } - } - - MbSubMenu { - id: ethernetItem - description: qsTr("Ethernet") - subpage: Component { PageSettingsTcpIp { showLinkLocal: true } } - } - - MbSubMenu { - description: qsTr("Wi-Fi") - subpage: vePlatform.hasHostAccessPoint ? wifiWithAP : wifiWithoutAP - Component { id: wifiWithoutAP; PageSettingsWifi {} } - Component { id: wifiWithAP; PageSettingsWifiWithAccessPoint {} } - } - - MbSubMenu { - description: qsTr("GSM modem") - subpage: Component { PageSettingsGsm {} } - } - - MbSubMenu { - description: qsTr("Bluetooth") - subpage: Component { PageSettingsBluetooth {} } - show: Connman.technologyList.indexOf("bluetooth") !== -1 - } - - MbSubMenu { - description: qsTr("GPS") - subpage: Component { PageSettingsGpsList {} } - } - - MbSubMenu { - description: qsTr("Generator start/stop") - subpage: Component { PageRelayGenerator {} } - show: hasRelay0 - } - - MbSubMenu { - description: qsTr("Tank pump") - subpage: Component { PageSettingsTankPump {} } - } - - MbSubMenu { - description: qsTr("Relay") - subpage: Component { PageSettingsRelay {} } - show: hasRelay0 - } - - MbSubMenu { - description: qsTr("Services") - subpage: Component { PageSettingsServices {} } - } - - MbSubMenu { - description: qsTr("I/O") - subpage: ioSettings - show: ioSettings.numAnalogDevices || ioSettings.numDigitalDevices - PageSettingsIo { id: ioSettings } - } - -//////// added for package control and version display - MbSubMenu - { - description: qsTr("Package manager") - subpage: Component { PageSettingsPackageManager {} } - } - - MbSubMenu { - description: qsTr("Debug") - subpage: Component { PageDebug {} } - showAccessLevel: User.AccessService - } - } -} diff --git a/FileSets/v2.73/PageSettings.qml.orig b/FileSets/v2.73/PageSettings.qml.orig deleted file mode 100644 index e2d1fcf..0000000 --- a/FileSets/v2.73/PageSettings.qml.orig +++ /dev/null @@ -1,180 +0,0 @@ -import QtQuick 1.1 -import com.victron.velib 1.0 -import net.connman 0.1 -import "utils.js" as Utils - -MbPage { - title: qsTr("Settings") - property string bindPrefix: "com.victronenergy.settings" - property VBusItem relay0Item: VBusItem {bind: "com.victronenergy.system/Relay/0/State"} - property bool hasRelay0: relay0Item.valid - - model: VisualItemModel { - MbSubMenu { - id: generalItem - description: qsTr("General") - subpage: Component { - PageSettingsGeneral { - title: generalItem.description - } - } - } - - MbSubMenu { - description: qsTr("Firmware") - subpage: Component { - PageSettingsFirmware { - title: qsTr("Firmware") - } - } - } - - MbSubMenu { - description: qsTr("Date & Time") - subpage: Component { - PageTzInfo { - title: qsTr("Date & Time") - } - } - } - - MbSubMenu { - description: qsTr("Remote Console") - subpage: Component { PageSettingsRemoteConsole {} } - } - - MbSubMenu { - id: systemSetupItem - description: qsTr("System setup") - subpage: Component { - PageSettingsSystem { - title: systemSetupItem.description - } - } - } - - MbSubMenu { - id: dvcc - description: qsTr("DVCC") - subpage: Component { - PageSettingsDVCC { - title: dvcc.description - } - } - } - - MbSubMenu { - id: displayItem - description: qsTr("Display & language") - subpage: Component { - PageSettingsDisplay { - title: displayItem.description - } - } - } - - MbSubMenu { - id: vrmLoggerItem - description: qsTr("VRM online portal") - subpage: Component { - PageSettingsLogger { - title: vrmLoggerItem.description - } - } - } - - MbSubMenu { - VBusItem { - id: systemType - bind: "com.victronenergy.system/SystemType" - } - description: systemType.value === "Hub-4" ? systemType.value : qsTr("ESS") - subpage: Component { PageSettingsHub4 {} } - } - - MbSubMenu { - description: qsTr("Energy meters") - subpage: Component { PageSettingsCGwacsOverview {} } - } - - MbSubMenu { - description: qsTr("PV inverters") - subpage: Component { PageSettingsFronius {} } - } - - MbSubMenu { - show: App.withQwacs - description: qsTr("Wireless AC sensors") - subpage: Component { PageSettingsQwacs {} } - } - - MbSubMenu { - description: qsTr("Modbus TCP devices") - subpage: Component { PageSettingsModbus {} } - } - - MbSubMenu { - id: ethernetItem - description: qsTr("Ethernet") - subpage: Component { PageSettingsTcpIp { showLinkLocal: true } } - } - - MbSubMenu { - description: qsTr("Wi-Fi") - subpage: vePlatform.hasHostAccessPoint ? wifiWithAP : wifiWithoutAP - Component { id: wifiWithoutAP; PageSettingsWifi {} } - Component { id: wifiWithAP; PageSettingsWifiWithAccessPoint {} } - } - - MbSubMenu { - description: qsTr("GSM modem") - subpage: Component { PageSettingsGsm {} } - } - - MbSubMenu { - description: qsTr("Bluetooth") - subpage: Component { PageSettingsBluetooth {} } - show: Connman.technologyList.indexOf("bluetooth") !== -1 - } - - MbSubMenu { - description: qsTr("GPS") - subpage: Component { PageSettingsGpsList {} } - } - - MbSubMenu { - description: qsTr("Generator start/stop") - subpage: Component { PageRelayGenerator {} } - show: hasRelay0 - } - - MbSubMenu { - description: qsTr("Tank pump") - subpage: Component { PageSettingsTankPump {} } - } - - MbSubMenu { - description: qsTr("Relay") - subpage: Component { PageSettingsRelay {} } - show: hasRelay0 - } - - MbSubMenu { - description: qsTr("Services") - subpage: Component { PageSettingsServices {} } - } - - MbSubMenu { - description: qsTr("I/O") - subpage: ioSettings - show: ioSettings.numAnalogDevices || ioSettings.numDigitalDevices - PageSettingsIo { id: ioSettings } - } - - MbSubMenu { - description: qsTr("Debug") - subpage: Component { PageDebug {} } - showAccessLevel: User.AccessService - } - } -} diff --git a/FileSets/v2.73/PageSettingsPackageManager.qml b/FileSets/v2.73/PageSettingsPackageManager.qml deleted file mode 100644 index 7aeb707..0000000 --- a/FileSets/v2.73/PageSettingsPackageManager.qml +++ /dev/null @@ -1,158 +0,0 @@ -/////// new menu for package version display - -import QtQuick 1.1 -import "utils.js" as Utils -import com.victron.velib 1.0 - -MbPage { - id: root - title: qsTr("Package manager") - property string settingsPrefix: "com.victronenergy.settings/Settings/PackageManager" - property string servicePrefix: "com.victronenergy.packageManager" - VBusItem { id: downloadStatus; bind: Utils.path(servicePrefix, "/GitHubUpdateStatus") } - VBusItem { id: installStatus; bind: Utils.path(servicePrefix, "/InstallStatus") } - VBusItem { id: mediaStatus; bind: Utils.path(servicePrefix, "/MediaUpdateStatus") } - VBusItem { id: actionNeeded; bind: Utils.path(servicePrefix, "/ActionNeeded") } - VBusItem { id: editAction; bind: Utils.path(servicePrefix, "/GuiEditAction") } - property bool showInstallStatus: installStatus.valid && installStatus.value != "" - property bool showMediaStatus: mediaStatus.valid && mediaStatus.value != "" - property bool showControls: installStatus.valid - - model: VisualItemModel - { - MbItemText - { - id: status - text: - { - if (! showControls) - return"Package manager not running" - else if (installStatus.valid && installStatus.value != "") - return installStatus.value - else if (mediaStatus.valid && mediaStatus.value != "") - return mediaStatus.value - else if (downloadStatus.valid && downloadStatus.value != "") - return downloadStatus.value - else - return "idle" - } - wrapMode: Text.WordWrap - horizontalAlignment: Text.AlignHCenter - } - MbItemOptions - { - id: autoDownload - description: qsTr ("Automatic GitHub downloads") - bind: Utils.path (settingsPrefix, "/GitHubAutoDownload") - possibleValues: - [ - MbOption { description: "On"; value: 1 }, - MbOption { description: "Once"; value: 2 }, - MbOption { description: "Off"; value: 0 } - ] - writeAccessLevel: User.AccessInstaller - } - MbSwitch - { - id: autoInstall - bind: Utils.path (settingsPrefix, "/AutoInstall") - name: qsTr ("Auto install packages") - writeAccessLevel: User.AccessInstaller - } - MbSubMenu - { - description: qsTr("Active packages") - subpage: Component { PageSettingsPackageVersions {} } - show: showControls - } - MbSubMenu - { - description: qsTr("Inactive packages") - subpage: Component { PageSettingsAddPackageList {} } - show: showControls - } - MbOK - { - id: finishButton - description: - { - if (editAction.value == 'reboot') - return qsTr ("REBOOTING ...") - else if (editAction.value == 'guiRestart') - return qsTr ("restarting GUI ...") - else - return qsTr ("action to finish install/uninstall") - } - value: - { - if (! actionNeeded.valid) - return "" - else if (actionNeeded.value == 'reboot') - return qsTr ("Reboot") - else if (actionNeeded.value == 'guiRestart') - return qsTr ("Restart GUI") - else - return "" - } - onClicked: - { - if (actionNeeded.value == 'reboot') - { - // needs immediate update because GUI will be going down ASAP - finishButton.description = qsTr ("REBOOTING ...") - editAction.setValue ( 'reboot' ) - } - else if (actionNeeded.value == 'guiRestart') - { - // needs immediate update because GUI will be going down ASAP - finishButton.description = qsTr ("restarting GUI ...") - editAction.setValue ( 'restartGui' ) - } - } - show: actionNeeded.valid && actionNeeded.value != '' - writeAccessLevel: User.AccessInstaller - } - MbSubMenu - { - description: qsTr("Backup & restore settings") - subpage: Component { PageSettingsPmBackup {} } - show: showControls - } - MbOK { - property int notMounted: 0 - property int mounted: 1 - property int unmountRequested: 2 - property int unmountBusy: 3 - - function mountStateToText(s) - { - switch (s) { - case mounted: - return qsTr("Press to eject"); - case unmountRequested: - case unmountBusy: - return qsTr("Ejecting, please wait"); - default: - return qsTr("No storage found"); - } - } - - VBusItem { - id: vMountState - bind: Utils.path(bindVrmloggerPrefix, "/Storage/MountState") - } - description: qsTr("microSD / USB") - value: mountStateToText(vMountState.value) - writeAccessLevel: User.AccessUser - onClicked: vMountState.setValue(unmountRequested); - editable: vMountState.value === mounted - cornerMark: false - } - MbSubMenu - { - description: qsTr("Initialize PackageManager ...") - subpage: Component { PageSettingsPmInitialize {} } - show: showControls - } - } -} diff --git a/FileSets/v2.73/PageSettingsPackageManager.qml.orig b/FileSets/v2.73/PageSettingsPackageManager.qml.orig deleted file mode 100644 index f915734..0000000 --- a/FileSets/v2.73/PageSettingsPackageManager.qml.orig +++ /dev/null @@ -1,243 +0,0 @@ -import QtQuick 1.1 -import com.victron.velib 1.0 -import "utils.js" as Utils - -MbPage -{ - id: root - property string bindSettingsPrefix: "com.victronenergy.settings" - property string bindVrmloggerPrefix: "com.victronenergy.logger" - property VBusItem errorText: VBusItem { bind: Utils.path(bindVrmloggerPrefix, "/Vrm/ConnectionErrorMessage") } - - model: VisualItemModel { - - MbItemOptions { - id: loggerMode - description: qsTr("Logging enabled") - bind: Utils.path(bindSettingsPrefix, "/Settings/Vrmlogger/Logmode") - possibleValues: [ - MbOption { description: qsTr("Disabled"); value: 0 }, - MbOption { description: qsTr("Enabled"); value: 1 } - ] - } - - MbItemValue { - description: qsTr("VRM Portal ID") - item.value: vePlatform.uniqueId - } - - MbItemOptions { - description: qsTr("Log interval") - bind: Utils.path(bindSettingsPrefix, "/Settings/Vrmlogger/LogInterval") - possibleValues: [ - MbOption { description: qsTr("1 min"); value: 60 }, - MbOption { description: qsTr("5 min"); value: 300 }, - MbOption { description: qsTr("10 min"); value: 600 }, - MbOption { description: qsTr("15 min"); value: 900 }, - MbOption { description: qsTr("30 min"); value: 1800 }, - MbOption { description: qsTr("1 hour"); value: 3600 }, - MbOption { description: qsTr("2 hours"); value: 7200 }, - MbOption { description: qsTr("4 hours"); value: 14400 }, - MbOption { description: qsTr("12 hours"); value: 43200 }, - MbOption { description: qsTr("1 day"); value: 86400 } - ] - show: loggerMode.valid && loggerMode.value > 0 - } - - MbSwitch { - name: qsTr("Use secure connection (HTTPS)") - bind: Utils.path(bindSettingsPrefix, "/Settings/Vrmlogger/HttpsEnabled") - } - - MbItemValue { - id: lastcontact - description: qsTr("Last contact") - item.bind: Utils.path(bindVrmloggerPrefix, "/Vrm/TimeLastContact") - show: loggerMode.value === 1 - } - - MbItemOptions { - id: networkError - description: qsTr("Connection error") - bind: Utils.path(bindVrmloggerPrefix, "/Vrm/ConnectionError") - readonly: true - possibleValues: [ - MbOption { description: qsTr("No error"); value: 0 }, - MbOption { description: "#150 " + qsTr("Unexpected response text"); value: 150 }, - MbOption { description: "#151 " + qsTr("Unexpected HTTP response"); value: 151 }, - MbOption { description: "#152 " + qsTr("Connection timeout"); value: 152 }, - MbOption { description: "#153 " + qsTr("Connection error"); value: 153 }, - MbOption { description: "#154 " + qsTr("DNS failure"); value: 154 }, - MbOption { description: "#155 " + qsTr("Routing error"); value: 155 }, - MbOption { description: "#156 " + qsTr("VRM unavailable"); value: 156 }, - MbOption { description: "#159 " + qsTr("Unknown error"); value: 159 } - ] - } - - MbItemText { - wrapMode: Text.Wrap - horizontalAlignment: Text.AlignLeft - text: qsTr("Error message") + ': ' + errorText.value - show: errorText.valid && errorText.value.length - } - - MbSwitch { - name: qsTr("VRM two-way communication") - bind: "com.victronenergy.settings/Settings/Services/MqttVrm" - } - - MbSwitch { - name: qsTr("Reboot device when no contact") - bind: "com.victronenergy.settings/Settings/Watchdog/VrmTimeout" - valueFalse: 0 - valueTrue: 3600 - onEditDone: if (newValue > 0) listview.positionViewAtIndex(currentIndex + 2, ListView.Contain) - } - - MbEditBoxTime { - description: qsTr("No contact reset delay (hh:mm)") - item { - bind: "com.victronenergy.settings/Settings/Watchdog/VrmTimeout" - min: 60 - } - show: item.valid && item.value > 0 - } - - MbItemValue { - id: bufferLocation - - property int internal: 0 - property int beingTransfered: 1 - property int external: 2 - - description: qsTr("Storage location") - item.text: locationToText(vBufferLocation.value) - - function locationToText(s) - { - switch (s) { - case internal: - return qsTr("Internal storage"); - case beingTransfered: - return qsTr("Transferring"); - case external: - return qsTr("External storage"); - default: - return qsTr("No buffer active"); - } - } - - VBusItem { - id: vBufferLocation - bind: Utils.path(bindVrmloggerPrefix, "/Buffer/Location") - } - } - - MbItemValue { - id: bufferErrorState - - property int noError: 0 - property int outOfSpaceError: 1 - property int ioError: 2 - property int mountError: 3 - property int firmwareImageError: 4 - property int notWritableError: 5 - - description: qsTr("Error") - item.text: errorToText(vBufferErrorState.value) - show: vBufferErrorState.value != 0 - - - function errorToText(error) - { - switch (error) - { - case noError: - return qsTr("No Error"); - case outOfSpaceError: - return qsTr("No space left on storage"); - case ioError: - return qsTr("IO error"); - case mountError: - return qsTr("Mount error"); - case firmwareImageError: - return qsTr("Contains firmware image. Not using."); - case notWritableError: - return qsTr("SD card / USB stick not writable"); - default: - return qsTr("Unknown error"); - } - } - - VBusItem { - id: vBufferErrorState - bind: Utils.path(bindVrmloggerPrefix, "/Buffer/ErrorState") - } - } - - MbItemValue { - description: qsTr("Free disk space") - item { - bind: Utils.path(bindVrmloggerPrefix, "/Buffer/FreeDiskSpace") - text: Utils.qtyToString(item.value, qsTr("byte"), qsTr("bytes")) - } - } - - MbOK { - property int notMounted: 0 - property int mounted: 1 - property int unmountRequested: 2 - property int unmountBusy: 3 - - function mountStateToText(s) - { - switch (s) { - case mounted: - return qsTr("Press to eject"); - case unmountRequested: - case unmountBusy: - return qsTr("Ejecting, please wait"); - default: - return qsTr("No storage found"); - } - } - - VBusItem { - id: vMountState - bind: Utils.path(bindVrmloggerPrefix, "/Storage/MountState") - } - description: qsTr("microSD / USB") - value: mountStateToText(vMountState.value) - writeAccessLevel: User.AccessUser - onClicked: vMountState.setValue(unmountRequested); - editable: vMountState.value === mounted - cornerMark: false - } - - MbItemValue { - description: qsTr("Stored records") - item { - bind: Utils.path(bindVrmloggerPrefix, "/Buffer/Count") - text: Utils.qtyToString(item.value, qsTr("item"), qsTr("records")) - } - } - - MbItemValue { - id: oldestBacklogItemAge - description: qsTr("Oldest record age") - item.bind: Utils.path(bindVrmloggerPrefix, "/Buffer/OldestTimestamp") - } - } - - // update every second to turn timestamp into time ago - Timer { - interval: 1000 - running: true - repeat: true - triggeredOnStart: true - onTriggered: { - lastcontact.item.text = Utils.timeAgo(lastcontact.item.value) - oldestBacklogItemAge.item.text = Utils.timeAgo(oldestBacklogItemAge.item.value) - } - } -} diff --git a/FileSets/v2.80-large-26/PageSettings.qml b/FileSets/v2.80-large-26/PageSettings.qml deleted file mode 100644 index 711686f..0000000 --- a/FileSets/v2.80-large-26/PageSettings.qml +++ /dev/null @@ -1,199 +0,0 @@ -//////// modified for package version and control -import QtQuick 1.1 -import com.victron.velib 1.0 -import net.connman 0.1 -import "utils.js" as Utils - -MbPage { - title: qsTr("Settings") - property string bindPrefix: "com.victronenergy.settings" - property VBusItem relay0Item: VBusItem {bind: "com.victronenergy.system/Relay/0/State"} - property bool hasRelay0: relay0Item.valid - - model: VisualItemModel { - MbSubMenu { - id: generalItem - description: qsTr("General") - subpage: Component { - PageSettingsGeneral { - title: generalItem.description - } - } - } - - MbSubMenu { - description: qsTr("Firmware") - subpage: Component { - PageSettingsFirmware { - title: qsTr("Firmware") - } - } - } - - MbSubMenu { - description: qsTr("Date & Time") - subpage: Component { - PageTzInfo { - title: qsTr("Date & Time") - } - } - } - - MbSubMenu { - description: qsTr("Remote Console") - subpage: Component { PageSettingsRemoteConsole {} } - } - - MbSubMenu { - id: systemSetupItem - description: qsTr("System setup") - subpage: Component { - PageSettingsSystem { - title: systemSetupItem.description - } - } - } - - MbSubMenu { - id: dvcc - description: qsTr("DVCC") - subpage: Component { - PageSettingsDVCC { - title: dvcc.description - } - } - } - - MbSubMenu { - id: displayItem - description: qsTr("Display & language") - subpage: Component { - PageSettingsDisplay { - title: displayItem.description - } - } - } - - MbSubMenu { - id: vrmLoggerItem - description: qsTr("VRM online portal") - subpage: Component { - PageSettingsLogger { - title: vrmLoggerItem.description - } - } - } - - MbSubMenu { - VBusItem { - id: systemType - bind: "com.victronenergy.system/SystemType" - } - description: systemType.value === "Hub-4" ? systemType.value : qsTr("ESS") - subpage: Component { PageSettingsHub4 {} } - } - - MbSubMenu { - description: qsTr("Energy meters") - subpage: Component { PageSettingsCGwacsOverview {} } - } - - MbSubMenu { - description: qsTr("PV inverters") - subpage: Component { PageSettingsFronius {} } - } - - MbSubMenu { - show: App.withQwacs - description: qsTr("Wireless AC sensors") - subpage: Component { PageSettingsQwacs {} } - } - - MbSubMenu { - description: qsTr("Modbus TCP devices") - subpage: Component { PageSettingsModbus {} } - } - - MbSubMenu { - id: ethernetItem - description: qsTr("Ethernet") - subpage: Component { PageSettingsTcpIp { showLinkLocal: true } } - } - - MbSubMenu { - description: qsTr("Wi-Fi") - subpage: vePlatform.hasHostAccessPoint ? wifiWithAP : wifiWithoutAP - Component { id: wifiWithoutAP; PageSettingsWifi {} } - Component { id: wifiWithAP; PageSettingsWifiWithAccessPoint {} } - } - - MbSubMenu { - description: qsTr("GSM modem") - subpage: Component { PageSettingsGsm {} } - } - - MbSubMenu { - description: qsTr("Bluetooth") - subpage: Component { PageSettingsBluetooth {} } - show: Connman.technologyList.indexOf("bluetooth") !== -1 - } - - MbSubMenu { - description: qsTr("GPS") - subpage: Component { PageSettingsGpsList {} } - } - - MbSubMenu { - description: qsTr("Generator start/stop") - subpage: Component { PageRelayGenerator {} } - show: hasRelay0 - } - - MbSubMenu { - description: qsTr("Tank pump") - subpage: Component { PageSettingsTankPump {} } - } - - MbSubMenu { - description: qsTr("Relay") - subpage: Component { PageSettingsRelay {} } - show: hasRelay0 - } - - MbSubMenu { - description: qsTr("Services") - subpage: Component { PageSettingsServices {} } - } - - MbSubMenu { - description: qsTr("I/O") - subpage: ioSettings - show: ioSettings.haveSubMenus - PageSettingsIo { id: ioSettings } - } - /* - MbSubMenu { - description: qsTr("Backup & Restore") - subpage: Component { PageSettingsBackup {} } - } - */ - MbSubMenu { - description: qsTr("Venus OS Large features") - subpage: Component { PageSettingsLarge {} } - show: vePlatform.serviceExists("signalk-server") - } - -//////// added for package control and version display - MbSubMenu - { - description: qsTr("Package manager") - subpage: Component { PageSettingsPackageManager {} } - } - - MbSubMenu { - description: qsTr("Debug") - subpage: Component { PageDebug {} } - showAccessLevel: User.AccessService - } - } -} diff --git a/FileSets/v2.80-large-26/PageSettings.qml.orig b/FileSets/v2.80-large-26/PageSettings.qml.orig deleted file mode 100644 index 2093e2f..0000000 --- a/FileSets/v2.80-large-26/PageSettings.qml.orig +++ /dev/null @@ -1,193 +0,0 @@ -import QtQuick 1.1 -import com.victron.velib 1.0 -import net.connman 0.1 -import "utils.js" as Utils - -MbPage { - title: qsTr("Settings") - property string bindPrefix: "com.victronenergy.settings" - property VBusItem relay0Item: VBusItem {bind: "com.victronenergy.system/Relay/0/State"} - property bool hasRelay0: relay0Item.valid - - model: VisualItemModel { - MbSubMenu { - id: generalItem - description: qsTr("General") - subpage: Component { - PageSettingsGeneral { - title: generalItem.description - } - } - } - - MbSubMenu { - description: qsTr("Firmware") - subpage: Component { - PageSettingsFirmware { - title: qsTr("Firmware") - } - } - } - - MbSubMenu { - description: qsTr("Date & Time") - subpage: Component { - PageTzInfo { - title: qsTr("Date & Time") - } - } - } - - MbSubMenu { - description: qsTr("Remote Console") - subpage: Component { PageSettingsRemoteConsole {} } - } - - MbSubMenu { - id: systemSetupItem - description: qsTr("System setup") - subpage: Component { - PageSettingsSystem { - title: systemSetupItem.description - } - } - } - - MbSubMenu { - id: dvcc - description: qsTr("DVCC") - subpage: Component { - PageSettingsDVCC { - title: dvcc.description - } - } - } - - MbSubMenu { - id: displayItem - description: qsTr("Display & language") - subpage: Component { - PageSettingsDisplay { - title: displayItem.description - } - } - } - - MbSubMenu { - id: vrmLoggerItem - description: qsTr("VRM online portal") - subpage: Component { - PageSettingsLogger { - title: vrmLoggerItem.description - } - } - } - - MbSubMenu { - VBusItem { - id: systemType - bind: "com.victronenergy.system/SystemType" - } - description: systemType.value === "Hub-4" ? systemType.value : qsTr("ESS") - subpage: Component { PageSettingsHub4 {} } - } - - MbSubMenu { - description: qsTr("Energy meters") - subpage: Component { PageSettingsCGwacsOverview {} } - } - - MbSubMenu { - description: qsTr("PV inverters") - subpage: Component { PageSettingsFronius {} } - } - - MbSubMenu { - show: App.withQwacs - description: qsTr("Wireless AC sensors") - subpage: Component { PageSettingsQwacs {} } - } - - MbSubMenu { - description: qsTr("Modbus TCP devices") - subpage: Component { PageSettingsModbus {} } - } - - MbSubMenu { - id: ethernetItem - description: qsTr("Ethernet") - subpage: Component { PageSettingsTcpIp { showLinkLocal: true } } - } - - MbSubMenu { - description: qsTr("Wi-Fi") - subpage: vePlatform.hasHostAccessPoint ? wifiWithAP : wifiWithoutAP - Component { id: wifiWithoutAP; PageSettingsWifi {} } - Component { id: wifiWithAP; PageSettingsWifiWithAccessPoint {} } - } - - MbSubMenu { - description: qsTr("GSM modem") - subpage: Component { PageSettingsGsm {} } - } - - MbSubMenu { - description: qsTr("Bluetooth") - subpage: Component { PageSettingsBluetooth {} } - show: Connman.technologyList.indexOf("bluetooth") !== -1 - } - - MbSubMenu { - description: qsTr("GPS") - subpage: Component { PageSettingsGpsList {} } - } - - MbSubMenu { - description: qsTr("Generator start/stop") - subpage: Component { PageRelayGenerator {} } - show: hasRelay0 - } - - MbSubMenu { - description: qsTr("Tank pump") - subpage: Component { PageSettingsTankPump {} } - } - - MbSubMenu { - description: qsTr("Relay") - subpage: Component { PageSettingsRelay {} } - show: hasRelay0 - } - - MbSubMenu { - description: qsTr("Services") - subpage: Component { PageSettingsServices {} } - } - - MbSubMenu { - description: qsTr("I/O") - subpage: ioSettings - show: ioSettings.haveSubMenus - PageSettingsIo { id: ioSettings } - } - - /* - MbSubMenu { - description: qsTr("Backup & Restore") - subpage: Component { PageSettingsBackup {} } - } - */ - - MbSubMenu { - description: qsTr("Venus OS Large features") - subpage: Component { PageSettingsLarge {} } - show: vePlatform.serviceExists("signalk-server") - } - - MbSubMenu { - description: qsTr("Debug") - subpage: Component { PageDebug {} } - showAccessLevel: User.AccessService - } - } -} diff --git a/FileSets/v2.89/PageSettings.qml b/FileSets/v2.89/PageSettings.qml deleted file mode 100644 index 1f9c8aa..0000000 --- a/FileSets/v2.89/PageSettings.qml +++ /dev/null @@ -1,195 +0,0 @@ -//////// modified for package version and control -import QtQuick 1.1 -import com.victron.velib 1.0 -import net.connman 0.1 -import "utils.js" as Utils - -MbPage { - title: qsTr("Settings") - property string bindPrefix: "com.victronenergy.settings" - property VBusItem relay0Item: VBusItem {bind: "com.victronenergy.system/Relay/0/State"} - property bool hasRelay0: relay0Item.valid - - model: VisualItemModel { - MbSubMenu { - id: generalItem - description: qsTr("General") - subpage: Component { - PageSettingsGeneral { - title: generalItem.description - } - } - } - - MbSubMenu { - description: qsTr("Firmware") - subpage: Component { - PageSettingsFirmware { - title: qsTr("Firmware") - } - } - } - - MbSubMenu { - description: qsTr("Date & Time") - subpage: Component { - PageTzInfo { - title: qsTr("Date & Time") - } - } - } - - MbSubMenu { - description: qsTr("Remote Console") - subpage: Component { PageSettingsRemoteConsole {} } - } - - MbSubMenu { - id: systemSetupItem - description: qsTr("System setup") - subpage: Component { - PageSettingsSystem { - title: systemSetupItem.description - } - } - } - - MbSubMenu { - id: dvcc - description: qsTr("DVCC") - subpage: Component { - PageSettingsDVCC { - title: dvcc.description - } - } - } - - MbSubMenu { - id: displayItem - description: qsTr("Display & language") - subpage: Component { - PageSettingsDisplay { - title: displayItem.description - } - } - } - - MbSubMenu { - id: vrmLoggerItem - description: qsTr("VRM online portal") - subpage: Component { - PageSettingsLogger { - title: vrmLoggerItem.description - } - } - } - - MbSubMenu { - VBusItem { - id: systemType - bind: "com.victronenergy.system/SystemType" - } - description: systemType.value === "Hub-4" ? systemType.value : qsTr("ESS") - subpage: Component { PageSettingsHub4 {} } - } - - MbSubMenu { - description: qsTr("Energy meters") - subpage: Component { PageSettingsCGwacsOverview {} } - } - - MbSubMenu { - description: qsTr("PV inverters") - subpage: Component { PageSettingsFronius {} } - } - - MbSubMenu { - show: App.withQwacs - description: qsTr("Wireless AC sensors") - subpage: Component { PageSettingsQwacs {} } - } - - MbSubMenu { - description: qsTr("Modbus TCP devices") - subpage: Component { PageSettingsModbus {} } - } - - MbSubMenu { - id: ethernetItem - description: qsTr("Ethernet") - subpage: Component { PageSettingsTcpIp { showLinkLocal: true } } - } - - MbSubMenu { - description: qsTr("Wi-Fi") - subpage: vePlatform.hasHostAccessPoint ? wifiWithAP : wifiWithoutAP - Component { id: wifiWithoutAP; PageSettingsWifi {} } - Component { id: wifiWithAP; PageSettingsWifiWithAccessPoint {} } - } - - MbSubMenu { - description: qsTr("GSM modem") - subpage: Component { PageSettingsGsm {} } - } - - MbSubMenu { - description: qsTr("Bluetooth") - subpage: Component { PageSettingsBluetooth {} } - show: Connman.technologyList.indexOf("bluetooth") !== -1 - } - - MbSubMenu { - description: qsTr("GPS") - subpage: Component { PageSettingsGpsList {} } - } - - MbSubMenu { - description: qsTr("Generator start/stop") - subpage: Component { PageRelayGenerator {} } - show: hasRelay0 - } - - MbSubMenu { - description: qsTr("Tank pump") - subpage: Component { PageSettingsTankPump {} } - } - - MbSubMenu { - description: qsTr("Relay") - subpage: Component { PageSettingsRelay {} } - show: hasRelay0 - } - - MbSubMenu { - description: qsTr("Services") - subpage: Component { PageSettingsServices {} } - } - - MbSubMenu { - description: qsTr("I/O") - subpage: ioSettings - show: ioSettings.haveSubMenus - PageSettingsIo { id: ioSettings } - } - - /* - MbSubMenu { - description: qsTr("Backup & Restore") - subpage: Component { PageSettingsBackup {} } - } - */ - -//////// added for package control and version display - MbSubMenu - { - description: qsTr("Package manager") - subpage: Component { PageSettingsPackageManager {} } - } - - MbSubMenu { - description: "Debug" - subpage: Component { PageDebug {} } - showAccessLevel: User.AccessService - } - } -} diff --git a/FileSets/v2.89/PageSettings.qml.orig b/FileSets/v2.89/PageSettings.qml.orig deleted file mode 100644 index 1dfe8a7..0000000 --- a/FileSets/v2.89/PageSettings.qml.orig +++ /dev/null @@ -1,187 +0,0 @@ -import QtQuick 1.1 -import com.victron.velib 1.0 -import net.connman 0.1 -import "utils.js" as Utils - -MbPage { - title: qsTr("Settings") - property string bindPrefix: "com.victronenergy.settings" - property VBusItem relay0Item: VBusItem {bind: "com.victronenergy.system/Relay/0/State"} - property bool hasRelay0: relay0Item.valid - - model: VisualItemModel { - MbSubMenu { - id: generalItem - description: qsTr("General") - subpage: Component { - PageSettingsGeneral { - title: generalItem.description - } - } - } - - MbSubMenu { - description: qsTr("Firmware") - subpage: Component { - PageSettingsFirmware { - title: qsTr("Firmware") - } - } - } - - MbSubMenu { - description: qsTr("Date & Time") - subpage: Component { - PageTzInfo { - title: qsTr("Date & Time") - } - } - } - - MbSubMenu { - description: qsTr("Remote Console") - subpage: Component { PageSettingsRemoteConsole {} } - } - - MbSubMenu { - id: systemSetupItem - description: qsTr("System setup") - subpage: Component { - PageSettingsSystem { - title: systemSetupItem.description - } - } - } - - MbSubMenu { - id: dvcc - description: qsTr("DVCC") - subpage: Component { - PageSettingsDVCC { - title: dvcc.description - } - } - } - - MbSubMenu { - id: displayItem - description: qsTr("Display & language") - subpage: Component { - PageSettingsDisplay { - title: displayItem.description - } - } - } - - MbSubMenu { - id: vrmLoggerItem - description: qsTr("VRM online portal") - subpage: Component { - PageSettingsLogger { - title: vrmLoggerItem.description - } - } - } - - MbSubMenu { - VBusItem { - id: systemType - bind: "com.victronenergy.system/SystemType" - } - description: systemType.value === "Hub-4" ? systemType.value : qsTr("ESS") - subpage: Component { PageSettingsHub4 {} } - } - - MbSubMenu { - description: qsTr("Energy meters") - subpage: Component { PageSettingsCGwacsOverview {} } - } - - MbSubMenu { - description: qsTr("PV inverters") - subpage: Component { PageSettingsFronius {} } - } - - MbSubMenu { - show: App.withQwacs - description: qsTr("Wireless AC sensors") - subpage: Component { PageSettingsQwacs {} } - } - - MbSubMenu { - description: qsTr("Modbus TCP devices") - subpage: Component { PageSettingsModbus {} } - } - - MbSubMenu { - id: ethernetItem - description: qsTr("Ethernet") - subpage: Component { PageSettingsTcpIp { showLinkLocal: true } } - } - - MbSubMenu { - description: qsTr("Wi-Fi") - subpage: vePlatform.hasHostAccessPoint ? wifiWithAP : wifiWithoutAP - Component { id: wifiWithoutAP; PageSettingsWifi {} } - Component { id: wifiWithAP; PageSettingsWifiWithAccessPoint {} } - } - - MbSubMenu { - description: qsTr("GSM modem") - subpage: Component { PageSettingsGsm {} } - } - - MbSubMenu { - description: qsTr("Bluetooth") - subpage: Component { PageSettingsBluetooth {} } - show: Connman.technologyList.indexOf("bluetooth") !== -1 - } - - MbSubMenu { - description: qsTr("GPS") - subpage: Component { PageSettingsGpsList {} } - } - - MbSubMenu { - description: qsTr("Generator start/stop") - subpage: Component { PageRelayGenerator {} } - show: hasRelay0 - } - - MbSubMenu { - description: qsTr("Tank pump") - subpage: Component { PageSettingsTankPump {} } - } - - MbSubMenu { - description: qsTr("Relay") - subpage: Component { PageSettingsRelay {} } - show: hasRelay0 - } - - MbSubMenu { - description: qsTr("Services") - subpage: Component { PageSettingsServices {} } - } - - MbSubMenu { - description: qsTr("I/O") - subpage: ioSettings - show: ioSettings.haveSubMenus - PageSettingsIo { id: ioSettings } - } - - /* - MbSubMenu { - description: qsTr("Backup & Restore") - subpage: Component { PageSettingsBackup {} } - } - */ - - MbSubMenu { - description: "Debug" - subpage: Component { PageDebug {} } - showAccessLevel: User.AccessService - } - } -} diff --git a/FileSets/v2.89/PageSettingsPackageManager.qml b/FileSets/v2.89/PageSettingsPackageManager.qml deleted file mode 100644 index 0967baa..0000000 --- a/FileSets/v2.89/PageSettingsPackageManager.qml +++ /dev/null @@ -1,131 +0,0 @@ -/////// new menu for package version display - -import QtQuick 1.1 -import "utils.js" as Utils -import com.victron.velib 1.0 - -MbPage { - id: root - title: qsTr("Package manager") - property string settingsPrefix: "com.victronenergy.settings/Settings/PackageManager" - property string servicePrefix: "com.victronenergy.packageManager" - VBusItem { id: downloadStatus; bind: Utils.path(servicePrefix, "/GitHubUpdateStatus") } - VBusItem { id: installStatus; bind: Utils.path(servicePrefix, "/InstallStatus") } - VBusItem { id: mediaStatus; bind: Utils.path(servicePrefix, "/MediaUpdateStatus") } - VBusItem { id: actionNeeded; bind: Utils.path(servicePrefix, "/ActionNeeded") } - VBusItem { id: editAction; bind: Utils.path(servicePrefix, "/GuiEditAction") } - property bool showInstallStatus: installStatus.valid && installStatus.value != "" - property bool showMediaStatus: mediaStatus.valid && mediaStatus.value != "" - property bool showControls: installStatus.valid - - model: VisualItemModel - { - MbItemText - { - id: status - text: - { - if (! showControls) - return"Package manager not running" - else if (installStatus.valid && installStatus.value != "") - return installStatus.value - else if (mediaStatus.valid && mediaStatus.value != "") - return mediaStatus.value - else if (downloadStatus.valid && downloadStatus.value != "") - return downloadStatus.value - else - return "idle" - } - wrapMode: Text.WordWrap - horizontalAlignment: Text.AlignHCenter - } - MbItemOptions - { - id: autoDownload - description: qsTr ("Automatic GitHub downloads") - bind: Utils.path (settingsPrefix, "/GitHubAutoDownload") - possibleValues: - [ - MbOption { description: "On"; value: 1 }, - MbOption { description: "Once"; value: 2 }, - MbOption { description: "Off"; value: 0 } - ] - writeAccessLevel: User.AccessInstaller - } - MbSwitch - { - id: autoInstall - bind: Utils.path (settingsPrefix, "/AutoInstall") - name: qsTr ("Auto install packages") - writeAccessLevel: User.AccessInstaller - } - MbSubMenu - { - description: qsTr("Active packages") - subpage: Component { PageSettingsPackageVersions {} } - show: showControls - } - MbSubMenu - { - description: qsTr("Inactive packages") - subpage: Component { PageSettingsAddPackageList {} } - show: showControls - } - MbOK - { - id: finishButton - description: - { - if (editAction.value == 'reboot') - return qsTr ("REBOOTING ...") - else if (editAction.value == 'guiRestart') - return qsTr ("restarting GUI ...") - else - return qsTr ("action to finish install/uninstall") - } - value: - { - if (! actionNeeded.valid) - return "" - else if (actionNeeded.value == 'reboot') - return qsTr ("Reboot") - else if (actionNeeded.value == 'guiRestart') - return qsTr ("Restart GUI") - else - return "" - } - onClicked: - { - if (actionNeeded.value == 'reboot') - { - // needs immediate update because GUI will be going down ASAP - finishButton.description = qsTr ("REBOOTING ...") - editAction.setValue ( 'reboot' ) - } - else if (actionNeeded.value == 'guiRestart') - { - // needs immediate update because GUI will be going down ASAP - finishButton.description = qsTr ("restarting GUI ...") - editAction.setValue ( 'restartGui' ) - } - } - show: actionNeeded.valid && actionNeeded.value != '' - writeAccessLevel: User.AccessInstaller - } - MbSubMenu - { - description: qsTr("Backup & restore settings") - subpage: Component { PageSettingsPmBackup {} } - show: showControls - } - MbMountState { - description: qsTr("microSD / USB") - } - MbSubMenu - { - description: qsTr("Initialize PackageManager ...") - subpage: Component { PageSettingsPmInitialize {} } - show: showControls - } - } -} diff --git a/FileSets/v2.89/PageSettingsPackageManager.qml.orig b/FileSets/v2.89/PageSettingsPackageManager.qml.orig deleted file mode 100644 index 9e08d99..0000000 --- a/FileSets/v2.89/PageSettingsPackageManager.qml.orig +++ /dev/null @@ -1,216 +0,0 @@ -import QtQuick 1.1 -import com.victron.velib 1.0 -import "utils.js" as Utils - -MbPage -{ - id: root - property string bindSettingsPrefix: "com.victronenergy.settings" - property string bindVrmloggerPrefix: "com.victronenergy.logger" - property VBusItem errorText: VBusItem { bind: Utils.path(bindVrmloggerPrefix, "/Vrm/ConnectionErrorMessage") } - - model: VisualItemModel { - - MbItemOptions { - id: loggerMode - description: qsTr("Logging enabled") - bind: Utils.path(bindSettingsPrefix, "/Settings/Vrmlogger/Logmode") - possibleValues: [ - MbOption { description: qsTr("Disabled"); value: 0 }, - MbOption { description: qsTr("Enabled"); value: 1 } - ] - } - - MbItemValue { - description: qsTr("VRM Portal ID") - item.value: vePlatform.uniqueId - } - - MbItemOptions { - description: qsTr("Log interval") - bind: Utils.path(bindSettingsPrefix, "/Settings/Vrmlogger/LogInterval") - possibleValues: [ - MbOption { description: qsTr("1 min"); value: 60 }, - MbOption { description: qsTr("5 min"); value: 300 }, - MbOption { description: qsTr("10 min"); value: 600 }, - MbOption { description: qsTr("15 min"); value: 900 }, - MbOption { description: qsTr("30 min"); value: 1800 }, - MbOption { description: qsTr("1 hour"); value: 3600 }, - MbOption { description: qsTr("2 hours"); value: 7200 }, - MbOption { description: qsTr("4 hours"); value: 14400 }, - MbOption { description: qsTr("12 hours"); value: 43200 }, - MbOption { description: qsTr("1 day"); value: 86400 } - ] - show: loggerMode.valid && loggerMode.value > 0 - } - - MbSwitch { - name: qsTr("Use secure connection (HTTPS)") - bind: Utils.path(bindSettingsPrefix, "/Settings/Vrmlogger/HttpsEnabled") - } - - MbItemValue { - id: lastcontact - description: qsTr("Last contact") - item.bind: Utils.path(bindVrmloggerPrefix, "/Vrm/TimeLastContact") - show: loggerMode.value === 1 - } - - MbItemOptions { - id: networkError - description: qsTr("Connection error") - bind: Utils.path(bindVrmloggerPrefix, "/Vrm/ConnectionError") - readonly: true - possibleValues: [ - MbOption { description: qsTr("No error"); value: 0 }, - MbOption { description: "#150 " + qsTr("Unexpected response text"); value: 150 }, - MbOption { description: "#151 " + qsTr("Unexpected HTTP response"); value: 151 }, - MbOption { description: "#152 " + qsTr("Connection timeout"); value: 152 }, - MbOption { description: "#153 " + qsTr("Connection error"); value: 153 }, - MbOption { description: "#154 " + qsTr("DNS failure"); value: 154 }, - MbOption { description: "#155 " + qsTr("Routing error"); value: 155 }, - MbOption { description: "#156 " + qsTr("VRM unavailable"); value: 156 }, - MbOption { description: "#159 " + qsTr("Unknown error"); value: 159 } - ] - } - - MbItemText { - wrapMode: Text.Wrap - horizontalAlignment: Text.AlignLeft - text: qsTr("Error message") + ': ' + errorText.value - show: errorText.valid && errorText.value.length - } - - MbSwitch { - name: qsTr("VRM two-way communication") - bind: "com.victronenergy.settings/Settings/Services/MqttVrm" - } - - MbSwitch { - name: qsTr("Reboot device when no contact") - bind: "com.victronenergy.settings/Settings/Watchdog/VrmTimeout" - valueFalse: 0 - valueTrue: 3600 - onEditDone: if (newValue > 0) listview.positionViewAtIndex(currentIndex + 2, ListView.Contain) - } - - MbEditBoxTime { - description: qsTr("No contact reset delay (hh:mm)") - item { - bind: "com.victronenergy.settings/Settings/Watchdog/VrmTimeout" - min: 60 - } - show: item.valid && item.value > 0 - } - - MbItemValue { - id: bufferLocation - - property int internal: 0 - property int beingTransfered: 1 - property int external: 2 - - description: qsTr("Storage location") - item.text: locationToText(vBufferLocation.value) - - function locationToText(s) - { - switch (s) { - case internal: - return qsTr("Internal storage"); - case beingTransfered: - return qsTr("Transferring"); - case external: - return qsTr("External storage"); - default: - return qsTr("No buffer active"); - } - } - - VBusItem { - id: vBufferLocation - bind: Utils.path(bindVrmloggerPrefix, "/Buffer/Location") - } - } - - MbItemValue { - id: bufferErrorState - - property int noError: 0 - property int outOfSpaceError: 1 - property int ioError: 2 - property int mountError: 3 - property int firmwareImageError: 4 - property int notWritableError: 5 - - description: qsTr("Error") - item.text: errorToText(vBufferErrorState.value) - show: vBufferErrorState.value != 0 - - - function errorToText(error) - { - switch (error) - { - case noError: - return qsTr("No Error"); - case outOfSpaceError: - return qsTr("No space left on storage"); - case ioError: - return qsTr("IO error"); - case mountError: - return qsTr("Mount error"); - case firmwareImageError: - return qsTr("Contains firmware image. Not using."); - case notWritableError: - return qsTr("SD card / USB stick not writable"); - default: - return qsTr("Unknown error"); - } - } - - VBusItem { - id: vBufferErrorState - bind: Utils.path(bindVrmloggerPrefix, "/Buffer/ErrorState") - } - } - - MbItemValue { - description: qsTr("Free disk space") - item { - bind: Utils.path(bindVrmloggerPrefix, "/Buffer/FreeDiskSpace") - text: Utils.qtyToString(item.value, qsTr("byte"), qsTr("bytes")) - } - } - - MbMountState { - description: qsTr("microSD / USB") - } - - MbItemValue { - description: qsTr("Stored records") - item { - bind: Utils.path(bindVrmloggerPrefix, "/Buffer/Count") - text: Utils.qtyToString(item.value, qsTr("item"), qsTr("records")) - } - } - - MbItemValue { - id: oldestBacklogItemAge - description: qsTr("Oldest record age") - item.bind: Utils.path(bindVrmloggerPrefix, "/Buffer/OldestTimestamp") - } - } - - // update every second to turn timestamp into time ago - Timer { - interval: 1000 - running: true - repeat: true - triggeredOnStart: true - onTriggered: { - lastcontact.item.text = Utils.timeAgo(lastcontact.item.value) - oldestBacklogItemAge.item.text = Utils.timeAgo(oldestBacklogItemAge.item.value) - } - } -} diff --git a/FileSets/v2.90/PageSettings.qml b/FileSets/v2.90/PageSettings.qml deleted file mode 100644 index 562fda5..0000000 --- a/FileSets/v2.90/PageSettings.qml +++ /dev/null @@ -1,203 +0,0 @@ -//////// modified for package version and control - -import QtQuick 1.1 -import com.victron.velib 1.0 -import net.connman 0.1 -import "utils.js" as Utils - -MbPage { - title: qsTr("Settings") - property string bindPrefix: "com.victronenergy.settings" - property VBusItem relay0Item: VBusItem {bind: "com.victronenergy.system/Relay/0/State"} - property bool hasRelay0: relay0Item.valid - - model: VisualItemModel { - MbSubMenu { - id: generalItem - description: qsTr("General") - subpage: Component { - PageSettingsGeneral { - title: generalItem.description - } - } - } - - MbSubMenu { - description: qsTr("Firmware") - subpage: Component { - PageSettingsFirmware { - title: qsTr("Firmware") - } - } - } - - MbSubMenu { - description: qsTr("Date & Time") - subpage: Component { - PageTzInfo { - title: qsTr("Date & Time") - } - } - } - - MbSubMenu { - description: qsTr("Remote Console") - subpage: Component { PageSettingsRemoteConsole {} } - } - - MbSubMenu { - id: systemSetupItem - description: qsTr("System setup") - subpage: Component { - PageSettingsSystem { - title: systemSetupItem.description - } - } - } - - MbSubMenu { - id: dvcc - description: qsTr("DVCC") - subpage: Component { - PageSettingsDVCC { - title: dvcc.description - } - } - } - - MbSubMenu { - id: displayItem - description: qsTr("Display & language") - subpage: Component { - PageSettingsDisplay { - title: displayItem.description - } - } - } - - MbSubMenu { - id: vrmLoggerItem - description: qsTr("VRM online portal") - subpage: Component { - PageSettingsLogger { - title: vrmLoggerItem.description - } - } - } - - MbSubMenu { - VBusItem { - id: systemType - bind: "com.victronenergy.system/SystemType" - } - description: systemType.value === "Hub-4" ? systemType.value : qsTr("ESS") - subpage: Component { PageSettingsHub4 {} } - } - - MbSubMenu { - description: qsTr("Energy meters") - subpage: Component { PageSettingsCGwacsOverview {} } - } - - MbSubMenu { - description: qsTr("PV inverters") - subpage: Component { PageSettingsFronius {} } - } - - MbSubMenu { - show: App.withQwacs - description: qsTr("Wireless AC sensors") - subpage: Component { PageSettingsQwacs {} } - } - - MbSubMenu { - description: qsTr("Modbus TCP devices") - subpage: Component { PageSettingsModbus {} } - } - - MbSubMenu { - id: ethernetItem - description: qsTr("Ethernet") - subpage: Component { PageSettingsTcpIp { showLinkLocal: true } } - } - - MbSubMenu { - description: qsTr("Wi-Fi") - property VeQuickItem accessPoint: VeQuickItem { uid: "dbus/com.victronenergy.platform/Services/AccessPoint/Enabled" } - subpage: accessPoint.value !== undefined ? wifiWithAP : wifiWithoutAP - Component { id: wifiWithoutAP; PageSettingsWifi {} } - Component { id: wifiWithAP; PageSettingsWifiWithAccessPoint {} } - } - - MbSubMenu { - description: qsTr("GSM modem") - subpage: Component { PageSettingsGsm {} } - } - - MbSubMenu { - description: qsTr("Bluetooth") - subpage: Component { PageSettingsBluetooth {} } - show: Connman.technologyList.indexOf("bluetooth") !== -1 - } - - MbSubMenu { - description: qsTr("GPS") - subpage: Component { PageSettingsGpsList {} } - } - - MbSubMenu { - description: qsTr("Generator start/stop") - subpage: Component { PageRelayGenerator {} } - show: hasRelay0 - } - - MbSubMenu { - description: qsTr("Tank pump") - subpage: Component { PageSettingsTankPump {} } - } - - MbSubMenu { - description: qsTr("Relay") - subpage: Component { PageSettingsRelay {} } - show: hasRelay0 - } - - MbSubMenu { - description: qsTr("Services") - subpage: Component { PageSettingsServices {} } - } - - MbSubMenu { - description: qsTr("I/O") - subpage: ioSettings - show: ioSettings.haveSubMenus - PageSettingsIo { id: ioSettings } - } - - /* - MbSubMenu { - description: qsTr("Backup & Restore") - subpage: Component { PageSettingsBackup {} } - } - */ - - MbSubMenu { - description: qsTr("Venus OS Large features") - subpage: Component { PageSettingsLarge {} } - show: vePlatform.serviceExists("signalk-server") || vePlatform.serviceExists("node-red-venus") - } - -//////// added for package control and version display - MbSubMenu - { - description: qsTr("Package manager") - subpage: Component { PageSettingsPackageManager {} } - } - - MbSubMenu { - description: "Debug" - subpage: Component { PageDebug {} } - showAccessLevel: User.AccessService - } - } -} diff --git a/FileSets/v2.90/PageSettings.qml.orig b/FileSets/v2.90/PageSettings.qml.orig deleted file mode 100644 index 2ab33ac..0000000 --- a/FileSets/v2.90/PageSettings.qml.orig +++ /dev/null @@ -1,194 +0,0 @@ -import QtQuick 1.1 -import com.victron.velib 1.0 -import net.connman 0.1 -import "utils.js" as Utils - -MbPage { - title: qsTr("Settings") - property string bindPrefix: "com.victronenergy.settings" - property VBusItem relay0Item: VBusItem {bind: "com.victronenergy.system/Relay/0/State"} - property bool hasRelay0: relay0Item.valid - - model: VisualItemModel { - MbSubMenu { - id: generalItem - description: qsTr("General") - subpage: Component { - PageSettingsGeneral { - title: generalItem.description - } - } - } - - MbSubMenu { - description: qsTr("Firmware") - subpage: Component { - PageSettingsFirmware { - title: qsTr("Firmware") - } - } - } - - MbSubMenu { - description: qsTr("Date & Time") - subpage: Component { - PageTzInfo { - title: qsTr("Date & Time") - } - } - } - - MbSubMenu { - description: qsTr("Remote Console") - subpage: Component { PageSettingsRemoteConsole {} } - } - - MbSubMenu { - id: systemSetupItem - description: qsTr("System setup") - subpage: Component { - PageSettingsSystem { - title: systemSetupItem.description - } - } - } - - MbSubMenu { - id: dvcc - description: qsTr("DVCC") - subpage: Component { - PageSettingsDVCC { - title: dvcc.description - } - } - } - - MbSubMenu { - id: displayItem - description: qsTr("Display & language") - subpage: Component { - PageSettingsDisplay { - title: displayItem.description - } - } - } - - MbSubMenu { - id: vrmLoggerItem - description: qsTr("VRM online portal") - subpage: Component { - PageSettingsLogger { - title: vrmLoggerItem.description - } - } - } - - MbSubMenu { - VBusItem { - id: systemType - bind: "com.victronenergy.system/SystemType" - } - description: systemType.value === "Hub-4" ? systemType.value : qsTr("ESS") - subpage: Component { PageSettingsHub4 {} } - } - - MbSubMenu { - description: qsTr("Energy meters") - subpage: Component { PageSettingsCGwacsOverview {} } - } - - MbSubMenu { - description: qsTr("PV inverters") - subpage: Component { PageSettingsFronius {} } - } - - MbSubMenu { - show: App.withQwacs - description: qsTr("Wireless AC sensors") - subpage: Component { PageSettingsQwacs {} } - } - - MbSubMenu { - description: qsTr("Modbus TCP devices") - subpage: Component { PageSettingsModbus {} } - } - - MbSubMenu { - id: ethernetItem - description: qsTr("Ethernet") - subpage: Component { PageSettingsTcpIp { showLinkLocal: true } } - } - - MbSubMenu { - description: qsTr("Wi-Fi") - property VeQuickItem accessPoint: VeQuickItem { uid: "dbus/com.victronenergy.platform/Services/AccessPoint/Enabled" } - subpage: accessPoint.value !== undefined ? wifiWithAP : wifiWithoutAP - Component { id: wifiWithoutAP; PageSettingsWifi {} } - Component { id: wifiWithAP; PageSettingsWifiWithAccessPoint {} } - } - - MbSubMenu { - description: qsTr("GSM modem") - subpage: Component { PageSettingsGsm {} } - } - - MbSubMenu { - description: qsTr("Bluetooth") - subpage: Component { PageSettingsBluetooth {} } - show: Connman.technologyList.indexOf("bluetooth") !== -1 - } - - MbSubMenu { - description: qsTr("GPS") - subpage: Component { PageSettingsGpsList {} } - } - - MbSubMenu { - description: qsTr("Generator start/stop") - subpage: Component { PageRelayGenerator {} } - show: hasRelay0 - } - - MbSubMenu { - description: qsTr("Tank pump") - subpage: Component { PageSettingsTankPump {} } - } - - MbSubMenu { - description: qsTr("Relay") - subpage: Component { PageSettingsRelay {} } - show: hasRelay0 - } - - MbSubMenu { - description: qsTr("Services") - subpage: Component { PageSettingsServices {} } - } - - MbSubMenu { - description: qsTr("I/O") - subpage: ioSettings - show: ioSettings.haveSubMenus - PageSettingsIo { id: ioSettings } - } - - /* - MbSubMenu { - description: qsTr("Backup & Restore") - subpage: Component { PageSettingsBackup {} } - } - */ - - MbSubMenu { - description: qsTr("Venus OS Large features") - subpage: Component { PageSettingsLarge {} } - show: vePlatform.serviceExists("signalk-server") || vePlatform.serviceExists("node-red-venus") - } - - MbSubMenu { - description: "Debug" - subpage: Component { PageDebug {} } - showAccessLevel: User.AccessService - } - } -} diff --git a/ServiceResources b/ServiceResources index ed6f70c..de77310 100755 --- a/ServiceResources +++ b/ServiceResources @@ -174,7 +174,7 @@ installService () fi # service not yet installed, COPY service directory to the active locaiton if [ ! -e "$serviceDir/$1" ]; then - logMessage "installing $1 service" + logMessage "installing $1 service - please wait" sleep 5 cp -R "$scriptDir/service" "$serviceDir/$1" if $tempFsOverlay ; then diff --git a/blindInstall/SetupHelperVersion b/blindInstall/SetupHelperVersion index d19c971..8254d75 100644 --- a/blindInstall/SetupHelperVersion +++ b/blindInstall/SetupHelperVersion @@ -1 +1 @@ -v4.27 +v4.28 diff --git a/changes b/changes index 3cee785..429cfc8 100644 --- a/changes +++ b/changes @@ -1,3 +1,6 @@ +v4.28: + make SetupHelper independent of Venus OS version + v4.27: fixed 20 MB size for blind isntall archive diff --git a/fileList b/fileList deleted file mode 100644 index 6d55f03..0000000 --- a/fileList +++ /dev/null @@ -1 +0,0 @@ -/opt/victronenergy/gui/qml/PageSettings.qml diff --git a/setup b/setup index 9d05b82..d850458 100755 --- a/setup +++ b/setup @@ -56,7 +56,28 @@ if [ $scriptAction == 'NONE' ] ; then fi if [ $scriptAction == 'INSTALL' ] ; then - updateActiveFile "$qmlDir/PageSettings.qml" + # modify PageSettings here so SetupHelper is independent of Venus OS verison + if [ -f "$qmlDir/PageSettings.qml.orig" ]; then + origFile="$qmlDir/PageSettings.qml.orig" + else + origFile="$qmlDir/PageSettings.qml" + fi + if (( $(grep -c "PackageManager" $origFile) > 0)); then + logMessage "ERROR: PageSettings.qml already modified for PackageManager -- skipping that modification" + else + rm -f "/var/volatile/tmp/PageSettings.qml" + echo "//////// modified to insert PackageManager menu" > "/var/volatile/tmp/PageSettings.qml" + # find line with second to last } + #################insertBefore=$(awk '{print NR " " $s}' "$origFile" | grep '}' | tail -2 | head -n 1 | awk '{print $1}') + insertBefore=$(cat -n "$origFile" | grep '}' | tail -2 | head -n 1 | awk '{print $1}') + ((insertBefore -= 1)) + # include all lines before that one + head -n $insertBefore $origFile >> "/var/volatile/tmp/PageSettings.qml" + # file with PackageManager menu code includes the last two } + cat "$pkgFileSets/PackageManagerMenu.txt" >> "/var/volatile/tmp/PageSettings.qml" + updateActiveFile "/var/volatile/tmp/PageSettings.qml" "$qmlDir/PageSettings.qml" + rm -f "/var/volatile/tmp/PageSettings.qml" + fi updateActiveFile "$qmlDir/PageSettingsPackageManager.qml" updateActiveFile "$qmlDir/PageSettingsPackageVersions.qml" updateActiveFile "$qmlDir/PageSettingsPackageEdit.qml" diff --git a/venus-data.UninstallPackages.tar.gz b/venus-data.UninstallPackages.tar.gz index 6ebf795..0ff5709 100644 Binary files a/venus-data.UninstallPackages.tar.gz and b/venus-data.UninstallPackages.tar.gz differ diff --git a/venus-data.tgz b/venus-data.tgz index 4a7423f..81b8701 100644 Binary files a/venus-data.tgz and b/venus-data.tgz differ diff --git a/version b/version index d19c971..8254d75 100644 --- a/version +++ b/version @@ -1 +1 @@ -v4.27 +v4.28