CRAC Team / AX12_PR

Fork of test_carteAToutFaire_PR by CRAC Team

Revision:
3:0175a071dd65
Parent:
2:9d280856a536
--- a/all_includes.h	Fri May 19 08:06:49 2017 +0000
+++ b/all_includes.h	Sat May 20 09:36:35 2017 +0000
@@ -3,14 +3,13 @@
 #include "AX12.h"
 #include "ident_crac.h"
 #include "cmsis.h"
-
-
+#include "Actionneur.h"
 
 #define SIZE_FIFO 20 
 #define TIME 0.1
 
-extern unsigned char EtatPompeDroite, EtatPompeGauche, EtatLanceur, EtatAx12, ChoixBras, ActionAx12, EtatTurbine, EtatServoVanne;
-extern unsigned char action_a_effectuer, ActionPompe;
+extern unsigned char EtatAx12, ActionAx12;
+extern unsigned char action_a_effectuer;
 
 extern PwmOut PompeDroite;
 
@@ -23,7 +22,6 @@
 void canRx_ISR(void);
 void canProcessRx(void);
 void CAN2_wrFilter (uint32_t id);
-void AX12_automate(unsigned char etat_ax12, unsigned char choix_bras);
-void gerer_turbine(unsigned char pwm_turbine);
+void AX12_automate(unsigned char etat_ax12);