From 0be3ff050330f7e36774b38e0fbe9467796b1507 Mon Sep 17 00:00:00 2001
From: kwindrem <58538395+kwindrem@users.noreply.github.com>
Date: Wed, 15 Dec 2021 18:05:52 -0800
Subject: [PATCH] ass support for SetupHelper v4

---
 .DS_Store                                     | Bin 10244 -> 6148 bytes
 FileSets/.DS_Store                            | Bin 6148 -> 6148 bytes
 FileSets/VenusGpioOverlay.dtb                 | Bin 633 -> 637 bytes
 FileSets/gpio_list                            |   5 +++
 FileSets/{v2.40 => v2.42}/.DS_Store           | Bin
 FileSets/{v2.40 => v2.42}/relaystate.py       |   0
 FileSets/{v2.40 => v2.42}/relaystate.py.orig  |   0
 FileSets/{v2.65 => v2.66}/.DS_Store           | Bin
 FileSets/{v2.65 => v2.66}/relaystate.py       |   0
 FileSets/{v2.65 => v2.66}/relaystate.py.orig  |   0
 FileSets/{v2.80~11 => v2.80~19}/.DS_Store     | Bin
 FileSets/{v2.80~11 => v2.80~19}/relaystate.py |   0
 .../{v2.80~11 => v2.80~19}/relaystate.py.orig |   0
 ReadMe                                        |  32 ++----------------
 VenusGpioOverlay.dts                          |   2 +-
 changes                                       |   6 ++++
 raspberryPiOnly                               |   0
 setup                                         |   5 +--
 timeStamp                                     |   2 +-
 version                                       |   2 +-
 20 files changed, 19 insertions(+), 35 deletions(-)
 rename FileSets/{v2.40 => v2.42}/.DS_Store (100%)
 rename FileSets/{v2.40 => v2.42}/relaystate.py (100%)
 rename FileSets/{v2.40 => v2.42}/relaystate.py.orig (100%)
 rename FileSets/{v2.65 => v2.66}/.DS_Store (100%)
 rename FileSets/{v2.65 => v2.66}/relaystate.py (100%)
 rename FileSets/{v2.65 => v2.66}/relaystate.py.orig (100%)
 rename FileSets/{v2.80~11 => v2.80~19}/.DS_Store (100%)
 rename FileSets/{v2.80~11 => v2.80~19}/relaystate.py (100%)
 rename FileSets/{v2.80~11 => v2.80~19}/relaystate.py.orig (100%)
 create mode 100644 changes
 create mode 100644 raspberryPiOnly

diff --git a/.DS_Store b/.DS_Store
index d9193cc3450334baa267475c7bba123505dade51..6166e94ead0606d8e9b6b032200ae696091b5020 100644
GIT binary patch
delta 195
zcmZn(XfcprU|?W$DortDU=RQ@Ie-{MGqg`k6q~50$jCA=z?zX|GLL{%tp6;aI17Uw
zLpnnyLrHGFi%U{YeiBfOgLl_yz3i=r9Z}^|@X8lt7zQWj=N16<FfcG}*qF$|zL=eZ
tLy#FPz#za4q+NlyePiNx=E?jjhKvl8ZFr<7C#bNqf*j4TIi6<@GXPxBD4PHP

literal 10244
zcmeHMZEO@p7@l`qVAn2mt^zH~fd>`&=mpvWnu^G^cYM^Av~n$N0V#X8OS^Gz_qg4=
z0;Sr>4}K_`_(OsC0}}j5G#V2DjmG#9jUS07S|u2NNc{X`Ow`1WnCLq@d$r{Xzldq#
zPBQb(yzjg-v(G;7?9Ch@1X}W110fMYh=`d<Dq}H4Vs@5GlHhA*qXhIP=0HO-ZD+D2
zJp)C6K!8AiK!8AiK!Ct>K>)wmEQu9d24#RifIxu2I09^ch+t+i=F3qoy{!Wa?+Adh
z9MxXJI%O4<5nsl9Im#tkFadW($z8!eVgPqXeZ=n<^W`X)+?{}b_yB)q@J}e<&5q+o
zyzT^ITn1%;K!89g0_^NwPF9lvVi0%I`5l^nm}tw`iA2h@Q>YV<IGx9GN8fIqY}c-7
z&kjzw8xT&TD@ObloYf>cNn&=1lNxfe{v7Y8vZmp<_4OA)C@Y^abCxKI72<61p5&lC
zlyp@$@3g47-K^EAx`Qdd-eue7cwJ5HH1wf<IyY`xu4-6%&T}?29lPx5F)Ym<YO(W{
z=6K^Ixj~X7QR=5P!@~{r_0dRE<JysEWVopj>+6~tM@A&EdRfE9)_s{nhlh`h+;@^a
z3GO%kzC<c{d%Qe_wUP(boV1z3r81`y<D|DhUR*F`AEyxKNR`zUk@}*DlypOdJX`7B
z+0)x6_tUBZg3yt54cl^d>Ny8xKdp2SxYo37b>?(t?@8NcK4UrkG?Z4&bly~5z1cLA
z#$g?Gl}<Wmn`Wo&7;KonUROWpGFyqMcb8-5+_*PbuYu$9UNrCMJ9He>DCh|s+Mysl
zKc_mpWZ9}U>zeM2Z*A`!tE8bSS)Mn)r(ifn%GCQ*C#_qWVGVQ-8Jat|3tx}r8v6}B
zCrKeV+hwU4eXJ@(D{B@gN^d@89LO8)AzCYno_5h<Mc$*~WZP|xd1>^VD0!Bpixp)z
zv&3^cmYVNy%W_5Ta`36B>UXS*%5vAe$P?;F+_k<zR=Q0!rJGcf_&n=xm6e_X2bQ+^
z%G)={N-ti8WpK$(2%^4vQ%q6zvYFde$L+}K7Ov_&fBFQjs*l;4HO*U7Wr$WOtxB6n
zKM{91gKAFi7(xz@`T7n~^xh-t*=U<J!?nkaNoJ&mRWLAA@Rjk15o?RItc|VU)!Nuv
zUh&|pjn(s(gtS~l8cBk*lYJydhRJbqf}9~Qk@MsNd6#@lE|SaSd-5~+h5Sl>BY(jR
zm;)3-Pz4KN1+0QPh{Aekh8BoJJKPOP=z?z83u(|{KMX(?3UCk(!C^QG55jSH7#@KW
za0br8lkgP00I$Ov@Fu(kAHrwwIb4LV;4*v--@s4sJNyBE3bHUym@iZdtAsjXov=~Z
zBD4uzeDOjt7I*V@u@t(oRvK<j!QXU*(^H31c<Z*-yV|C4C|#Pvg6GD$^X6AaSVY}+
zNAo!OI9rPZok)9+>yskH<GM$LD@ZzqA+|8QNWQ5UoIE5ageV4yeo$mgr?YtPrSi=p
z1__<Po6F^uB8CT@$(zyeY7qmH3SLug2(Ohe>}VNpM#B{tF>F$~N!}n~_|fvQh021O
zjq)a$5*GdvA15B(EMf>z@p^Il1M(@kgxvlSx&1ekg9J6O1XjWtXo5`;LpCR13v@sy
z>_AR4M)!jXDbOGT7P9&PIB*0;;C>i|2awqhA-5lc$KfQLf+vvMPs20tEIbG2;5@tx
zufVJD8oUD^A;Z6fZ?E9*_9An+gzu)}@5B!??Ai8cBmXd$@H}Jx`+>ezzeyiz{&Tuy
ztU@wpnYJ~6>nX<C<fR6!0D%C30D%C30D%C3X^KD@Usr_P|8Ktf|Nql;^}(_N1Of!E
z2Le!@NG4ivq^tdwXLs!p%=<92#QKeL>A7IxUB{#JuH&)6uH(Hc2Gsd?3Z7pK^~`^i
eORQn~@Ba*#aOr3U=l|jjS#bWpK>jc1|9=2?CGofb

diff --git a/FileSets/.DS_Store b/FileSets/.DS_Store
index 761f2501505dd5f78c5d43f3549e72572d2624b6..c4470a6cd95e9f6be0f1d111f89e7afe764efd94 100644
GIT binary patch
delta 369
zcmZoMXfc=&$!N4OYCkih(PSx>C-p`t#mPBI`T04F3=9mc3}p;P40;SE3`RNWhQZ1C
zxdlK`ATTHf5=gSS`7SO=Ir&LIQ4SzpK5_D4M|2e_1XL7c0Bx9D%PL`HR2E#6my@5D
z4m1MU8D<P-*jxt`o_w5D*3}Hv6%7h#t^lgb%|~_xHWiaK*_7ohk*(o?27(2H0Ye>w
kA%o@QEH-6fOEk+qPMAD-0h=gD9K{N#IHTp}du(cg0A*KG@&Et;

delta 369
zcmZoMXfc=&$!M@KYCkih!DK0xC-nv?#mPBI`T02vK)}jS#$d#t$6&%>kdtm0oSdIq
z01{?kFenBRNV2*4E-pzq`AI-g4j}$(*nHR#T}2836$KeU8z$GXN*EcG1sCPz<maUW
zjbKDF#*D!fo9lqWlaI5?x|*W7Li1q(iYtKXa`RDKfknk+O*UmYLu6|>pn+h)V8Bqv
mV8~!NIg3qM*bvpShUYsQCof<V1&JeD0TX95+<cEsO%MRbf>Q(l

diff --git a/FileSets/VenusGpioOverlay.dtb b/FileSets/VenusGpioOverlay.dtb
index dd3995a30aa772a877f7496f3ff0aef5b0ea7834..af86cfc17d5146bbc3f6fb9515fc30a71f8eacc9 100644
GIT binary patch
delta 55
zcmey#@|Q*60`I@K3=B-Q3=9kwKw4&^fH>omi5ka6C4eGYK+FonY(UHl!~&ZbD;WWS
C9tw2;

delta 52
zcmey%@{>j20`I@K3=B+_3=9kwKw4s=fH>oWi5kZRMSvn&K+FonY(UJrnT4^E5ddSg
B3RVCB

diff --git a/FileSets/gpio_list b/FileSets/gpio_list
index c5e8487..655bde5 100644
--- a/FileSets/gpio_list
+++ b/FileSets/gpio_list
@@ -38,3 +38,8 @@
 # Digital input 5   Pin 37 / GPIO 26
 26  in digital_input_5
 
+#### Gracefull shutdown input
+#### Note this input is NOT added to the available I/O used by Venus OS !!!!
+# Pin 36 / GPIO 16
+16  in digital_input_6
+
diff --git a/FileSets/v2.40/.DS_Store b/FileSets/v2.42/.DS_Store
similarity index 100%
rename from FileSets/v2.40/.DS_Store
rename to FileSets/v2.42/.DS_Store
diff --git a/FileSets/v2.40/relaystate.py b/FileSets/v2.42/relaystate.py
similarity index 100%
rename from FileSets/v2.40/relaystate.py
rename to FileSets/v2.42/relaystate.py
diff --git a/FileSets/v2.40/relaystate.py.orig b/FileSets/v2.42/relaystate.py.orig
similarity index 100%
rename from FileSets/v2.40/relaystate.py.orig
rename to FileSets/v2.42/relaystate.py.orig
diff --git a/FileSets/v2.65/.DS_Store b/FileSets/v2.66/.DS_Store
similarity index 100%
rename from FileSets/v2.65/.DS_Store
rename to FileSets/v2.66/.DS_Store
diff --git a/FileSets/v2.65/relaystate.py b/FileSets/v2.66/relaystate.py
similarity index 100%
rename from FileSets/v2.65/relaystate.py
rename to FileSets/v2.66/relaystate.py
diff --git a/FileSets/v2.65/relaystate.py.orig b/FileSets/v2.66/relaystate.py.orig
similarity index 100%
rename from FileSets/v2.65/relaystate.py.orig
rename to FileSets/v2.66/relaystate.py.orig
diff --git a/FileSets/v2.80~11/.DS_Store b/FileSets/v2.80~19/.DS_Store
similarity index 100%
rename from FileSets/v2.80~11/.DS_Store
rename to FileSets/v2.80~19/.DS_Store
diff --git a/FileSets/v2.80~11/relaystate.py b/FileSets/v2.80~19/relaystate.py
similarity index 100%
rename from FileSets/v2.80~11/relaystate.py
rename to FileSets/v2.80~19/relaystate.py
diff --git a/FileSets/v2.80~11/relaystate.py.orig b/FileSets/v2.80~19/relaystate.py.orig
similarity index 100%
rename from FileSets/v2.80~11/relaystate.py.orig
rename to FileSets/v2.80~19/relaystate.py.orig
diff --git a/ReadMe b/ReadMe
index c49f211..1e1af56 100644
--- a/ReadMe
+++ b/ReadMe
@@ -23,36 +23,8 @@ It will then called from reinstallMods to reinstall functionality after a Venus
 
 Setup:
 
-The easiest way to install this or other of my packages is to first install SetupHelper,
+The easiest way to install this or other of my packages is to first install SetupHelper
+which you need to do anyway,
 then use its package install tool. Refer to the SetupHelper ReadMe for instructions.
 
-There are two other methods to fetch a package archive.
-
-IF the Venus device has internet access is to run the following command:
-
-wget -qO - https://github.com/kwindrem/RpiGpioSetup/archive/current.tar.gz | tar -xzf - -C /data
-
-If the Venus device does not have internet access, you will need to fetch the archive using a computer that does have internet access:
-
-click on this link in a web browser:
-https://github.com/kwindrem/RpiGpioSetup/archive/current.tar.gz
-
-rename the resulting .tar.gz file to venus-data.tar.gz
-copy the venus-data.tar.gz to a USB stick,
-put the stick in the Venus device and reboot.
-When Venus boots, it will unarchive the file to /data/RpiGpioSetup-current
-
-Move the directory into it's active locaiton:
-rm -rf /data/RpiGpioSetup
-mv /data/RpiGpioSetup-current /data/RpiGpioSetup
-
-Repeat the above for SetupHelper if you haven't done so for another package.
-
-Finally, run the setup script to complete the installation
-/data/RpiGpioSetup/setup
-
-You will need root access to the Venus device. Instructions can be found here:
-https://www.victronenergy.com/live/ccgx:root_access
-The root password needs to be reentered following a Venus update.
-Setting up an authorization key (see documentation referenced above) will save time and avoid having to reset the root password after each update.
 
diff --git a/VenusGpioOverlay.dts b/VenusGpioOverlay.dts
index 6da5e2d..c272c7f 100644
--- a/VenusGpioOverlay.dts
+++ b/VenusGpioOverlay.dts
@@ -17,7 +17,7 @@
             pinctrl-0 = <&my_pins>;
 
             my_pins: my_pins {
-                brcm,pins = <5 6 13 19 26>;     /* gpio no. */
+                brcm,pins = <5 6 13 16 19 26>;     /* gpio no. */
                 brcm,function = <0>; /* 0:in, 1:out */
                 brcm,pull = <2>;     /* 2:up 1:down 0:none */
             };
diff --git a/changes b/changes
new file mode 100644
index 0000000..da78e42
--- /dev/null
+++ b/changes
@@ -0,0 +1,6 @@
+v3.4
+	added raspberryPiOnly flag file
+	add graceful shutdown GPIO pin - used by ShutdownMonitor v2.0 or later
+	add exit codes
+	this supports SetupHelper v4
+	removed manual download/install instructions from the ReadMe
diff --git a/raspberryPiOnly b/raspberryPiOnly
new file mode 100644
index 0000000..e69de29
diff --git a/setup b/setup
index db9514e..cb240bc 100755
--- a/setup
+++ b/setup
@@ -36,6 +36,7 @@ source "/data/SetupHelper/CommonResources"
 
 #### end of lines to include SetupHelper
 
+####### this is duplicate to code in CommonResources -- keep in case SetupHelepr has not been updated
 # prevent installing if not a Raspberry Pi
 if [ -f /etc/venus/machine ]; then
     machine=$(cat /etc/venus/machine)
@@ -46,7 +47,7 @@ if [ -z $machine ]; then
         scriptAction='UNINSTALL'
     else
         logMessage "can't determine Venus device type - exiting"
-        exit
+		exit $INCOMPATIBLE_PLATFORM
     fi
 elif [ $machine != "raspberrypi2" ] && [ $machine != "raspberrypi4" ]; then
     if [ -f "$installedFlag" ]; then
@@ -54,7 +55,7 @@ elif [ $machine != "raspberrypi2" ] && [ $machine != "raspberrypi4" ]; then
         scriptAction='UNINSTALL'
     else
         logMessage "$packageName not compatible with $machine - exiting"
-        exit
+		exit $INCOMPATIBLE_PLATFORM
     fi
 fi
 
diff --git a/timeStamp b/timeStamp
index a353ef4..a96dc77 100644
--- a/timeStamp
+++ b/timeStamp
@@ -1 +1 @@
-1633068625
+1635100489
diff --git a/version b/version
index 4d5034c..7945083 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-v3.2
+v3.4