josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2725 from mkbel/fix_pwm_warning 

Fix compiler warning enumeration value 'ONE_TO_FALL' not handled in s…
This commit is contained in:
Marek Běl 2020-06-08 15:08:53 +02:00 committed by GitHub
parent 2c03abade9 5648f3fef0
commit 829aa83cfd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Firmware/heatbed_pwm.cpp
View File

@ -59,7 +59,6 @@ enum class States : uint8_t {
RISE, ///< 16 fast PWM cycles with increasing duty up to steady ON RISE, ///< 16 fast PWM cycles with increasing duty up to steady ON
RISE_TO_ONE, ///< metastate allowing the timer change its state atomically without artefacts on the output pin RISE_TO_ONE, ///< metastate allowing the timer change its state atomically without artefacts on the output pin
ONE, ///< steady 1 (ON), no change for the whole period ONE, ///< steady 1 (ON), no change for the whole period
ONE_TO_FALL, ///< metastate allowing the timer change its state atomically without artefacts on the output pin
FALL, ///< 16 fast PWM cycles with decreasing duty down to steady OFF FALL, ///< 16 fast PWM cycles with decreasing duty down to steady OFF
FALL_TO_ZERO ///< metastate allowing the timer change its state atomically without artefacts on the output pin FALL_TO_ZERO ///< metastate allowing the timer change its state atomically without artefacts on the output pin
}; };
@ -155,12 +154,7 @@ ISR(TIMER0_OVF_vect) // timer compare interrupt service routine
return; // want full duty for the next ONE cycle again - so keep on heating and just wait for the next timer ovf return; // want full duty for the next ONE cycle again - so keep on heating and just wait for the next timer ovf
} }
// otherwise moving towards FALL // otherwise moving towards FALL
// @@TODO it looks like ONE_TO_FALL isn't necessary, there are no artefacts at all
state = States::ONE;//_TO_FALL; state = States::ONE;//_TO_FALL;
// TCCR0B = (1 << CS00); // change prescaler to 1, i.e. 62.5kHz
// break;
// case States::ONE_TO_FALL:
// OCR0B = 255; // zero duty
state=States::FALL; state=States::FALL;
fastCounter = fastMax - 1;// we'll do 16-1 cycles of RISE fastCounter = fastMax - 1;// we'll do 16-1 cycles of RISE
TCNT0 = 255; // force overflow on the next clock cycle TCNT0 = 255; // force overflow on the next clock cycle