DM: fix tone 0 frequency

deanm1278 · deanm1278 · commit 4f22a0749106 · 2017-10-24T17:59:23.000-04:00
diff --git a/cores/arduino/Tone.cpp b/cores/arduino/Tone.cpp
@@ -69,7 +69,6 @@ void toneAccurateClock (uint32_t accurateSystemCoreClockFrequency)
   toneMaxFrequency = accurateSystemCoreClockFrequency / 2;
 }
 
-//DM TODO: make this work as a rest when frequency 0 is passed
 void tone (uint32_t outputPin, uint32_t frequency, uint32_t duration)
 {
   // Configure interrupt request
@@ -90,6 +89,9 @@ void tone (uint32_t outputPin, uint32_t frequency, uint32_t duration)
     while (GCLK->STATUS.bit.SYNCBUSY);
 #endif
   }
+
+  //if it's a rest, set to 1Hz (below audio range)
+  frequency = (frequency > 0 ? frequency : 1);
   
   if (toneIsActive && (outputPin != lastOutputPin))
     noTone(lastOutputPin);

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,6 @@ void toneAccurateClock (uint32_t accurateSystemCoreClockFrequency)`
`69`	`69`	`toneMaxFrequency = accurateSystemCoreClockFrequency / 2;`
`70`	`70`	`}`
`71`	`71`
`72`		`-//DM TODO: make this work as a rest when frequency 0 is passed`
`73`	`72`	`void tone (uint32_t outputPin, uint32_t frequency, uint32_t duration)`
`74`	`73`	`{`
`75`	`74`	`// Configure interrupt request`
`@@ -90,6 +89,9 @@ void tone (uint32_t outputPin, uint32_t frequency, uint32_t duration)`
`90`	`89`	`while (GCLK->STATUS.bit.SYNCBUSY);`
`91`	`90`	`#endif`
`92`	`91`	`}`
	`92`	`+`
	`93`	`+ //if it's a rest, set to 1Hz (below audio range)`
	`94`	`+ frequency = (frequency > 0 ? frequency : 1);`
`93`	`95`
`94`	`96`	`if (toneIsActive && (outputPin != lastOutputPin))`
`95`	`97`	`noTone(lastOutputPin);`