From 61a938924954bbca81313fd50032a53f3f6fc966 Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Sun, 28 Apr 2013 19:21:13 +0200 Subject: digital/io-hub/src/apbirthday: temporarily disable unused FSM --- digital/io-hub/src/apbirthday/drinks.cc | 17 +++++++++++++---- digital/io-hub/src/apbirthday/plate.cc | 17 +++++++++++++---- 2 files changed, 26 insertions(+), 8 deletions(-) (limited to 'digital/io-hub/src') diff --git a/digital/io-hub/src/apbirthday/drinks.cc b/digital/io-hub/src/apbirthday/drinks.cc index b0dca57a..09fe4699 100644 --- a/digital/io-hub/src/apbirthday/drinks.cc +++ b/digital/io-hub/src/apbirthday/drinks.cc @@ -112,11 +112,20 @@ FSM_EVENTS (drinks_take, FSM_START_WITH (DRINKS_OFF) -FSM_TRANS (DRINKS_OFF, init_actuators, DRINKS_INIT_PREPARING) +FSM_TRANS (DRINKS_OFF, init_actuators, + off, DRINKS_OFF, + on, DRINKS_INIT_PREPARING) { - Drinks::upper_down (); - Drinks::upper_close (); - Drinks::lower_close (); + // TODO: disabled until present. + if (1) + return FSM_BRANCH (off); + else + { + Drinks::upper_down (); + Drinks::upper_close (); + Drinks::lower_close (); + return FSM_BRANCH (on); + } } FSM_TRANS_TIMEOUT (DRINKS_INIT_PREPARING, 100, DRINKS_INIT_UPING) diff --git a/digital/io-hub/src/apbirthday/plate.cc b/digital/io-hub/src/apbirthday/plate.cc index 7b8fe9aa..43e05e57 100644 --- a/digital/io-hub/src/apbirthday/plate.cc +++ b/digital/io-hub/src/apbirthday/plate.cc @@ -67,10 +67,19 @@ FSM_EVENTS (plate_take, FSM_START_WITH (PLATE_OFF) -FSM_TRANS (PLATE_OFF, init_actuators, PLATE_INIT_PREPARE) -{ - Plate::arm_down (); - Plate::clamp_open (); +FSM_TRANS (PLATE_OFF, init_actuators, + off, PLATE_OFF, + on, PLATE_INIT_PREPARE) +{ + // TODO: disabled until present. + if (1) + return FSM_BRANCH (off); + else + { + Plate::arm_down (); + Plate::clamp_open (); + return FSM_BRANCH (on); + } } FSM_TRANS_TIMEOUT (PLATE_INIT_PREPARE, 100, PLATE_INIT_TAKING) -- cgit v1.2.3