From 4ade1ba9302fdde1b1654e91dd4b922f7577fe68 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Wed, 25 Jul 2018 11:09:06 +0200
Subject: [PATCH] update conf num step filt (5-->10 ) + conf 2010 donati

---
 IOB-PI/Donati/2010_186/IOB.cfg          |  2 +-
 IOB-PI/Donati/2010_186/IOB.cfg.donati   | 27 ++++++++++++++++++++++---
 IOB-PI/Donati/2010_186/readParallela.py |  6 +++++-
 IOB-PI/std_vers/IOB.cfg                 |  6 +++---
 4 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/IOB-PI/Donati/2010_186/IOB.cfg b/IOB-PI/Donati/2010_186/IOB.cfg
index e165171..c565a1c 100644
--- a/IOB-PI/Donati/2010_186/IOB.cfg
+++ b/IOB-PI/Donati/2010_186/IOB.cfg
@@ -45,7 +45,7 @@ bit6 = 0
 bit7 = 0
 
 [filter]
-MAX_COUNTER_FILTER = 5
+MAX_COUNTER_FILTER = 10
 bit0 = 0
 bit1 = 1
 bit2 = 0
diff --git a/IOB-PI/Donati/2010_186/IOB.cfg.donati b/IOB-PI/Donati/2010_186/IOB.cfg.donati
index 07a641f..c565a1c 100644
--- a/IOB-PI/Donati/2010_186/IOB.cfg.donati
+++ b/IOB-PI/Donati/2010_186/IOB.cfg.donati
@@ -1,5 +1,5 @@
 [id]
-idxMacchina = 2004
+idxMacchina = 2010
 
 [web]
 URLBASE = http://192.168.51.77/MP/IO/IOB/input/
@@ -26,9 +26,30 @@ port = /dev/ttyAMA0
 [blink]
 MAX_COUNTER_BLINK = 30
 bit0 = 0
-bit1 = 0
+bit1 = 1
 bit2 = 0
-bit3 = 1
+bit3 = 0
+bit4 = 0
+bit5 = 0
+bit6 = 0
+bit7 = 0
+
+[invert]
+bit0 = 0
+bit1 = 1
+bit2 = 0
+bit3 = 0
+bit4 = 0
+bit5 = 0
+bit6 = 0
+bit7 = 0
+
+[filter]
+MAX_COUNTER_FILTER = 10
+bit0 = 0
+bit1 = 1
+bit2 = 0
+bit3 = 0
 bit4 = 0
 bit5 = 0
 bit6 = 0
diff --git a/IOB-PI/Donati/2010_186/readParallela.py b/IOB-PI/Donati/2010_186/readParallela.py
index be774fa..0dc1ffe 100644
--- a/IOB-PI/Donati/2010_186/readParallela.py
+++ b/IOB-PI/Donati/2010_186/readParallela.py
@@ -193,10 +193,12 @@ def readParallelaFiltrata():
                         # vero fronte  0 -> 1
                         i_filter_counters[i] = MAX_COUNTER_FILTER
                         B_temp[i] = 0   # tengo l' ingresso a 0
+                        logPro.info("START spike 0->1 on bit " +  `i` )
                     else :
                         # fine disturbo breve di uno stato 1
                         i_filter_counters[i] = 0
                         B_temp[i] = 1   # tengo l' ingresso a 1
+                        logPro.info("END spike 0->1 on bit " +  `i` )
                   
                 # stabile 1 -> 1
                 if ( B_input[i] == 1 ) and ( B_filter_prev [i] == 1 ) :
@@ -214,10 +216,12 @@ def readParallelaFiltrata():
                         # vero fronte  1 -> 0
                         i_filter_counters[i] = MAX_COUNTER_FILTER
                         B_temp[i] = 1   # tengo l' ingresso a 1
+                        logPro.info("START spike 1->0 on bit " +  `i` )
                     else :
                         # fine disturbo breve di uno stato 0
                         i_filter_counters[i] = 0
                         B_temp[i] = 0   # tengo l' ingresso a 0
+                        logPro.info("END spike 1->0 on bit " +  `i` )
 
                 # stabile 0 -> 0
                 if ( B_input[i] == 0 ) and ( B_filter_prev [i] == 0 ) :
@@ -538,7 +542,7 @@ try:
     B_filter[6] = config.getint ( 'filter' , 'bit6'   )
     B_filter[7] = config.getint ( 'filter' , 'bit7'   )   
     
-   MAX_COUNTER_FILTER = config.getint ( 'filter' , 'MAX_COUNTER_FILTER'   )
+    MAX_COUNTER_FILTER = config.getint ( 'filter' , 'MAX_COUNTER_FILTER' )
                                                                     
     
 except:
diff --git a/IOB-PI/std_vers/IOB.cfg b/IOB-PI/std_vers/IOB.cfg
index d0e7e4b..f1d9fb0 100644
--- a/IOB-PI/std_vers/IOB.cfg
+++ b/IOB-PI/std_vers/IOB.cfg
@@ -26,9 +26,9 @@ port = /dev/ttyAMA0
 [blink]
 MAX_COUNTER_BLINK = 30
 bit0 = 0
-bit1 = 0
+bit1 = 1
 bit2 = 0
-bit3 = 1
+bit3 = 0
 bit4 = 0
 bit5 = 0
 bit6 = 0
@@ -45,7 +45,7 @@ bit6 = 0
 bit7 = 0
 
 [filter]
-MAX_COUNTER_FILTER = 5
+MAX_COUNTER_FILTER = 10
 bit0 = 0
 bit1 = 1
 bit2 = 0