summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerome Jutteau2013-02-27 22:06:37 +0100
committerJerome Jutteau2013-02-27 22:16:08 +0100
commitb10b8b3ad12e98401e79f2eaebba481dd46a21d7 (patch)
treee6721f6fe7092416ec62b3b08445e546dbe8cc2d
parent301edb5ec41f673f73f9b41153ba81b1e7f68125 (diff)
digital/io-hub/src/guybrush: update fsm
-rw-r--r--digital/io-hub/src/guybrush/Makefile6
-rw-r--r--digital/io-hub/src/guybrush/bottom_clamp.c4
-rw-r--r--digital/io-hub/src/guybrush/main.c19
-rw-r--r--digital/io-hub/src/guybrush/move.c4
-rw-r--r--digital/io-hub/src/guybrush/top.c4
5 files changed, 14 insertions, 23 deletions
diff --git a/digital/io-hub/src/guybrush/Makefile b/digital/io-hub/src/guybrush/Makefile
index e52378b3..0c642017 100644
--- a/digital/io-hub/src/guybrush/Makefile
+++ b/digital/io-hub/src/guybrush/Makefile
@@ -7,7 +7,7 @@ io_hub_SOURCES = main.c top.c strat.c \
radar_defs.c radar.c path.c move.c \
pressure.c \
logger.avr.c \
- init.c fsm.host.c fsm_AI_gen.avr.c fsm_queue.c \
+ init.c angfsm.host.c fsm_AI_gen.avr.c fsm_queue.c \
contact.avr.c contact.host.c \
output.c output.host.c \
twi_master.c asserv.c mimot.c beacon.c \
@@ -31,7 +31,7 @@ vpath %.c $(AI_MODULES:%=../../../ai/src/%)
vpath %.h $(AI_MODULES:%=../../../ai/src/%)
INCLUDES += -I. -I../common $(AI_MODULES:%=-I../../../ai/src/%)
-EXTRA_CLEAN_FILES = fsm_AI_gen.h fsm_AI_gen.avr.c \
+EXTRA_CLEAN_FILES = angfsm_gen_avr_AI.h fsm_AI_gen.avr.c \
dot_AI_1.dot dot_AI_1.png dot_AI_1.svg
include $(BASE)/make/Makefile.gen
@@ -39,4 +39,4 @@ include $(BASE)/make/Makefile.gen
# FSM generation.
include ../../../ai/src/fsm/Makefile.fsm
-obj/main.avr.o: fsm_AI_gen.h
+obj/main.avr.o: angfsm_gen_avr_AI.h
diff --git a/digital/io-hub/src/guybrush/bottom_clamp.c b/digital/io-hub/src/guybrush/bottom_clamp.c
index 52a61705..e6b844b6 100644
--- a/digital/io-hub/src/guybrush/bottom_clamp.c
+++ b/digital/io-hub/src/guybrush/bottom_clamp.c
@@ -34,8 +34,8 @@
#include "strat.h"
-#define FSM_NAME AI
-#include "fsm.h"
+#define ANGFSM_NAME AI
+#include "angfsm.h"
#include "fsm_queue.h"
/*
diff --git a/digital/io-hub/src/guybrush/main.c b/digital/io-hub/src/guybrush/main.c
index ff1a1ab8..cfec1879 100644
--- a/digital/io-hub/src/guybrush/main.c
+++ b/digital/io-hub/src/guybrush/main.c
@@ -46,8 +46,8 @@
#include "pressure.h"
#include "logger.h"
-#define FSM_NAME AI
-#include "fsm.h"
+#define ANGFSM_NAME AI
+#include "angfsm.h"
#ifdef HOST
# include <string.h>
#endif
@@ -650,18 +650,9 @@ void main_set_drop_coin_pos(int pos_to_drop)
int
main (int argc, char **argv)
{
-#ifdef HOST
- /* Produce AVR's FSM headers. */
- int i;
- if (argc > 1)
- for (i = 1; i < argc; i++)
- if (strcmp (argv[i], "--gen") == 0)
- {
- FSM_GENERATE (AVR, 0);
- FSM_GEN_DOT (AI);
- return 0;
- }
-#endif
+ /* produce AVR's FSM headers. */
+ if (ANGFSM_OPTIONS (argc, argv))
+ return 0;
avr_init (argc, argv);
main_init ();
main_loop ();
diff --git a/digital/io-hub/src/guybrush/move.c b/digital/io-hub/src/guybrush/move.c
index ef30725d..2e524463 100644
--- a/digital/io-hub/src/guybrush/move.c
+++ b/digital/io-hub/src/guybrush/move.c
@@ -28,8 +28,8 @@
#include "main.h"
#include "asserv.h"
-#define FSM_NAME AI
-#include "fsm.h"
+#define ANGFSM_NAME AI
+#include "angfsm.h"
#include "fsm_queue.h"
#include "radar.h"
diff --git a/digital/io-hub/src/guybrush/top.c b/digital/io-hub/src/guybrush/top.c
index 95a3b885..3fa7ce5b 100644
--- a/digital/io-hub/src/guybrush/top.c
+++ b/digital/io-hub/src/guybrush/top.c
@@ -29,8 +29,8 @@
#include "playground_2012.h"
#include "asserv.h"
-#define FSM_NAME AI
-#include "fsm.h"
+#define ANGFSM_NAME AI
+#include "angfsm.h"
#include "main.h"
#include "move.h"