Diff: Strategie/Strategie.cpp

Revision:

45:4f93e99bac6e

Parent:

44:badcbe8766e9

Child:

46:a9b6bcb30b1c

--- a/Strategie/Strategie.cpp	Tue May 07 17:37:46 2019 +0000
+++ b/Strategie/Strategie.cpp	Thu May 09 08:38:45 2019 +0000
@@ -121,8 +121,8 @@
 E_Stratposdebut etat_pos=RECALAGE_1;
 
 /////////////////DEFINITION DES BOUTONS////////////////////
-Button COTE_VERT(0, 25, 400, 300, "VERT");
-Button COTE_ORANGE(0, 350, 400, 300, "ORANGE");
+Button COTE_VERT(0, 25, 400, 300, "JAUNE");
+Button COTE_ORANGE(0, 350, 400, 300, "VIOLET");
 Button RETOUR  (0, 680, 400, 110, "--Precedent--");
 Button LANCER  (0, 200, 400, 200, "--LANCER--");
 Button CHECK (0, 420, 400, 200, "Valider");
@@ -693,11 +693,11 @@
                     etat=DEMO;
                 } else if(ABAISSE_BLOC.Touched()) {
                     while (ABAISSE_BLOC.Touched());
-                    SendRawId(BAISSER_ATTRAPE_BLOC);
+                    SendRawId(GABARIT_PETIT_ROBOT);
                     break;
                 } else if(RELEVE_BLOC.Touched()) {
                     while (RELEVE_BLOC.Touched());
-                    SendRawId(RELEVER_ATTRAPE_BLOC);
+                    SendRawId(PRESENTOIR_AVANT);
                     break;
                 } else if(BRAS_ABEILLE_ON.Touched()) {
                     while (BRAS_ABEILLE_ON.Touched());
@@ -787,8 +787,8 @@
             lcd.SetTextColor(LCD_COLOR_BLACK);
 
             lcd.DisplayStringAt(70, LINE(0), (uint8_t *)"Choisir le cote", LEFT_MODE);
-            COTE_VERT.Draw(VERT, 0);
-            COTE_ORANGE.Draw(ORANGE, 0);
+            COTE_VERT.Draw(LCD_COLOR_YELLOW, 0);
+            COTE_ORANGE.Draw(LCD_COLOR_DARKMAGENTA, 0);
             RETOUR.Draw(LCD_COLOR_RED, 0);
 
 
@@ -1118,7 +1118,7 @@
                         waitingAckID = ASSERVISSEMENT_RECALAGE;
                         waitingAckFrom = ACKNOWLEDGE_MOTEUR;
 #ifdef ROBOT_SMALL
-                        GoStraight(-40, 0, 0, 0);//-450
+                        GoStraight(-450, 0, 0, 0);//-450
 #else
                         GoStraight(150, 0, 0, 0);
 #endif
@@ -1174,7 +1174,7 @@
                         waitingAckID = ASSERVISSEMENT_RECALAGE;
                         waitingAckFrom = ACKNOWLEDGE_MOTEUR;
 #ifdef ROBOT_SMALL
-                        GoStraight(-40, 0, 0, 0);
+                        GoStraight(-450, 0, 0, 0);
 #else
                         GoStraight(200, 0, 0, 0);
 #endif