summaryrefslogtreecommitdiff
path: root/digital/io/src/trace.trc
diff options
context:
space:
mode:
authorNicolas Schodet2011-05-08 16:15:06 +0200
committerNicolas Schodet2011-05-08 16:15:06 +0200
commit0feb542a8cf7630a5d442387727414f5251aad83 (patch)
tree02092fbede27ef619ee63466f671513a889fb2ea /digital/io/src/trace.trc
parent4cd9c4458eaa49c269171145f4bc2a184948eae1 (diff)
parentd385a9eacb2e8580239f101f96356f7ed216dd97 (diff)
Merge branch 'master' into efrei-robotique
Conflicts: digital/mimot/src/dirty/counter_ext.avr.c digital/mimot/tools/mimot/init.py
Diffstat (limited to 'digital/io/src/trace.trc')
-rw-r--r--digital/io/src/trace.trc2
1 files changed, 1 insertions, 1 deletions
diff --git a/digital/io/src/trace.trc b/digital/io/src/trace.trc
index 4cdcf8e0..1da5012b 100644
--- a/digital/io/src/trace.trc
+++ b/digital/io/src/trace.trc
@@ -1,4 +1,4 @@
-EVENT main_timer__late "MainTimer: we are late."
+EVENT timer__late "Timer: we are late."
EVENT fsm__handle_event from 1 event 1 to 1 "FSM: %i =%i=> %i."
EVENT move__go_to xd 2 yd 2 "Move: (%d, %d)."
EVENT food__best food 1 "Food best: %d."