summaryrefslogtreecommitdiffhomepage
path: root/digital/io/src/filterbridge_cb.c
diff options
context:
space:
mode:
authorNicolas Haller2009-05-22 08:16:41 +0200
committerNicolas Haller2009-05-22 08:16:41 +0200
commit39cd5564e451ade59dd9e61b5c5682c7eceabd55 (patch)
tree21d94335af4635a2ffeb333d7e59826ff4b20ad3 /digital/io/src/filterbridge_cb.c
parent758fa17894937e750b61641f1bae821dd6a8262a (diff)
* digital/io/src:
- fix the elevator loop event transition
Diffstat (limited to 'digital/io/src/filterbridge_cb.c')
-rw-r--r--digital/io/src/filterbridge_cb.c24
1 files changed, 14 insertions, 10 deletions
diff --git a/digital/io/src/filterbridge_cb.c b/digital/io/src/filterbridge_cb.c
index 0c29e495..2b4e452d 100644
--- a/digital/io/src/filterbridge_cb.c
+++ b/digital/io/src/filterbridge_cb.c
@@ -71,20 +71,24 @@ filterbridge__CLOSE_DOOR__state_timeout (void)
/*
* WAIT_A_PUCK =puck_on_pos2=>
- * lift_not_ready => WAIT_A_PUCK
- * Lift not ready, we stand by
- * lift_ready => MARCEL_WAIT
- * wait the puck is entirely on pos2
+ * => WAIT_LIFT_READY
+ * Puck ready to be dropped to the elevator. Test if elvt ready to get it.
*/
fsm_branch_t
filterbridge__WAIT_A_PUCK__puck_on_pos2 (void)
{
- if(elvt_is_ready)
- {
- return filterbridge_next_branch (WAIT_A_PUCK, puck_on_pos2, lift_ready);
- }
- else
- return filterbridge_next_branch (WAIT_A_PUCK, puck_on_pos2, lift_not_ready);
+ return filterbridge_next (WAIT_A_PUCK, puck_on_pos2);
+}
+
+/*
+ * WAIT_LIFT_READY =lift_ready=>
+ * => MARCEL_WAIT
+ * the lift is ready
+ */
+fsm_branch_t
+filterbridge__WAIT_LIFT_READY__lift_ready (void)
+{
+ return filterbridge_next (WAIT_LIFT_READY, lift_ready);
}
/*