summaryrefslogtreecommitdiffhomepage
path: root/digital/io/src/main.c
diff options
context:
space:
mode:
authorNicolas Haller2009-05-21 04:39:13 +0200
committerNicolas Haller2009-05-21 04:39:13 +0200
commit5536ee0fb112ee462fdcceb327ffa5ac5bac9ba3 (patch)
tree799498807bed172ad3f31bbf402bf5b9b60e7895 /digital/io/src/main.c
parentcf550d27be5f0a165241c2c11421701609331918 (diff)
* digital/io/src:
- fix elevator fsm: using timeout to control doors - add forgotten event handler for cylinder (no_close_order) - fix elevator fsm again: elevator positions
Diffstat (limited to 'digital/io/src/main.c')
-rw-r--r--digital/io/src/main.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/digital/io/src/main.c b/digital/io/src/main.c
index 0f31221a..20717222 100644
--- a/digital/io/src/main.c
+++ b/digital/io/src/main.c
@@ -55,6 +55,7 @@
#include "filterbridge.h"
#include "cylinder.h"
#include "init.h"
+#include "top.h"
#include "io.h"
@@ -244,14 +245,19 @@ main_event_to_fsm (void)
FSM_HANDLE_EVENT (&cylinder_fsm,
CYLINDER_EVENT_bridge_ready);
/* bot empty */
- if(fb_nb_puck + elvt_nb_puck + cylinder_nb_puck < 4)
+ if(top_puck_inside_bot < 4)
FSM_HANDLE_EVENT (&cylinder_fsm,
CYLINDER_EVENT_bot_not_full);
/* cylinder_close_order */
if(cylinder_close_order)
+ {
FSM_HANDLE_EVENT (&cylinder_fsm,
CYLINDER_EVENT_close_order);
+ }
+ else
+ FSM_HANDLE_EVENT (&cylinder_fsm,
+ CYLINDER_EVENT_no_close_order);
/* cylinder_flush_order */
if(cylinder_flush_order)