update conf num step filt (5-->10 ) + conf 2010 donati

This commit is contained in:
Samuele E. Locatelli
2018-07-25 11:09:06 +02:00
parent 5fc6d49a3e
commit 4ade1ba930
4 changed files with 33 additions and 8 deletions
+1 -1
View File
@@ -45,7 +45,7 @@ bit6 = 0
bit7 = 0
[filter]
MAX_COUNTER_FILTER = 5
MAX_COUNTER_FILTER = 10
bit0 = 0
bit1 = 1
bit2 = 0
+24 -3
View File
@@ -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
+5 -1
View File
@@ -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:
+3 -3
View File
@@ -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