summaryrefslogtreecommitdiff
path: root/digital/io/src/test/gutter
diff options
context:
space:
mode:
Diffstat (limited to 'digital/io/src/test/gutter')
-rw-r--r--digital/io/src/test/gutter/Makefile17
-rw-r--r--digital/io/src/test/gutter/main.c26
2 files changed, 23 insertions, 20 deletions
diff --git a/digital/io/src/test/gutter/Makefile b/digital/io/src/test/gutter/Makefile
index 21470810..cd355139 100644
--- a/digital/io/src/test/gutter/Makefile
+++ b/digital/io/src/test/gutter/Makefile
@@ -1,7 +1,12 @@
-BASE= ..
+BASE= ../../../../avr
+HOST_PROGS = fsm
+IOBASE = ../..
+fsm_SOURCES = main.c $(IOBASE)/fsm.c \
+ $(IOBASE)/gutter_cb.c $(IOBASE)/gutter_fsm.c
+MODULES =
+CONFIGFILE =
+# -O2 : speed
+# -Os : size
+OPTIMIZE = -O2
-all: main.c $(BASE)/gutter.c $(BASE)/gutter_cb.c
- gcc -g -O2 -Wall main.c $(BASE)/gutter.c $(BASE)/gutter_cb.c -o fsm
-
-clean: fsm
- rm -f fsm
+include $(BASE)/make/Makefile.gen
diff --git a/digital/io/src/test/gutter/main.c b/digital/io/src/test/gutter/main.c
index 08be3342..41860461 100644
--- a/digital/io/src/test/gutter/main.c
+++ b/digital/io/src/test/gutter/main.c
@@ -22,17 +22,18 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* }}} */
-#include "../gutter.h"
-#include "../gutter_robo.h"
+#include "common.h"
+
+#include "../../fsm.h"
#include <stdio.h>
void
-gutter_print_test (gutter_t *gutter)
+gutter_print_test (fsm_t *gutter)
{
printf ("Machine state ");
- switch (gutter->fsm)
+ switch (gutter->state_current)
{
case GUTTER_STATE_END:
printf ("END");
@@ -55,28 +56,25 @@ gutter_print_test (gutter_t *gutter)
int
main (void)
{
- gutter_t gutter_fsm;
+ fsm_init (&gutter_fsm);
+
+ fsm_handle_event (&gutter_fsm, GUTTER_EVENT_ok);
- gutter_init (&gutter_fsm);
gutter_print_test (&gutter_fsm);
- gutter_handle_event (&gutter_fsm,
- GUTTER_EVENT_position_failed);
+ fsm_handle_event (&gutter_fsm, GUTTER_EVENT_position_failed);
gutter_print_test (&gutter_fsm);
- gutter_handle_event (&gutter_fsm,
- GUTTER_EVENT_position_reached);
+ fsm_handle_event (&gutter_fsm, GUTTER_EVENT_position_reached);
gutter_print_test (&gutter_fsm);
- gutter_handle_event (&gutter_fsm,
- GUTTER_EVENT_collector_opened);
+ fsm_handle_event (&gutter_fsm, GUTTER_EVENT_collector_opened);
gutter_print_test (&gutter_fsm);
- gutter_handle_event (&gutter_fsm,
- GUTTER_EVENT_collector_closed);
+ fsm_handle_event (&gutter_fsm, GUTTER_EVENT_collector_closed);
gutter_print_test (&gutter_fsm);