diff --git a/FileSets/VersionIndependent/spi1-1cs.dtbo b/FileSets/VersionIndependent/spi1-1cs.dtbo new file mode 100644 index 0000000..1ee5981 Binary files /dev/null and b/FileSets/VersionIndependent/spi1-1cs.dtbo differ 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