add support for v3.54, v3.60~25

kwindrem · Feb 25, 2025 · ad91f6a · ad91f6a
1 parent 3c47ea7
commit ad91f6a
Show file tree

Hide file tree

Showing 482 changed files with 16,113 additions and 712 deletions.
diff --git a/FileSets/PatchSource/HubData.qml b/FileSets/PatchSource/HubData.qml
@@ -1,11 +1,7 @@
-//////// modified for VE.Direct inverter support
-//////// modified for grid/genset meter
-//////// added alternator, AC charger, wind generator
-
 import QtQuick 1.1
-import com.victron.velib 1.0
 import "utils.js" as Utils
 
+import com.victron.velib 1.0
 Item {
 	id: root
 

diff --git a/FileSets/PatchSource/HubData.qml.patch b/FileSets/PatchSource/HubData.qml.patch
@@ -1,14 +1,10 @@
 --- /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/HubData.qml.orig	2025-01-12 08:25:03
-+++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/HubData.qml	2024-05-17 06:58:33
-@@ -1,14 +1,32 @@
-+//////// modified for VE.Direct inverter support
-+//////// modified for grid/genset meter
-+//////// added alternator, AC charger, wind generator
-+
++++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/HubData.qml	2025-02-02 21:49:14
+@@ -1,14 +1,28 @@
  import QtQuick 1.1
-+import com.victron.velib 1.0
  import "utils.js" as Utils
 
++import com.victron.velib 1.0
  Item {
  	id: root
 
@@ -33,7 +29,7 @@
  	property alias pvCharger: _pvCharger
  	property alias pvOnAcIn1: _pvOnAcIn1
  	property alias pvOnAcIn2: _pvOnAcIn2
-@@ -18,8 +36,8 @@
+@@ -18,8 +32,8 @@
  	property alias acInLoad: _acInLoad
  	property alias acOutLoad: _acOutLoad
  	property alias grid: _grid
@@ -43,7 +39,7 @@
  	property VBusItem systemType: VBusItem { bind: Utils.path(systemPrefix, "/SystemType") }
  	property bool hasGridMeter: _hasGridMeter.valid
  	property variant acSource: _acSource.value
-@@ -60,6 +78,30 @@
+@@ -60,6 +74,30 @@
  		property VBusItem power: VBusItem { bind: Utils.path(systemPrefix, "/Dc/Pv/Power"); unit: "W"}
  	}
 
@@ -74,7 +70,7 @@
  	ObjectAcConnection {
  		id: _pvOnAcOut
  		bindPrefix: Utils.path(systemPrefix, "/Ac/PvOnOutput")
-@@ -77,8 +119,11 @@
+@@ -77,8 +115,11 @@
 
  	ObjectAcConnection {
  		id: _genset
@@ -87,7 +83,7 @@
  	}
 
  	VBusItem {
-@@ -91,20 +136,20 @@
+@@ -91,20 +132,20 @@
  		bind: Utils.path(systemPrefix, "/Ac/Grid/DeviceType")
  	}
 
@@ -121,7 +117,7 @@
 
  	VBusItem {
  		id: _l2L1OutSummed
-@@ -114,32 +159,42 @@
+@@ -114,32 +155,42 @@
 
  	ObjectAcConnection {
  		id: _grid
@@ -172,7 +168,7 @@
  		bindPrefix: Utils.path(systemPrefix, "/Ac/ConsumptionOnInput")
  	}
 
-@@ -167,4 +222,47 @@
+@@ -167,4 +218,47 @@
  		id: _dcSystem
  		property VBusItem power: VBusItem { bind: Utils.path(systemPrefix, "/Dc/System/Power"); unit: "W"}
  	}

diff --git a/FileSets/PatchSource/MbItemDigitalInput.qml-v3.40 b/FileSets/PatchSource/MbItemDigitalInput.qml-v3.40
@@ -1,5 +1,3 @@
-//// modified for ExtTransferSwitch package
-
 import QtQuick 1.1
 
 MbItemOptions {

diff --git a/FileSets/PatchSource/MbItemDigitalInput.qml-v3.40.patch b/FileSets/PatchSource/MbItemDigitalInput.qml-v3.40.patch
@@ -1,12 +1,6 @@
 --- /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/MbItemDigitalInput.qml-v3.40.orig	2024-07-09 10:19:45
-+++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/MbItemDigitalInput.qml-v3.40	2024-05-14 07:00:12
-@@ -1,3 +1,5 @@
-+//// modified for ExtTransferSwitch package
-+
- import QtQuick 1.1
-
- MbItemOptions {
-@@ -14,8 +16,11 @@
++++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/MbItemDigitalInput.qml-v3.40	2025-02-02 17:42:41
+@@ -14,8 +14,11 @@
  		MbOption { description: qsTr("Smoke alarm"); value: 6 },
  		MbOption { description: qsTr("Fire alarm"); value: 7 },
  		MbOption { description: qsTr("CO2 alarm"); value: 8 },

diff --git a/FileSets/PatchSource/ObjectAcConnection.qml b/FileSets/PatchSource/ObjectAcConnection.qml
@@ -1,7 +1,3 @@
-////// modified to show voltage, current and frequency in flow overview
-////// modified to show bar graphs
-////// modified to use grid or genset meter if present
-
 import QtQuick 1.1
 import com.victron.velib 1.0
 import "utils.js" as Utils

diff --git a/FileSets/PatchSource/ObjectAcConnection.qml.patch b/FileSets/PatchSource/ObjectAcConnection.qml.patch
@@ -1,13 +1,6 @@
 --- /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/ObjectAcConnection.qml.orig	2025-01-12 08:28:05
-+++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/ObjectAcConnection.qml	2024-05-14 07:00:12
-@@ -1,19 +1,41 @@
-+////// modified to show voltage, current and frequency in flow overview
-+////// modified to show bar graphs
-+////// modified to use grid or genset meter if present
-+
- import QtQuick 1.1
- import com.victron.velib 1.0
- import "utils.js" as Utils
++++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/ObjectAcConnection.qml	2025-02-02 17:43:09
+@@ -4,16 +4,34 @@
 
  QtObject {
  	property string bindPrefix

diff --git a/FileSets/PatchSource/PageDigitalInput.qml b/FileSets/PatchSource/PageDigitalInput.qml
@@ -1,5 +1,3 @@
-//// modified for ExtTransferSwitch package
-
 import QtQuick 1.1
 import com.victron.velib 1.0
 import "utils.js" as Utils

diff --git a/FileSets/PatchSource/PageDigitalInput.qml.patch b/FileSets/PatchSource/PageDigitalInput.qml.patch
@@ -1,12 +1,6 @@
 --- /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/PageDigitalInput.qml.orig	2024-07-09 10:19:57
-+++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/PageDigitalInput.qml	2024-05-14 07:00:12
-@@ -1,3 +1,5 @@
-+//// modified for ExtTransferSwitch package
-+
- import QtQuick 1.1
- import com.victron.velib 1.0
- import "utils.js" as Utils
-@@ -18,6 +20,20 @@
++++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/PageDigitalInput.qml	2025-02-02 17:43:22
+@@ -18,6 +18,20 @@
  		bind: service.path("/DeviceInstance")
  	}
 
@@ -27,7 +21,7 @@
  	// Handle translations
  	function getType(type){
  		switch (type) {
-@@ -41,6 +57,9 @@
+@@ -41,6 +55,9 @@
  			return qsTr("CO2 alarm")
  		case "Generator":
  			return qsTr("Generator")
@@ -37,7 +31,7 @@
  		}
  		return type;
  	}
-@@ -72,6 +91,11 @@
+@@ -72,6 +89,11 @@
  			return qsTr("Running")
  		case 11:
  			return qsTr("Stopped")
@@ -49,7 +43,7 @@
  		}
 
  		return qsTr("Unknown")
-@@ -105,5 +129,19 @@
+@@ -105,5 +127,19 @@
  				}
  			}
  		}

diff --git a/FileSets/PatchSource/PageMain.qml-v3.22 b/FileSets/PatchSource/PageMain.qml-v3.22
@@ -1,5 +1,3 @@
-//////// GuiMods 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

diff --git a/FileSets/PatchSource/PageMain.qml-v3.22.patch b/FileSets/PatchSource/PageMain.qml-v3.22.patch
@@ -1,8 +1,6 @@
 --- /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/PageMain.qml-v3.22.orig	2024-07-08 09:45:00
-+++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/PageMain.qml-v3.22	2024-07-09 09:53:20
-@@ -1,11 +1,52 @@
-+//////// GuiMods modified order to put Settings, then Notifications at top of list
-+
++++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/PageMain.qml-v3.22	2025-02-02 17:47:12
+@@ -1,11 +1,50 @@
  import QtQuick 1.1
 +import "utils.js" as Utils
  import com.victron.velib 1.0
@@ -53,7 +51,7 @@
  		VisualDataModel {
  			model: VeSortFilterProxyModel {
  				model: DeviceList {
-@@ -27,7 +68,7 @@
+@@ -27,7 +66,7 @@
  				subpage: model.page
  			}
  		}
@@ -62,7 +60,7 @@
  			MbSubMenu {
  				id: menuNotifications
  				description: qsTr("Notifications")
-@@ -37,17 +78,22 @@
+@@ -37,17 +76,22 @@
  					value: active.length > 0 ? active.length : ""
  				}
  				subpage: Component { PageNotifications {} }

diff --git a/FileSets/PatchSource/PageMain.qml-v3.34 b/FileSets/PatchSource/PageMain.qml-v3.34
@@ -1,5 +1,3 @@
-//////// GuiMods 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

diff --git a/FileSets/PatchSource/PageMain.qml-v3.34.patch b/FileSets/PatchSource/PageMain.qml-v3.34.patch
@@ -1,8 +1,6 @@
 --- /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/PageMain.qml-v3.34.orig	2024-07-08 09:45:00
-+++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/PageMain.qml-v3.34	2024-07-09 09:53:47
-@@ -1,11 +1,48 @@
-+//////// GuiMods modified order to put Settings, then Notifications at top of list
-+
++++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/PageMain.qml-v3.34	2025-02-02 17:47:35
+@@ -1,11 +1,46 @@
  import QtQuick 1.1
 +import "utils.js" as Utils
  import com.victron.velib 1.0
@@ -49,7 +47,7 @@
  		VisualDataModel {
  			model: VeSortFilterProxyModel {
  				model: DeviceList {
-@@ -27,23 +64,28 @@
+@@ -27,23 +62,28 @@
  				subpage: model.page
  			}
  		}

diff --git a/FileSets/PatchSource/PageMain.qml-v3.40 b/FileSets/PatchSource/PageMain.qml-v3.40
@@ -1,5 +1,3 @@
-//////// GuiMods 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

diff --git a/FileSets/PatchSource/PageMain.qml-v3.40.patch b/FileSets/PatchSource/PageMain.qml-v3.40.patch
@@ -1,8 +1,6 @@
 --- /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/PageMain.qml-v3.40.orig	2024-07-08 09:45:00
-+++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/PageMain.qml-v3.40	2024-07-09 09:55:28
-@@ -1,11 +1,48 @@
-+//////// GuiMods modified order to put Settings, then Notifications at top of list
-+
++++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/PageMain.qml-v3.40	2025-02-02 17:47:45
+@@ -1,11 +1,46 @@
  import QtQuick 1.1
 +import "utils.js" as Utils
  import com.victron.velib 1.0
@@ -49,7 +47,7 @@
  		VisualDataModel {
  			model: VeSortFilterProxyModel {
  				model: DeviceList {
-@@ -27,23 +64,28 @@
+@@ -27,23 +62,28 @@
  				subpage: model.page
  			}
  		}
@@ -80,7 +78,7 @@
  				editable: true
 
  				function clicked() {
-@@ -155,7 +197,8 @@
+@@ -155,7 +195,8 @@
  			page = vebusPage
  			break;
  		case DBusService.DBUS_SERVICE_MULTI_RS: