Skip to content

Commit

Permalink
fixed: white screen with firmware prior to v3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@kwindrem
kwindrem committed Jul 9, 2024
1 parent b118f6d commit 0178703
Show file tree
Hide file tree
Showing 11 changed files with 682 additions and 15 deletions.
281 changes: 281 additions & 0 deletions FileSets/PatchSource/PageMain.qml-v2.94
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,281 @@
//////// modified order to put Settings, then Notifications at top of list

import QtQuick 1.1
import "utils.js" as Utils
import com.victron.velib 1.0

MbPage {
id: root
title: qsTr("Device List")
property VBusItem moveSettings: VBusItem { id: moveSettings; bind: Utils.path("com.victronenergy.settings", "/Settings/GuiMods/MoveSettings")}
property bool settingsAtTop: moveSettings.valid && moveSettings.value === 1

model: VisualModels {
//////// put Settings at top of list
VisualItemModel { //////// use VisualItemModel below for v2.93 and earlier
MbSubMenu {
description: qsTr("Settings")
subpage: Component { PageSettings {} }
show: settingsAtTop
}

//////// put Notifications second
MbSubMenu {
id: menuNotificationsTop
description: qsTr("Notifications")
item: VBusItem {
property variant active: NotificationCenter.notifications.filter(
function isActive(obj) { return obj.active} )
value: active.length > 0 ? active.length : ""
}
subpage: Component { PageNotifications {} }
show: settingsAtTop
}

MbOK {
description: qsTr("Remove disconnected devices")
value: qsTr("Press to remove")
show: settingsAtTop && deviceList.disconnectedDevices != 0
editable: true

function clicked() {
listview.decrementCurrentIndex()
deviceList.removeDisconnected()
}
}
}
VisualDataModel {
model: VeSortFilterProxyModel {
model: DeviceList {
id: deviceList
onRowsAboutToBeRemoved: {
for (var i = first; i <= last; i++)
deviceList.page(i).destroy()
}
}
sortRole: DeviceList.DescriptionRole
dynamicSortFilter: true
naturalSort: true
sortCaseSensitivity: Qt.CaseInsensitive
}

delegate: MbDevice {
iconId: "icon-toolbar-enter"
service: model.page.service
subpage: model.page
}
}

VisualItemModel { //////// use VisualItemModel below for v2.93 and earlier
MbSubMenu {
id: menuNotifications
description: qsTr("Notifications")
item: VBusItem {
property variant active: NotificationCenter.notifications.filter(
function isActive(obj) { return obj.active} )
value: active.length > 0 ? active.length : ""
}
subpage: Component { PageNotifications {} }
show: !settingsAtTop
}

MbSubMenu {
description: qsTr("Settings")
subpage: Component { PageSettings {} }
show: !settingsAtTop
}

MbOK {
description: qsTr("Remove disconnected devices")
value: qsTr("Press to remove")
show: !settingsAtTop && deviceList.disconnectedDevices != 0
editable: true

function clicked() {
listview.decrementCurrentIndex()
deviceList.removeDisconnected()
}
}
}
}

Component {
id: vebusPage
PageVebus {}
}

Component {
id: multiRsPage
PageMultiRs {}
}

Component {
id: batteryPage
PageBattery {}
}

Component {
id: solarChargerPage
PageSolarCharger {}
}

Component {
id: acInPage
PageAcIn {}
}

Component {
id: acChargerPage
PageAcCharger {}
}

Component {
id: tankPage
PageTankSensor {}
}

Component {
id: motorDrivePage
PageMotorDrive {}
}

Component {
id: inverterPage
PageInverter {}
}

Component {
id: pulseCounterPage
PagePulseCounter {}
}

Component {
id: digitalInputPage
PageDigitalInput {}
}

Component {
id: temperatureSensorPage
PageTemperatureSensor {}
}

Component {
id: unsupportedDevicePage
PageUnsupportedDevice {}
}

Component {
id: meteoDevicePage
PageMeteo {}
}

Component {
id: evChargerPage
PageEvCharger {}
}

Component {
id: dcMeterPage
PageDcMeter {}
}

Component {
id: alternatorPage
PageAlternator {}
}

function addService(service)
{
var name = service.name

var page
switch(service.type)
{
case DBusService.DBUS_SERVICE_MULTI:
page = vebusPage
break;
case DBusService.DBUS_SERVICE_MULTI_RS:
page = multiRsPage
break;
case DBusService.DBUS_SERVICE_BATTERY:
page = batteryPage
break;
case DBusService.DBUS_SERVICE_SOLAR_CHARGER:
page = solarChargerPage
break;
case DBusService.DBUS_SERVICE_PV_INVERTER:
page = acInPage
break;
case DBusService.DBUS_SERVICE_AC_CHARGER:
page = acChargerPage
break;
case DBusService.DBUS_SERVICE_TANK:
page = tankPage
break;
case DBusService.DBUS_SERVICE_GRIDMETER:
page = acInPage
break
case DBusService.DBUS_SERVICE_GENSET:
page = acInPage
break
case DBusService.DBUS_SERVICE_MOTOR_DRIVE:
page = motorDrivePage
break
case DBusService.DBUS_SERVICE_INVERTER:
page = inverterPage
break;
case DBusService.DBUS_SERVICE_TEMPERATURE_SENSOR:
page = temperatureSensorPage
break;
case DBusService.DBUS_SERVICE_SYSTEM_CALC:
return;
case DBusService.DBUS_SERVICE_DIGITAL_INPUT:
page = digitalInputPage
break;
case DBusService.DBUS_SERVICE_PULSE_COUNTER:
page = pulseCounterPage
break;
case DBusService.DBUS_SERVICE_UNSUPPORTED:
page = unsupportedDevicePage
break;
case DBusService.DBUS_SERVICE_METEO:
page = meteoDevicePage
break;
case DBusService.DBUS_SERVICE_VECAN:
return;
case DBusService.DBUS_SERVICE_EVCHARGER:
page = evChargerPage
break
case DBusService.DBUS_SERVICE_ACLOAD:
page = acInPage
break
case DBusService.DBUS_SERVICE_HUB4:
return;
case DBusService.DBUS_SERVICE_FUELCELL:
case DBusService.DBUS_SERVICE_DCSOURCE:
case DBusService.DBUS_SERVICE_DCLOAD:
case DBusService.DBUS_SERVICE_DCSYSTEM:
page = dcMeterPage
break
case DBusService.DBUS_SERVICE_ALTERNATOR:
page = alternatorPage
break
default:
console.log("unknown service " + name)
return;
}

deviceList.append(service, page.createObject(root, {service: service, bindPrefix: service.name}))
initListView()
}

Component.onCompleted: {
for (var i = 0; i < DBusServices.count; i++)
addService(DBusServices.at(i))
}

Connections {
target: DBusServices
onDbusServiceFound: addService(service)
}
}
Loading

0 comments on commit 0178703

Please sign in to comment.