summaryrefslogtreecommitdiff
path: root/firmware/pwm.c
diff options
context:
space:
mode:
authorYves Fischer <yvesf-git@xapek.org>2011-10-11 21:56:36 +0200
committerYves Fischer <yvesf-git@xapek.org>2011-10-11 21:56:36 +0200
commitcbc941282074856fc6179761b70a0c9879b0b64d (patch)
treeed15c6d9e20ceaf1ff01a05aa63054410bb8ed54 /firmware/pwm.c
parent324c5ba9098c1010d0aa8c1e26b95509878ce9f2 (diff)
downloadmini-octopus-cbc941282074856fc6179761b70a0c9879b0b64d.tar.gz
mini-octopus-cbc941282074856fc6179761b70a0c9879b0b64d.zip
update firmware to @319
Diffstat (limited to 'firmware/pwm.c')
-rw-r--r--firmware/pwm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/firmware/pwm.c b/firmware/pwm.c
index 9e3666d..b8b6231 100644
--- a/firmware/pwm.c
+++ b/firmware/pwm.c
@@ -84,7 +84,7 @@ int pwm_init(int pin)
{
case 9:
/* set pin as output */
- OX_DDR9 |=(1<<OX_P9);
+ DDRB |=(1<<PB5);
OCR1A=1; // TOP
#ifdef OCTOPUS_CAN
/* configure timer, (WGM = FAST PWM) (clear on OCnA, set on TOP COM1A1)*/
@@ -97,7 +97,7 @@ int pwm_init(int pin)
#endif
break;
case 8:
- OX_DDR8 |=(1<<OX_P8);
+ DDRB |=(1<<PB4);
#ifdef OCTOPUS_CAN
OCR2A=1; // TOP
/* configure timer, (WGM = FAST PWM) (clear on OCnA, set on TOP COM1A1)*/
@@ -138,7 +138,7 @@ void pwm_deinit_usb(int pin)
int pwm_deinit(int pin)
{
- octopus.ports[pin]=PIN_OUT; // this is wrong!
+ octopus.ports[pin]=PIN_NONE;
#ifdef OCTOPUS_CAN
switch(pin)
{