summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhaller2005-04-17 02:30:34 +0000
committerhaller2005-04-17 02:30:34 +0000
commitf0d97a476182f9f6fbe91cac516cf045d84f051e (patch)
treea292a8e3ae2aae466e1531a6ca3a6118672e2527
parent7b0c03739d6ac095c305de86e5df4d79dd339e5c (diff)
Ajout des variables pour asserv dans le fichier temoin de conf
-rw-r--r--2005/i/robert/runtime/rc/config11
-rw-r--r--2005/i/robert/src/Makefile.defs2
2 files changed, 11 insertions, 2 deletions
diff --git a/2005/i/robert/runtime/rc/config b/2005/i/robert/runtime/rc/config
index 38cc7d1..9733735 100644
--- a/2005/i/robert/runtime/rc/config
+++ b/2005/i/robert/runtime/rc/config
@@ -1,5 +1,14 @@
# Paramètres d'asservissement.
-asserv.tty = "/dev/ttyS0"
+asserv.tty = "-"
+asserv.footing = 12
+asserv.epsilon = 12.2
+asserv.accel = 32.2
+asserv.kp = 23.3
+asserv.ki = 76.2
+asserv.kd = 23.3
+asserv.speedIntMax = 23
+asserv.maxSpeed = 23.8
+asserv.pwmMax = 255
# Exemples.
foo = "toto"
diff --git a/2005/i/robert/src/Makefile.defs b/2005/i/robert/src/Makefile.defs
index c088828..e30a9ab 100644
--- a/2005/i/robert/src/Makefile.defs
+++ b/2005/i/robert/src/Makefile.defs
@@ -5,7 +5,7 @@ INCLUDES = -I$(SRCDIR) -I.
# Tests de coverage (man gcov).
ifeq ($(COV),)
-CXXFLAGS += -O2
+#CXXFLAGS += -O2
else
CXXFLAGS += -fprofile-arcs -ftest-coverage
endif