summaryrefslogtreecommitdiff
path: root/digital
diff options
context:
space:
mode:
authorNélio Laranjeiro2008-03-22 17:03:35 +0100
committerNélio Laranjeiro2008-03-22 17:03:35 +0100
commit29a5f6b8df6f85b75a940bf6b0162013037b6a7d (patch)
treecde02a53c1fd50dc0faa721d44c7933f987251b3 /digital
parent6ba7fe28e7919778343ab64874fd446e888f7edf (diff)
Update the getsamples FSM to go to the distributor, take the samples and
take samples...
Diffstat (limited to 'digital')
-rw-r--r--digital/io/src/getsamples/Makefile9
-rw-r--r--digital/io/src/getsamples/getSamplesFsm.fsm5
2 files changed, 7 insertions, 7 deletions
diff --git a/digital/io/src/getsamples/Makefile b/digital/io/src/getsamples/Makefile
index 41e7f96f..dfb61442 100644
--- a/digital/io/src/getsamples/Makefile
+++ b/digital/io/src/getsamples/Makefile
@@ -12,11 +12,12 @@ getsamples.h getsamples_cb_skel.c getsamples_cb.h: getsamples.c
getsamples.o: getsamples_cb.h getsamples.h
getsamples_cb.o: getsamples_cb.h getsamples.h
-%.dot: %.fsm
- python ../../../../tools/dfagen/dfagen.py -o dot -d $< -p $(@:%.dot=%)
+dot: getSamplesFsm.fsm
+ python ../../../../tools/dfagen/dfagen.py -o dot -d getSamplesFsm.fsm -p getsamples
-%.png: %.dot
- dot -Tpng $< -o $@
+png: getSamplesFsm.fsm
+ make dot
+ dot -Tpng getsamples.dot -o getsamples.png
clean:
rm -f getsamples getsamples.o getsamples_cb.o getsamples.c getsamples.h getsamples_cb_skel.c getsamples_cb.h getsamples_cb.c
diff --git a/digital/io/src/getsamples/getSamplesFsm.fsm b/digital/io/src/getsamples/getSamplesFsm.fsm
index e0862263..b8c31e46 100644
--- a/digital/io/src/getsamples/getSamplesFsm.fsm
+++ b/digital/io/src/getsamples/getSamplesFsm.fsm
@@ -6,7 +6,6 @@ States:
PREPARE_ARM
FORWARD_CONTROL
TAKE_SAMPLES
- CLASSIFY
BACKWARD
END
@@ -32,9 +31,9 @@ FORWARD_CONTROL:
End the position to the distributor.
TAKE_SAMPLES:
- sample_took: nb_samples < quantity -> .
+ sample_took: more -> .
Continue to take samples and classify the next sample.
- sample_took: nb_samples == quantity -> BACKWARD
+ sample_took: no_more -> BACKWARD
If the quantity of samples are tooked, then go backeward and conitnue classifying the samples.
BACKWARD: