From 828805ef4c91ab898788250b7d72aab4e7a16514 Mon Sep 17 00:00:00 2001 From: Samuel Date: Sat, 6 Apr 2024 20:38:30 +0200 Subject: [PATCH] =?UTF-8?q?Fin=20de=20trajet=20pour=20les=20rotations=20:?= =?UTF-8?q?=20am=C3=A9lioration?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Trajet.c | 3 ++- Trajet.h | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Trajet.c b/Trajet.c index c2afe61..1da0264 100644 --- a/Trajet.c +++ b/Trajet.c @@ -103,7 +103,8 @@ int Trajet_terminee(float abscisse){ return 1; }*/ - if(trajet_trajectoire.type != TRAJECTOIRE_BEZIER){ + if(trajet_trajectoire.type != TRAJECTOIRE_BEZIER && + trajet_trajectoire.type != TRAJECTOIRE_ROTATION){ if(abscisse >= 1 || distance_fin_trajectoire_mm < 0.1){ return 1; } diff --git a/Trajet.h b/Trajet.h index 2887a3e..8fd2be8 100644 --- a/Trajet.h +++ b/Trajet.h @@ -1,6 +1,9 @@ #include "pico/stdlib.h" #include "Trajectoire.h" +#ifndef TRAJET_H +#define TRAJET_H + enum etat_trajet_t{ TRAJET_EN_COURS, TRAJET_TERMINE @@ -29,3 +32,5 @@ float Trajet_get_orientation_avance(void); float Trajet_get_abscisse(); uint32_t Trajet_get_bloque(); void Trajet_inverse(); + +#endif