From 76be9195ee7ae01cfd473868e94ef5f99aeaaad8 Mon Sep 17 00:00:00 2001
From: Tobias Bora <tobias.bora@gmail.com>
Date: Sat, 7 Dec 2013 19:51:40 +0100
Subject: [PATCH] Revert mode activated.

---
 sapin_noel.bin | Bin 290753 -> 290911 bytes
 sapin_noel.ml  |   2 +-
 shiftReg.ml    |  27 +++++++++++++++------------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/sapin_noel.bin b/sapin_noel.bin
index e7f8bb73ccf254a220aba5d1bcc1ed71bf389c25..3da8cfb09989ecf1a4ece5e1cf93b5233606a1c1 100755
GIT binary patch
delta 612
zcmZ9Jzb`{k6vy9v_b5uy8bm`%CA<<rB<N64+Nvj#5=<qMD(XjsScyR*Hj}#;YQQ3~
zG<kyoe}N8W%wiL(=X<0t5hwZNoOAE_dGF(^_w~(tcq9sXu;>b}^kuT)W22~BMp1t5
zh<&SRlq9LAI8}J!nx^?d5D4{P%C<Q+(;x#pAO@Te9d-g#gIcf%WJ&v=IerW{@yn&N
zn93)pC;MjGHkYjjT#B!&fHOrqYyu(B3Ai-NJaB9-?*`o7VHh^&u^1}#A{&$(r|0HM
z_+7uJnpQw>?!~?Udn$b=1Cc2l{|yWM^WVR1o7*`XdrKv_-I5wfQh$yYuLC><mtx@!
z*$#tCz*{eX1GEl6*ML>P8*Bo8IMzJj0Js7}fOGk!S^%khk|srk`bbhnNR^tPTOrR(
z+Gs4pbt_=uNu5-wj!fzhWZjr_;P*suRlrk5QS{sz%u=^YKaE;z8}udX61$rx?(6a|
j^L{;-vSydm);0xw?Y*g)i7EW35sS_u&o!+swyEU@{)k=V

delta 469
zcmZ9|&r1S96bJC#o!4fm<Q7qxhq7M_5kVA1WTx4Vb(5mH^#jBT`vKW0A~2z#OF_4}
zMHf2-B?x=9|6ng+H#>C}qHFe@$cqCX=Djz}+u2w8&|XVg=1R^hep?+K8BZkQ*Sf7(
zy3M{$<fP>b6QgbkYYv<cfh4%V3w~g{5M@09AHq#YfE%jEGGY&G1A``*h3feZVmE)9
zr{UJmN~I#Mw}1lT$i)lqtdk$dnS*aEkbTgI;vk5=x46*opJS8KHThmm9<Iq5a?wxx
zj(C>_qBp_W56@jNFAoN&U7JS10b+^QIe2-I+Umv-KJpoZOu3%l7?h9|UN-0%+e4HN
zJ4Bzq`C%8|n1C!Oyw{`wnORFFrM>PTN_k8NV^Qv{;w}xT^kT-AE%k`LnP<Ovs^|JM
kS#@jjeCm?Fac7GB&3$((t40iS)FYwwkR+*VJeZ=cUs`TlBLDyZ

diff --git a/sapin_noel.ml b/sapin_noel.ml
index 323fa5e..dcaeace 100644
--- a/sapin_noel.ml
+++ b/sapin_noel.ml
@@ -6,7 +6,7 @@ let _ =
   setupPhys ();
   (* reg : pin_value = p_v, pin_shift = p_s, pin_apply = p_a *)
   (* On crée le register *)
-  let reg = (11,13,15) in
+  let reg = genReg 11 13 15 ~invert:true in
   (* On initialise *)
   let leds = initReg reg ~nb_reg:1 in
   (* On boucle pour afficher les leds unes par unes *)
diff --git a/shiftReg.ml b/shiftReg.ml
index b9b2f10..2f53c1a 100644
--- a/shiftReg.ml
+++ b/shiftReg.ml
@@ -6,30 +6,33 @@
 *)
 open WiringPiOcaml
 (** reg : (pin_value = p_v, pin_shift = p_s, pin_apply = p_a). It is
-    used to contain the needed input **)
-type reg = int * int * int;;
+    used to contain the informations about connections. The invert
+    variable is used in order to revert the mode (false = lighted,
+    true = not lighted) **)
+type reg = {p_v : int; p_s : int; p_a : int; invert : bool}
 
 (** The first thing to do is setupPhys (). This function put in OUTPUT
     mode the outputs and return back a bool array which represent the output of registers (begining with the first LED of the first shift register) **)
 let initReg ?nb_reg:(nb_reg = 1) reg =
-  let (p_v, p_s, p_a) = reg in
-  pinMode p_v 1; (* mode output *)
-  pinMode p_s 1;
-  pinMode p_a 1;
+  pinMode reg.p_v 1; (* mode output *)
+  pinMode reg.p_s 1;
+  pinMode reg.p_a 1;
   Array.make (8*nb_reg) false (* return back an array for all pieces *)
 
 let write pin value = digitalWrite pin (if value then 1 else 0)
 
+let genReg ?invert:(invert = false) pin_value pin_shift pin_apply =
+  {p_v = pin_value; p_s = pin_shift; p_a = pin_apply; invert = invert}
+  
 (** This function apply all modifications to the register **)
 let applyReg reg leds =
-  let (p_v, p_s, p_a) = reg in
-  write p_a false;
+  write reg.p_a false;
   for i = (Array.length leds) - 1 downto 0 do
-    write p_s false;
-    write p_v leds.(i);
-    write p_s true;
+    write reg.p_s false;
+    write reg.p_v (leds.(i) <> reg.invert); (* On inverse si besoin *)
+    write reg.p_s true;
   done;
-  write p_a true
+  write reg.p_a true
 
 
 (** Don't forget to apply it with applyReg after **)