add v3.40, dropping support for firmware earlier than v3.10

kwindrem · Jul 17, 2024 · a7eb57e · a7eb57e
1 parent d24baf3
commit a7eb57e
Show file tree

Hide file tree

Showing 2,656 changed files with 8,777 additions and 74,776 deletions.
diff --git a/ExtTransferSwitch.py b/ExtTransferSwitch.py
@@ -29,26 +29,18 @@
 import os
 import time
 import dbus
-
-dbusSettingsPath = "com.victronenergy.settings"
-dbusSystemPath = "com.victronenergy.system"
-
-
-
-# accommodate both Python 2 and 3
-# if the Python 3 GLib import fails, import the Python 2 gobject
-try:
-	from gi.repository import GLib # for Python 3
-except ImportError:
-	import gobject as GLib # for Python 2
-
+from gi.repository import GLib
 # add the path to our own packages for import
-# use an established Victron service to maintain compatiblity
-sys.path.insert(1, os.path.join('/opt/victronenergy/dbus-systemcalc-py', 'ext', 'velib_python'))
+sys.path.insert(1, "/data/SetupHelper/velib_python")
 from vedbus import VeDbusService
 from ve_utils import wrap_dbus_value
 from settingsdevice import SettingsDevice
 
+
+dbusSettingsPath = "com.victronenergy.settings"
+dbusSystemPath = "com.victronenergy.system"
+
+
 class Monitor:
 
 	def getVeBusObjects (self):

diff --git a/FileSets/PatchSource/Battery.qml-v3.40~32 → FileSets/PatchSource/Battery.qml-v3.34 b/FileSets/PatchSource/Battery.qml-v3.40~32 → FileSets/PatchSource/Battery.qml-v3.34
diff --git a/...ets/PatchSource/Battery.qml-v3.40~32.orig → FileSets/PatchSource/Battery.qml-v3.34.orig b/...ets/PatchSource/Battery.qml-v3.40~32.orig → FileSets/PatchSource/Battery.qml-v3.34.orig
diff --git a/...ts/PatchSource/Battery.qml-v3.40~32.patch → FileSets/PatchSource/Battery.qml-v3.34.patch b/...ts/PatchSource/Battery.qml-v3.40~32.patch → FileSets/PatchSource/Battery.qml-v3.34.patch
@@ -1,5 +1,5 @@
---- /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/Battery.qml-v3.40~32.orig	2024-07-09 10:19:41
-+++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/Battery.qml-v3.40~32	2024-05-14 07:00:12
+--- /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/Battery.qml-v3.34.orig	2024-07-09 10:19:41
++++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/Battery.qml-v3.34	2024-05-14 07:00:12
 @@ -6,9 +6,14 @@
  	width: 145
  	height: 101

diff --git a/FileSets/PatchSource/Battery.qml-v3.40~35 → FileSets/PatchSource/Battery.qml-v3.40 b/FileSets/PatchSource/Battery.qml-v3.40~35 → FileSets/PatchSource/Battery.qml-v3.40
diff --git a/...Sets/PatchSource/Battery.qmlv3.40~35.orig → FileSets/PatchSource/Battery.qmlv3.40.orig b/...Sets/PatchSource/Battery.qmlv3.40~35.orig → FileSets/PatchSource/Battery.qmlv3.40.orig
diff --git a/FileSets/PatchSource/MbItemDigitalInput.qml-v2.94.patch b/FileSets/PatchSource/MbItemDigitalInput.qml-v2.94.patch
diff --git a/...tchSource/MbItemDigitalInput.qml-v3.40~35 → .../PatchSource/MbItemDigitalInput.qml-v3.40 b/...tchSource/MbItemDigitalInput.qml-v3.40~35 → .../PatchSource/MbItemDigitalInput.qml-v3.40
diff --git a/...urce/MbItemDigitalInput.qml-v3.40~35.orig → ...hSource/MbItemDigitalInput.qml-v3.40.orig b/...urce/MbItemDigitalInput.qml-v3.40~35.orig → ...hSource/MbItemDigitalInput.qml-v3.40.orig
diff --git a/...rce/MbItemDigitalInput.qml-v3.40~35.patch → ...Source/MbItemDigitalInput.qml-v3.40.patch b/...rce/MbItemDigitalInput.qml-v3.40~35.patch → ...Source/MbItemDigitalInput.qml-v3.40.patch
@@ -1,5 +1,5 @@
---- /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/MbItemDigitalInput.qml-v3.40~35.orig	2024-07-09 10:19:45
-+++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/MbItemDigitalInput.qml-v3.40~35	2024-05-14 07:00:12
+--- /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
 +

diff --git a/FileSets/PatchSource/MbSpinBox.qml-v2.73.patch b/FileSets/PatchSource/MbSpinBox.qml-v2.73.patch
diff --git a/FileSets/PatchSource/MbSpinBox.qml-v2.89.patch b/FileSets/PatchSource/MbSpinBox.qml-v2.89.patch
diff --git a/FileSets/PatchSource/MbSpinBox.qml-v3.40~35 → FileSets/PatchSource/MbSpinBox.qml-v3.40 b/FileSets/PatchSource/MbSpinBox.qml-v3.40~35 → FileSets/PatchSource/MbSpinBox.qml-v3.40
diff --git a/...s/PatchSource/MbSpinBox.qml-v3.40~35.orig → ...Sets/PatchSource/MbSpinBox.qml-v3.40.orig b/...s/PatchSource/MbSpinBox.qml-v3.40~35.orig → ...Sets/PatchSource/MbSpinBox.qml-v3.40.orig
diff --git a/FileSets/PatchSource/MbSpinBox.qml.patch → ...ets/PatchSource/MbSpinBox.qml-v3.40.patch b/FileSets/PatchSource/MbSpinBox.qml.patch → ...ets/PatchSource/MbSpinBox.qml-v3.40.patch
@@ -1,5 +1,5 @@
---- /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/MbSpinBox.qml.orig	2024-07-09 10:19:46
-+++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/MbSpinBox.qml	2024-05-14 07:00:12
+--- /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/MbSpinBox.qml-v3.40.orig	2024-07-09 10:19:46
++++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/MbSpinBox.qml-v3.40	2024-05-14 07:00:12
 @@ -6,6 +6,10 @@
  	id: root
  	cornerMark: !readOnly && !spinbox.enabled

diff --git a/FileSets/PatchSource/MbSpinBox.qml-v3.40~35.patch b/FileSets/PatchSource/MbSpinBox.qml-v3.40~35.patch
diff --git a/FileSets/PatchSource/MbStyle.qml-v2.94.patch b/FileSets/PatchSource/MbStyle.qml-v2.94.patch
diff --git a/FileSets/PatchSource/MbStyle.qml-v3.40~35 → FileSets/PatchSource/MbStyle.qml-v3.40 b/FileSets/PatchSource/MbStyle.qml-v3.40~35 → FileSets/PatchSource/MbStyle.qml-v3.40
diff --git a/...ets/PatchSource/MbStyle.qml-v3.40~35.orig → FileSets/PatchSource/MbStyle.qml-v3.40.orig b/...ets/PatchSource/MbStyle.qml-v3.40~35.orig → FileSets/PatchSource/MbStyle.qml-v3.40.orig
diff --git a/...ts/PatchSource/MbStyle.qml-v3.40~35.patch → FileSets/PatchSource/MbStyle.qml-v3.40.patch b/...ts/PatchSource/MbStyle.qml-v3.40~35.patch → FileSets/PatchSource/MbStyle.qml-v3.40.patch
@@ -1,5 +1,5 @@
---- /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/MbStyle.qml-v3.40~35.orig	2024-07-09 10:19:46
-+++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/MbStyle.qml-v3.40~35	2024-05-14 07:00:12
+--- /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/MbStyle.qml-v3.40.orig	2024-07-09 10:19:46
++++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/MbStyle.qml-v3.40	2024-05-14 07:00:12
 @@ -4,6 +4,10 @@
   * common style properties
   */

diff --git a/FileSets/PatchSource/PageMain.qml-v2.94.patch b/FileSets/PatchSource/PageMain.qml-v2.94.patch
diff --git a/FileSets/PatchSource/PageMain.qml-v3.40~13 → FileSets/PatchSource/PageMain.qml-v3.34 b/FileSets/PatchSource/PageMain.qml-v3.40~13 → FileSets/PatchSource/PageMain.qml-v3.34
diff --git a/...ts/PatchSource/PageMain.qml-v3.40~13.orig → FileSets/PatchSource/PageMain.qml-v3.34.orig b/...ts/PatchSource/PageMain.qml-v3.40~13.orig → FileSets/PatchSource/PageMain.qml-v3.34.orig
diff --git a/...s/PatchSource/PageMain.qml-v3.40~13.patch → ...Sets/PatchSource/PageMain.qml-v3.34.patch b/...s/PatchSource/PageMain.qml-v3.40~13.patch → ...Sets/PatchSource/PageMain.qml-v3.34.patch
@@ -1,5 +1,5 @@
---- /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/PageMain.qml-v3.40~13.orig	2024-07-08 09:45:00
-+++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/PageMain.qml-v3.40~13	2024-07-09 09:53:47
+--- /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
 +

diff --git a/FileSets/PatchSource/PageMain.qml-v3.40~35 → FileSets/PatchSource/PageMain.qml-v3.40 b/FileSets/PatchSource/PageMain.qml-v3.40~35 → FileSets/PatchSource/PageMain.qml-v3.40
diff --git a/...ts/PatchSource/PageMain.qml-v3.40~35.orig → FileSets/PatchSource/PageMain.qml-v3.40.orig b/...ts/PatchSource/PageMain.qml-v3.40~35.orig → FileSets/PatchSource/PageMain.qml-v3.40.orig
diff --git a/...s/PatchSource/PageMain.qml-v3.40~35.patch → ...Sets/PatchSource/PageMain.qml-v3.40.patch b/...s/PatchSource/PageMain.qml-v3.40~35.patch → ...Sets/PatchSource/PageMain.qml-v3.40.patch
@@ -1,5 +1,5 @@
---- /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/PageMain.qml-v3.40~35.orig	2024-07-08 09:45:00
-+++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/PageMain.qml-v3.40~35	2024-07-09 09:55:28
+--- /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
 +