Return Ticker to libraries only for modularity.

Author: dok-net

CMakeLists.txt

@@ -59,7 +59,6 @@ set(CORE_SRCS
   cores/esp32/StreamString.cpp
   cores/esp32/Tone.cpp
   cores/esp32/HWCDC.cpp
-  cores/esp32/Ticker.cpp
   cores/esp32/USB.cpp
   cores/esp32/USBCDC.cpp
   cores/esp32/USBMSC.cpp

cores/esp32/Ticker.cpp

@@ -8,7 +8,14 @@ Ticker	KEYWORD1
 # Methods and Functions (KEYWORD2)
 #######################################
 
+attach_scheduled	KEYWORD2
 attach	KEYWORD2
+attach_ms_scheduled	KEYWORD2
 attach_ms	KEYWORD2
+once_scheduled	KEYWORD2
 once	KEYWORD2
+once_ms_scheduled	KEYWORD2
+once_ms	KEYWORD2
 detach	KEYWORD2
+active	KEYWORD2
+

cores/esp32/Ticker.h

@@ -34,7 +34,17 @@ Ticker::~Ticker()
 	detach();
 }
 
+void Ticker::_attach_s(float seconds, bool repeat, callback_with_arg_t callback, void* arg)
+{
+	_attach_us(1000000ULL * seconds, repeat, callback, arg);
+}
+
 void Ticker::_attach_ms(uint32_t milliseconds, bool repeat, callback_with_arg_t callback, void* arg)
+{
+	_attach_us(1000ULL * milliseconds, repeat, callback, arg);
+}
+
+void Ticker::_attach_us(uint32_t micros, bool repeat, callback_with_arg_t callback, void* arg)
 {
 	esp_timer_create_args_t _timerConfig;
 	_timerConfig.arg = reinterpret_cast<void*>(arg);
@@ -47,10 +57,10 @@ void Ticker::_attach_ms(uint32_t milliseconds, bool repeat, callback_with_arg_t
 	}
 	esp_timer_create(&_timerConfig, &_timer);
 	if (repeat) {
-		esp_timer_start_periodic(_timer, milliseconds * 1000ULL);
+		esp_timer_start_periodic(_timer, micros);
 	}
 	else {
-		esp_timer_start_once(_timer, milliseconds * 1000ULL);
+		esp_timer_start_once(_timer, micros);
 	}
 }
 
@@ -59,6 +69,7 @@ void Ticker::detach() {
 		esp_timer_stop(_timer);
 		esp_timer_delete(_timer);
 		_timer = nullptr;
+		_callback_function = nullptr;
 	}
 }
 
@@ -70,7 +81,7 @@ bool Ticker::active() const {
 void Ticker::_static_callback(void* arg)
 {
 	Ticker* _this = reinterpret_cast<Ticker*>(arg);
-	if (!_this) return;
-	if (_this->_callback_function) _this->_callback_function();
+	if (_this && _this->_callback_function)
+		_this->_callback_function();
 }