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

Ebola-Chan-bot · Jul 14, 2021 · c1be23c · c1be23c
1 parent 0ebcaa3
commit c1be23c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/library.properties b/library.properties
@@ -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. 充分利用你开发板上所有的硬件计时器

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>)