From 0c3aa34cbbaf605571e953098964527ca42c8464 Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Wed, 10 Apr 2013 22:32:08 +0200 Subject: digital/io-hub/src/apbirthday: centralize FSM definitions --- digital/io-hub/src/apbirthday/candles.cc | 5 ----- digital/io-hub/src/apbirthday/main.cc | 5 ----- digital/io-hub/src/apbirthday/robot.cc | 2 +- digital/io-hub/src/apbirthday/top.cc | 11 ----------- 4 files changed, 1 insertion(+), 22 deletions(-) (limited to 'digital/io-hub/src/apbirthday') diff --git a/digital/io-hub/src/apbirthday/candles.cc b/digital/io-hub/src/apbirthday/candles.cc index 0fd1beb1..daed19eb 100644 --- a/digital/io-hub/src/apbirthday/candles.cc +++ b/digital/io-hub/src/apbirthday/candles.cc @@ -26,11 +26,6 @@ #include "defs.hh" #include "candles.hh" -extern "C" { -#define ANGFSM_NAME AI -#include "angfsm.h" -} - Candles::Candles (int calif_mode) { int i; diff --git a/digital/io-hub/src/apbirthday/main.cc b/digital/io-hub/src/apbirthday/main.cc index bea4ceec..1a7d5f42 100644 --- a/digital/io-hub/src/apbirthday/main.cc +++ b/digital/io-hub/src/apbirthday/main.cc @@ -26,11 +26,6 @@ #include "robot.hh" #include "defs.hh" -extern "C" { -#define ANGFSM_NAME AI -#include "angfsm.h" -} - /// Global team color. TeamColor team_color = TEAM_COLOR_UNKNOWN; diff --git a/digital/io-hub/src/apbirthday/robot.cc b/digital/io-hub/src/apbirthday/robot.cc index cd782ffc..8ed99782 100644 --- a/digital/io-hub/src/apbirthday/robot.cc +++ b/digital/io-hub/src/apbirthday/robot.cc @@ -174,7 +174,7 @@ Robot::fsm_gen_event () // FSM queue. if (fsm_queue.poll ()) { - FsmQueue::Event event = fsm_queue.pop (); + Event event = fsm_queue.pop (); if (ANGFSM_HANDLE_VAR (AI, event)) return true; } diff --git a/digital/io-hub/src/apbirthday/top.cc b/digital/io-hub/src/apbirthday/top.cc index 79b97bc4..71c568ea 100644 --- a/digital/io-hub/src/apbirthday/top.cc +++ b/digital/io-hub/src/apbirthday/top.cc @@ -26,17 +26,6 @@ #include "playground_2013.hh" #include "bot.hh" -extern "C" { -#define ANGFSM_NAME AI -#include "angfsm.h" -} - -#ifdef TARGET_host -typedef unsigned Branch; -#else -typedef angfsm_AI_branch_t Branch; -#endif - #include /// Top context. -- cgit v1.2.3