From 03753f2129ea046c862f438d21d79ad55bd82511 Mon Sep 17 00:00:00 2001
From: Tobias Bora <tobias.bora@gmail.com>
Date: Tue, 17 Dec 2013 21:23:04 +0100
Subject: [PATCH] Minor modification in doc and add global variables in
 sapin_noel.ml

---
 Makefile       |   1 +
 README.org     |   4 ++--
 sapin_noel.bin | Bin 292966 -> 293026 bytes
 sapin_noel.ml  |  12 ++++++++----
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index bd347bf..90138bf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+# This Makefile is really not optimized...
 CC=ocamlc
 OPT=-custom
 
diff --git a/README.org b/README.org
index cd6c62d..9f83b02 100644
--- a/README.org
+++ b/README.org
@@ -5,8 +5,8 @@ and then
 : sudo ./sapin_noel.bin
 
 * Goal
-This script uses the wiringPi library http://wiringpi.com/ (thank you for your job) and adapt it in order to make it usable in Ocaml. Must common functions are implemented (see wiringPiOcaml.ml) but lot's a function aren't present for the moment. It's very simple to add these functions, so you can add them and if you want I can add your modifications.
+This script uses the wiringPi library http://wiringpi.com/ (thank you for your job) and adapts it in order to make it usable in Ocaml. Most common functions are implemented (see wiringPiOcaml.ml) but lot's of functions aren't present for the moment. It's very simple to add these functions, so you can add them and if you want I can add your modifications.
 
-There is too a little script to use shift registers.
+There is too a little script to use shift registers, and an example file named sapin_noel.ml.
 
 Enjoy !
diff --git a/sapin_noel.bin b/sapin_noel.bin
index d28e7966f7c07255e482e6e1032984c654453277..ac72ea0b84e7a3bbb54b1a8d5c64d1429152b475 100755
GIT binary patch
delta 372
zcmaF%L2%JW!G;#bElf%m*o;!rl2g;#H7+o1*SNquzmX@Ifq@|dh_irry8muwnR==J
z|NnCWdD=h>0&V~P|IY-{AXOk73&iz|3=Hx>S_FvGftVkNbAXr^N^=8gAt>J-NP_@6
z-vTJM1T4eApa7&<ftZVdL5V>S$be~rDPjVODFLw=5O1EI5yT?T3bKQDdQT9G^7PlA
znKe``f&48%4Du03n<@|o0I?zvTLCdhe(UxpK`drcf**kF{R|AujSLJ-$2l07Zfw`i
zWqH6hoxg-dnQ_~6;}VuG#x2wLfp}ZDKPq9F!X)r*f_ZMx97h+Cd9zQ>w*6c(y{(*O
cz2Jd>AWvTg1}O~}#}G#b26mR|ZWSyF0HhsBa{vGU

delta 375
zcmZ4VQSjLZ!G;#bElf%m*i22+Qj$#CH7+o1*SNquztL8k0Rk5M|Noy8$b|9b(D+^d
z{{PPa%Etn6JtG5yJdoy}E)&Ee?P&&NZU$nIv;`0^0b&qP0Af}k<^p1nnk_&KlV<|5
zm4G-Ch(Y>5@>{1*2x5_E<pnbNr*8>jQ8sl1GC@EXh?#-d5{S0}aWW8tOi~5n03cQb
zVk;m9$#37T63k*ICHMu%J_yv-&cMKQmV<%m!S?K2mIrJs6C5TuP4_NgQD)pRJ->vd
zi*eiZUm)K0?Q*3oQ<wyH&zzTHfBE&_dbgI={MRRHrynY3S#Q`75aj90z#ygJ;ur#S
l6+1_8q^}duWI5*`=U@f~#;-uzSe+Ada||slEh7vJEC9jlQFs6V

diff --git a/sapin_noel.ml b/sapin_noel.ml
index 9f6c3f9..94c95e9 100644
--- a/sapin_noel.ml
+++ b/sapin_noel.ml
@@ -1,6 +1,10 @@
 open WiringPiOcaml;;
 open ShiftReg;;
 
+let g_invert = false
+and g_pulse = false
+and g_nb_reg = 2
+
 (* Ici on utilise des fonctions plus souples mais moins agréables pour les tests. Pour voir les fonctions classiques, cf anim_01 *)
 let test reg leds =
   lightLeds leds;
@@ -60,17 +64,17 @@ let anim_02 reg leds n =
   done
 
 let _ =
+  let t = true
+  and f = false in
   (* On choisit le mode d'affichage Phys *)
   ignore(setupPhys ());
   (* reg : pin_value = p_v, pin_shift = p_s, pin_apply = p_a *)
   (* On crée le register *)
   (* En mode pulse : *)
   (* let reg = genReg 11 13 15 ~pulse:true in *)
-  let reg = genReg 11 13 15 ~invert:false in
+  let reg = genReg 11 13 15 ~invert:g_invert ~pulse:g_pulse in
   (* On initialise *)
-  let leds = initReg reg ~nb_reg:2 in
-  let t = true
-  and f = false in
+  let leds = initReg reg ~nb_reg:g_nb_reg in
   Printf.printf "Début\n%!";
   (* And a pretty animation *)
   anim_01 reg leds max_int;