Reuse passive timer, set max timers from Cmake

Author: diffstorm

.gitignore

@@ -50,3 +50,5 @@ modules.order
 Module.symvers
 Mkfile.old
 dkms.conf
+
+build/

CMakeLists.txt

@@ -5,6 +5,12 @@
 cmake_minimum_required(VERSION 3.10)
 project(FlexiTimerLibrary LANGUAGES C CXX)
 
+option(FLEXITIMER_MAX_TIMERS_OPTION "Set the maximum number of timers" ON)
+if(FLEXITIMER_MAX_TIMERS_OPTION)
+    set(FLEXITIMER_MAX_TIMERS 10 CACHE STRING "Maximum number of timers")
+    add_definitions(-DFLEXITIMER_MAX_TIMERS=${FLEXITIMER_MAX_TIMERS})
+endif()
+
 # Add the include directory
 include_directories(${PROJECT_SOURCE_DIR}/include)
 

README.md

@@ -185,7 +185,7 @@ Resumes the paused timer with the specified id.
 ```c
 flexitimer_error_t flexitimer_restart(timer_id_t id);
 ```
-Restarts the timer with the specified id.
+Restarts the timer with the specified id. Can now also re-activate expired single-shot timers if they have a valid callback.
 
 ### Cancelling a Timer
 
@@ -223,23 +223,11 @@ flexitimer_error_t flexitimer_get_elapsed(timer_id_t id, timer_time_t *time);
 Gets the remaining time of the timer with the specified id.
 
 ## Best Practices / Tips
-- Update configuration values and types in the `flexitimer.h` header to match specific needs. Adjust `FLEXITIMER_MAX_TIMERS` to support more timers along with the `timer_id_t` if required, and modify the type of `timer_time_t` for saving memory in environments with limited resources:
-```c
-/**
-    @brief Number of timers
-*/
-#define FLEXITIMER_MAX_TIMERS (20) // Example for increasing the number of timers
-
-/**
-    @brief Id unit type
-*/
-typedef uint16_t timer_id_t; // Example for larger ID range
-
-/**
-    @brief Time unit type
-*/
-typedef uint16_t timer_time_t; // Example for smaller time unit to save memory
+- Configure `FLEXITIMER_MAX_TIMERS` via CMake: The maximum number of timers can be set during the CMake configuration step. This allows you to adjust the library's capacity without modifying source files.
+```bash
+cmake -DFLEXITIMER_MAX_TIMERS=50 ..
 ```
+  You can also adjust `timer_id_t` and `timer_time_t` in `flexitimer.h` to match specific needs and save memory in resource-constrained environments.
 - Ensure callback functions are non-blocking and consist of minimal, efficient code to prevent delays in the scheduler execution.
 - Use an enum to list timer IDs in a single place for easier management and readability.
 - Utilize getter functions to control the flow and monitor timer states effectively.

include/flexitimer.h

@@ -27,9 +27,7 @@ extern "C" {
 /**
     @brief Number of timers
 */
-#ifndef FLEXITIMER_MAX_TIMERS
-#define FLEXITIMER_MAX_TIMERS (10)
-#endif
+
 
 /**
     @brief Id unit type

src/flexitimer.c

@@ -153,7 +153,7 @@ flexitimer_error_t flexitimer_restart(timer_id_t id)
         return FLEXITIMER_ERROR_INVALID_ID;
     }
 
-    if(timers[id].state != TIMER_STATE_PASSIVE)
+    if(timers[id].callback != NULL)
     {
         timers[id].remaining = timers[id].timeout;
         timers[id].state = TIMER_STATE_ACTIVE;

test/flexitimerTest.cpp

@@ -94,7 +94,7 @@ TEST_F(FlexiTimerTest, PauseResumeTimer)
 
 TEST_F(FlexiTimerTest, RestartTimer)
 {
-    flexitimer_start(0, TIMER_TYPE_SINGLESHOT, 2, nullptr);
+    flexitimer_start(0, TIMER_TYPE_SINGLESHOT, 2, test_callback);
     flexitimer_handler(); // remaining=1
     EXPECT_EQ(flexitimer_restart(0), FLEXITIMER_OK);
     timer_time_t remaining;
@@ -132,4 +132,24 @@ TEST_F(FlexiTimerTest, MultipleTimersIndependent)
     flexitimer_handler(); // Timer 1 decrements to 1
     flexitimer_handler(); // Timer 1 triggers, count=3
     EXPECT_EQ(callback_count, 3);
+}
+
+TEST_F(FlexiTimerTest, RestartPassiveSingleShotTimer)
+{
+    flexitimer_start(0, TIMER_TYPE_SINGLESHOT, 1, test_callback);
+    flexitimer_handler(); // Timer expires
+    EXPECT_EQ(callback_count, 1);
+    timer_state_t state;
+    flexitimer_get_state(0, &state);
+    EXPECT_EQ(state, TIMER_STATE_PASSIVE);
+
+    EXPECT_EQ(flexitimer_restart(0), FLEXITIMER_OK);
+    flexitimer_get_state(0, &state);
+    EXPECT_EQ(state, TIMER_STATE_ACTIVE);
+    timer_time_t remaining;
+    flexitimer_get_elapsed(0, &remaining);
+    EXPECT_EQ(remaining, 1); // Should be reset to original timeout
+
+    flexitimer_handler(); // Should trigger callback again
+    EXPECT_EQ(callback_count, 2);
 }