From 46257aef869c929aaedf49dc0ce8eae378fbbc58 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Wed, 4 Oct 2017 14:50:40 +0200
Subject: [PATCH] Fix state machine DOPOSAN x tavola

---
 StateMachine/Donati/27_ABB_DOOSAN_pallet.csv | 17 ++---------------
 StateMachine/Donati/27_ABB_DOOSAN_pallet.rul | 15 ++++++---------
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/StateMachine/Donati/27_ABB_DOOSAN_pallet.csv b/StateMachine/Donati/27_ABB_DOOSAN_pallet.csv
index e16778b..f31c21d 100644
--- a/StateMachine/Donati/27_ABB_DOOSAN_pallet.csv
+++ b/StateMachine/Donati/27_ABB_DOOSAN_pallet.csv
@@ -1,16 +1,3 @@
 IdxFamigliaIngresso;IdxMicroStato;ValoreIngresso;IdxTipoEvento;next_IdxMicroStato
-27;0;1;35;2
-27;0;2;36;3
-27;0;3;35;2
-27;1;1;35;2
-27;1;2;36;3
-27;1;3;35;2
-27;2;0;37;1
-27;2;2;37;1
-27;2;3;39;4
-27;3;0;38;1
-27;3;1;38;1
-27;3;3;39;4
-27;4;0;36;3
-27;4;1;35;2
-27;4;2;36;3
+27;0;1;35;1
+27;1;0;36;0
diff --git a/StateMachine/Donati/27_ABB_DOOSAN_pallet.rul b/StateMachine/Donati/27_ABB_DOOSAN_pallet.rul
index ff34d70..3857c11 100644
--- a/StateMachine/Donati/27_ABB_DOOSAN_pallet.rul
+++ b/StateMachine/Donati/27_ABB_DOOSAN_pallet.rul
@@ -20,8 +20,7 @@ $N_BITS     : 1
 
 #definizione bit : obbligatorio iniziare da 0
 
-$BIT        : 0         : B_EndCiclo
-$BIT        : 1         : B_LavoraTav
+$BIT        : 0         : B_LavoraTav
 
 #definizione stati : obbligatorio iniziare da 0
 
@@ -64,18 +63,16 @@ $EVENT      : 30        : HW - emergenza
 $EVENT      : 31        : Barcode - Modifica Programmi          
 $EVENT      : 32        : Barcode - Sostituzione Utensile  
 $EVENT      : 33        : HW - Allarme Macchina
-$EVENT      : 34        : HW - deposito robot
-$EVENT      : 35        : HW - start pallet
-$EVENT      : 36        : HW - end pallet
-
+$EVENT      : 34        : HW - deposito robot                   
+$EVENT      : 35        : HW - Start Tavola                   
+$EVENT      : 36        : HW - End Tavola
 
 $RULES
 
 # state           : input             : next state        : event 
 
-ST_End        	  : B_LavoraTav         : ST_LavTav         : HW - start pallet
-ST_LavTav         : B_EndCiclo          : ST_End            : HW - end pallet
-
+ST_End        	  : B_LavoraTav       : ST_LavTav         : HW - Start Tavola
+ST_LavTav         : NOT B_LavoraTav   : ST_End            : HW - End Tavola
 
 #--------------------------------------------------------------------------