merged
This commit is contained in:
commit
8a42a75845
@ -29,13 +29,13 @@
|
||||
<tool id="dk.xpg.msp430eclipse.tool.compiler.gcc.1609866167" name="MSP430 C Compiler" superClass="dk.xpg.msp430eclipse.tool.compiler.gcc">
|
||||
<option defaultValue="dk.xpg.msp430eclipse.compiler.option.optimization.level.none" id="dk.xpg.msp430eclipse.compiler.option.optimization.level.1638221170" name="Optimization Level" superClass="dk.xpg.msp430eclipse.compiler.option.optimization.level" valueType="enumerated"/>
|
||||
<option defaultValue="dk.xpg.msp430eclipse.compiler.option.debugging.level.default" id="dk.xpg.msp430eclipse.compiler.option.debugging.level.423105011" name="Debugging Level" superClass="dk.xpg.msp430eclipse.compiler.option.debugging.level" valueType="enumerated"/>
|
||||
<option id="dk.xpg.msp430eclipse.compiler.option.includes.paths.113771113" name="Include paths (-I)" superClass="dk.xpg.msp430eclipse.compiler.option.includes.paths" valueType="includePath"/>
|
||||
<option id="dk.xpg.msp430eclipse.compiler.option.includes.paths.113771113" name="Include paths (-I)" superClass="dk.xpg.msp430eclipse.compiler.option.includes.paths"/>
|
||||
<option id="dk.xpg.msp430eclipse.compiler.option.language.standard.1069227926" name="Standard" superClass="dk.xpg.msp430eclipse.compiler.option.language.standard" useByScannerDiscovery="false" value="dk.xpg.msp430eclipse.compiler.option.language.standard.gnu99" valueType="enumerated"/>
|
||||
<inputType id="dk.xpg.msp430eclipse.tool.compiler.gcc.input.2144495992" name="C Source File" superClass="dk.xpg.msp430eclipse.tool.compiler.gcc.input"/>
|
||||
<inputType id="dk.xpg.msp430eclipse.tool.compiler.gcc.input.cc.194364093" name="C++ Source File" superClass="dk.xpg.msp430eclipse.tool.compiler.gcc.input.cc"/>
|
||||
</tool>
|
||||
<tool id="dk.xpg.msp430eclipse.tool.assembler.gcc.1721201165" name="MSP430 Assembler" superClass="dk.xpg.msp430eclipse.tool.assembler.gcc">
|
||||
<option id="dk.xpg.msp430eclipse.assembler.option.general.include.1531893167" name="Include Paths (-I)" superClass="dk.xpg.msp430eclipse.assembler.option.general.include" valueType="includePath"/>
|
||||
<option id="dk.xpg.msp430eclipse.assembler.option.general.include.1531893167" name="Include Paths (-I)" superClass="dk.xpg.msp430eclipse.assembler.option.general.include"/>
|
||||
<inputType id="dk.xpg.msp430eclipse.tool.assembler.input.975463794" name="Assembler Files" superClass="dk.xpg.msp430eclipse.tool.assembler.input"/>
|
||||
</tool>
|
||||
<tool id="dk.xpg.msp430eclipse.tool.linker.gcc.1458265663" name="MSP430 Linker" superClass="dk.xpg.msp430eclipse.tool.linker.gcc">
|
||||
|
Binary file not shown.
@ -74,9 +74,6 @@ volatile uint8_t activeOffset = 0;
|
||||
|
||||
|
||||
ISR(TIMER0_A0, TA0_ISR_Ovrfl) {
|
||||
if (pulseWidthIdx == 0) {
|
||||
}
|
||||
|
||||
uint16_t pw = pulseWidths[pulseWidthIdx + activeOffset];
|
||||
if (pulseWidthIdx != (NUM_OF_SINE_VALUES - 1)) {
|
||||
TA0CCR1 = pw;
|
||||
@ -107,13 +104,20 @@ void inverterExec() {
|
||||
if (! running) {
|
||||
// start
|
||||
pulseWidthIdx = 0;
|
||||
// bridge start polarity
|
||||
P1OUT &= ~BIT1;
|
||||
P1OUT |= ((BIT2 & P1IN) >> 1);
|
||||
// start timer
|
||||
TA0CTL = MC_1 | ID_0 | TASSEL_0 | TACLR;
|
||||
running = true;
|
||||
}
|
||||
} else {
|
||||
if (running) {
|
||||
// stop
|
||||
// stop timer
|
||||
TA0CTL = MC_0;
|
||||
// shutdown bridge
|
||||
P2OUT &= ~BIT1;
|
||||
running = false;
|
||||
}
|
||||
}
|
||||
@ -121,14 +125,16 @@ void inverterExec() {
|
||||
|
||||
void inverterInit() {
|
||||
// start, stop
|
||||
// BIT3: start, BIT4: stop
|
||||
P1OUT &= (BIT3 | BIT4);
|
||||
P1DIR &= (BIT3 | BIT4);
|
||||
P1OUT &= ~BIT3;
|
||||
P1DIR &= ~BIT3;
|
||||
|
||||
// bridge direction
|
||||
P1OUT &= ~BIT2;
|
||||
P1OUT |= BIT1;
|
||||
P1DIR |= BIT1 | BIT2;
|
||||
// bridge start polarity
|
||||
P1DIR &= ~BIT2;
|
||||
|
||||
// bridge polarity
|
||||
P1OUT &= ~BIT1;
|
||||
P1OUT |= ((BIT2 & P1IN) >> 1);
|
||||
P1DIR |= BIT1;
|
||||
|
||||
// bridge enable (PWM)
|
||||
P2OUT &= ~BIT1;
|
||||
|
Loading…
x
Reference in New Issue
Block a user