summaryrefslogtreecommitdiff
path: root/i/marvin/src/es/es.cc
diff options
context:
space:
mode:
authorhaller2006-05-25 22:14:43 +0000
committerhaller2006-05-25 22:14:43 +0000
commitbf03b37b06877b55e4f23b627647a6b156ed664e (patch)
tree47aa544812fa1a1eed22666179bd21a7e1ee3807 /i/marvin/src/es/es.cc
parent1aff85cbaa8174f4aef9ded81c2156c8f1c5a508 (diff)
* Constification de getFd dans la classe Serial et ses clients
* Fonction afterMatch dans ai * Fonction motorSmartFindHole * Déclaration de la fonction motorDeblock * Ajout d'info sur le lcd lors de l'init * Utilisation des capteurs barillet
Diffstat (limited to 'i/marvin/src/es/es.cc')
-rw-r--r--i/marvin/src/es/es.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/i/marvin/src/es/es.cc b/i/marvin/src/es/es.cc
index 86bbb3b..8c4c6fb 100644
--- a/i/marvin/src/es/es.cc
+++ b/i/marvin/src/es/es.cc
@@ -617,27 +617,27 @@ Es::newBallFront(void)
switch (positionBarillet_)
{
case avant0:
- stockBarillet[0] = colorSeen(frontBallRVB_)==whiteColor_?white:white;
+ stockBarillet[0] = colorSeen(frontBallRVB_)==whiteColor_?white:black;
positionBarillet_ = avant4;
log_ ("Es::Barillet", Log::debug) << "trou 0:" << ((stockBarillet[0] == white)?"white":"pas white");
break;
case avant1:
- stockBarillet[1] = colorSeen(frontBallRVB_)==whiteColor_?white:white;
+ stockBarillet[1] = colorSeen(frontBallRVB_)==whiteColor_?white:black;
positionBarillet_ = avant0;
log_ ("Es::Barillet", Log::debug) << "trou 1:" << ((stockBarillet[1] == white)?"white":"pas white");
break;
case avant2:
- stockBarillet[2] = colorSeen(frontBallRVB_)==whiteColor_?white:white;
+ stockBarillet[2] = colorSeen(frontBallRVB_)==whiteColor_?white:black;
positionBarillet_ = avant1;
log_ ("Es::Barillet", Log::debug) << "trou 2:" << ((stockBarillet[2] == white)?"white":"pas white");
break;
case avant3:
- stockBarillet[3] = colorSeen(frontBallRVB_)==whiteColor_?white:white;
+ stockBarillet[3] = colorSeen(frontBallRVB_)==whiteColor_?white:black;
positionBarillet_ = avant2;
log_ ("Es::Barillet", Log::debug) << "trou 3:" << ((stockBarillet[3] == white)?"white":"pas white");
break;
case avant4:
- stockBarillet[4] = colorSeen(frontBallRVB_)==whiteColor_?white:white;
+ stockBarillet[4] = colorSeen(frontBallRVB_)==whiteColor_?white:black;
positionBarillet_ = avant3;
log_ ("Es::Barillet", Log::debug) << "trou 4:" << ((stockBarillet[4] == white)?"white":"pas white");
break;