summaryrefslogtreecommitdiffhomepage
path: root/digital/io/src
diff options
context:
space:
mode:
authorJerome Jutteau2013-02-27 21:57:37 +0100
committerJerome Jutteau2013-02-27 22:16:08 +0100
commit301edb5ec41f673f73f9b41153ba81b1e7f68125 (patch)
tree13b18fd2b289c96197de359fa5cc7ff059049738 /digital/io/src
parent0fe95079677149ca0791aa5edd7dc99c7276748b (diff)
digital/io/src: update fsm
Diffstat (limited to 'digital/io/src')
-rw-r--r--digital/io/src/Makefile14
-rw-r--r--digital/io/src/hola.c4
-rw-r--r--digital/io/src/init.c4
-rw-r--r--digital/io/src/loader.c4
-rw-r--r--digital/io/src/main.c16
-rw-r--r--digital/io/src/move.c4
-rw-r--r--digital/io/src/top.c4
7 files changed, 21 insertions, 29 deletions
diff --git a/digital/io/src/Makefile b/digital/io/src/Makefile
index 4c50ba71..56cf4a03 100644
--- a/digital/io/src/Makefile
+++ b/digital/io/src/Makefile
@@ -8,7 +8,7 @@ io_SOURCES = main.c fsm_queue.c eeprom.avr.c pwm.c \
twi_master.c asserv.c mimot.c \
simu.host.c contact.c radar.c radar_defs.c \
path.c food.c events.host.c \
- fsm.host.c init.c move.c top.c hola.c loader.c fsm_AI_gen.avr.c
+ angfsm.host.c init.c move.c top.c hola.c loader.c fsm_AI_gen.avr.c
# Modules needed for IO.
MODULES = proto uart twi utils adc math/fixed math/geometry path/astar \
devices/usdist devices/servo \
@@ -26,16 +26,16 @@ vpath %.c $(AI_MODULES:%=../../ai/src/%)
vpath %.h $(AI_MODULES:%=../../ai/src/%)
INCLUDES += -I. $(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
include $(BASE)/make/Makefile.gen
# FSM generation.
-obj/main.avr.o: fsm_AI_gen.h
-fsm_AI_gen.avr.c: fsm_AI_gen.h
-fsm_AI_gen.h: io.host
- ./$< --gen
- mv fsm_AI_gen.c fsm_AI_gen.avr.c
+obj/main.avr.o: angfsm_gen_avr_AI.h
+fsm_AI_gen.avr.c: angfsm_gen_avr_AI.h
+angfsm_gen_avr_AI.h: io.host
+ ./$< --ang-gen avr
+ mv angfsm_gen_avr_AI.c fsm_AI_gen.avr.c
events.h events.host.c: trace.trc $(BASE)/../../tools/trace/lib/parser.py
PYTHONPATH=$(BASE)/../../host python $(BASE)/../../tools/trace/trace.py -t create -i $< -o
diff --git a/digital/io/src/hola.c b/digital/io/src/hola.c
index 7c9d5184..af663c4a 100644
--- a/digital/io/src/hola.c
+++ b/digital/io/src/hola.c
@@ -23,10 +23,10 @@
*
* }}} */
-#define FSM_NAME AI
+#define ANGFSM_NAME AI
#include "common.h"
-#include "fsm.h"
+#include "angfsm.h"
#include "asserv.h"
#include "mimot.h"
#include "bot.h"
diff --git a/digital/io/src/init.c b/digital/io/src/init.c
index 1236b11c..77701c2b 100644
--- a/digital/io/src/init.c
+++ b/digital/io/src/init.c
@@ -22,10 +22,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* }}} */
-#define FSM_NAME AI
+#define ANGFSM_NAME AI
#include "common.h"
-#include "fsm.h"
+#include "angfsm.h"
#include "asserv.h"
#include "init.h"
#include "playground_2010.h"
diff --git a/digital/io/src/loader.c b/digital/io/src/loader.c
index e8f8c139..82a548d8 100644
--- a/digital/io/src/loader.c
+++ b/digital/io/src/loader.c
@@ -22,11 +22,11 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* }}} */
-#define FSM_NAME AI
+#define ANGFSM_NAME AI
#include "common.h"
#include "loader.h"
-#include "fsm.h"
+#include "angfsm.h"
#include "asserv.h"
#include "mimot.h"
#include "bot.h"
diff --git a/digital/io/src/main.c b/digital/io/src/main.c
index 5aa35fb7..7424fffe 100644
--- a/digital/io/src/main.c
+++ b/digital/io/src/main.c
@@ -48,8 +48,8 @@
#include "mimot.h"
#include "twi_master.h"
#include "eeprom.h" /* Parameters loaded/stored in the EEPROM */
-#define FSM_NAME AI
-#include "fsm.h"
+#define ANGFSM_NAME AI
+#include "angfsm.h"
#include "fsm_queue.h"
#include "bot.h"
#include "radar.h"
@@ -676,16 +676,8 @@ int
main (int argc, char **argv)
{
/* produce AVR's FSM headers. */
-#ifdef HOST
- int i;
- if (argc > 1)
- for (i = 1; i < argc; i++)
- if (strcmp (argv[i], "--gen") == 0)
- {
- FSM_GENERATE (AVR, 0);
- return 0;
- }
-#endif
+ if (ANGFSM_OPTIONS (argc, argv))
+ return 0;
avr_init (argc, argv);
diff --git a/digital/io/src/move.c b/digital/io/src/move.c
index a887e1b2..c497d2f0 100644
--- a/digital/io/src/move.c
+++ b/digital/io/src/move.c
@@ -23,11 +23,11 @@
*
* }}} */
-#define FSM_NAME AI
+#define ANGFSM_NAME AI
#include "common.h"
#include "move.h"
-#include "fsm.h"
+#include "angfsm.h"
#include "bot.h"
#include "radar.h"
#include "asserv.h"
diff --git a/digital/io/src/top.c b/digital/io/src/top.c
index 23debf46..83cbdbda 100644
--- a/digital/io/src/top.c
+++ b/digital/io/src/top.c
@@ -23,9 +23,9 @@
*
* }}} */
-#define FSM_NAME AI
+#define ANGFSM_NAME AI
-#include "fsm.h"
+#include "angfsm.h"
#include "common.h"
#include "defs.h"
#include "top.h"