From 18c90e0455d7be7fe298c4e85f7996ec3691c74f Mon Sep 17 00:00:00 2001 From: Guillaume Chevillot Date: Mon, 11 Feb 2008 11:11:05 +0100 Subject: Define a regv macro to make it compile. It would be better to remove regv... --- analog/motor-power-avr/src/mp_pwm_LR_.h | 6 ++++-- analog/motor-power-avr/src/pwm.avr.c | 2 ++ analog/motor-power-avr/src/timer.avr.c | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'analog/motor-power-avr/src') diff --git a/analog/motor-power-avr/src/mp_pwm_LR_.h b/analog/motor-power-avr/src/mp_pwm_LR_.h index e7018918..09fafb38 100644 --- a/analog/motor-power-avr/src/mp_pwm_LR_.h +++ b/analog/motor-power-avr/src/mp_pwm_LR_.h @@ -28,6 +28,8 @@ #include "common.h" #include "io.h" +#include "utils.h" + // Control outputs of H-bridges // _L_/_R_ : Left or Right bridge // A/B : bridge leg @@ -75,8 +77,8 @@ 0, 0, 0, 0, 0, 0, 1, 0)) // timer interrupts configuration -#define TIMSK_LR_CFG (regv (OCIE2, TOIE2, TICIE1, OCIE1A, OCIE1B, OCIE0, TOIE0,\ - 1, 1, 0, 0, 0, 1, 1)) +#define TIMSK_LR_CFG (regv (OCIE2, TOIE2, TICIE1, OCIE1A, OCIE1B, OCIE0, TOIE0, 0, \ + 1, 1, 0, 0, 0, 1, 1, 0)) // PWM max, min, and offset values #define PWM_MIN_LR_ 0x10 diff --git a/analog/motor-power-avr/src/pwm.avr.c b/analog/motor-power-avr/src/pwm.avr.c index 773cfef0..90115768 100644 --- a/analog/motor-power-avr/src/pwm.avr.c +++ b/analog/motor-power-avr/src/pwm.avr.c @@ -23,6 +23,8 @@ * * }}} */ +#include "utils.h" + /** Define the PWM output used for left motor. */ #define PWM_LEFT_OCR OCR1C /** Define the PWM output used for right motor. */ diff --git a/analog/motor-power-avr/src/timer.avr.c b/analog/motor-power-avr/src/timer.avr.c index dcad74d0..0532bd28 100644 --- a/analog/motor-power-avr/src/timer.avr.c +++ b/analog/motor-power-avr/src/timer.avr.c @@ -25,6 +25,8 @@ /* +AutoDec */ +#include "utils.h" + /** Initialise the timer. */ static inline void timer_init (void); -- cgit v1.2.3