Remove Global.dcLoads and DcLoad.qml

Global.dcLoads does nothing except provide a global model, so move
this model into AllDevicesModel. DcLoad.qml is not needed as the
Device List delegate does not need the individual DcLoad properties.

Part of #1400

CMakeLists.txt

@@ -219,6 +219,7 @@ set (VENUS_QML_MODULE_SOURCES
     components/Led.qml
     components/LoadGraph.qml
     components/LoadGraphShapePath.qml
+    components/MultiServiceDeviceModel.qml
     components/NavBar.qml
     components/NavButton.qml
     components/NotificationDelegate.qml
@@ -238,6 +239,7 @@ set (VENUS_QML_MODULE_SOURCES
     components/SegmentedButtonRow.qml
     components/SeparatorBar.qml
     components/ServiceDeviceModel.qml
+    components/ServiceModelLoader.qml
     components/SettingsRangeSlider.qml
     components/SettingsSlider.qml
     components/ShinyProgressArc.qml
@@ -380,7 +382,6 @@ set (VENUS_QML_MODULE_SOURCES
     data/Batteries.qml
     data/DataManager.qml
     data/DcInputs.qml
-    data/DcLoads.qml
     data/DigitalInputs.qml
     data/EnvironmentInputs.qml
     data/Ess.qml
@@ -405,7 +406,6 @@ set (VENUS_QML_MODULE_SOURCES
     data/common/AcInput.qml
     data/common/DcDevice.qml
     data/common/DcInput.qml
-    data/common/DcLoad.qml
     data/common/DeviceModel.qml
     data/common/EnvironmentInput.qml
     data/common/EssData.qml
@@ -783,7 +783,6 @@ endif()
 set(Dbus_QML_MODULE_SOURCES
     data/dbus/DBusDataManager.qml
     data/dbus/DcInputsImpl.qml
-    data/dbus/DcLoadsImpl.qml
     data/dbus/EnvironmentInputsImpl.qml
     data/dbus/EssImpl.qml
     data/dbus/EvChargersImpl.qml
@@ -902,7 +901,6 @@ endif()
 # Mqtt_QML_MODULE
 set(Mqtt_QML_MODULE_SOURCES
     data/mqtt/DcInputsImpl.qml
-    data/mqtt/DcLoadsImpl.qml
     data/mqtt/EnvironmentInputsImpl.qml
     data/mqtt/EssImpl.qml
     data/mqtt/EvChargersImpl.qml

Global.qml

@@ -31,7 +31,6 @@ QtObject {
 	property var acInputs
 	property var batteries
 	property var dcInputs
-	property var dcLoads
 	property var digitalInputs
 	property var environmentInputs
 	property var ess
@@ -103,7 +102,6 @@ QtObject {
 		acInputs = null
 		batteries = null
 		dcInputs = null
-		dcLoads = null
 		digitalInputs = null
 		environmentInputs = null
 		ess = null

components/AllDevicesModel.qml

@@ -12,7 +12,7 @@ AggregateDeviceModel {
 	sourceModels: [
 		batteryDevices,
 		Global.dcInputs.model,
-		Global.dcLoads.model,
+		combinedDcLoadsModel,
 		digitalInputDevices,
 		Global.environmentInputs.model,
 		Global.evChargers.model,
@@ -40,6 +40,11 @@ AggregateDeviceModel {
 		modelId: "battery"
 	}
 
+	readonly property MultiServiceDeviceModel combinedDcLoadsModel: MultiServiceDeviceModel {
+		serviceTypes: ["dcload", "dcsystem", "dcdc"]
+		modelId: "combinedDcloads"
+	}
+
 	readonly property ServiceDeviceModel digitalInputDevices: ServiceDeviceModel {
 		serviceType: "digitalinput"
 		modelId: "digitalinput"

components/MultiServiceDeviceModel.qml

@@ -0,0 +1,40 @@
+/*
+** Copyright (C) 2024 Victron Energy B.V.
+** See LICENSE.txt for license information.
+*/
+
+import QtQuick
+import Victron.VenusOS
+
+// Provides a generic DeviceModel for a set of service types.
+//
+// All services found for the specified types will be added and removed as Device objects.
+
+DeviceModel {
+	id: root
+
+	required property var serviceTypes
+
+	readonly property Instantiator _serviceObjects: Instantiator {
+		model: root.serviceTypes
+		delegate: Instantiator {
+			required property string modelData
+			readonly property ServiceModelLoader modelLoader: ServiceModelLoader {
+				serviceType: modelData
+			}
+
+			model: modelLoader.item
+			delegate: Device {
+				id: device
+				serviceUid: model.uid
+				onValidChanged: {
+					if (valid) {
+						root.addDevice(device)
+					} else {
+						root.removeDevice(device.serviceUid)
+					}
+				}
+			}
+		}
+	}
+}

components/ServiceDeviceModel.qml

@@ -30,24 +30,7 @@ DeviceModel {
 		}
 	}
 
-	readonly property Loader modelLoader: Loader {
-		sourceComponent: BackendConnection.type === BackendConnection.MqttSource ? _mqttModelComponent
-			 : _dbusOrMockModelComponent
-	}
-
-	readonly property Component _dbusOrMockModelComponent: Component {
-		VeQItemSortTableModel {
-			dynamicSortFilter: true
-			filterRole: VeQItemTableModel.UniqueIdRole
-			filterRegExp: "^%1/com\.victronenergy\.%2\.".arg(BackendConnection.uidPrefix()).arg(root.serviceType)
-			model: Global.dataServiceModel
-		}
-	}
-
-	readonly property Component _mqttModelComponent: Component {
-		VeQItemTableModel {
-			uids: [ "mqtt/" + root.serviceType ]
-			flags: VeQItemTableModel.AddChildren | VeQItemTableModel.AddNonLeaves | VeQItemTableModel.DontAddItem
-		}
+	readonly property ServiceModelLoader modelLoader: ServiceModelLoader {
+		serviceType: root.serviceType
 	}
 }

components/ServiceModelLoader.qml

@@ -0,0 +1,32 @@
+/*
+** Copyright (C) 2024 Victron Energy B.V.
+** See LICENSE.txt for license information.
+*/
+
+import QtQuick
+import Victron.VenusOS
+
+Loader {
+	id: root
+
+	required property string serviceType
+
+	sourceComponent: BackendConnection.type === BackendConnection.MqttSource ? _mqttModelComponent
+		 : _dbusOrMockModelComponent
+
+	readonly property Component _dbusOrMockModelComponent: Component {
+		VeQItemSortTableModel {
+			dynamicSortFilter: true
+			filterRole: VeQItemTableModel.UniqueIdRole
+			filterRegExp: "^%1/com\.victronenergy\.%2\.".arg(BackendConnection.uidPrefix()).arg(root.serviceType)
+			model: Global.dataServiceModel
+		}
+	}
+
+	readonly property Component _mqttModelComponent: Component {
+		VeQItemTableModel {
+			uids: [ "mqtt/" + root.serviceType ]
+			flags: VeQItemTableModel.AddChildren | VeQItemTableModel.AddNonLeaves | VeQItemTableModel.DontAddItem
+		}
+	}
+}

components/widgets/DcLoadsWidget.qml

@@ -24,15 +24,15 @@ OverviewWidget {
 	title: qsTrId("overview_widget_dcloads_title")
 	icon.source: "qrc:/images/dcloads.svg"
 	type: VenusOS.OverviewWidget_Type_DcLoads
-	enabled: Global.dcLoads.model.count > 0
+	enabled: Global.allDevicesModel.combinedDcLoadsModel.count > 0
 
 	quantityLabel.dataObject: Global.system.dc
 
 	onClicked: {
-		if (Global.dcLoads.model.count > 1) {
+		if (Global.allDevicesModel.combinedDcLoadsModel.count > 1) {
 			Global.pageManager.pushPage(deviceListPageComponent, { "title": root.title })
 		} else {
-			root._showSettingsPage(Global.dcLoads.model.firstObject)
+			root._showSettingsPage(Global.allDevicesModel.combinedDcLoadsModel.firstObject)
 		}
 	}
 
@@ -41,7 +41,7 @@ OverviewWidget {
 
 		Page {
 			GradientListView {
-				model: Global.dcLoads.model
+				model: Global.allDevicesModel.combinedDcLoadsModel
 
 				delegate: ListTextGroup {
 					id: deviceDelegate
@@ -50,11 +50,16 @@ OverviewWidget {
 
 					text: device.name
 					textModel: [
-						Units.getCombinedDisplayText(VenusOS.Units_Volt_DC, device.voltage),
-						Units.getCombinedDisplayText(VenusOS.Units_Amp, device.current),
-						Units.getCombinedDisplayText(VenusOS.Units_Watt, device.power),
+						Units.getCombinedDisplayText(VenusOS.Units_Volt_DC, dcDevice.voltage),
+						Units.getCombinedDisplayText(VenusOS.Units_Amp, dcDevice.current),
+						Units.getCombinedDisplayText(VenusOS.Units_Watt, dcDevice.power),
 					]
 
+					DcDevice {
+						id: dcDevice
+						serviceUid: deviceDelegate.device.serviceUid
+					}
+
 					ListPressArea {
 						id: delegatePressArea
 

data/DataManager.qml

@@ -16,7 +16,6 @@ Item {
 			&& !!Global.acInputs
 			&& !!Global.batteries
 			&& !!Global.dcInputs
-			&& !!Global.dcLoads
 			&& !!Global.digitalInputs
 			&& !!Global.environmentInputs
 			&& !!Global.ess
@@ -96,7 +95,6 @@ Item {
 	AcInputs {}
 	Batteries {}
 	DcInputs {}
-	DcLoads {}
 	DigitalInputs {}
 	EnvironmentInputs {}
 	Ess {}

data/dbus/DBusDataManager.qml

@@ -11,7 +11,6 @@ QtObject {
 	id: root
 
 	property var dcInputs: DcInputsImpl { }
-	property var dcLoads: DcLoadsImpl { }
 	property var environmentInputs: EnvironmentInputsImpl { }
 	property var ess: EssImpl { }
 	property var evChargers: EvChargersImpl { }

data/mock/DcLoadsImpl.qml

@@ -64,16 +64,16 @@ QtObject {
 	}
 
 	property Timer updateDcValues: Timer {
-		running: Global.mockDataSimulator.timersActive
-		interval: 1000
+		running: Global.mockDataSimulator.timersActive && !!(Global.allDevicesModel?.combinedDcLoadsModel)
+		interval: 500
 		repeat: true
-		triggeredOnStart: true
 
 		onTriggered: {
 			let totalPower = NaN
-			for (let i = 0; i < Global.dcLoads.model.count; ++i) {
-				const dcLoad = Global.dcLoads.model.deviceAt(i)
-				totalPower = Units.sumRealNumbers(totalPower, dcLoad.power)
+			for (let i = 0; i < Global.allDevicesModel.combinedDcLoadsModel.count; ++i) {
+				const dcLoad = Global.allDevicesModel.combinedDcLoadsModel.deviceAt(i)
+				const power = Global.mockDataSimulator.mockValue(dcLoad.serviceUid + "/Dc/0/Power")
+				totalPower = Units.sumRealNumbers(totalPower, power)
 			}
 
 			Global.mockDataSimulator.setMockValue("com.victronenergy.system/Dc/System/Power", totalPower)
@@ -83,7 +83,7 @@ QtObject {
 	}
 
 	property Component dcLoadComponent: Component {
-		DcLoad {
+		Device {
 			id: dcLoad
 
 			property string serviceType