Remove Global.solarChargers

Use Global.solarDevices instead, as that contains not only
solarcharger devices, but also any multi and inverter devices that
have solar trackers.

AllDevicesModel now needs its own list of solarcharger devices, as it
cannot use Global.solarDevices.model, since that may contain multi
services (which should not be in the Device List), and also may
contain inverter services (which are already provided by
Global.inverterChargers.inverters).

Part of #1574

CMakeLists.txt

@@ -394,7 +394,6 @@ set (VENUS_QML_MODULE_SOURCES
     data/ManualRelayModel.qml
     data/Notifications.qml
     data/PvInverters.qml
-    data/SolarChargers.qml
     data/SolarDevices.qml
     data/StartPageConfiguration.qml
     data/System.qml
@@ -421,7 +420,6 @@ set (VENUS_QML_MODULE_SOURCES
     data/common/Notification.qml
     data/common/PvInverter.qml
     data/common/PvMonitor.qml
-    data/common/SolarCharger.qml
     data/common/SolarDailyHistory.qml
     data/common/SolarDevice.qml
     data/common/SolarHistory.qml
@@ -802,7 +800,6 @@ set(Dbus_QML_MODULE_SOURCES
     data/dbus/GeneratorsImpl.qml
     data/dbus/NotificationsImpl.qml
     data/dbus/PvInvertersImpl.qml
-    data/dbus/SolarChargersImpl.qml
     data/dbus/SystemSettingsImpl.qml
     data/dbus/TanksImpl.qml
     data/dbus/InverterChargersImpl.qml
@@ -850,7 +847,7 @@ set(Mock_QML_MODULE_SOURCES
     data/mock/NotificationsImpl.qml
     data/mock/PulseMetersImpl.qml
     data/mock/PvInvertersImpl.qml
-    data/mock/SolarChargersImpl.qml
+    data/mock/SolarDevicesImpl.qml
     data/mock/SystemImpl.qml
     data/mock/SystemSettingsImpl.qml
     data/mock/TanksImpl.qml
@@ -921,7 +918,6 @@ set(Mqtt_QML_MODULE_SOURCES
     data/mqtt/MqttDataManager.qml
     data/mqtt/NotificationsImpl.qml
     data/mqtt/PvInvertersImpl.qml
-    data/mqtt/SolarChargersImpl.qml
     data/mqtt/SystemSettingsImpl.qml
     data/mqtt/TanksImpl.qml
     data/mqtt/InverterChargersImpl.qml

Global.qml

@@ -37,7 +37,6 @@ QtObject {
 	property var inverterChargers
 	property var notifications
 	property var pvInverters
-	property var solarChargers
 	property var solarDevices
 	property var system
 	property var systemSettings
@@ -75,7 +74,7 @@ QtObject {
 		if (deviceClass === "com.victronenergy.battery") {
 			return [allDevicesModel.batteryDevices]
 		} else if (deviceClass === "com.victronenergy.solarcharger" || deviceClass === "solarcharger") {
-			return [solarChargers.model]
+			return [solarDevices.model]
 		} else if (deviceClass === "analog") {
 			return Global.tanks.allTankModels.concat([Global.environmentInputs.model])
 		}
@@ -107,7 +106,6 @@ QtObject {
 		inverterChargers = null
 		notifications = null
 		pvInverters = null
-		solarChargers = null
 		solarDevices = null
 		system = null
 		systemSettings = null

components/AllDevicesModel.qml

@@ -23,8 +23,8 @@ AggregateDeviceModel {
 		meteoDevices,
 		motorDriveDevices,
 		pulseMeterDevices,
+		solarChargerDevices,
 		Global.pvInverters.model,
-		Global.solarChargers.model,
 		unsupportedDevices,
 
 		// AC input models
@@ -85,6 +85,11 @@ AggregateDeviceModel {
 		modelId: "pulsemeter"
 	}
 
+	readonly property ServiceDeviceModel solarChargerDevices: ServiceDeviceModel {
+		serviceType: "solarcharger"
+		modelId: "solarcharger"
+	}
+
 	readonly property ServiceDeviceModel unsupportedDevices: ServiceDeviceModel {
 		serviceType: "unsupported"
 		modelId: "unsupported"

components/SolarYieldModel.qml

@@ -16,7 +16,7 @@ ListModel {
 	property bool _resetting
 
 	property Instantiator _yieldUpdateConnections: Instantiator {
-		model: !!root.targetHistory ? null : Global.solarChargers.model
+		model: !!root.targetHistory ? null : Global.solarDevices.model
 
 		delegate: Connections {
 			target: model.device
@@ -52,9 +52,9 @@ ListModel {
 				yieldForDay += history.yieldKwh
 			}
 		} else {
-			for (i = 0; i < Global.solarChargers.model.count; ++i) {
-				const solarCharger = Global.solarChargers.model.deviceAt(i)
-				history = solarCharger.dailyHistory(day)
+			for (i = 0; i < Global.solarDevices.model.count; ++i) {
+				const solarDevice = Global.solarDevices.model.deviceAt(i)
+				history = solarDevice.dailyHistory(day)
 				if (history && !isNaN(history.yieldKwh)) {
 					yieldForDay += history.yieldKwh
 				}

components/widgets/SolarYieldWidget.qml

@@ -10,10 +10,10 @@ OverviewWidget {
 	id: root
 
 	onClicked: {
-		const singleDeviceOnly = (Global.solarChargers.model.count + Global.pvInverters.model.count) === 1
-		if (singleDeviceOnly && Global.solarChargers.model.count === 1) {
+		const singleDeviceOnly = (Global.solarDevices.model.count + Global.pvInverters.model.count) === 1
+		if (singleDeviceOnly && Global.solarDevices.model.count === 1) {
 			Global.pageManager.pushPage("/pages/solar/SolarDevicePage.qml",
-					{ "bindPrefix": Global.solarChargers.model.firstObject.serviceUid })
+					{ "solarDevice": Global.solarDevices.model.firstObject })
 		} else if (singleDeviceOnly && Global.pvInverters.model === 1) {
 			Global.pageManager.pushPage("/pages/solar/PvInverterPage.qml",
 					{ "pvInverter": Global.pvInverters.model.deviceAt(0) })
@@ -53,7 +53,7 @@ OverviewWidget {
 			}
 			active: root.size >= VenusOS.OverviewWidget_Size_L
 			sourceComponent: {
-				if (Global.pvInverters.model.count === 1 && Global.solarChargers.model.count === 0) {
+				if (Global.pvInverters.model.count === 1 && Global.solarDevices.model.count === 0) {
 					return phaseComponent
 				} else if (Global.pvInverters.model.count === 0) {
 					return historyComponent

data/DataManager.qml

@@ -22,7 +22,6 @@ Item {
 			&& !!Global.inverterChargers
 			&& !!Global.notifications
 			&& !!Global.pvInverters
-			&& !!Global.solarChargers
 			&& !!Global.solarDevices
 			&& !!Global.system
 			&& !!Global.systemSettings
@@ -100,7 +99,6 @@ Item {
 	InverterChargers {}
 	Notifications {}
 	PvInverters {}
-	SolarChargers {}
 	SolarDevices {}
 	System {}
 	SystemSettings {}

data/System.qml

@@ -56,7 +56,7 @@ QtObject {
 		// In cases where the overall current cannot be determined, the value is NaN.
 		readonly property real current: {
 			if (Global.pvInverters.model.count > 0) {
-				if (Global.solarChargers.model.count > 0) {
+				if (Global.solarDevices.model.count > 0) {
 					// If both PV chargers and PV inverters are present, return NaN as the current
 					// cannot be summed across AC and DC systems.
 					return NaN
@@ -69,7 +69,7 @@ QtObject {
 				// There are one or more PV inverters, which are all single-phase, so it's safe to
 				// return a total current as they should all have the same PV output voltage.
 				return _pvMonitor.totalCurrent
-			} else if (Global.solarChargers.model.count > 0) {
+			} else if (Global.solarDevices.model.count > 0) {
 				return _dcPvCurrent.isValid ? _dcPvCurrent.value : NaN
 			}
 			return NaN

data/common/SolarDevice.qml

@@ -34,7 +34,7 @@ Device {
 	function trackerName(trackerIndex, format) {
 		const tracker = _trackerObjects.objectAt(trackerIndex)
 		const trackerName = tracker ? tracker.name || "" : ""
-		return Global.solarChargers.formatTrackerName(trackerName, trackerIndex, trackers.count, root.name, format)
+		return Global.solarDevices.formatTrackerName(trackerName, trackerIndex, trackers.count, root.name, format)
 	}
 
 	//--- internal members below ---

data/common/SolarHistory.qml

@@ -32,7 +32,7 @@ QtObject {
 	function trackerName(trackerIndex, format) {
 		const nameObject = _trackerNames.objectAt(trackerIndex)
 		const name = nameObject ? nameObject.value || "" : ""
-		return Global.solarChargers.formatTrackerName(name, trackerIndex, trackerCount, deviceName, format)
+		return Global.solarDevices.formatTrackerName(name, trackerIndex, trackerCount, deviceName, format)
 	}
 
 	readonly property Instantiator _trackerNames: Instantiator {

data/dbus/DBusDataManager.qml

@@ -18,7 +18,6 @@ QtObject {
 	property var inverterChargers: InverterChargersImpl {}
 	property var notifications: NotificationsImpl {}
 	property var pvInverters: PvInvertersImpl { }
-	property var solarChargers: SolarChargersImpl { }
 	property var systemSettings: SystemSettingsImpl { }
 	property var tanks: TanksImpl { }