Timed Tenants

app/backplane/sensor_module/src/c_sensor_module.cpp

@@ -3,6 +3,7 @@
 // F-Core Tenant
 #include <f_core/messaging/c_msgq_message_port.h>
 #include <f_core/os/n_rtos.h>
+#include <f_core/os/tenants/c_timed_tenant.h> // TODO: Blast once we have CCpuMonitorTenant inherit this
 #include <f_core/utils/n_time_utils.h>
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(sensor_module);

include/f_core/os/tenants/c_timed_tenant.h

@@ -0,0 +1,20 @@
+#ifndef C_TIMED_TENANT_H
+#define C_TIMED_TENANT_H
+
+#include "f_core/os/c_tenant.h"
+#include "f_core/utils/c_soft_timer.h"
+
+class CTimedTenant : public CTenant {
+public:
+    /**
+     * @brief Constructor
+     * @param name Name of the tenant
+     * @param intervalMillis Interval in milliseconds for the timeout
+     */
+    explicit CTimedTenant(const char* name, const uint32_t intervalMillis);
+
+private:
+    CSoftTimer timer;
+};
+
+#endif //C_TIMED_TENANT_H

include/f_core/utils/c_soft_timer.h

@@ -13,6 +13,17 @@ class CSoftTimer {
         k_timer_init(&timer, expirationFn, stopFn);
     }
 
+    /**
+    * Constructor
+    * @param timeoutMillis Time in milliseconds until the timer expires
+    * @param expirationFn Function to call when the timer expires
+    * @param stopFn Function to call when the timer is stopped
+    */
+    CSoftTimer(const uint32_t timeoutMillis, k_timer_expiry_t expirationFn = nullptr, k_timer_stop_t stopFn = nullptr) {
+        k_timer_init(&timer, expirationFn, stopFn);
+        StartTimer(timeoutMillis);
+    }
+
     /**
     * Destructor
     */
@@ -24,7 +35,7 @@ class CSoftTimer {
     * Start the timer with the given expiration time
     * @param millis Time in milliseconds until the timer expires
     */
-    void StartTimer(int millis) {
+    void StartTimer(uint32_t millis) {
         // Duration (second arg) is the initial expiration time
         // Period (third arg) is the time set after each expiration
         k_timer_start(&timer, K_MSEC(millis), K_MSEC(millis));
@@ -59,7 +70,7 @@ class CSoftTimer {
     * @param millis Time in milliseconds until the timer expires
     * @param initialExpirationMillis Time in milliseconds to wait before the first expiration
     */
-    void StartTimer(int millis, int initialExpirationMillis) {
+    void StartTimer(uint32_t millis, uint32_t initialExpirationMillis) {
         // Duration (second arg) is the initial expiration time
         // Period (third arg) is the time set after each expiration
         k_timer_start(&timer, K_MSEC(initialExpirationMillis), K_MSEC(millis));

lib/f_core/os/CMakeLists.txt

@@ -2,6 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 zephyr_library()
-FILE(GLOB sources *.cpp)
+FILE(GLOB sources *.cpp tenants/*.cpp)
 zephyr_library_sources(${sources})
 

lib/f_core/os/tenants/c_timed_tenant.cpp

@@ -0,0 +1,20 @@
+#include "f_core/os/tenants/c_timed_tenant.h"
+
+#include "f_core/os/n_rtos.h"
+#include "zephyr/logging/log.h"
+
+LOG_MODULE_REGISTER(CTimedTenant);
+
+static void timerExpirationCallback(struct k_timer* timer) {
+    auto* tenant = static_cast<CTimedTenant*>(k_timer_user_data_get(timer));
+    if (tenant != nullptr) {
+        tenant->Run();
+    } else {
+        LOG_ERR("Timed tenant callback with null tenant");
+    }
+}
+
+CTimedTenant::CTimedTenant(const char* name, const uint32_t intervalMillis)
+    : CTenant(name), timer(intervalMillis, timerExpirationCallback, nullptr) {
+    timer.SetUserData(this);
+}