From 3580b5a9a3c4bade0ef9353c9b2caf5efa622f6f Mon Sep 17 00:00:00 2001
From: kwindrem <58538395+kwindrem@users.noreply.github.com>
Date: Thu, 22 Feb 2024 16:29:22 -0800
Subject: [PATCH] install spi1-1cs overlay

---
 FileSets/VersionIndependent/spi1-1cs.dtbo | Bin 0 -> 1523 bytes
 FileSets/fileListVersionIndependent       |   1 +
 changes                                   |   4 ++++
 setup                                     |  10 +---------
 version                                   |   2 +-
 5 files changed, 7 insertions(+), 10 deletions(-)
 create mode 100644 FileSets/VersionIndependent/spi1-1cs.dtbo
 create mode 100644 FileSets/fileListVersionIndependent

diff --git a/FileSets/VersionIndependent/spi1-1cs.dtbo b/FileSets/VersionIndependent/spi1-1cs.dtbo
new file mode 100644
index 0000000000000000000000000000000000000000..1ee5981dd8bbe5980ee9095581f82caf81653e1e
GIT binary patch
literal 1523
zcmaJ>&2AGh5O&&B1(ixbLE?bKPlbdKQL-sWRZisrcmTv<<!qd=V*gn0Rtc}bv3JhA
z04L5|xPZh<aN)!q_&%>4Z_+lFW@pBp`8=Ne>>vAoe+#kmM+k8YeINQU<ObwAgyW|W
z-CvEl^6gk}8+xDixQx=L<0u^-A3e8gooOj&smiL8ftg`!7qa&c1G*E2`Kc-sxd=lB
zbaW91VG(DVo)C<`2Du42fZT%IhB%zN)^`3A_^fM-+F(Vx1-Hy29>wJmhk4E?4l&x|
z&k|t8$6j_8hc!fO8~cUHZt}0demPN7Stk{znZvo)5O)sFu?NcbjCDJ_9oSj^RxY49
z+@7qTHhVBpr?&ge+%5x~d0NYy+IZgIR5$<OVpqR9vH6?oVC=<x<PLtnO?_O)cX*aR
zB@U?@1~qv1fcpWmWjIMbjSK;|Bi)-7ajr+txV1U^9`qTct1DU64e^K%Y`sXwd18^-
z&xeqYeNXCsi@*H~xcdn4pEkyy=jR>deD*m(dk-v`njb)axg>^lwEww1%QT+Xg=-Se
zg8MGMdW^xSlI2WQXq2B^*?hEYUeinD^DcgCg?kJvU~nJCeD^WK^%z@Ul1DNLSE|H6
zShl*kbL;N~@!fraY2Fs%Sxmky=eWUma)X0!95KjIa)86-Q(ukpw2)OiPLycc)4X!#
zg)-cl)>%}=c_xZCGMgamP);VL(z+L^B+=qf$M2Q3krh>C(#vG3v~b=)xV{R@z*5b4
tL3^p3_ok(KSF0>qAZoy;%xHUkJ>!h!xWuLf_KFALK#=it10n0V_z%ZoAesOG

literal 0
HcmV?d00001

diff --git a/FileSets/fileListVersionIndependent b/FileSets/fileListVersionIndependent
new file mode 100644
index 0000000..5a1a520
--- /dev/null
+++ b/FileSets/fileListVersionIndependent
@@ -0,0 +1 @@
+/u-boot/overlays/spi1-1cs.dtbo
\ No newline at end of file
diff --git a/changes b/changes
index 8abda8f..2253b68 100644
--- a/changes
+++ b/changes
@@ -1,3 +1,7 @@
+v4.5:
+	install spi1-1cs overlay for use in VeCanSetup for CANbus hats that use spi1
+		spi1-3cd conflicts with Shutdown pin
+
 v4.4:
 	added alternate GPIO overlay to remove conflicts with FD can hat
 
diff --git a/setup b/setup
index 19c1d7d..ca56cbf 100755
--- a/setup
+++ b/setup
@@ -36,7 +36,6 @@
 gpioListFile="/etc/venus/gpio_list"
 overlayFile="/u-boot/overlays/VenusGpioOverlay.dtbo"
 altOverlayFile="/u-boot/overlays/VenusGpioOverlayForCanHats.dtbo"
-relayStateFile="/opt/victronenergy/dbus-systemcalc-py/delegates/relaystate.py"
 configFile="/u-boot/config.txt"
 
 # no log file for this package
@@ -129,9 +128,6 @@ if [ $scriptAction == 'INSTALL' ] ; then
 		updateActiveFile "$gpioListFile"
 	fi
 
-    # modify relaystate.py for additional relays to prevent system calc crash
-    updateActiveFile "$relayStateFile"
-    
 	# install / update GPIO overlay
 	# there are two overlays, make sure the "other" one is removed from config.txt
 	if [ -f "$setupOptionsDir/alternateGpio" ]; then
@@ -160,10 +156,6 @@ fi
 # uninstalling - check scriptAction again
 # if an install step failed package needs to be removed
 if [ $scriptAction == 'UNINSTALL' ] ; then
-    restoreActiveFile "$gpioListFile"
-    restoreActiveFile "$overlayFile"
-    restoreActiveFile "$altOverlayFile"
-    restoreActiveFile "$relayStateFile"
 
     # remove mods from configFile - do not use restore in case other mods were made manually
     if [ -f "$configFile" ]; then
@@ -179,5 +171,5 @@ if $filesUpdated ; then
 fi
 
 # thats all folks - SCRIPT EXITS INSIDE THE FUNCTION
-endScript
+endScript 'INSTALL_FILES'
 
diff --git a/version b/version
index a7021c5..a3db10f 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-v4.4
+v4.5