Merge branch 'ticker_api' into add-schedule

Author: dok-net

cores/esp32/Ticker.cpp

@@ -34,7 +34,17 @@ Ticker::~Ticker()
 	detach();
 }
 
+void Ticker::_attach_s(float seconds, bool repeat, callback_with_arg_t callback, void* arg)
+{
+	_attach_us(1000000 * seconds, repeat, callback, arg);
+}
+
 void Ticker::_attach_ms(uint32_t milliseconds, bool repeat, callback_with_arg_t callback, void* arg)
+{
+	_attach_us(1000 * 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 * 1000);
+		esp_timer_start_periodic(_timer, micros);
 	}
 	else {
-		esp_timer_start_once(_timer, milliseconds * 1000);
+		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,6 +81,6 @@ 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();
 }

cores/esp32/Ticker.h

@@ -48,7 +48,7 @@ class Ticker
 	void attach(float seconds, callback_function_t callback)
 	{
 		_callback_function = std::move(callback);
-		_attach_ms(seconds * 1000, true, _static_callback, this);
+		_attach_s(seconds, true, _static_callback, this);
 	}
 
 	void attach_ms_scheduled(uint32_t milliseconds, callback_function_t callback)
@@ -62,14 +62,25 @@ class Ticker
 		_attach_ms(milliseconds, true, _static_callback, this);
 	}
 
+	void attach_us_scheduled(uint32_t micros, callback_function_t callback)
+	{
+		attach_us(micros, [callback]() { schedule_function(callback); });
+	}
+
+	void attach_us(uint32_t micros, callback_function_t callback)
+	{
+		_callback_function = std::move(callback);
+		_attach_us(micros, true, _static_callback, this);
+	}
+
 	template<typename TArg>
 	void attach(float seconds, void (*callback)(TArg), TArg arg)
 	{
 		static_assert(sizeof(TArg) <= sizeof(void*), "attach() callback argument size must be <= sizeof(void*)");
 		// C-cast serves two purposes:
 		// static_cast for smaller integer types,
 		// reinterpret_cast + const_cast for pointer types
-		_attach_ms(seconds * 1000, true, reinterpret_cast<callback_with_arg_t>(callback), (void*)arg);
+		_attach_s(seconds, true, reinterpret_cast<callback_with_arg_t>(callback), (void*)arg);
 	}
 
 	template<typename TArg>
@@ -79,15 +90,22 @@ class Ticker
 		_attach_ms(milliseconds, true, reinterpret_cast<callback_with_arg_t>(callback), (void*)arg);
 	}
 
+	template<typename TArg>
+	void attach_us(uint32_t micros, void (*callback)(TArg), TArg arg)
+	{
+		static_assert(sizeof(TArg) <= sizeof(void*), "attach() callback argument size must be <= sizeof(void*)");
+		_attach_us(micros, true, reinterpret_cast<callback_with_arg_t>(callback), (void*)arg);
+	}
+	
 	void once_scheduled(float seconds, callback_function_t callback)
 	{
 		once(seconds, [callback]() { schedule_function(callback); });
 	}
-
+	
 	void once(float seconds, callback_function_t callback)
 	{
 		_callback_function = std::move(callback);
-		_attach_ms(seconds * 1000, false, _static_callback, this);
+		_attach_s(seconds, false, _static_callback, this);
 	}
 
 	void once_ms_scheduled(uint32_t milliseconds, callback_function_t callback)
@@ -101,11 +119,22 @@ class Ticker
 		_attach_ms(milliseconds, false, _static_callback, this);
 	}
 
+	void once_us_scheduled(uint32_t micros, callback_function_t callback)
+	{
+		once_us(micros, [callback]() { schedule_function(callback); });
+	}
+
+	void once_us(uint32_t micros, callback_function_t callback)
+	{
+		_callback_function = std::move(callback);
+		_attach_us(micros, false, _static_callback, this);
+	}
+
 	template<typename TArg>
 	void once(float seconds, void (*callback)(TArg), TArg arg)
 	{
 		static_assert(sizeof(TArg) <= sizeof(void*), "attach() callback argument size must be <= sizeof(void*)");
-		_attach_ms(seconds * 1000, false, reinterpret_cast<callback_with_arg_t>(callback), (void*)arg);
+		_attach_s(seconds, false, reinterpret_cast<callback_with_arg_t>(callback), (void*)arg);
 	}
 
 	template<typename TArg>
@@ -115,6 +144,13 @@ class Ticker
 		_attach_ms(milliseconds, false, reinterpret_cast<callback_with_arg_t>(callback), (void*)arg);
 	}
 
+	template<typename TArg>
+	void once_us(uint32_t micros, void (*callback)(TArg), TArg arg)
+	{
+		static_assert(sizeof(TArg) <= sizeof(void*), "attach() callback argument size must be <= sizeof(void*)");
+		_attach_us(micros, false, reinterpret_cast<callback_with_arg_t>(callback), (void*)arg);
+	}
+
 	void detach();
 	bool active() const;
 
@@ -124,8 +160,11 @@ class Ticker
 
 	callback_function_t _callback_function = nullptr;
 
-protected:
 	esp_timer_handle_t _timer;
+
+private:
+	void _attach_us(uint32_t micros, bool repeat, callback_with_arg_t callback, void* arg);
+	void _attach_s(float seconds, bool repeat, callback_with_arg_t callback, void* arg);
 };