From f0d6c72ecef666e4c09d9b814c16e020174e7c53 Mon Sep 17 00:00:00 2001 From: Samuel Date: Thu, 9 May 2024 18:50:18 +0200 Subject: [PATCH] Match 2 --- Holonome2023.c | 2 +- Strategie_2024_panneaux.c | 6 +++--- Strategie_2024_pots.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Holonome2023.c b/Holonome2023.c index f9fdfdf..1e3b514 100644 --- a/Holonome2023.c +++ b/Holonome2023.c @@ -110,7 +110,7 @@ int main() { break; case MATCH_EN_COURS: - if (timer_match_ms > 90000){ // 98 secondes + if (timer_match_ms > 90000){ // 90 secondes printf("MATCH_ARRET_EN_COURS\n"); statu_match = MATCH_ARRET_EN_COURS; } diff --git a/Strategie_2024_panneaux.c b/Strategie_2024_panneaux.c index 662a43b..542a6f0 100644 --- a/Strategie_2024_panneaux.c +++ b/Strategie_2024_panneaux.c @@ -54,7 +54,7 @@ enum etat_action_t Strat_2024_tourner_panneaux(enum couleur_t couleur, uint32_t 323, 180, (150. *DEGRE_EN_RADIAN), EVITEMENT_PAUSE_DEVANT_OBSTACLE, step_ms); }else{ etat_action = Strategie_tourner_et_aller_a( - 3000 - 173, 180, (150. *DEGRE_EN_RADIAN), EVITEMENT_PAUSE_DEVANT_OBSTACLE, step_ms); + 3000 - 248, 180, (150. *DEGRE_EN_RADIAN), EVITEMENT_PAUSE_DEVANT_OBSTACLE, step_ms); } if (etat_action == ACTION_TERMINEE){ Score_ajout_panneau(1); @@ -66,7 +66,7 @@ enum etat_action_t Strat_2024_tourner_panneaux(enum couleur_t couleur, uint32_t if(couleur == COULEUR_BLEU){ etat_action = active_panneau_solaire(558, step_ms); }else{ - etat_action = active_panneau_solaire(3000 - 408, step_ms); + etat_action = active_panneau_solaire(3000 - 483, step_ms); } if (etat_action == ACTION_TERMINEE){ Score_ajout_panneau(1); @@ -80,7 +80,7 @@ enum etat_action_t Strat_2024_tourner_panneaux(enum couleur_t couleur, uint32_t if(couleur == COULEUR_BLEU){ etat_action = active_panneau_solaire(803, step_ms); }else{ - etat_action = active_panneau_solaire(3000 - 653, step_ms); + etat_action = active_panneau_solaire(3000 - 738, step_ms); } if (etat_action == ACTION_TERMINEE){ Score_ajout_panneau(1); diff --git a/Strategie_2024_pots.c b/Strategie_2024_pots.c index 84966ae..ecebded 100644 --- a/Strategie_2024_pots.c +++ b/Strategie_2024_pots.c @@ -48,7 +48,7 @@ struct position_t position_groupe_pot[6] = {.x_mm = 36.1, .y_mm = 1386.8, .angle_radian = -90 * DEGRE_EN_RADIAN}, {.x_mm = 36.1, .y_mm = 616.2, .angle_radian = -90 * DEGRE_EN_RADIAN}, {.x_mm = 1020, .y_mm = 36.4, .angle_radian = 0 * DEGRE_EN_RADIAN}, - {.x_mm = 1980, .y_mm = 41.4, .angle_radian = 0 * DEGRE_EN_RADIAN}, // Attention bidouille !!! + {.x_mm = 1980, .y_mm = 51.4, .angle_radian = 0 * DEGRE_EN_RADIAN}, // Attention bidouille !!! {.x_mm = 2963.9, .y_mm = 616.2, .angle_radian = 90 * DEGRE_EN_RADIAN}, {.x_mm = 2963.9, .y_mm = 1386.8, .angle_radian = 90 * DEGRE_EN_RADIAN} };