Disable interrupts before modifying Tone timer

facchinm · facchinm · commit 76c915355975 · 2019-01-16T17:23:28.000+01:00
Fixes #13
diff --git a/cores/arduino/Tone.cpp b/cores/arduino/Tone.cpp
@@ -120,6 +120,8 @@ void tone(uint8_t pin, unsigned int frequency, unsigned long duration)
     }
 
     // Timer settings -- will be type B
+    uint8_t status = SREG;
+    cli();
 
     // Disable for now, set clk according to 'prescaler_needed'
     // (Prescaled clock will come from TCA --
@@ -147,6 +149,8 @@ void tone(uint8_t pin, unsigned int frequency, unsigned long duration)
 
     // Enable timer
     _timer->CTRLA |= TCB_ENABLE_bm;
+
+    SREG = status;
 }
 
 // pin which currently is being used for a tone

Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,8 @@ void tone(uint8_t pin, unsigned int frequency, unsigned long duration)`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`// Timer settings -- will be type B`
	`123`	`+ uint8_t status = SREG;`
	`124`	`+ cli();`
`123`	`125`
`124`	`126`	`// Disable for now, set clk according to 'prescaler_needed'`
`125`	`127`	`// (Prescaled clock will come from TCA --`
`@@ -147,6 +149,8 @@ void tone(uint8_t pin, unsigned int frequency, unsigned long duration)`
`147`	`149`
`148`	`150`	`// Enable timer`
`149`	`151`	`_timer->CTRLA \|= TCB_ENABLE_bm;`
	`152`	`+`
	`153`	`+ SREG = status;`
`150`	`154`	`}`
`151`	`155`
`152`	`156`	`// pin which currently is being used for a tone`