diff --git a/src/modelec_interfaces/msg/Strat/StratState.msg b/src/modelec_interfaces/msg/Strat/StratState.msg index f81a2e1..89c45a0 100644 --- a/src/modelec_interfaces/msg/Strat/StratState.msg +++ b/src/modelec_interfaces/msg/Strat/StratState.msg @@ -1,12 +1,13 @@ int32 INIT=0 int32 WAIT_START=1 int32 SELECT_MISSION=2 +int32 SELECT_GAME_ACTION=3 -int32 DO_PREPARE_CONCERT=3 -int32 DO_PROMOTION=4 +int32 TAKE_MISSION=10 +int32 FREE_MISSION=11 -int32 DO_GO_HOME=5 -int32 STOP=6 +int32 DO_GO_HOME=20 +int32 STOP=21 int32 state string reason \ No newline at end of file diff --git a/src/modelec_strat/include/modelec_strat/strat_fms.hpp b/src/modelec_strat/include/modelec_strat/strat_fms.hpp index 2069550..a748528 100644 --- a/src/modelec_strat/include/modelec_strat/strat_fms.hpp +++ b/src/modelec_strat/include/modelec_strat/strat_fms.hpp @@ -21,16 +21,16 @@ namespace Modelec { enum class State { - INIT, - WAIT_START, - SELECT_MISSION, - SELECT_GAME_ACTION, + INIT = 0, + WAIT_START = 1, + SELECT_MISSION = 2, + SELECT_GAME_ACTION = 3, - TAKE_MISSION, - FREE_MISSION, + TAKE_MISSION = 10, + FREE_MISSION = 11, - DO_GO_HOME, - STOP + DO_GO_HOME = 20, + STOP = 21 }; class StratFMS : public rclcpp::Node diff --git a/src/modelec_strat/src/strat_fms.cpp b/src/modelec_strat/src/strat_fms.cpp index be23ccf..71ffbe1 100644 --- a/src/modelec_strat/src/strat_fms.cpp +++ b/src/modelec_strat/src/strat_fms.cpp @@ -70,7 +70,7 @@ namespace Modelec game_action_sequence_.push(State::TAKE_MISSION); game_action_sequence_.push(State::FREE_MISSION); game_action_sequence_.push(State::FREE_MISSION); - static_strat_ = true; + static_strat_ = false; } void StratFMS::Init()