From 14a6dd5f9c6784afa21f81a795d13c994ec515ee Mon Sep 17 00:00:00 2001 From: Filip Jares Date: Thu, 27 May 2010 22:20:32 +0200 Subject: [PATCH] robofsm: rename six_oranges strategy to 12_oranges (it in fact performed "12 oranges" strategy) --- src/robofsm/Makefile.omk | 2 +- src/robofsm/common-states.h | 2 +- src/robofsm/competition.cc | 2 +- src/robofsm/{strategy_six_oranges.cc => strategy_12_oranges.cc} | 2 +- src/robofsm/strategy_opp_oranges.cc | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename src/robofsm/{strategy_six_oranges.cc => strategy_12_oranges.cc} (98%) diff --git a/src/robofsm/Makefile.omk b/src/robofsm/Makefile.omk index 7b5acd02..e14e920b 100644 --- a/src/robofsm/Makefile.omk +++ b/src/robofsm/Makefile.omk @@ -10,7 +10,7 @@ robot_config_DEFINES = CONFIG_LOCK_CHECKING HAVE_PRIO_INHERIT bin_PROGRAMS += competition competition_SOURCES = competition.cc common-states.cc \ strategy_opp_corn.cc strategy_opp_oranges.cc \ - strategy_six_oranges.cc + strategy_12_oranges.cc bin_PROGRAMS += homologation homologation_SOURCES = homologation.cc diff --git a/src/robofsm/common-states.h b/src/robofsm/common-states.h index 72ffc5df..23d7e84b 100644 --- a/src/robofsm/common-states.h +++ b/src/robofsm/common-states.h @@ -9,7 +9,7 @@ extern struct TrajectoryConstraints tcFast, tcSlow, tcVerySlow; FSM_STATE_DECL(start_opp_oranges); -FSM_STATE_DECL(start_six_oranges); +FSM_STATE_DECL(start_12_oranges); FSM_STATE_DECL(start_opp_corn); diff --git a/src/robofsm/competition.cc b/src/robofsm/competition.cc index 0255eb3b..0c31b038 100644 --- a/src/robofsm/competition.cc +++ b/src/robofsm/competition.cc @@ -46,7 +46,7 @@ int main() //robot.fsm.main.state = &fsm_state_main_start_opp_corn; //robot.fsm.main.state = &fsm_state_main_start_opp_oranges; - robot.fsm.main.state = &fsm_state_main_start_six_oranges; + robot.fsm.main.state = &fsm_state_main_start_12_oranges; //robot.fsm.main.transition_callback = trans_callback; //robot.fsm.motion.transition_callback = move_trans_callback; diff --git a/src/robofsm/strategy_six_oranges.cc b/src/robofsm/strategy_12_oranges.cc similarity index 98% rename from src/robofsm/strategy_six_oranges.cc rename to src/robofsm/strategy_12_oranges.cc index 5d489c4e..de395b47 100644 --- a/src/robofsm/strategy_six_oranges.cc +++ b/src/robofsm/strategy_12_oranges.cc @@ -4,7 +4,7 @@ static FSM_STATE_DECL(pick_our_oranges); -FSM_STATE(start_six_oranges) +FSM_STATE(start_12_oranges) { switch (FSM_EVENT) { case EV_ENTRY: diff --git a/src/robofsm/strategy_opp_oranges.cc b/src/robofsm/strategy_opp_oranges.cc index 86a57812..608078e4 100644 --- a/src/robofsm/strategy_opp_oranges.cc +++ b/src/robofsm/strategy_opp_oranges.cc @@ -26,7 +26,7 @@ FSM_STATE(start_opp_oranges) start_exit(); break; case EV_SWITCH_STRATEGY: - FSM_TRANSITION(start_six_oranges); + FSM_TRANSITION(start_12_oranges); break; default:; } -- 2.39.2