修复PlayTone模板应用错误bug、SquareWave条件表达式bug

Ebola-Chan-bot · Ebola-Chan-bot · commit c1be23c8807e · 2021-07-14T14:43:20.000+08:00
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=TimersOneForAll
-version=1.4.0
+version=1.4.1
 author=EbolaChan <Leenrung@outlook.com>
 maintainer=EbolaChan <Leenrung@outlook.com>
 sentence=Make full use of all your hardware timers on your Arduino board. 充分利用你开发板上所有的硬件计时器
diff --git a/src/Internal/PlayTone.h b/src/Internal/PlayTone.h
@@ -24,6 +24,6 @@ namespace TimersOneForAll
 	{
 		constexpr Internal::TimerSetting TS = Internal::GetTimerSetting(TimerCode, 500.f / FrequencyHz);
 		Gifts::EfficientDigitalToggle<PinCode>();
-		Internal::SLRepeaterSet<TimerCode, Gifts::EfficientDigitalToggle<PinCode>, uint32_t(FrequencyHz) * Milliseconds / 500, DoneCallback>(TS.TCNT, TS.PrescalerBits);
+		Internal::SLRepeaterSet<TimerCode, TS.TCNT, TS.PrescalerBits, Gifts::EfficientDigitalToggle<PinCode>, DoneCallback>(uint32_t(FrequencyHz) * Milliseconds / 500);
 	}
 }
diff --git a/src/Internal/SquareWave.h b/src/Internal/SquareWave.h
@@ -228,7 +228,7 @@ namespace TimersOneForAll
 						SetOCRB<TimerCode>(TryTS.TCNT * HighMilliseconds / FullCycle);
 						LR<TimerCode> = RepeatTimes;
 						COMPA<TimerCode> = Gifts::EfficientDigitalWrite<PinCode, HIGH>;
-						COMPB<TimerCode> = RepeatTimes > 0 ? []
+						COMPB<TimerCode> = RepeatTimes > 0 ? (void(*)())[]
 						{
 							Gifts::EfficientDigitalWrite<PinCode, LOW>();
 							if (!--LR<TimerCode>)

-Original file line number
+Diff line change
@@ @@ -1,5 +1,5 @@ @@
 name=TimersOneForAll
 -version=1.4.0
 +version=1.4.1
 author=EbolaChan <[email protected]>
 maintainer=EbolaChan <[email protected]>
 sentence=Make full use of all your hardware timers on your Arduino board. 充分利用你开发板上所有的硬件计时器
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,6 @@ namespace TimersOneForAll`
`24`	`24`	`{`
`25`	`25`	`constexpr Internal::TimerSetting TS = Internal::GetTimerSetting(TimerCode, 500.f / FrequencyHz);`
`26`	`26`	`Gifts::EfficientDigitalToggle<PinCode>();`
`27`		`- Internal::SLRepeaterSet<TimerCode, Gifts::EfficientDigitalToggle<PinCode>, uint32_t(FrequencyHz) * Milliseconds / 500, DoneCallback>(TS.TCNT, TS.PrescalerBits);`
	`27`	`+ Internal::SLRepeaterSet<TimerCode, TS.TCNT, TS.PrescalerBits, Gifts::EfficientDigitalToggle<PinCode>, DoneCallback>(uint32_t(FrequencyHz) * Milliseconds / 500);`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ namespace TimersOneForAll`
`228`	`228`	`SetOCRB<TimerCode>(TryTS.TCNT * HighMilliseconds / FullCycle);`
`229`	`229`	`LR<TimerCode> = RepeatTimes;`
`230`	`230`	`COMPA<TimerCode> = Gifts::EfficientDigitalWrite<PinCode, HIGH>;`
`231`		`- COMPB<TimerCode> = RepeatTimes > 0 ? []`
	`231`	`+ COMPB<TimerCode> = RepeatTimes > 0 ? (void(*)())[]`
`232`	`232`	`{`
`233`	`233`	`Gifts::EfficientDigitalWrite<PinCode, LOW>();`
`234`	`234`	`if (!--LR<TimerCode>)`