summaryrefslogtreecommitdiff
path: root/2005
diff options
context:
space:
mode:
authordufourj2005-05-06 19:33:18 +0000
committerdufourj2005-05-06 19:33:18 +0000
commit121d2ee5661e38d0843621a2007d1788c0f150ad (patch)
tree6bc25987105489bafb5a93b00330a527b2845baa /2005
parenta95c0b822899c7004cfe06e1a6dfb84461ebc125 (diff)
Config :
Rajout du paramêtre de temporisation de début de match Video4Linux : Correction de warnings (à vérifier ?)
Diffstat (limited to '2005')
-rw-r--r--2005/i/robert/runtime/rc/config3
-rw-r--r--2005/i/robert/src/video4linux/video4linux.cc4
2 files changed, 4 insertions, 3 deletions
diff --git a/2005/i/robert/runtime/rc/config b/2005/i/robert/runtime/rc/config
index 041572a..b08ecd0 100644
--- a/2005/i/robert/runtime/rc/config
+++ b/2005/i/robert/runtime/rc/config
@@ -11,7 +11,7 @@ asserv.eSat = 1023 # p E w
asserv.speedIntMax = 8191 #Isat
asserv.dSample = 1 # p s b
# Aprs homolgation, passage de 16 8
-asserv.maxSLin = 8
+asserv.maxSLin = 6
asserv.maxSRot = 4
asserv.useTazFSM = false
asserv.pwmMax = 256
@@ -45,4 +45,5 @@ foobar = (4 5 6 7 8)
ai.roundDuration = 90000
ai.vitesseAsc = 3
+ai.tempoDebutMatch = 20000 # 20 secondes
diff --git a/2005/i/robert/src/video4linux/video4linux.cc b/2005/i/robert/src/video4linux/video4linux.cc
index ddffde9..4f0d432 100644
--- a/2005/i/robert/src/video4linux/video4linux.cc
+++ b/2005/i/robert/src/video4linux/video4linux.cc
@@ -81,9 +81,9 @@ Video4Linux::read (uint8_t *buf, unsigned size)
memcpy (buf, map_, size);
break;
case Image::yuv:
- for (unsigned i = 0; i < height_/2; ++i)
+ for (int i = 0; i < height_/2; ++i)
{
- for (unsigned j = 0; j < width_/2; ++j)
+ for (int j = 0; j < width_/2; ++j)
{
*dst++ = *srcY++; *dst2++ = *srcY2++;
*dst++ = *srcU; *dst2++ = *srcU;