thebears/marlin_skr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Tone fixes/changes (#10151)

Browse Source
This commit is contained in:
Bob-the-Kuhn
2018-03-19 04:48:06 -05:00
committed by Scott Lahteine
parent 2f192dbcd6
commit 53362b81cc
4 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/src/HAL/HAL_DUE/Tone.cpp
View File

@@ -34,13 +34,15 @@ static pin_t tone_pin;
volatile static int32_t toggles;
void toneInit() {
HAL_timer_start(TONE_TIMER_NUM, 1); // Lowest frequency possible
HAL_timer_start(TONE_TIMER_NUM, 100000);
HAL_timer_disable_interrupt(TONE_TIMER_NUM);
}
void tone(const pin_t _pin, const unsigned int frequency, const unsigned long duration) {
tone_pin = _pin;
toggles = 2 * frequency * duration / 1000;
HAL_timer_set_compare(TONE_TIMER_NUM, VARIANT_MCK / 2 / frequency); // 84MHz / 2 prescaler / Hz
HAL_timer_set_count(TONE_TIMER_NUM, 0); // ensure first beep is correct (make sure counter is less than the compare value)
HAL_timer_set_compare(TONE_TIMER_NUM, VARIANT_MCK / 2 / 2 / frequency); // 84MHz / 2 prescaler / 2 interrupts per cycle /Hz
HAL_timer_enable_interrupt(TONE_TIMER_NUM);
}
@@ -52,11 +54,13 @@ void noTone(const pin_t _pin) {
HAL_TONE_TIMER_ISR {
static uint8_t pin_state = 0;
HAL_timer_isr_prologue(TONE_TIMER_NUM);
if (toggles) {
toggles--;
digitalWrite(tone_pin, (pin_state ^= 1));
}
else noTone(tone_pin); // seems superfluous ?
else noTone(tone_pin); // turn off interrupt
HAL_timer_restrain_count(TONE_TIMER_NUM, 10); // make sure next ISR isn't delayed by up to 2 minutes
}
#endif // ARDUINO_ARCH_SAM