From 12161ca13b40cac3d181f475f08f05665ca81401 Mon Sep 17 00:00:00 2001 From: Jérémy Dufour Date: Mon, 21 Apr 2008 23:56:48 +0200 Subject: * digital/io/src - start top FSM does not require the team color anymore (it is managed in the top FSM itself) ; - start top FSM into the main init. --- digital/io/src/main.c | 2 ++ digital/io/src/top.c | 5 +---- digital/io/src/top.h | 5 +---- 3 files changed, 4 insertions(+), 8 deletions(-) (limited to 'digital/io') diff --git a/digital/io/src/main.c b/digital/io/src/main.c index f9f7664a..6ca9327b 100644 --- a/digital/io/src/main.c +++ b/digital/io/src/main.c @@ -79,6 +79,8 @@ main_init (void) trap_init (); /* Switch module */ switch_init (); + /* Start the top FSM */ + top_start (); /* Enable interrupts */ sei (); diff --git a/digital/io/src/top.c b/digital/io/src/top.c index 6d8ab268..dbbe4892 100644 --- a/digital/io/src/top.c +++ b/digital/io/src/top.c @@ -37,15 +37,12 @@ uint8_t top_waiting_for_settings_ack_ = 0; /** Start a main FSM. */ void -top_start (uint8_t color_team) +top_start (void) { /* Set parameters. */ top_data.sequence = 0x15; top_data.boxes_used = 0x0; top_data.sequence_to_do = 0x15; - /* Get the team color. - * !! I supose that the 0 value is 0 and red value is 1 */ - top_data.team_color = color_team; /* Start the FSM. */ fsm_init (&top_fsm); fsm_handle_event (&top_fsm, TOP_EVENT_start); diff --git a/digital/io/src/top.h b/digital/io/src/top.h index 5e2da9b4..024231ec 100644 --- a/digital/io/src/top.h +++ b/digital/io/src/top.h @@ -56,16 +56,13 @@ struct top_data_t uint8_t boxes_used; /** sequence to realize. */ uint8_t sequence_to_do; - /** The color of the balls the robot shall take. - * RED_TEAM or BLUE_TEAM. */ - uint8_t team_color; }; extern struct top_data_t top_data; /** Start a Top FSM. */ void -top_start (uint8_t team_color); +top_start (void); /** * Do we need to tell the top FSM the settings has been acknowledged? -- cgit v1.2.3