summaryrefslogtreecommitdiffhomepage
path: root/digital/io/src/elevator_cb.c
diff options
context:
space:
mode:
authorNicolas Haller2009-05-21 08:59:09 +0200
committerNicolas Haller2009-05-21 08:59:09 +0200
commit710a5ffc18798f11b54d1a1df56d188b30cc8557 (patch)
tree36391c9cf89b6f1168421980b3c425df27f247e0 /digital/io/src/elevator_cb.c
parent5d6d7db94b1192213b6eca94ab89f1707e8ee7de (diff)
* digital/io/src:
- fix the order bypass on elevator
Diffstat (limited to 'digital/io/src/elevator_cb.c')
-rw-r--r--digital/io/src/elevator_cb.c21
1 files changed, 5 insertions, 16 deletions
diff --git a/digital/io/src/elevator_cb.c b/digital/io/src/elevator_cb.c
index e1799879..d47d286f 100644
--- a/digital/io/src/elevator_cb.c
+++ b/digital/io/src/elevator_cb.c
@@ -144,29 +144,18 @@ elevator__WAIT_A_PUCK__new_puck (void)
}
/*
- * WAIT_A_PUCK =order_received=>
- * => WAIT_FB_EMPTY
- * elevator filling has been shut, get ready to drop pucks
- */
-fsm_branch_t
-elevator__WAIT_A_PUCK__order_received (void)
-{
- elvt_is_ready = 0;
- return elevator_next (WAIT_A_PUCK, order_received);
-}
-
-/*
- * WAIT_FB_EMPTY =fb_empty=>
+ * WAIT_A_PUCK =order_bypass=>
* => GO_TO_POS_Y
- * execute order
+ * elevator filling has been shut, get ready to drop pucks
*/
fsm_branch_t
-elevator__WAIT_FB_EMPTY__fb_empty (void)
+elevator__WAIT_A_PUCK__order_bypass (void)
{
elvt_new_puck = 0;
+ elvt_is_ready = 0;
asserv_move_elevator_absolute(posy[elvt_order - 1] - MAJ_POSY,
ASSERV_ELVT_SPEED_DEFAULT);
- return elevator_next (WAIT_FB_EMPTY, fb_empty);
+ return elevator_next (WAIT_A_PUCK, order_bypass);
}
/*