summaryrefslogtreecommitdiff
path: root/n/accel/calcul.h
diff options
context:
space:
mode:
authorburg2004-12-13 01:00:55 +0000
committerburg2004-12-13 01:00:55 +0000
commitf4316ec9077a9271f6147f094c3a85b52168e77d (patch)
tree5e8c4b0615223bde4e975baf2af4911b471ccf30 /n/accel/calcul.h
parent82eca8372fdd8c56a136b09b534e4369ce4a2486 (diff)
Profonde modification, la plus part des fichiers a été réecrite.
*Pb à la calibration *Pb sur le calule de l'accéleration => immoble = acceleration constante
Diffstat (limited to 'n/accel/calcul.h')
-rw-r--r--n/accel/calcul.h18
1 files changed, 10 insertions, 8 deletions
diff --git a/n/accel/calcul.h b/n/accel/calcul.h
index 27d0698..0d69059 100644
--- a/n/accel/calcul.h
+++ b/n/accel/calcul.h
@@ -30,29 +30,31 @@
/* Variable globale, propre au calcul
*/
+#include "accel.h"
#include <inttypes.h>
-#define BIT_SCALE_FACTOR 4096
-
-enum T_etat {strt_at_Ta, rd_at_Tb, rd_at_Tc, rd_at_Td, calcul };
+#define BIT_SCALE_FACTOR 256
extern uint16_t T2_cal;
extern uint16_t T1x_cal;
extern uint16_t T1y_cal;
+extern volatile uint8_t calcul_rdy;
extern uint32_t K;
-extern int16_t G0x;
-extern int16_t G0y;
extern int16_t Vx;
extern int16_t Vy;
-extern volatile uint16_t Tb,Td,Tc;
+extern volatile uint16_t Tb,Td,Tc,T2;
+extern volatile uint16_t Tx;
+extern volatile uint16_t Ty;
+extern volatile uint16_t T2x;
+extern volatile uint16_t T2y;
extern volatile enum T_etat etat;
+extern volatile uint8_t mode;
/* Fonction
*/
void calibration(void);
-int16_t calculG(uint16_t T1, uint16_t T2,int16_t Zcal);
-int16_t calculGb(uint16_t T1, uint16_t T2,uint16_t T1cal);
+int16_t calculG(uint16_t T1, uint16_t T1_cal);
#endif /* calcul_h */