summaryrefslogtreecommitdiff
path: root/analog
diff options
context:
space:
mode:
authorGuillaume Chevillot2008-02-11 11:11:05 +0100
committerGuillaume Chevillot2008-02-11 11:11:05 +0100
commit18c90e0455d7be7fe298c4e85f7996ec3691c74f (patch)
treec033350e91bad9c22147a0e2c317623084d193ac /analog
parent4d10e19afe45695f30e7bf408757e92893f3fd2c (diff)
Define a regv macro to make it compile. It would be better to remove regv...
Diffstat (limited to 'analog')
-rw-r--r--analog/motor-power-avr/src/mp_pwm_LR_.h6
-rw-r--r--analog/motor-power-avr/src/pwm.avr.c2
-rw-r--r--analog/motor-power-avr/src/timer.avr.c2
3 files changed, 8 insertions, 2 deletions
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);