wn/SMPS2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
hg 2015-02-21 16:00:35 +01:00
parent a9d2cbd6e4
commit 43e1c5c384
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/pwm.cpp
View File

@ -23,6 +23,22 @@ volatile uint16_t newPwm = 0;
void pwmInit() {
P1DIR |= BIT6;
P1SEL |= BIT6;
P1OUT = 0;
TACCR0 = PWM_MAX;
TACCR1 = 8;
TACCTL0 = CCIE;
TACCTL1 = OUTMOD_7;
TACTL = MC_1 | ID_0 | TASSEL_2 | TACLR;
}
void pwmSet(uint16_t v) {
TACCR1 = v;
}
ISR(TIMER0_A0, TA0_ISR) { ISR(TIMER0_A0, TA0_ISR) {
static uint8_t cycleCnt = 0; static uint8_t cycleCnt = 0;
@ -39,7 +55,7 @@ ISR(TIMER0_A0, TA0_ISR) {
float newPwm_f = ctrl.cycle(u_des, u_curr); float newPwm_f = ctrl.cycle(u_des, u_curr);
newPwm = (uint16_t) newPwm_f; newPwm = (uint16_t) newPwm_f;
TACCR1 = newPwm; pwmSet(newPwm);
} }
} }
@ -75,16 +91,3 @@ void setUDes(float uDes) {
} }
void pwmInit() {
P1DIR |= BIT6;
P1SEL |= BIT6;
P1OUT = 0;
TACCR0 = PWM_MAX;
TACCR1 = 8;
TACCTL0 = CCIE;
TACCTL1 = OUTMOD_7;
TACTL = MC_1 | ID_0 | TASSEL_2 | TACLR;
}