summaryrefslogtreecommitdiff
path: root/digital/mimot/src/dirty/pwm_ocr.avr.c
diff options
context:
space:
mode:
authorNicolas Schodet2012-03-21 00:46:03 +0100
committerNicolas Schodet2012-03-21 18:56:51 +0100
commit1e7c8a8a9811c45091e6c471482086113f059f40 (patch)
treed7faa80dd162799c394ec23925cc53b6dbff008e /digital/mimot/src/dirty/pwm_ocr.avr.c
parent0feb542a8cf7630a5d442387727414f5251aad83 (diff)
parentdcb79f383269440ec2c5a54b6d7792fbb0110d5a (diff)
Merge branch 'master' into efrei-robotique
Conflicts: digital/mimot/src/dirty/aux.c digital/mimot/src/dirty/aux.h digital/mimot/src/dirty/contacts.h digital/mimot/src/dirty/main.c digital/mimot/src/dirty/models.host.c digital/mimot/src/dirty/twi_proto.c digital/mimot/tools/mimot/init.py
Diffstat (limited to 'digital/mimot/src/dirty/pwm_ocr.avr.c')
-rw-r--r--digital/mimot/src/dirty/pwm_ocr.avr.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/digital/mimot/src/dirty/pwm_ocr.avr.c b/digital/mimot/src/dirty/pwm_ocr.avr.c
index f10f37e7..804d7dcd 100644
--- a/digital/mimot/src/dirty/pwm_ocr.avr.c
+++ b/digital/mimot/src/dirty/pwm_ocr.avr.c
@@ -94,12 +94,12 @@ pwm_ocr_update (void)
IO_SET (PWM1_BRK_IO);
if (PWM_VALUE (PWM1) < 0)
{
- pwm1 = -PWM_VALUE (PWM1);
+ pwm1 = -PWM_VALUE (PWM1) + PWM_OFFSET;
}
else
{
dir_d |= _BV (PWM1_DIR);
- pwm1 = PWM_VALUE (PWM1);
+ pwm1 = PWM_VALUE (PWM1) + PWM_OFFSET;
}
}
# endif /* PWM1 */
@@ -115,12 +115,12 @@ pwm_ocr_update (void)
IO_SET (PWM2_BRK_IO);
if (PWM_VALUE (PWM2) < 0)
{
- pwm2 = -PWM_VALUE (PWM2);
+ pwm2 = -PWM_VALUE (PWM2) + PWM_OFFSET;
}
else
{
dir_d |= _BV (PWM2_DIR);
- pwm2 = PWM_VALUE (PWM2);
+ pwm2 = PWM_VALUE (PWM2) + PWM_OFFSET;
}
}
# endif /* PWM2 */