From c07e5335bb9c178854ef0d9f686414cc66b7a240 Mon Sep 17 00:00:00 2001 From: Jerome Jutteau Date: Wed, 27 Feb 2013 22:12:50 +0100 Subject: digital/io-hub/src/robospierre: update fsm --- digital/io-hub/src/robospierre/Makefile | 8 ++++---- digital/io-hub/src/robospierre/clamp.c | 4 ++-- digital/io-hub/src/robospierre/main.c | 18 +++++------------- digital/io-hub/src/robospierre/move.c | 4 ++-- digital/io-hub/src/robospierre/pawn_sensor.c | 4 ++-- digital/io-hub/src/robospierre/top.c | 4 ++-- 6 files changed, 17 insertions(+), 25 deletions(-) (limited to 'digital') diff --git a/digital/io-hub/src/robospierre/Makefile b/digital/io-hub/src/robospierre/Makefile index d822e798..0f8d89c5 100644 --- a/digital/io-hub/src/robospierre/Makefile +++ b/digital/io-hub/src/robospierre/Makefile @@ -8,7 +8,7 @@ io_hub_SOURCES = main.c top.c \ clamp.c logistic.c element.c pawn_sensor.c \ codebar.avr.c codebar.host.c \ radar_defs.c radar.c path.c move.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 \ pwm.avr.c pwm.host.c \ contact.avr.c contact.host.c \ twi_master.c asserv.c mimot.c \ @@ -33,7 +33,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 include $(BASE)/make/Makefile.gen @@ -41,5 +41,5 @@ include $(BASE)/make/Makefile.gen obj/main.avr.o: fsm_AI_gen.h fsm_AI_gen.avr.c: fsm_AI_gen.h fsm_AI_gen.h: io_hub.host - ./$< --gen - mv fsm_AI_gen.c fsm_AI_gen.avr.c + ./$< --ang-gen avr + mv angfsm_gen_avr_AI.c fsm_AI_gen.avr.c diff --git a/digital/io-hub/src/robospierre/clamp.c b/digital/io-hub/src/robospierre/clamp.c index 39ae8dfa..641bf4de 100644 --- a/digital/io-hub/src/robospierre/clamp.c +++ b/digital/io-hub/src/robospierre/clamp.c @@ -32,8 +32,8 @@ #include "element.h" #include "playground_2011.h" -#define FSM_NAME AI -#include "fsm.h" +#define ANGFSM_NAME AI +#include "angfsm.h" #include "fsm_queue.h" #include "logistic.h" diff --git a/digital/io-hub/src/robospierre/main.c b/digital/io-hub/src/robospierre/main.c index e68de49c..e812226d 100644 --- a/digital/io-hub/src/robospierre/main.c +++ b/digital/io-hub/src/robospierre/main.c @@ -44,8 +44,8 @@ #include "pawn_sensor.h" #include "radar.h" -#define FSM_NAME AI -#include "fsm.h" +#define ANGFSM_NAME AI +#include "angfsm.h" #ifdef HOST # include #endif @@ -375,17 +375,9 @@ proto_callback (uint8_t cmd, uint8_t size, uint8_t *args) 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); - 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/robospierre/move.c b/digital/io-hub/src/robospierre/move.c index a44b5715..e3542e14 100644 --- a/digital/io-hub/src/robospierre/move.c +++ b/digital/io-hub/src/robospierre/move.c @@ -29,8 +29,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/robospierre/pawn_sensor.c b/digital/io-hub/src/robospierre/pawn_sensor.c index 5c2f2ece..7896aa72 100644 --- a/digital/io-hub/src/robospierre/pawn_sensor.c +++ b/digital/io-hub/src/robospierre/pawn_sensor.c @@ -37,8 +37,8 @@ #include "mimot.h" #include "main.h" -#define FSM_NAME AI -#include "fsm.h" +#define ANGFSM_NAME AI +#include "angfsm.h" #include "fsm_queue.h" #include "modules/utils/utils.h" diff --git a/digital/io-hub/src/robospierre/top.c b/digital/io-hub/src/robospierre/top.c index 93fb447f..384eee48 100644 --- a/digital/io-hub/src/robospierre/top.c +++ b/digital/io-hub/src/robospierre/top.c @@ -28,8 +28,8 @@ #include "playground_2011.h" #include "asserv.h" -#define FSM_NAME AI -#include "fsm.h" +#define ANGFSM_NAME AI +#include "angfsm.h" #include "logistic.h" #include "move.h" -- cgit v1.2.3