summaryrefslogtreecommitdiff
path: root/i/marvin/runtime
diff options
context:
space:
mode:
authordufourj2006-05-24 01:13:15 +0000
committerdufourj2006-05-24 01:13:15 +0000
commit1d57bcc0e69306423d76cfa40a37bad2acf61577 (patch)
treef7b5643d5406c7c1ba6f163107df296d3aeea486 /i/marvin/runtime
parentfb348e99165ff47969a255b2bbd66a1be008da20 (diff)
Marvin :
* Es : - supporte pleins de nouveauté du code ES avr. * Proto : - commande moche qui envoye un string plutôt qu'une liste d'arguments ; - support de 5 arguments max au lieu de 4.
Diffstat (limited to 'i/marvin/runtime')
-rw-r--r--i/marvin/runtime/rc/config12
1 files changed, 5 insertions, 7 deletions
diff --git a/i/marvin/runtime/rc/config b/i/marvin/runtime/rc/config
index 8744cc1..320d121 100644
--- a/i/marvin/runtime/rc/config
+++ b/i/marvin/runtime/rc/config
@@ -28,11 +28,7 @@ asserv.pwm_stat = 0
asserv.timer_stat = 0
### ES
-es.tty = "/dev/ttyS0"
-
-### Motor
-motor.pStatPosition = 8
-motor.pStatMotor = 0
+es.tty = "/dev/ttyS1"
### Log
# Default minimum level outputed
@@ -47,8 +43,10 @@ motor.pStatMotor = 0
# - file:/path/filename : to a file ;
# - ram : in a circular buffer for getting it at the end of the program by
# network.
-log.logger.default = "ram"
+# log.logger.default = "ram"
# log.logger.asserv = "null"
+#log.logger.default = "stdout"
+#log.level.default = "debug"
### Exemples
foo = "toto"
@@ -56,4 +54,4 @@ foo = "toto"
foobar = (4 5 6 7 8)
# TestProto
-testProto.tty = "/home/nicolas/robotSVN/n/asserv/src/asserv/uart0.pts"
+#testProto.tty = "/home/nicolas/robotSVN/n/asserv/src/asserv/uart0.pts"