Diff: entete.h

Revision:

98:2426d699362b

Parent:

97:42167cfeb8d7

--- a/entete.h	Fri May 06 22:15:43 2016 +0000
+++ b/entete.h	Fri May 06 23:55:01 2016 +0000
@@ -6,6 +6,26 @@
 
 #define PI 3.14159f
 
+#define ENTRAXE 243.8
+#define DIAMETRE_ROUE_GAUCHE 61.7
+#define DIAMETRE_ROUE_DROITE 61.8
+
+#define accel_angle 3200
+#define vitesse_angle 3200
+#define deccel_angle 3200
+
+#define accel_dista 4000
+#define vitesse_dista 4000
+#define deccel_dista 4000
+
+#define waiting_time 1
+#define GAUCHE 1
+#define DROITE -1
+
+#define VERT 1
+#define VIOLET 2
+#define NOIR 3
+
 /* Classes du projet : 
 AX12
 Roboclaw
@@ -38,8 +58,8 @@
 void init_globals();
 
 //vFonctions deplacement.cpp
-void GotoDist (float timer);
-void GotoArr(float timer);
+void GotoDist (float timer, int acc=accel_dista, int speed=vitesse_dista, int decc=deccel_dista);
+void GotoArr(float timer, int acc=accel_dista, int speed=vitesse_dista, int decc=deccel_dista);
 void GotoThet(double theta_);
 void GotoDistPos(double distance);
 
@@ -49,24 +69,4 @@
 void depart(void);
 void changeCamp(void);
 
-#define ENTRAXE 243.8
-#define DIAMETRE_ROUE_GAUCHE 61.7
-#define DIAMETRE_ROUE_DROITE 61.8
-
-#define accel_angle 3200
-#define vitesse_angle 3200
-#define deccel_angle 3200
-
-#define accel_dista 4000
-#define vitesse_dista 4000
-#define deccel_dista 4000
-
-#define waiting_time 1
-#define GAUCHE 1
-#define DROITE -1
-
-#define VERT 1
-#define VIOLET 2
-#define NOIR 3
-
 #endif
\ No newline at end of file