Diff: Functions/func.h

Revision:

48:03da1aead032

Parent:

46:5658af4e5149

Child:

49:5e2f7323f280

--- a/Functions/func.h	Mon Apr 25 12:38:58 2016 +0000
+++ b/Functions/func.h	Thu Apr 28 08:11:25 2016 +0000
@@ -9,6 +9,13 @@
 #include "AX12.h"
 
 #define SEUIL 0.25
+#define VERT 1
+#define VIOLET 2
+#define ATTENTE 0
+#define GO 1
+#define STOP 2
+#define ADR 0x80
+#define dt 10000
 
 extern Serial logger;
 extern RoboClaw roboclaw;
@@ -25,21 +32,21 @@
 extern InterruptIn EndR;
 extern InterruptIn EndZ;
 extern InterruptIn EndL;
-extern AX12 left_hand;
-extern AX12 right_hand;
+//extern AX12 left_hand;
+//extern AX12 right_hand;
 extern Odometry odo;
+extern Ticker ticker;
 extern InterruptIn CAMP;
 extern InterruptIn START;
 extern DigitalOut LEDR;
 extern DigitalOut LEDV;
 
-extern int SIMON_i, SIMON_state;
+
+extern int SIMON_i, SIMON_state, SCouleur, SStart;
 extern bool SIMON_EL, SIMON_EZ, SIMON_ER;
 
 void changeCamp(void);
-void changeCampoff(void);
-void letsgo(void);
-void letsgooff(void);
+void go(void);
 void ELpressed(void);
 void ELunpressed(void);
 void EZpressed(void);
@@ -55,5 +62,6 @@
 void init_interrupt(void);
 void goHome(void);
 void checkAround(void);
+void update_main(void);
 
 #endif
\ No newline at end of file