summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--digital/io/src/Makefile.getsamples21
-rw-r--r--digital/io/src/getSamplesFsm.conf (renamed from digital/io/src/getsamples/getSamplesFsm.conf)0
-rw-r--r--digital/io/src/getSamplesFsm.fsm (renamed from digital/io/src/getsamples/getSamplesFsm.fsm)0
-rw-r--r--digital/io/src/getsamples/Makefile.getsamples23
-rw-r--r--digital/io/src/getsamples_cb.c (renamed from digital/io/src/getsamples/getsamples_cb.c)0
-rw-r--r--digital/io/src/getsamples_robo.h (renamed from digital/io/src/getsamples/getsamples_robo.h)0
-rw-r--r--digital/io/src/gutter/gutter_cb.c3
-rw-r--r--digital/io/src/testgetsamples/Makefile (renamed from digital/io/src/getsamples/test/Makefile)0
-rw-r--r--digital/io/src/testgetsamples/main.c (renamed from digital/io/src/getsamples/test/main.c)0
9 files changed, 23 insertions, 24 deletions
diff --git a/digital/io/src/Makefile.getsamples b/digital/io/src/Makefile.getsamples
new file mode 100644
index 00000000..9e3287f4
--- /dev/null
+++ b/digital/io/src/Makefile.getsamples
@@ -0,0 +1,21 @@
+CFLAGS = -O2 -Wall
+
+all: prgm exe dot png
+
+prgm: getSamplesFsm.fsm getSamplesFsm.conf
+ python ../../../tools/dfagen/dfagen.py -o c -d $< -c getSamplesFsm.conf -p getsamples
+
+exe: prgm
+
+dot: getSamplesFsm.fsm getSamplesFsm.conf
+ python ../../../tools/dfagen/dfagen.py -o dot -d $< -c getSamplesFsm.conf -p getsamples
+
+png: getsamples.dot
+ dot -Tpng -o getsamples.png getsamples.dot
+
+clean:
+ rm -f getsamples.h
+ rm -f getsamples_cb.h
+ rm -f getsamples.dot
+ rm -f getsamples.png
+ rm -f getsamples.c
diff --git a/digital/io/src/getsamples/getSamplesFsm.conf b/digital/io/src/getSamplesFsm.conf
index 238c0f6f..238c0f6f 100644
--- a/digital/io/src/getsamples/getSamplesFsm.conf
+++ b/digital/io/src/getSamplesFsm.conf
diff --git a/digital/io/src/getsamples/getSamplesFsm.fsm b/digital/io/src/getSamplesFsm.fsm
index 3f7266d0..3f7266d0 100644
--- a/digital/io/src/getsamples/getSamplesFsm.fsm
+++ b/digital/io/src/getSamplesFsm.fsm
diff --git a/digital/io/src/getsamples/Makefile.getsamples b/digital/io/src/getsamples/Makefile.getsamples
deleted file mode 100644
index c59fdb64..00000000
--- a/digital/io/src/getsamples/Makefile.getsamples
+++ /dev/null
@@ -1,23 +0,0 @@
-CFLAGS = -O2 -Wall
-
-all: prgm exe dot png
-
-prgm: getSamplesFsm.fsm getSamplesFsm.conf
- python ../../../../tools/dfagen/dfagen.py -o c -d $< -c getSamplesFsm.conf -p getsamples
-
-exe: getSamplesFsm.fsm getSamplesFsm.conf
- make prgm
- #if [ -f getsamples_cb.c ]; then vimdiff getsamples_cb.c getsamples_cb_skel.c; else mv getsamples_cb_skel.c getsamples_cb.c; fi;
-
-dot: getSamplesFsm.fsm getSamplesFsm.conf
- python ../../../../tools/dfagen/dfagen.py -o dot -d $< -c getSamplesFsm.conf -p getsamples
-
-png: getsamples.dot
- dot -Tpng -o getsamples.png getsamples.dot
-
-clean:
- rm -f getsamples.h
- rm -f getsamples_cb.h
- rm -f getsamples.dot
- rm -f getsamples.png
- rm -f getsamples.c
diff --git a/digital/io/src/getsamples/getsamples_cb.c b/digital/io/src/getsamples_cb.c
index de10ac53..de10ac53 100644
--- a/digital/io/src/getsamples/getsamples_cb.c
+++ b/digital/io/src/getsamples_cb.c
diff --git a/digital/io/src/getsamples/getsamples_robo.h b/digital/io/src/getsamples_robo.h
index 11309a10..11309a10 100644
--- a/digital/io/src/getsamples/getsamples_robo.h
+++ b/digital/io/src/getsamples_robo.h
diff --git a/digital/io/src/gutter/gutter_cb.c b/digital/io/src/gutter/gutter_cb.c
index 14268177..729c187f 100644
--- a/digital/io/src/gutter/gutter_cb.c
+++ b/digital/io/src/gutter/gutter_cb.c
@@ -28,6 +28,7 @@ gutter_branch_t
gutter__CLOSE_COLLECTOR__collector_closed (gutter_t *user)
{
//Close the collector.
+ trap_close_rear_panel();
return gutter_next (CLOSE_COLLECTOR, collector_closed);
}
@@ -51,6 +52,7 @@ gutter_branch_t
gutter__GO_TO_GUTTER__position_reached (gutter_t *user)
{
// Open the collector.
+ trap_open_rear_panel();
return gutter_next (GO_TO_GUTTER, position_reached);
}
@@ -66,4 +68,3 @@ gutter__OPEN_COLLECTOR__collector_opened (gutter_t *user)
return gutter_next (OPEN_COLLECTOR, collector_opened);
}
-
diff --git a/digital/io/src/getsamples/test/Makefile b/digital/io/src/testgetsamples/Makefile
index ad659fdd..ad659fdd 100644
--- a/digital/io/src/getsamples/test/Makefile
+++ b/digital/io/src/testgetsamples/Makefile
diff --git a/digital/io/src/getsamples/test/main.c b/digital/io/src/testgetsamples/main.c
index 33a3fd80..33a3fd80 100644
--- a/digital/io/src/getsamples/test/main.c
+++ b/digital/io/src/testgetsamples/main.c