From 266966d7fd9e90a636948e931c8d7a6777114b91 Mon Sep 17 00:00:00 2001 From: Nicolas Haller Date: Wed, 20 May 2009 16:24:19 +0200 Subject: * digital/io/src: - new cylinder fsm - fsm variable prefixed by fsm name --- digital/io/src/main.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'digital/io/src/main.c') diff --git a/digital/io/src/main.c b/digital/io/src/main.c index 7d38d1dd..c84c7ca6 100644 --- a/digital/io/src/main.c +++ b/digital/io/src/main.c @@ -240,17 +240,23 @@ main_event_to_fsm (void) FSM_HANDLE_EVENT (&elevator_fsm, ELEVATOR_EVENT_doors_opened); /* bridge ready */ - /* - if(nb_puck_fb < 2) + if(fb_nb_puck < 2) FSM_HANDLE_EVENT (&cylinder_fsm, CYLINDER_EVENT_bridge_ready); - */ /* bot empty */ - /* - if(!nb_puck_fb && !nb_puck_in_elvt && !nb_puck_cylinder) + if(fb_nb_puck + elvt_nb_puck + cylinder_nb_puck < 4) FSM_HANDLE_EVENT (&cylinder_fsm, - CYLINDER_EVENT_bot_empty); - */ + CYLINDER_EVENT_bot_not_full); + + /* cylinder_close_order */ + if(cylinder_close_order) + FSM_HANDLE_EVENT (&cylinder_fsm, + CYLINDER_EVENT_close_order); + + /* cylinder__flush_order */ + if(cylinder_flush_order) + FSM_HANDLE_EVENT (&cylinder_fsm, + CYLINDER_EVENT_flush_order); /* Jack */ if(switch_get_jack()) -- cgit v1.2.3