Egalware/Mapo-IOB
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Samuele Locatelli
2022-09-26 18:27:21 +02:00
parent f33f796500 2f7f9f2c6c
commit de33b976d3
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-PI/vers2.4 12bit/readParallela.py
+10 -3
View File
@@ -10,6 +10,7 @@
# - (2.3) gestione 12 bit cv 14-I-2020
# - (2.4) fix ingressi e conf apertura parallela + gestione vari bit filtraggio x nuovi ingressi + update conf con 12 parametri bit SEL 15-I-2020
# - (2.4.8) versione adatta a raspberry PI vecchia generazione (GPIO corto, 8bit)
# - (2.5) Fix (hope) ciclo "wait send to complete", gestione timeout (rety infinito se IO riparte in modo anomalo)
#---------------------------------------------------------------
# levare locking
@@ -39,12 +40,12 @@ from array import *
# COSTANTI
MSGLEN = 9
TIMEOUTSERIALE = 10
MAXRETRY = 3
MAXRETRY = 10
# numero campioni filtraggio segnale ballerino
MAX_COUNTER_BLINK = 10
PROGRAM_NAME ="ReadPar IOB-pi v.2.4"
PROGRAM_NAME ="ReadPar IOB-pi v.2.5.0"
# DA FILE CONF
idxMacchina = "1001"
@@ -398,7 +399,13 @@ def svuota_coda():
# completato invio, riporto sending a zero!
sending = '0'
else:
logPro.info("WAIT active send to complete")
if to_retry > 0:
to_retry -= 1
logPro.info("WAIT active send to complete")
else:
sending = '0'
to_retry = MAXRETRY
logPro.info("END WAIT, reset to_retry var")
else:
pass
IOB-PI/vers2.4 8bit/readParallela.py
+11 -4
View File
@@ -10,6 +10,7 @@
# - (2.3) gestione 12 bit cv 14-I-2020
# - (2.4) fix ingressi e conf apertura parallela + gestione vari bit filtraggio x nuovi ingressi + update conf con 12 parametri bit SEL 15-I-2020
# - (2.4.8) versione adatta a raspberry PI vecchia generazione (GPIO corto, 8bit)
# - (2.5) Fix (hope) ciclo "wait send to complete", gestione timeout (rety infinito se IO riparte in modo anomalo)
#---------------------------------------------------------------
# levare locking
@@ -39,12 +40,12 @@ from array import *
# COSTANTI
MSGLEN = 9
TIMEOUTSERIALE = 10
MAXRETRY = 3
MAXRETRY = 10
# numero campioni filtraggio segnale ballerino
MAX_COUNTER_BLINK = 10
PROGRAM_NAME ="ReadPar IOB-pi v.2.4.8"
PROGRAM_NAME ="ReadPar IOB-pi v.2.5.0"
# DA FILE CONF
idxMacchina = "1001"
@@ -398,8 +399,14 @@ def svuota_coda():
# completato invio, riporto sending a zero!
sending = '0'
else:
logPro.info("WAIT active send to complete")
if to_retry > 0:
to_retry -= 1
logPro.info("WAIT active send to complete")
else:
sending = '0'
to_retry = MAXRETRY
logPro.info("END WAIT, reset to_retry var")
else:
pass