将函数指针非模板化以便支持λ表达式；支持计时器的暂停和继续

Author: 埃博拉酱

.vscode/c_cpp_properties.json

@@ -5,9 +5,9 @@
 			"includePath": [
                 "${workspaceFolder}",
                 "${USERPROFILE}/Documents/Arduino/libraries/**",
-                "${LOCALAPPDATA}/Arduino15/packages/arduino/hardware/avr/1.8.5/cores/arduino",
+                "${LOCALAPPDATA}/Arduino15/packages/arduino/hardware/avr/1.8.6/cores/arduino",
                 "${LOCALAPPDATA}/Arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino7/avr/include",
-                "${LOCALAPPDATA}/Arduino15/packages/arduino/hardware/avr/1.8.5/variants/**"
+                "${LOCALAPPDATA}/Arduino15/packages/arduino/hardware/avr/1.8.6/variants/**"
 			],
 			"forcedInclude": [
                 "Arduino.h"

README.md

@@ -21,6 +21,10 @@
 
 如果你使用的开发板并非ATMega2560系列的CPU，也可能可以使用本库。具体需要参考你的CPU数据表，看是否具有兼容的硬件计时器。
 
+# 常见故障排除
+
+如果链接时遇到`undefined reference to TIMSK`类似的错误，请检查你选择的开发板是否正确，以及是否使用了你的开发板所不支持的计时器。
+
 Make full use of all your hardware timers on your Arduino board. 
 
 The only library you can choose any hardware timer you like to use in your timing function. Tones, square waves, delayed tasks, timed repetitive tasks are provided as building blocks for your own sophisticated multi-timer tasks. My library hides hardware register details for you.
@@ -43,6 +47,11 @@ This timer is also 8-bit, but different from timer 0 at 3 aspects:
 Moreover, builtin `analogWrite()` and `tone()` may dynamically occupy any of the timers listed above. You'll have to handle potential conflicts if you want to use these builtins.
 
 If you aren't using ATMega2560 CPU series, you may or may not be able to use this library. Refer to your datasheet to see if it has compatible hardware timer configurations.
+
+# Common troubleshooting
+
+If you encounter an error similar to `undefined reference to TIMSK` when linking, please check whether you have selected the correct board and whether you are using a timer that is not supported by your board.
+
 # API参考 API Reference
 ```C++
 //在指定的毫秒数后触发一个计时器中断，调用你的函数。

examples/LedAndBuzzerShow/LedAndBuzzerShow.ino

@@ -3,32 +3,32 @@
 using namespace TimersOneForAll;
 constexpr uint8_t LED = 7;
 constexpr uint8_t Buzzer = 8;
+void LightDown()
+{
+  digitalWrite(LED, LOW);
+}
 void setup()
 {
   pinMode(7, OUTPUT);
   pinMode(8, OUTPUT);
   Serial.begin(9600);
   digitalWrite(LED, HIGH);
   //设置计时器3在5秒后熄灭LED灯，但不阻断程序
-  DoAfter<3, 5000, LightDown>();
+  DoAfter<3, 5000>(LightDown);
 
   //设置4号计时器，每隔2秒，就用5号计时器生成2000㎐脉冲1秒，重复3次
-  RepeatAfter<4, 2000, PlayTone<5, Buzzer, 2000, 1000>, 3>();
+  RepeatAfter<4, 2000, 3>(PlayTone<5, Buzzer, 2000, 1000>);
   //设置计时器1，将程序阻断7秒
   Delay<1, 7000>();
   //设置计时器1，将LED灯先亮2秒，再熄灭1秒，无限循环
   SquareWave<1, LED, 2000, 1000>();
   //设置计时器3在8秒后停止计时器1
-  DoAfter<3, 8000, ShutDown<1>>();
+  DoAfter<3, 8000>(ShutDown<1>);
   //观察到，LED灯明暗循环两次后，最终停在了亮状态，因为1号计时器尚未触发暗事件就被停止了
   //亮1秒暗2秒的方波，重复5个循环
   Delay<4, 8000>();
   SquareWave<1, LED, 1000, 2000, 5>();
 }
-void LightDown()
-{
-  digitalWrite(LED, LOW);
-}
 void loop()
 {
 }

src/Internal/Debugger.h

@@ -12,20 +12,20 @@ namespace TimersOneForAll
 			Delaying<TimerCode> = false;
 		}
 	}
-	//阻塞当前代码执行指定毫秒数
+	// 阻塞当前代码执行指定毫秒数
 	template <uint8_t TimerCode, uint16_t DelayMilliseconds>
 	void Delay()
 	{
-		DoAfter<TimerCode, DelayMilliseconds, Internal::Undelay<TimerCode>>();
+		DoAfter<TimerCode, DelayMilliseconds>(Internal::Undelay<TimerCode>);
 		Internal::Delaying<TimerCode> = true;
 		while (Internal::Delaying<TimerCode>)
 			;
 	}
-	//阻塞当前代码执行指定毫秒数
+	// 阻塞当前代码执行指定毫秒数
 	template <uint8_t TimerCode>
 	void Delay(uint16_t DelayMilliseconds)
 	{
-		DoAfter<TimerCode, Internal::Undelay<TimerCode>>(DelayMilliseconds);
+		DoAfter<TimerCode>(DelayMilliseconds, Internal::Undelay<TimerCode>);
 		Internal::Delaying<TimerCode> = true;
 		while (Internal::Delaying<TimerCode>)
 			;

src/Internal/Delay.h

@@ -2,18 +2,20 @@
 #include "Kernel.h"
 namespace TimersOneForAll
 {
-	//在指定毫秒数后执行任务
-	template <uint8_t TimerCode, uint16_t AfterMilliseconds, void (*DoTask)()>
-	void DoAfter()
+	// 在指定毫秒数后执行任务
+	template <uint8_t TimerCode, uint16_t AfterMilliseconds>
+	void DoAfter(void (*DoTask)())
 	{
 		constexpr Internal::TimerSetting TS = Internal::GetTimerSetting(TimerCode, AfterMilliseconds);
-		Internal::SLRepeaterSet<TimerCode, TS.TCNT, TS.PrescalerBits, DoTask, 1, nullptr>();
+		Internal::TimerTask<TimerCode> = DoTask;
+		Internal::SLRepeaterSet<TimerCode, TS.TCNT, TS.PrescalerBits, 1, nullptr>();
 	}
-	//在指定毫秒数后执行任务
-	template <uint8_t TimerCode, void (*DoTask)()>
-	void DoAfter(uint16_t AfterMilliseconds)
+	// 在指定毫秒数后执行任务
+	template <uint8_t TimerCode>
+	void DoAfter(uint16_t AfterMilliseconds, void (*DoTask)())
 	{
 		Internal::TimerSetting TS = Internal::GetTimerSetting<TimerCode>(AfterMilliseconds);
-		Internal::SLRepeaterSet<TimerCode, DoTask, 1, nullptr>(TS.TCNT, TS.PrescalerBits);
+		Internal::TimerTask<TimerCode> = DoTask;
+		Internal::SLRepeaterSet<TimerCode, 1, nullptr>(TS.TCNT, TS.PrescalerBits);
 	}
 }