summaryrefslogtreecommitdiff
path: root/n
diff options
context:
space:
mode:
Diffstat (limited to 'n')
-rw-r--r--n/accel/accel.c6
-rw-r--r--n/accel/calcul.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/n/accel/accel.c b/n/accel/accel.c
index 55779f6..baca9e0 100644
--- a/n/accel/accel.c
+++ b/n/accel/accel.c
@@ -28,6 +28,8 @@
*
*/
+// Define
+
#include "accel.h"
//#define DEBUG
@@ -230,7 +232,7 @@ main (void)
proto_send0('Z');
//initialisation du timer prescaler 256
- TCCR1B = _BV(ICES1) | _BV(CS12);
+ TCCR1B = _BV(ICES1) | _BV(CS11);
// Input Capture Interrupt enable & Timer 1 overflow
TIMSK = _BV(TICIE1) | _BV(TOIE1);
TCCR1B |= _BV(ICES1); //trigge sur le front montant
@@ -253,7 +255,7 @@ main (void)
TCNT1 = 0;
Gx = calculG(Tx,T1x_cal);
Gy = calculG(Ty,T1y_cal);
-
+
// Tx et Ty ont été utilisé, on peut les écrasés
calcul_rdy = 0 ;
diff --git a/n/accel/calcul.c b/n/accel/calcul.c
index fe18b40..1623c85 100644
--- a/n/accel/calcul.c
+++ b/n/accel/calcul.c
@@ -81,9 +81,9 @@ calibration(void)
int16_t
calculG ( uint16_t T1, uint16_t T1_cal)
{
-
return (T1 - T1_cal) * K ;
}
+
int16_t
calculGb(uint16_t T1, uint16_t T2, uint16_t T1cal)
{