fixed: v4.5 had corrupted file sets

kwindrem · Feb 28, 2024 · bd3da1f · bd3da1f
1 parent 3580b5a
commit bd3da1f
Show file tree

Hide file tree

Showing 107 changed files with 40 additions and 267 deletions.
diff --git a/FileSets/v3.30~8/relaystate.py → FileSets/PatchSource/relaystate.py.edited b/FileSets/v3.30~8/relaystate.py → FileSets/PatchSource/relaystate.py.edited
@@ -21,15 +21,16 @@ def get_input(self):
 			('com.victronenergy.settings', [
 				 '/Settings/Relay/Function'])] # Managed by the gui
 
+#### add relays 3 - 6 for RpiGpioSetup
 	def get_settings(self):
 		return [
-            ('/Relay/0/State', '/Settings/Relay/0/InitialState', 0, 0, 1),
-            ('/Relay/1/State', '/Settings/Relay/1/InitialState', 0, 0, 1),
-            ('/Relay/2/State', '/Settings/Relay/2/InitialState', 0, 0, 1),
-            ('/Relay/3/State', '/Settings/Relay/3/InitialState', 0, 0, 1),
-            ('/Relay/4/State', '/Settings/Relay/4/InitialState', 0, 0, 1),
-            ('/Relay/5/State', '/Settings/Relay/5/InitialState', 0, 0, 1),
-            ('/Relay/6/State', '/Settings/Relay/6/InitialState', 0, 0, 1)
+			('/Relay/0/State', '/Settings/Relay/0/InitialState', 0, 0, 1),
+			('/Relay/1/State', '/Settings/Relay/1/InitialState', 0, 0, 1),
+			('/Relay/2/State', '/Settings/Relay/2/InitialState', 0, 0, 1),
+			('/Relay/3/State', '/Settings/Relay/3/InitialState', 0, 0, 1),
+			('/Relay/4/State', '/Settings/Relay/4/InitialState', 0, 0, 1),
+			('/Relay/5/State', '/Settings/Relay/5/InitialState', 0, 0, 1),
+			('/Relay/6/State', '/Settings/Relay/6/InitialState', 0, 0, 1)
 		]
 
 	@property

diff --git a/FileSets/PatchSource/relaystate.py.patch b/FileSets/PatchSource/relaystate.py.patch
@@ -0,0 +1,20 @@
+--- /Users/Kevin/GitHub/RpiGpioSetup/FileSets/PatchSource/relaystate.py.source	2024-02-23 09:55:27
++++ /Users/Kevin/GitHub/RpiGpioSetup/FileSets/PatchSource/relaystate.py.edited	2024-02-23 22:32:14
+@@ -21,10 +21,16 @@
+ 			('com.victronenergy.settings', [
+ 				 '/Settings/Relay/Function'])] # Managed by the gui
+
++#### add relays 3 - 6 for RpiGpioSetup
+ 	def get_settings(self):
+ 		return [
+ 			('/Relay/0/State', '/Settings/Relay/0/InitialState', 0, 0, 1),
+-			('/Relay/1/State', '/Settings/Relay/1/InitialState', 0, 0, 1)
++			('/Relay/1/State', '/Settings/Relay/1/InitialState', 0, 0, 1),
++			('/Relay/2/State', '/Settings/Relay/2/InitialState', 0, 0, 1),
++			('/Relay/3/State', '/Settings/Relay/3/InitialState', 0, 0, 1),
++			('/Relay/4/State', '/Settings/Relay/4/InitialState', 0, 0, 1),
++			('/Relay/5/State', '/Settings/Relay/5/InitialState', 0, 0, 1),
++			('/Relay/6/State', '/Settings/Relay/6/InitialState', 0, 0, 1)
+ 		]
+
+ 	@property
diff --git a/FileSets/v3.30~8/relaystate.py.orig → FileSets/PatchSource/relaystate.py.source b/FileSets/v3.30~8/relaystate.py.orig → FileSets/PatchSource/relaystate.py.source
diff --git a/FileSets/VenusGpioOverlay.dtbo → .../VersionIndependent/VenusGpioOverlay.dtbo b/FileSets/VenusGpioOverlay.dtbo → .../VersionIndependent/VenusGpioOverlay.dtbo
diff --git a/FileSets/VenusGpioOverlayForCanHats.dtbo → ...dependent/VenusGpioOverlayForCanHats.dtbo b/FileSets/VenusGpioOverlayForCanHats.dtbo → ...dependent/VenusGpioOverlayForCanHats.dtbo
diff --git a/FileSets/fileList → FileSets/fileListPatched b/FileSets/fileList → FileSets/fileListPatched
diff --git a/FileSets/fileListVersionIndependent b/FileSets/fileListVersionIndependent
@@ -1 +1,3 @@
-/u-boot/overlays/spi1-1cs.dtbo
+/u-boot/overlays/spi1-1cs.dtbo
+/u-boot/overlays/VenusGpioOverlay.dtbo
+/u-boot/overlays/VenusGpioOverlayForCanHats.dtbo
diff --git a/FileSets/v2.71/COMPLETE b/FileSets/v2.71/COMPLETE
diff --git a/FileSets/v2.71/LINKS_ONLY b/FileSets/v2.71/LINKS_ONLY
diff --git a/FileSets/v2.71/relaystate.py b/FileSets/v2.71/relaystate.py
diff --git a/FileSets/v2.72/COMPLETE b/FileSets/v2.72/COMPLETE
diff --git a/FileSets/v2.72/LINKS_ONLY b/FileSets/v2.72/LINKS_ONLY
diff --git a/FileSets/v2.72/relaystate.py b/FileSets/v2.72/relaystate.py
diff --git a/FileSets/v2.73/COMPLETE b/FileSets/v2.73/COMPLETE
diff --git a/FileSets/v2.73/relaystate.py b/FileSets/v2.73/relaystate.py
diff --git a/FileSets/v2.73/relaystate.py.orig b/FileSets/v2.73/relaystate.py.orig
diff --git a/FileSets/v2.80/COMPLETE b/FileSets/v2.80/COMPLETE
diff --git a/FileSets/v2.80/LINKS_ONLY b/FileSets/v2.80/LINKS_ONLY
diff --git a/FileSets/v2.80/relaystate.py b/FileSets/v2.80/relaystate.py
diff --git a/FileSets/v2.81/COMPLETE b/FileSets/v2.81/COMPLETE
diff --git a/FileSets/v2.81/LINKS_ONLY b/FileSets/v2.81/LINKS_ONLY
diff --git a/FileSets/v2.81/relaystate.py b/FileSets/v2.81/relaystate.py
diff --git a/FileSets/v2.82/COMPLETE b/FileSets/v2.82/COMPLETE
diff --git a/FileSets/v2.82/LINKS_ONLY b/FileSets/v2.82/LINKS_ONLY
diff --git a/FileSets/v2.82/relaystate.py b/FileSets/v2.82/relaystate.py
diff --git a/FileSets/v2.83/COMPLETE b/FileSets/v2.83/COMPLETE
diff --git a/FileSets/v2.83/LINKS_ONLY b/FileSets/v2.83/LINKS_ONLY
diff --git a/FileSets/v2.83/relaystate.py b/FileSets/v2.83/relaystate.py
diff --git a/FileSets/v2.84/COMPLETE b/FileSets/v2.84/COMPLETE
diff --git a/FileSets/v2.84/LINKS_ONLY b/FileSets/v2.84/LINKS_ONLY
diff --git a/FileSets/v2.84/relaystate.py b/FileSets/v2.84/relaystate.py
diff --git a/FileSets/v2.85/COMPLETE b/FileSets/v2.85/COMPLETE
diff --git a/FileSets/v2.85/LINKS_ONLY b/FileSets/v2.85/LINKS_ONLY
diff --git a/FileSets/v2.85/relaystate.py b/FileSets/v2.85/relaystate.py
diff --git a/FileSets/v2.86/COMPLETE b/FileSets/v2.86/COMPLETE
diff --git a/FileSets/v2.86/LINKS_ONLY b/FileSets/v2.86/LINKS_ONLY
diff --git a/FileSets/v2.86/relaystate.py b/FileSets/v2.86/relaystate.py
diff --git a/FileSets/v2.87/COMPLETE b/FileSets/v2.87/COMPLETE
diff --git a/FileSets/v2.87/LINKS_ONLY b/FileSets/v2.87/LINKS_ONLY
diff --git a/FileSets/v2.87/relaystate.py b/FileSets/v2.87/relaystate.py
diff --git a/FileSets/v2.89/COMPLETE b/FileSets/v2.89/COMPLETE
diff --git a/FileSets/v2.89/LINKS_ONLY b/FileSets/v2.89/LINKS_ONLY
diff --git a/FileSets/v2.89/relaystate.py b/FileSets/v2.89/relaystate.py
diff --git a/FileSets/v2.90/COMPLETE b/FileSets/v2.90/COMPLETE
diff --git a/FileSets/v2.90/LINKS_ONLY b/FileSets/v2.90/LINKS_ONLY
diff --git a/FileSets/v2.90/relaystate.py b/FileSets/v2.90/relaystate.py
diff --git a/FileSets/v2.91/COMPLETE b/FileSets/v2.91/COMPLETE
diff --git a/FileSets/v2.91/LINKS_ONLY b/FileSets/v2.91/LINKS_ONLY
diff --git a/FileSets/v2.91/relaystate.py b/FileSets/v2.91/relaystate.py
diff --git a/FileSets/v2.92/COMPLETE b/FileSets/v2.92/COMPLETE
diff --git a/FileSets/v2.92/LINKS_ONLY b/FileSets/v2.92/LINKS_ONLY
diff --git a/FileSets/v2.92/relaystate.py b/FileSets/v2.92/relaystate.py
diff --git a/FileSets/v2.93/COMPLETE b/FileSets/v2.93/COMPLETE
diff --git a/FileSets/v2.93/LINKS_ONLY b/FileSets/v2.93/LINKS_ONLY
diff --git a/FileSets/v2.93/relaystate.py b/FileSets/v2.93/relaystate.py
diff --git a/FileSets/v2.94/COMPLETE b/FileSets/v2.94/COMPLETE
diff --git a/FileSets/v2.94/LINKS_ONLY b/FileSets/v2.94/LINKS_ONLY
diff --git a/FileSets/v2.94/relaystate.py b/FileSets/v2.94/relaystate.py
diff --git a/FileSets/v3.00/COMPLETE b/FileSets/v3.00/COMPLETE
diff --git a/FileSets/v3.00/LINKS_ONLY b/FileSets/v3.00/LINKS_ONLY
diff --git a/FileSets/v3.00/relaystate.py b/FileSets/v3.00/relaystate.py
diff --git a/FileSets/v3.00~32/COMPLETE b/FileSets/v3.00~32/COMPLETE
diff --git a/FileSets/v3.00~32/LINKS_ONLY b/FileSets/v3.00~32/LINKS_ONLY
diff --git a/FileSets/v3.00~32/relaystate.py b/FileSets/v3.00~32/relaystate.py
diff --git a/FileSets/v3.01/COMPLETE b/FileSets/v3.01/COMPLETE
diff --git a/FileSets/v3.01/LINKS_ONLY b/FileSets/v3.01/LINKS_ONLY
diff --git a/FileSets/v3.01/relaystate.py b/FileSets/v3.01/relaystate.py
diff --git a/FileSets/v3.10/COMPLETE b/FileSets/v3.10/COMPLETE
diff --git a/FileSets/v3.10/LINKS_ONLY b/FileSets/v3.10/LINKS_ONLY
diff --git a/FileSets/v3.10/relaystate.py b/FileSets/v3.10/relaystate.py
diff --git a/FileSets/v3.11/COMPLETE b/FileSets/v3.11/COMPLETE
diff --git a/FileSets/v3.11/LINKS_ONLY b/FileSets/v3.11/LINKS_ONLY
diff --git a/FileSets/v3.11/relaystate.py b/FileSets/v3.11/relaystate.py
diff --git a/FileSets/v3.12/COMPLETE b/FileSets/v3.12/COMPLETE
diff --git a/FileSets/v3.12/LINKS_ONLY b/FileSets/v3.12/LINKS_ONLY
diff --git a/FileSets/v3.12/relaystate.py b/FileSets/v3.12/relaystate.py
diff --git a/FileSets/v3.13/COMPLETE b/FileSets/v3.13/COMPLETE
diff --git a/FileSets/v3.13/LINKS_ONLY b/FileSets/v3.13/LINKS_ONLY
diff --git a/FileSets/v3.13/relaystate.py b/FileSets/v3.13/relaystate.py
diff --git a/FileSets/v3.14/COMPLETE b/FileSets/v3.14/COMPLETE
diff --git a/FileSets/v3.14/LINKS_ONLY b/FileSets/v3.14/LINKS_ONLY
diff --git a/FileSets/v3.14/relaystate.py b/FileSets/v3.14/relaystate.py
diff --git a/FileSets/v3.20/COMPLETE b/FileSets/v3.20/COMPLETE
diff --git a/FileSets/v3.20/LINKS_ONLY b/FileSets/v3.20/LINKS_ONLY
diff --git a/FileSets/v3.20/relaystate.py b/FileSets/v3.20/relaystate.py
diff --git a/FileSets/v3.21/COMPLETE b/FileSets/v3.21/COMPLETE
diff --git a/FileSets/v3.21/LINKS_ONLY b/FileSets/v3.21/LINKS_ONLY
diff --git a/FileSets/v3.21/relaystate.py b/FileSets/v3.21/relaystate.py
diff --git a/FileSets/v3.30~3/COMPLETE b/FileSets/v3.30~3/COMPLETE
diff --git a/FileSets/v3.30~3/LINKS_ONLY b/FileSets/v3.30~3/LINKS_ONLY
diff --git a/FileSets/v3.30~3/relaystate.py b/FileSets/v3.30~3/relaystate.py
diff --git a/FileSets/v3.30~4/COMPLETE b/FileSets/v3.30~4/COMPLETE
diff --git a/FileSets/v3.30~4/LINKS_ONLY b/FileSets/v3.30~4/LINKS_ONLY
diff --git a/FileSets/v3.30~4/relaystate.py b/FileSets/v3.30~4/relaystate.py
diff --git a/FileSets/v3.30~6/COMPLETE b/FileSets/v3.30~6/COMPLETE
diff --git a/FileSets/v3.30~6/LINKS_ONLY b/FileSets/v3.30~6/LINKS_ONLY
diff --git a/FileSets/v3.30~6/relaystate.py b/FileSets/v3.30~6/relaystate.py
diff --git a/FileSets/v3.30~7/COMPLETE b/FileSets/v3.30~7/COMPLETE
diff --git a/FileSets/v3.30~7/LINKS_ONLY b/FileSets/v3.30~7/LINKS_ONLY
diff --git a/FileSets/v3.30~7/relaystate.py b/FileSets/v3.30~7/relaystate.py
diff --git a/FileSets/v3.30~8/COMPLETE b/FileSets/v3.30~8/COMPLETE
diff --git a/HelperResources/CommonResources b/HelperResources/CommonResources
@@ -1253,13 +1253,6 @@ fi
 versionStringToNumber $venusVersion
 venusVersionNumber=$versionNumber
 
-# create obsolete version file if it does not already exist
-#	accommodates previous mechanism that used shell varaible
-if [ ! -z $obsoleteVersion ] && [ ! -f "$scriptDir/obsoleteVersion" ]; then
-	echo $obsoleteVersion > "$scriptDir/obsoleteVersion"
-fi
-
-
 # prevent installing Raspberry Pi packages on other platforms
 if [ -f "$scriptDir/raspberryPiOnly" ]; then 
 	if [[ $machine != *"raspberrypi"* ]]; then
@@ -1298,6 +1291,9 @@ fi
 #	do final checks before permitting install
 if [ $scriptAction != 'UNINSTALL' ]; then
 
+	# check for package conflicts and prevent installs if there are any
+	###################################
+
 	# determine if GUI v1 is installed
 	#	Note, it may NOT be running or selected to run!!!!
 	if [ ! -d "/opt/victronenergy/gui" ]; then

diff --git a/PI GPIO pins.numbers b/PI GPIO pins.numbers
diff --git a/PI GPIO pins.pdf b/PI GPIO pins.pdf
diff --git a/changes b/changes
@@ -1,3 +1,8 @@
+v4.6:
+	fixed: v4.5 had corrupted file sets (v2.73 and maybe others)
+	cleanup overlay install
+	move to version-independent and patched replacements
+
 v4.5:
 	install spi1-1cs overlay for use in VeCanSetup for CANbus hats that use spi1
 		spi1-3cd conflicts with Shutdown pin