From 4ff4b2c8bf836980ef75a414035615c0ab772e6e Mon Sep 17 00:00:00 2001 From: Samuel Date: Thu, 29 May 2025 19:21:10 +0200 Subject: [PATCH] =?UTF-8?q?Activation=20de=20l'=C3=A9vitement=20pour=20les?= =?UTF-8?q?=20groupies?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Strategie.c | 4 ++-- main.c | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Strategie.c b/Strategie.c index d42cbdf..71b593f 100644 --- a/Strategie.c +++ b/Strategie.c @@ -84,7 +84,7 @@ enum etat_action_t Strategie_groupie_1(uint32_t step_ms, enum couleur_t couleur) case SSS_AVANCE: Trajet_config(TRAJECT_CONFIG_RAPIDE); - if(Strategie_parcourir_trajet(trajectoire_composee, step_ms, EVITEMENT_SANS_EVITEMENT) == ACTION_TERMINEE){ + if(Strategie_parcourir_trajet(trajectoire_composee, step_ms, EVITEMENT_PAUSE_DEVANT_OBSTACLE) == ACTION_TERMINEE){ etat_sss = SSS_DANCE; } break; @@ -121,7 +121,7 @@ enum etat_action_t Strategie_groupie_2(uint32_t step_ms, enum couleur_t couleur) case SSS_AVANCE: Trajet_config(TRAJECT_CONFIG_RAPIDE); - if(Strategie_parcourir_trajet(trajectoire1, step_ms, EVITEMENT_SANS_EVITEMENT) == ACTION_TERMINEE){ + if(Strategie_parcourir_trajet(trajectoire1, step_ms, EVITEMENT_PAUSE_DEVANT_OBSTACLE) == ACTION_TERMINEE){ etat_sss = SSS_DANCE; } break; diff --git a/main.c b/main.c index 986c62b..010b902 100644 --- a/main.c +++ b/main.c @@ -87,9 +87,13 @@ void main(void) - multicore_launch_core1(gestion_affichage); + // TODO: A remettre - quand on aura récupéré un capteur - //multicore_launch_core1(gestion_VL53L8CX); + if(get_identifiant() != 0){ + multicore_launch_core1(gestion_VL53L8CX); + }else{ + multicore_launch_core1(gestion_affichage); + } printf("Demarrage...\n");