sec. conf

Author: mikee47

Sming/Core/CallbackTimer.h

@@ -69,7 +69,8 @@ class CallbackTimer
      *  @param  arg Optional argument passed to callback
      *  @retval CallbackTimer& Reference to timer
      */
-	CallbackTimer& IRAM_ATTR initializeUs(TimeType microseconds, TimerCallback callback, void* arg = nullptr)
+	__forceinline CallbackTimer& IRAM_ATTR initializeUs(TimeType microseconds, TimerCallback callback,
+														void* arg = nullptr)
 	{
 		setCallback(callback, arg);
 		setIntervalUs(microseconds);
@@ -81,7 +82,7 @@ class CallbackTimer
      *  @param  callback Interrupt-style callback function to call when timer triggers (Default: none)
      *  @retval CallbackTimer& Reference to timer
      */
-	CallbackTimer& IRAM_ATTR initializeUs(TimeType microseconds, InterruptCallback callback = nullptr)
+	__forceinline CallbackTimer& IRAM_ATTR initializeUs(TimeType microseconds, InterruptCallback callback = nullptr)
 	{
 		setCallback(reinterpret_cast<TimerCallback>(callback));
 		setIntervalUs(microseconds);
@@ -107,7 +108,8 @@ class CallbackTimer
      *  @param  arg Optional argument passed to callback
      *  @retval CallbackTimer& Reference to timer
      */
-	CallbackTimer& IRAM_ATTR initializeMs(uint32_t milliseconds, TimerCallback callback, void* arg = nullptr)
+	__forceinline CallbackTimer& IRAM_ATTR initializeMs(uint32_t milliseconds, TimerCallback callback,
+														void* arg = nullptr)
 	{
 		setCallback(callback, arg);
 		setIntervalMs(milliseconds);
@@ -119,7 +121,7 @@ class CallbackTimer
      *  @param  callback Interrupt-style callback function to call when timer triggers (Default: none)
      *  @retval CallbackTimer& Reference to timer
      */
-	CallbackTimer& IRAM_ATTR initializeMs(uint32_t milliseconds, InterruptCallback callback = nullptr)
+	__forceinline CallbackTimer& IRAM_ATTR initializeMs(uint32_t milliseconds, InterruptCallback callback = nullptr)
 	{
 		setCallback(reinterpret_cast<TimerCallback>(callback));
 		setIntervalMs(milliseconds);
@@ -131,7 +133,7 @@ class CallbackTimer
      *  @param  delegateFunction Function to call when timer triggers
      *  @note   Delegate callback method
      */
-	CallbackTimer& initializeMs(uint32_t milliseconds, TimerDelegate delegateFunction)
+	__forceinline CallbackTimer& initializeMs(uint32_t milliseconds, TimerDelegate delegateFunction)
 	{
 		setCallback(delegateFunction);
 		setIntervalMs(milliseconds);
@@ -143,7 +145,7 @@ class CallbackTimer
      *  @param  delegateFunction Function to call when timer triggers
      *  @note   Delegate callback method
      */
-	CallbackTimer& initializeUs(uint32_t microseconds, TimerDelegate delegateFunction)
+	__forceinline CallbackTimer& initializeUs(uint32_t microseconds, TimerDelegate delegateFunction)
 	{
 		setCallback(delegateFunction);
 		setIntervalUs(microseconds);
@@ -154,7 +156,7 @@ class CallbackTimer
      *  @param  repeating True to restart timer when it triggers, false for one-shot (Default: true)
      *  @retval bool True if timer started
      */
-	bool IRAM_ATTR start(bool repeating = true)
+	__forceinline bool IRAM_ATTR start(bool repeating = true)
 	{
 		if(!callbackSet || interval == 0) {
 			stop();
@@ -176,7 +178,7 @@ class CallbackTimer
 
 	/** @brief  Stops timer
 	 */
-	void IRAM_ATTR stop()
+	__forceinline void IRAM_ATTR stop()
 	{
 		if(started) {
 			api.disarm();
@@ -188,15 +190,15 @@ class CallbackTimer
 	 *  @retval bool True if timer started
 	 *  @note   Timer is stopped then started with current configuration
 	 */
-	bool IRAM_ATTR restart()
+	__forceinline bool IRAM_ATTR restart()
 	{
 		return start(repeating);
 	}
 
 	/** @brief  Check if timer is started
 	 *  @retval bool True if started
 	 */
-	bool isStarted() const
+	__forceinline bool isStarted() const
 	{
 		return started;
 	}
@@ -225,7 +227,7 @@ class CallbackTimer
 	/** @brief  Set timer interval in timer ticks
      *  @param  ticks Interval in ticks
      */
-	bool IRAM_ATTR checkInterval(uint32_t ticks) const
+	__forceinline bool checkInterval(uint32_t ticks) const
 	{
 		return ticks > api.minTicks() && ticks < api.maxTicks();
 	}
@@ -250,7 +252,7 @@ class CallbackTimer
 	/** @brief  Set timer interval in timer ticks
      *  @param  ticks Interval in ticks
      */
-	bool IRAM_ATTR setInterval(TickType ticks)
+	__forceinline bool setInterval(TickType ticks)
 	{
 		if(checkInterval(ticks)) {
 			interval = ticks;
@@ -266,23 +268,23 @@ class CallbackTimer
 	/** @brief  Set timer interval
      *  @param  microseconds Interval time in microseconds
      */
-	bool IRAM_ATTR setIntervalUs(TimeType microseconds)
+	__forceinline bool IRAM_ATTR setIntervalUs(TimeType microseconds)
 	{
 		return setInterval(this->timeToTicks(microseconds));
 	}
 
 	/** @brief  Set timer interval
      *  @param  milliseconds Interval time in milliseconds
      */
-	bool IRAM_ATTR setIntervalMs(uint32_t milliseconds)
+	__forceinline bool IRAM_ATTR setIntervalMs(uint32_t milliseconds)
 	{
 		return setInterval(Millis::timeToTicks(milliseconds));
 	}
 
 	/** @brief  Set timer trigger callback
      *  @param  callback Function to call when timer triggers
      */
-	void IRAM_ATTR setCallback(TimerCallback callback, void* arg = nullptr)
+	__forceinline void IRAM_ATTR setCallback(TimerCallback callback, void* arg = nullptr)
 	{
 		stop();
 		api.setCallback(callback, arg);