From 526b2358aa1950e35bc9b2ae8527ee2e06da1d86 Mon Sep 17 00:00:00 2001
From: Aaron Chan <aarchan108@gmail.com>
Date: Tue, 17 Jun 2025 20:00:32 -0700
Subject: [PATCH 01/33] Add cpu monitor tenant files

---
 include/f_core/os/tenants/c_cpu_monitor_tenant.h | 8 ++++++++
 lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp   | 1 +
 2 files changed, 9 insertions(+)
 create mode 100644 include/f_core/os/tenants/c_cpu_monitor_tenant.h
 create mode 100644 lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp

diff --git a/include/f_core/os/tenants/c_cpu_monitor_tenant.h b/include/f_core/os/tenants/c_cpu_monitor_tenant.h
new file mode 100644
index 000000000..dd4b783d8
--- /dev/null
+++ b/include/f_core/os/tenants/c_cpu_monitor_tenant.h
@@ -0,0 +1,8 @@
+//
+// Created by aaron on 6/17/25.
+//
+
+#ifndef C_CPU_MONITOR_H
+#define C_CPU_MONITOR_H
+
+#endif //C_CPU_MONITOR_H
diff --git a/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp b/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp
new file mode 100644
index 000000000..ccaaaee17
--- /dev/null
+++ b/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp
@@ -0,0 +1 @@
+#include "f_core/os/tenants/c_cpu_monitor_tenant.h"

From 8a0bd0b79945593a9dc5f1832bba083091eeef1b Mon Sep 17 00:00:00 2001
From: Aaron Chan <aarchan108@gmail.com>
Date: Tue, 17 Jun 2025 20:00:47 -0700
Subject: [PATCH 02/33] Update cmake

---
 lib/f_core/os/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/f_core/os/CMakeLists.txt b/lib/f_core/os/CMakeLists.txt
index 7ef6af7b3..4efe81815 100644
--- a/lib/f_core/os/CMakeLists.txt
+++ b/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})
 

From 107a928a5d5a63e8afa486f155eccbd055a486fa Mon Sep 17 00:00:00 2001
From: Aaron Chan <aarchan108@gmail.com>
Date: Tue, 17 Jun 2025 20:04:31 -0700
Subject: [PATCH 03/33] CPU monitor tenant header

---
 app/backplane/sensor_module/.idea/editor.xml  |  5 +++
 .../sensor_module/include/c_sensor_module.h   |  1 +
 .../f_core/os/tenants/c_cpu_monitor_tenant.h  | 31 +++++++++++++++----
 3 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/app/backplane/sensor_module/.idea/editor.xml b/app/backplane/sensor_module/.idea/editor.xml
index e42167fe8..b4aaf98ac 100644
--- a/app/backplane/sensor_module/.idea/editor.xml
+++ b/app/backplane/sensor_module/.idea/editor.xml
@@ -256,5 +256,10 @@
     <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/PLACE_WHILE_ON_NEW_LINE/@EntryValue" value="false" type="bool" />
     <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/REQUIRES_EXPRESSION_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
     <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/TYPE_DECLARATION_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
+    <option name="/Default/CodeStyle/Generate/=CppConstructor/@KeyIndexDefined" value="true" type="bool" />
+    <option name="/Default/CodeStyle/Generate/=CppConstructor/Options/=AcceptParameterKind/@EntryIndexedValue" value="Const reference" type="string" />
+    <option name="/Default/CodeStyle/Generate/=CppConstructor/Options/=AccessRight/@EntryIndexedValue" value="public" type="string" />
+    <option name="/Default/CodeStyle/Generate/=CppConstructor/Options/=DeclareConstructorsNodiscard/@EntryIndexedValue" value="False" type="string" />
+    <option name="/Default/CodeStyle/Generate/=CppConstructor/Options/=UseConstParameterTypes/@EntryIndexedValue" value="False" type="string" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/backplane/sensor_module/include/c_sensor_module.h b/app/backplane/sensor_module/include/c_sensor_module.h
index 8c8db5e18..5a3f8cc9e 100644
--- a/app/backplane/sensor_module/include/c_sensor_module.h
+++ b/app/backplane/sensor_module/include/c_sensor_module.h
@@ -12,6 +12,7 @@
 #include <f_core/os/c_task.h>
 #include <f_core/os/flight_log.hpp>
 #include <f_core/os/tenants/c_datalogger_tenant.h>
+#include <f_core/os/tenants/c_cpu_monitor_tenant.h>
 #include <n_autocoder_network_defs.h>
 #include <n_autocoder_types.h>
 #include <f_core/device/c_rtc.h>
diff --git a/include/f_core/os/tenants/c_cpu_monitor_tenant.h b/include/f_core/os/tenants/c_cpu_monitor_tenant.h
index dd4b783d8..82a2bab55 100644
--- a/include/f_core/os/tenants/c_cpu_monitor_tenant.h
+++ b/include/f_core/os/tenants/c_cpu_monitor_tenant.h
@@ -1,8 +1,27 @@
-//
-// Created by aaron on 6/17/25.
-//
+#ifndef C_CPU_MONITOR_TENANT_H
+#define C_CPU_MONITOR_TENANT_H
 
-#ifndef C_CPU_MONITOR_H
-#define C_CPU_MONITOR_H
+class CCpuMonitorTenant : public CTenant {
+public:
+    static CCpuMonitorTenant &GetInstance() {
+        return instance;
+    }
+    
+    CCpuMonitorTenant (const CCpuMonitorTenant&) = delete;
 
-#endif //C_CPU_MONITOR_H
+    void Startup() override;
+
+    void PostStartup() override;
+
+    void Run() override;
+
+    void Cleanup() override;
+    
+private:
+    static CCpuMonitorTenant instance;
+    
+    explicit CCpuMonitorTenant() : CTenant("CPU Monitor Tenant") {};
+    
+};
+
+#endif //C_CPU_MONITOR_TENANT_H

From 685c6f0ad1cb243c9d5483ee3f9bc837317dfd50 Mon Sep 17 00:00:00 2001
From: Aaron Chan <aarchan108@gmail.com>
Date: Tue, 17 Jun 2025 20:08:48 -0700
Subject: [PATCH 04/33] Fix singleton

---
 app/backplane/sensor_module/.idea/editor.xml          |  5 -----
 app/backplane/sensor_module/include/c_sensor_module.h |  2 ++
 include/f_core/os/tenants/c_cpu_monitor_tenant.h      |  7 ++++---
 lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp        | 10 ++++++++++
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/app/backplane/sensor_module/.idea/editor.xml b/app/backplane/sensor_module/.idea/editor.xml
index b4aaf98ac..e42167fe8 100644
--- a/app/backplane/sensor_module/.idea/editor.xml
+++ b/app/backplane/sensor_module/.idea/editor.xml
@@ -256,10 +256,5 @@
     <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/PLACE_WHILE_ON_NEW_LINE/@EntryValue" value="false" type="bool" />
     <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/REQUIRES_EXPRESSION_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
     <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/TYPE_DECLARATION_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
-    <option name="/Default/CodeStyle/Generate/=CppConstructor/@KeyIndexDefined" value="true" type="bool" />
-    <option name="/Default/CodeStyle/Generate/=CppConstructor/Options/=AcceptParameterKind/@EntryIndexedValue" value="Const reference" type="string" />
-    <option name="/Default/CodeStyle/Generate/=CppConstructor/Options/=AccessRight/@EntryIndexedValue" value="public" type="string" />
-    <option name="/Default/CodeStyle/Generate/=CppConstructor/Options/=DeclareConstructorsNodiscard/@EntryIndexedValue" value="False" type="string" />
-    <option name="/Default/CodeStyle/Generate/=CppConstructor/Options/=UseConstParameterTypes/@EntryIndexedValue" value="False" type="string" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/backplane/sensor_module/include/c_sensor_module.h b/app/backplane/sensor_module/include/c_sensor_module.h
index 5a3f8cc9e..d7346bf3a 100644
--- a/app/backplane/sensor_module/include/c_sensor_module.h
+++ b/app/backplane/sensor_module/include/c_sensor_module.h
@@ -73,6 +73,8 @@ class CSensorModule : public CProjectConfiguration {
     CUdpBroadcastTenant<NTypes::LoRaBroadcastSensorData> downlinkTelemTenant{"Telemetry Downlink Tenant", ipAddrStr.c_str(), telemetryDownlinkPort, telemetryDownlinkPort, downlinkMessagePort};
     CUdpBroadcastTenant<NAlerts::AlertPacket> udpAlertTenant{"UDP Alert Tenant", ipAddrStr.c_str(), alertPort, alertPort, alertMessagePort};
     CDataLoggerTenant<NTypes::TimestampedSensorData> dataLoggerTenant{"Data Logger Tenant", "/lfs/sensor_module_data.bin", LogMode::Growing, 0, sensorDataLogMessagePort, K_SECONDS(3), 64};
+    CCpuMonitorTenant& cpuMonitorTenant = CCpuMonitorTenant::GetInstance();
+
 
     // Tasks
     CTask networkTask{"Networking Task", 15, 3072, 0};
diff --git a/include/f_core/os/tenants/c_cpu_monitor_tenant.h b/include/f_core/os/tenants/c_cpu_monitor_tenant.h
index 82a2bab55..2a374e633 100644
--- a/include/f_core/os/tenants/c_cpu_monitor_tenant.h
+++ b/include/f_core/os/tenants/c_cpu_monitor_tenant.h
@@ -1,6 +1,9 @@
 #ifndef C_CPU_MONITOR_TENANT_H
 #define C_CPU_MONITOR_TENANT_H
 
+#include "f_core/os/c_tenant.h"
+
+
 class CCpuMonitorTenant : public CTenant {
 public:
     static CCpuMonitorTenant &GetInstance() {
@@ -18,10 +21,8 @@ class CCpuMonitorTenant : public CTenant {
     void Cleanup() override;
     
 private:
+    CCpuMonitorTenant();
     static CCpuMonitorTenant instance;
-    
-    explicit CCpuMonitorTenant() : CTenant("CPU Monitor Tenant") {};
-    
 };
 
 #endif //C_CPU_MONITOR_TENANT_H
diff --git a/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp b/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp
index ccaaaee17..ab035fafe 100644
--- a/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp
+++ b/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp
@@ -1 +1,11 @@
 #include "f_core/os/tenants/c_cpu_monitor_tenant.h"
+
+
+CCpuMonitorTenant CCpuMonitorTenant::instance;
+
+CCpuMonitorTenant::CCpuMonitorTenant() : ::CTenant("CPU Monitor Tenant") {}
+
+void CCpuMonitorTenant::Startup() {}
+void CCpuMonitorTenant::PostStartup() {}
+void CCpuMonitorTenant::Run() {}
+void CCpuMonitorTenant::Cleanup() {}

From 2d97b01470759f683bca8727eb1888fef6dce7f6 Mon Sep 17 00:00:00 2001
From: Aaron Chan <aarchan108@gmail.com>
Date: Tue, 17 Jun 2025 20:13:58 -0700
Subject: [PATCH 05/33] CPU monitor type

---
 data/autocoder_inputs/types.yaml                 | 11 +++++++++++
 include/f_core/os/tenants/c_cpu_monitor_tenant.h |  8 ++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/data/autocoder_inputs/types.yaml b/data/autocoder_inputs/types.yaml
index fc64cb29d..5ccd9aa59 100644
--- a/data/autocoder_inputs/types.yaml
+++ b/data/autocoder_inputs/types.yaml
@@ -221,3 +221,14 @@ LoRaReceiveStatistics:
       type: int16_t
     - name: SignalToNoiseRatio
       type: int8_t
+
+CPUMonitor:
+    description: CPU monitor data.
+    fields:
+      - name: Uptime
+        type: uint32_t
+      - name: Utilization
+        type: uint8_t
+      - name: DieTemperature
+        type: int16_t
+    timestamp: false
\ No newline at end of file
diff --git a/include/f_core/os/tenants/c_cpu_monitor_tenant.h b/include/f_core/os/tenants/c_cpu_monitor_tenant.h
index 2a374e633..6e75f3dd0 100644
--- a/include/f_core/os/tenants/c_cpu_monitor_tenant.h
+++ b/include/f_core/os/tenants/c_cpu_monitor_tenant.h
@@ -1,16 +1,13 @@
 #ifndef C_CPU_MONITOR_TENANT_H
 #define C_CPU_MONITOR_TENANT_H
 
+#include "f_core/messaging/c_message_port.h"
 #include "f_core/os/c_tenant.h"
 
 
 class CCpuMonitorTenant : public CTenant {
 public:
-    static CCpuMonitorTenant &GetInstance() {
-        return instance;
-    }
-    
-    CCpuMonitorTenant (const CCpuMonitorTenant&) = delete;
+    CCpuMonitorTenant(const CMessagePort<>);
 
     void Startup() override;
 
@@ -21,7 +18,6 @@ class CCpuMonitorTenant : public CTenant {
     void Cleanup() override;
     
 private:
-    CCpuMonitorTenant();
     static CCpuMonitorTenant instance;
 };
 

From 25f879b3a1906814489d797dbb43fefc24d555bb Mon Sep 17 00:00:00 2001
From: Aaron Chan <aarchan108@gmail.com>
Date: Tue, 17 Jun 2025 20:18:34 -0700
Subject: [PATCH 06/33] Add the monitor message port to csensor module

---
 app/backplane/sensor_module/include/c_sensor_module.h | 3 ++-
 app/backplane/sensor_module/src/c_sensor_module.cpp   | 6 +++++-
 include/f_core/os/tenants/c_cpu_monitor_tenant.h      | 4 +++-
 lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp        | 4 ----
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/backplane/sensor_module/include/c_sensor_module.h b/app/backplane/sensor_module/include/c_sensor_module.h
index d7346bf3a..afd9224ae 100644
--- a/app/backplane/sensor_module/include/c_sensor_module.h
+++ b/app/backplane/sensor_module/include/c_sensor_module.h
@@ -60,6 +60,7 @@ class CSensorModule : public CProjectConfiguration {
     CMessagePort<NTypes::SensorData>& sensorDataBroadcastMessagePort;
     CMessagePort<NTypes::LoRaBroadcastSensorData>& downlinkMessagePort;
     CMessagePort<NTypes::TimestampedSensorData>& sensorDataLogMessagePort;
+    CMessagePort<NTypes::CPUMOnitor>& cpuMonitorMessagePort;
     CMessagePort<NAlerts::AlertPacket>& alertMessagePort;
 
     CFlightLog flight_log;
@@ -73,7 +74,7 @@ class CSensorModule : public CProjectConfiguration {
     CUdpBroadcastTenant<NTypes::LoRaBroadcastSensorData> downlinkTelemTenant{"Telemetry Downlink Tenant", ipAddrStr.c_str(), telemetryDownlinkPort, telemetryDownlinkPort, downlinkMessagePort};
     CUdpBroadcastTenant<NAlerts::AlertPacket> udpAlertTenant{"UDP Alert Tenant", ipAddrStr.c_str(), alertPort, alertPort, alertMessagePort};
     CDataLoggerTenant<NTypes::TimestampedSensorData> dataLoggerTenant{"Data Logger Tenant", "/lfs/sensor_module_data.bin", LogMode::Growing, 0, sensorDataLogMessagePort, K_SECONDS(3), 64};
-    CCpuMonitorTenant& cpuMonitorTenant = CCpuMonitorTenant::GetInstance();
+    CCpuMonitorTenant& cpuMonitorTenant
 
 
     // Tasks
diff --git a/app/backplane/sensor_module/src/c_sensor_module.cpp b/app/backplane/sensor_module/src/c_sensor_module.cpp
index 40cb8a7c2..022d96230 100644
--- a/app/backplane/sensor_module/src/c_sensor_module.cpp
+++ b/app/backplane/sensor_module/src/c_sensor_module.cpp
@@ -19,9 +19,13 @@ static auto dataLogMsgQueue = CMsgqMessagePort<NTypes::TimestampedSensorData>(da
 K_MSGQ_DEFINE(alertQueue, sizeof(NAlerts::AlertPacket), 4, 4);
 static auto alertMsgQueue = CMsgqMessagePort<NAlerts::AlertPacket>(alertQueue);
 
+K_MSGQ_DEFINE(cpuMonitorQueue, sizeof(NTypes::CPUMonitor), 4, 4);
+static auto cpuMonitorMsgQueue = CMsgqMessagePort<NTypes::CPUMonitor>(cpuMonitorQueue);
+
 CSensorModule::CSensorModule()
     : CProjectConfiguration(), sensorDataBroadcastMessagePort(broadcastMsgQueue), downlinkMessagePort(downlinkMsgQueue),
-      sensorDataLogMessagePort(dataLogMsgQueue), alertMessagePort(alertMsgQueue), flight_log{"/lfs/flight_log.txt"} {}
+      sensorDataLogMessagePort(dataLogMsgQueue), alertMessagePort(alertMsgQueue),
+      cpuMonitorMessagePort(cpuMonitorMsgQueue), flight_log{"/lfs/flight_log.txt"} {}
 
 void CSensorModule::AddTenantsToTasks() {
     // Networking
diff --git a/include/f_core/os/tenants/c_cpu_monitor_tenant.h b/include/f_core/os/tenants/c_cpu_monitor_tenant.h
index 6e75f3dd0..f328b97c5 100644
--- a/include/f_core/os/tenants/c_cpu_monitor_tenant.h
+++ b/include/f_core/os/tenants/c_cpu_monitor_tenant.h
@@ -7,7 +7,8 @@
 
 class CCpuMonitorTenant : public CTenant {
 public:
-    CCpuMonitorTenant(const CMessagePort<>);
+    CCpuMonitorTenant(const CMessagePort<NTypes::CPUMonitor> &outputPort) :
+        CTenant("CPU Monitor Tenant"), outputPort(outputPort) {};
 
     void Startup() override;
 
@@ -19,6 +20,7 @@ class CCpuMonitorTenant : public CTenant {
     
 private:
     static CCpuMonitorTenant instance;
+    CMessagePort<NTypes::CPUMonitor> &outputPort;
 };
 
 #endif //C_CPU_MONITOR_TENANT_H
diff --git a/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp b/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp
index ab035fafe..64c34ef6c 100644
--- a/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp
+++ b/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp
@@ -1,10 +1,6 @@
 #include "f_core/os/tenants/c_cpu_monitor_tenant.h"
 
 
-CCpuMonitorTenant CCpuMonitorTenant::instance;
-
-CCpuMonitorTenant::CCpuMonitorTenant() : ::CTenant("CPU Monitor Tenant") {}
-
 void CCpuMonitorTenant::Startup() {}
 void CCpuMonitorTenant::PostStartup() {}
 void CCpuMonitorTenant::Run() {}

From 2ed3fc84e5c9e175afc9246cd4f02d17ace343bc Mon Sep 17 00:00:00 2001
From: Aaron Chan <aarchan108@gmail.com>
Date: Tue, 17 Jun 2025 20:19:08 -0700
Subject: [PATCH 07/33] Init the tenant in sensor mod

---
 app/backplane/sensor_module/include/c_sensor_module.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/backplane/sensor_module/include/c_sensor_module.h b/app/backplane/sensor_module/include/c_sensor_module.h
index afd9224ae..3fa16df09 100644
--- a/app/backplane/sensor_module/include/c_sensor_module.h
+++ b/app/backplane/sensor_module/include/c_sensor_module.h
@@ -74,7 +74,7 @@ class CSensorModule : public CProjectConfiguration {
     CUdpBroadcastTenant<NTypes::LoRaBroadcastSensorData> downlinkTelemTenant{"Telemetry Downlink Tenant", ipAddrStr.c_str(), telemetryDownlinkPort, telemetryDownlinkPort, downlinkMessagePort};
     CUdpBroadcastTenant<NAlerts::AlertPacket> udpAlertTenant{"UDP Alert Tenant", ipAddrStr.c_str(), alertPort, alertPort, alertMessagePort};
     CDataLoggerTenant<NTypes::TimestampedSensorData> dataLoggerTenant{"Data Logger Tenant", "/lfs/sensor_module_data.bin", LogMode::Growing, 0, sensorDataLogMessagePort, K_SECONDS(3), 64};
-    CCpuMonitorTenant& cpuMonitorTenant
+    CCpuMonitorTenant& cpuMonitorTenant{cpuMonitorMessagePort};
 
 
     // Tasks

From 29b76b0c15334357a5cccc5fbbdf6f8b96d7265c Mon Sep 17 00:00:00 2001
From: Aaron Chan <aarchan108@gmail.com>
Date: Tue, 17 Jun 2025 20:34:16 -0700
Subject: [PATCH 08/33] Fix compiler errors and warnings

---
 app/backplane/sensor_module/include/c_sensor_module.h | 4 ++--
 app/backplane/sensor_module/src/c_sensor_module.cpp   | 5 +++--
 include/f_core/os/tenants/c_cpu_monitor_tenant.h      | 4 +++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/backplane/sensor_module/include/c_sensor_module.h b/app/backplane/sensor_module/include/c_sensor_module.h
index 3fa16df09..3e05e97b9 100644
--- a/app/backplane/sensor_module/include/c_sensor_module.h
+++ b/app/backplane/sensor_module/include/c_sensor_module.h
@@ -60,7 +60,7 @@ class CSensorModule : public CProjectConfiguration {
     CMessagePort<NTypes::SensorData>& sensorDataBroadcastMessagePort;
     CMessagePort<NTypes::LoRaBroadcastSensorData>& downlinkMessagePort;
     CMessagePort<NTypes::TimestampedSensorData>& sensorDataLogMessagePort;
-    CMessagePort<NTypes::CPUMOnitor>& cpuMonitorMessagePort;
+    CMessagePort<NTypes::CPUMonitor>& cpuMonitorMessagePort;
     CMessagePort<NAlerts::AlertPacket>& alertMessagePort;
 
     CFlightLog flight_log;
@@ -74,7 +74,7 @@ class CSensorModule : public CProjectConfiguration {
     CUdpBroadcastTenant<NTypes::LoRaBroadcastSensorData> downlinkTelemTenant{"Telemetry Downlink Tenant", ipAddrStr.c_str(), telemetryDownlinkPort, telemetryDownlinkPort, downlinkMessagePort};
     CUdpBroadcastTenant<NAlerts::AlertPacket> udpAlertTenant{"UDP Alert Tenant", ipAddrStr.c_str(), alertPort, alertPort, alertMessagePort};
     CDataLoggerTenant<NTypes::TimestampedSensorData> dataLoggerTenant{"Data Logger Tenant", "/lfs/sensor_module_data.bin", LogMode::Growing, 0, sensorDataLogMessagePort, K_SECONDS(3), 64};
-    CCpuMonitorTenant& cpuMonitorTenant{cpuMonitorMessagePort};
+    CCpuMonitorTenant cpuMonitorTenant{cpuMonitorMessagePort};
 
 
     // Tasks
diff --git a/app/backplane/sensor_module/src/c_sensor_module.cpp b/app/backplane/sensor_module/src/c_sensor_module.cpp
index 022d96230..730112e77 100644
--- a/app/backplane/sensor_module/src/c_sensor_module.cpp
+++ b/app/backplane/sensor_module/src/c_sensor_module.cpp
@@ -24,8 +24,9 @@ static auto cpuMonitorMsgQueue = CMsgqMessagePort<NTypes::CPUMonitor>(cpuMonitor
 
 CSensorModule::CSensorModule()
     : CProjectConfiguration(), sensorDataBroadcastMessagePort(broadcastMsgQueue), downlinkMessagePort(downlinkMsgQueue),
-      sensorDataLogMessagePort(dataLogMsgQueue), alertMessagePort(alertMsgQueue),
-      cpuMonitorMessagePort(cpuMonitorMsgQueue), flight_log{"/lfs/flight_log.txt"} {}
+      sensorDataLogMessagePort(dataLogMsgQueue), cpuMonitorMessagePort(cpuMonitorMsgQueue),
+      alertMessagePort(alertMsgQueue),
+      flight_log{"/lfs/flight_log.txt"} {}
 
 void CSensorModule::AddTenantsToTasks() {
     // Networking
diff --git a/include/f_core/os/tenants/c_cpu_monitor_tenant.h b/include/f_core/os/tenants/c_cpu_monitor_tenant.h
index f328b97c5..2f640df5f 100644
--- a/include/f_core/os/tenants/c_cpu_monitor_tenant.h
+++ b/include/f_core/os/tenants/c_cpu_monitor_tenant.h
@@ -4,10 +4,12 @@
 #include "f_core/messaging/c_message_port.h"
 #include "f_core/os/c_tenant.h"
 
+#include <FSW/n_autocoder_types.h>
+
 
 class CCpuMonitorTenant : public CTenant {
 public:
-    CCpuMonitorTenant(const CMessagePort<NTypes::CPUMonitor> &outputPort) :
+    CCpuMonitorTenant(CMessagePort<NTypes::CPUMonitor> &outputPort) :
         CTenant("CPU Monitor Tenant"), outputPort(outputPort) {};
 
     void Startup() override;

From d35b5d6c154daf174601a16ba94514e9bc803413 Mon Sep 17 00:00:00 2001
From: Aaron Chan <aarchan108@gmail.com>
Date: Tue, 17 Jun 2025 20:39:16 -0700
Subject: [PATCH 09/33] Add die temp to backplane module dts

---
 boards/arm/deployment_module/deployment_module.dts | 4 ++++
 boards/arm/power_module/power_module.dts           | 4 ++++
 boards/arm/radio_module/radio_module.dts           | 4 ++++
 boards/arm/sensor_module/sensor_module.dts         | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/boards/arm/deployment_module/deployment_module.dts b/boards/arm/deployment_module/deployment_module.dts
index a7af0b42c..01ba70881 100644
--- a/boards/arm/deployment_module/deployment_module.dts
+++ b/boards/arm/deployment_module/deployment_module.dts
@@ -251,6 +251,10 @@
 	status = "okay";
 };
 
+&die_temp {
+    status = "okay";
+};
+
 &flash0 {
 	partitions {
 		compatible = "fixed-partitions";
diff --git a/boards/arm/power_module/power_module.dts b/boards/arm/power_module/power_module.dts
index eb099e447..9dabcc412 100644
--- a/boards/arm/power_module/power_module.dts
+++ b/boards/arm/power_module/power_module.dts
@@ -214,6 +214,10 @@
     status = "okay";
 };
 
+&die_temp {
+    status = "okay";
+};
+
 &flash0 {
 
     partitions {
diff --git a/boards/arm/radio_module/radio_module.dts b/boards/arm/radio_module/radio_module.dts
index 5611ef3f6..2febe2946 100644
--- a/boards/arm/radio_module/radio_module.dts
+++ b/boards/arm/radio_module/radio_module.dts
@@ -241,6 +241,10 @@
     status = "okay";
 };
 
+&die_temp {
+    status = "okay";
+};
+
 &flash0 {
     partitions {
         compatible = "fixed-partitions";
diff --git a/boards/arm/sensor_module/sensor_module.dts b/boards/arm/sensor_module/sensor_module.dts
index 4ec1ca545..a9a04c3d3 100644
--- a/boards/arm/sensor_module/sensor_module.dts
+++ b/boards/arm/sensor_module/sensor_module.dts
@@ -248,6 +248,10 @@
 	status = "okay";
 };
 
+&die_temp {
+    status = "okay";
+};
+
 &flash0 {
 	partitions {
 		compatible = "fixed-partitions";

From 9a1fa0106c0987fb6c8650855306638a17312f49 Mon Sep 17 00:00:00 2001
From: Aaron Chan <aarchan108@gmail.com>
Date: Tue, 17 Jun 2025 20:41:50 -0700
Subject: [PATCH 10/33] Add die temp alias

---
 boards/arm/deployment_module/deployment_module.dts | 3 +++
 boards/arm/power_module/power_module.dts           | 3 +++
 boards/arm/radio_module/radio_module.dts           | 3 +++
 boards/arm/sensor_module/sensor_module.dts         | 1 +
 include/f_core/os/tenants/c_cpu_monitor_tenant.h   | 2 ++
 5 files changed, 12 insertions(+)

diff --git a/boards/arm/deployment_module/deployment_module.dts b/boards/arm/deployment_module/deployment_module.dts
index 01ba70881..e4fbf4481 100644
--- a/boards/arm/deployment_module/deployment_module.dts
+++ b/boards/arm/deployment_module/deployment_module.dts
@@ -59,6 +59,9 @@
 		pyro-ctrl-1 = &pyro_ctrl_1;
 		pyro-ctrl-2 = &pyro_ctrl_2;
 		pyro-ctrl-3 = &pyro_ctrl_3;
+
+		rtc = &rtc;
+		die-temp = &die_temp;
 	};
 
 	leds: leds {
diff --git a/boards/arm/power_module/power_module.dts b/boards/arm/power_module/power_module.dts
index 9dabcc412..6d9812e19 100644
--- a/boards/arm/power_module/power_module.dts
+++ b/boards/arm/power_module/power_module.dts
@@ -25,8 +25,11 @@
         inabatt = &ina0;
         ina3v3 = &ina1;
         ina5v0 = &ina2;
+
         vin = &adc1;
+
         rtc = &rtc;
+		die-temp = &die_temp;
     };
 
     leds: leds {
diff --git a/boards/arm/radio_module/radio_module.dts b/boards/arm/radio_module/radio_module.dts
index 2febe2946..14e1079a5 100644
--- a/boards/arm/radio_module/radio_module.dts
+++ b/boards/arm/radio_module/radio_module.dts
@@ -94,6 +94,9 @@
 
         lora = &lora0;
         gnss = &maxm10s;
+
+		rtc = &rtc;
+		die-temp = &die_temp;
     };
 };
 
diff --git a/boards/arm/sensor_module/sensor_module.dts b/boards/arm/sensor_module/sensor_module.dts
index a9a04c3d3..7ac8745bb 100644
--- a/boards/arm/sensor_module/sensor_module.dts
+++ b/boards/arm/sensor_module/sensor_module.dts
@@ -19,6 +19,7 @@
 		logfs = &lfs1;
 
 		rtc = &rtc;
+		die-temp = &die_temp;
 	};
 
 	aliases {
diff --git a/include/f_core/os/tenants/c_cpu_monitor_tenant.h b/include/f_core/os/tenants/c_cpu_monitor_tenant.h
index 2f640df5f..3eeba9cef 100644
--- a/include/f_core/os/tenants/c_cpu_monitor_tenant.h
+++ b/include/f_core/os/tenants/c_cpu_monitor_tenant.h
@@ -23,6 +23,8 @@ class CCpuMonitorTenant : public CTenant {
 private:
     static CCpuMonitorTenant instance;
     CMessagePort<NTypes::CPUMonitor> &outputPort;
+
+#if DT_NODE_EXISTS()
 };
 
 #endif //C_CPU_MONITOR_TENANT_H

From 8640f6458459e454a4e86964ce3937e9babdc46c Mon Sep 17 00:00:00 2001
From: Aaron Chan <aarchan108@gmail.com>
Date: Tue, 17 Jun 2025 20:49:13 -0700
Subject: [PATCH 11/33] Set uptime and die temp and fix aliases/chosen

---
 .../sensor_module/.idea/csv-editor.xml        | 16 +++++++++++
 .../deployment_module/deployment_module.dts   |  1 -
 boards/arm/power_module/power_module.dts      |  2 +-
 boards/arm/radio_module/radio_module.dts      |  2 +-
 boards/arm/sensor_module/sensor_module.dts    |  1 +
 data/autocoder_inputs/types.yaml              |  2 +-
 .../f_core/os/tenants/c_cpu_monitor_tenant.h  |  4 ++-
 .../os/tenants/c_cpu_monitor_tenant.cpp       | 27 ++++++++++++++++++-
 8 files changed, 49 insertions(+), 6 deletions(-)
 create mode 100644 app/backplane/sensor_module/.idea/csv-editor.xml

diff --git a/app/backplane/sensor_module/.idea/csv-editor.xml b/app/backplane/sensor_module/.idea/csv-editor.xml
new file mode 100644
index 000000000..f24169574
--- /dev/null
+++ b/app/backplane/sensor_module/.idea/csv-editor.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CsvFileAttributes">
+    <option name="attributeMap">
+      <map>
+        <entry key="$PROJECT_DIR$/../../samples/openrocket_sensors/data/flight.csv">
+          <value>
+            <Attribute>
+              <option name="separator" value="," />
+            </Attribute>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/boards/arm/deployment_module/deployment_module.dts b/boards/arm/deployment_module/deployment_module.dts
index e4fbf4481..06db0a6ab 100644
--- a/boards/arm/deployment_module/deployment_module.dts
+++ b/boards/arm/deployment_module/deployment_module.dts
@@ -60,7 +60,6 @@
 		pyro-ctrl-2 = &pyro_ctrl_2;
 		pyro-ctrl-3 = &pyro_ctrl_3;
 
-		rtc = &rtc;
 		die-temp = &die_temp;
 	};
 
diff --git a/boards/arm/power_module/power_module.dts b/boards/arm/power_module/power_module.dts
index 6d9812e19..f4546a5f6 100644
--- a/boards/arm/power_module/power_module.dts
+++ b/boards/arm/power_module/power_module.dts
@@ -19,6 +19,7 @@
 
         storage = &w25q128;
         logfs = &lfs1;
+        rtc = &rtc;
     };
 
     aliases {
@@ -28,7 +29,6 @@
 
         vin = &adc1;
 
-        rtc = &rtc;
 		die-temp = &die_temp;
     };
 
diff --git a/boards/arm/radio_module/radio_module.dts b/boards/arm/radio_module/radio_module.dts
index 14e1079a5..143b4b337 100644
--- a/boards/arm/radio_module/radio_module.dts
+++ b/boards/arm/radio_module/radio_module.dts
@@ -23,6 +23,7 @@
 
         storage = &w25q128;
         logfs = &lfs1;
+        rtc = &rtc;
     };
 
     fstab {
@@ -96,7 +97,6 @@
         gnss = &maxm10s;
 
 		rtc = &rtc;
-		die-temp = &die_temp;
     };
 };
 
diff --git a/boards/arm/sensor_module/sensor_module.dts b/boards/arm/sensor_module/sensor_module.dts
index 7ac8745bb..199d57391 100644
--- a/boards/arm/sensor_module/sensor_module.dts
+++ b/boards/arm/sensor_module/sensor_module.dts
@@ -25,6 +25,7 @@
 	aliases {
 		led0 = &red_led_1;
 		led1 = &red_led_2;
+		die-temp = &die_temp;
 	};
 
 	leds: leds {
diff --git a/data/autocoder_inputs/types.yaml b/data/autocoder_inputs/types.yaml
index 5ccd9aa59..4f811df53 100644
--- a/data/autocoder_inputs/types.yaml
+++ b/data/autocoder_inputs/types.yaml
@@ -230,5 +230,5 @@ CPUMonitor:
       - name: Utilization
         type: uint8_t
       - name: DieTemperature
-        type: int16_t
+        type: int32_t
     timestamp: false
\ No newline at end of file
diff --git a/include/f_core/os/tenants/c_cpu_monitor_tenant.h b/include/f_core/os/tenants/c_cpu_monitor_tenant.h
index 3eeba9cef..891d20634 100644
--- a/include/f_core/os/tenants/c_cpu_monitor_tenant.h
+++ b/include/f_core/os/tenants/c_cpu_monitor_tenant.h
@@ -24,7 +24,9 @@ class CCpuMonitorTenant : public CTenant {
     static CCpuMonitorTenant instance;
     CMessagePort<NTypes::CPUMonitor> &outputPort;
 
-#if DT_NODE_EXISTS()
+#if DT_NODE_EXISTS(DT_ALIAS(die_temp))
+    const device *dieTempSensor = DEVICE_DT_GET(DT_ALIAS(die_temp));
+#endif
 };
 
 #endif //C_CPU_MONITOR_TENANT_H
diff --git a/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp b/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp
index 64c34ef6c..dd105b56d 100644
--- a/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp
+++ b/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp
@@ -1,7 +1,32 @@
 #include "f_core/os/tenants/c_cpu_monitor_tenant.h"
 
+#include "zephyr/drivers/sensor.h"
+
 
 void CCpuMonitorTenant::Startup() {}
 void CCpuMonitorTenant::PostStartup() {}
-void CCpuMonitorTenant::Run() {}
+void CCpuMonitorTenant::Run() {
+    NTypes::CPUMonitor cpuMonitorData{0};
+
+    cpuMonitorData.Uptime = k_uptime_get_32();
+
+#if DT_NODE_EXISTS(DT_ALIAS(die_temp))
+    if (device_is_ready(dieTempSensor)) {
+        sensor_value dieTempValue{0};
+        if (sensor_sample_fetch(dieTempSensor) == 0 &&
+            sensor_channel_get(dieTempSensor, SENSOR_CHAN_DIE_TEMP, &dieTempValue) == 0) {
+            cpuMonitorData.DieTemperature = dieTempValue.val1;
+        } else {
+            cpuMonitorData.DieTemperature = 0; // Default value if sensor fetch fails
+        }
+    } else {
+        cpuMonitorData.DieTemperature = 0; // Default value if sensor is not ready
+    }
+#endif
+
+
+    if (outputPort.Send(cpuMonitorData, K_NO_WAIT) != 0) {
+        outputPort.Clear();
+    }
+}
 void CCpuMonitorTenant::Cleanup() {}

From 4048bc35ab7ae29ec733066cb086e85e31e7068d Mon Sep 17 00:00:00 2001
From: Aaron Chan <aarchan108@gmail.com>
Date: Tue, 17 Jun 2025 21:06:28 -0700
Subject: [PATCH 12/33] Need to add ADC for die temp to work on F446

---
 app/backplane/sensor_module/src/c_sensor_module.cpp | 3 +--
 boards/arm/sensor_module/sensor_module.dts          | 7 +++++++
 boards/arm/sensor_module/sensor_module_defconfig    | 4 +++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/backplane/sensor_module/src/c_sensor_module.cpp b/app/backplane/sensor_module/src/c_sensor_module.cpp
index 730112e77..09201f709 100644
--- a/app/backplane/sensor_module/src/c_sensor_module.cpp
+++ b/app/backplane/sensor_module/src/c_sensor_module.cpp
@@ -25,8 +25,7 @@ static auto cpuMonitorMsgQueue = CMsgqMessagePort<NTypes::CPUMonitor>(cpuMonitor
 CSensorModule::CSensorModule()
     : CProjectConfiguration(), sensorDataBroadcastMessagePort(broadcastMsgQueue), downlinkMessagePort(downlinkMsgQueue),
       sensorDataLogMessagePort(dataLogMsgQueue), cpuMonitorMessagePort(cpuMonitorMsgQueue),
-      alertMessagePort(alertMsgQueue),
-      flight_log{"/lfs/flight_log.txt"} {}
+      alertMessagePort(alertMsgQueue), flight_log{"/lfs/flight_log.txt"} {}
 
 void CSensorModule::AddTenantsToTasks() {
     // Networking
diff --git a/boards/arm/sensor_module/sensor_module.dts b/boards/arm/sensor_module/sensor_module.dts
index 199d57391..c6229e58f 100644
--- a/boards/arm/sensor_module/sensor_module.dts
+++ b/boards/arm/sensor_module/sensor_module.dts
@@ -250,6 +250,13 @@
 	status = "okay";
 };
 
+&adc1 {
+	pinctrl-0 = <&adc1_in0_pa0>;
+	pinctrl-names = "default";
+	st,adc-prescaler = <4>;
+	status = "okay";
+};
+
 &die_temp {
     status = "okay";
 };
diff --git a/boards/arm/sensor_module/sensor_module_defconfig b/boards/arm/sensor_module/sensor_module_defconfig
index c7b41cdce..92bc335fb 100644
--- a/boards/arm/sensor_module/sensor_module_defconfig
+++ b/boards/arm/sensor_module/sensor_module_defconfig
@@ -27,6 +27,7 @@ CONFIG_SPI_NOR_SLEEP_WHILE_WAITING_UNTIL_READY=y
 CONFIG_LED=y
 
 # Sensors
+CONFIG_ADC=y
 CONFIG_SENSOR=y
 CONFIG_SENSOR_ASYNC_API=y
 CONFIG_SENSOR_INFO=y
@@ -34,4 +35,5 @@ CONFIG_TMP116=y
 CONFIG_BMP388=y
 CONFIG_LSM6DSL=y
 CONFIG_ADXL375=y
-CONFIG_MS5611=y
\ No newline at end of file
+CONFIG_MS5611=y
+CONFIG_STM32_TEMP=y
\ No newline at end of file

From 14d8b1cf7ee3632b4d6e7564c96dc789907a6dae Mon Sep 17 00:00:00 2001
From: Aaron Chan <aarchan108@gmail.com>
Date: Tue, 17 Jun 2025 21:09:24 -0700
Subject: [PATCH 13/33] Update defconfigs for rest of modules

---
 boards/arm/deployment_module/deployment_module_defconfig | 7 ++++++-
 boards/arm/power_module/power_module_defconfig           | 5 ++++-
 boards/arm/radio_module/radio_module_defconfig           | 5 +++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/boards/arm/deployment_module/deployment_module_defconfig b/boards/arm/deployment_module/deployment_module_defconfig
index 2ff101b57..0abb9a431 100644
--- a/boards/arm/deployment_module/deployment_module_defconfig
+++ b/boards/arm/deployment_module/deployment_module_defconfig
@@ -9,6 +9,7 @@ CONFIG_ENTROPY_STM32_RNG=y
 CONFIG_ENTROPY_DEVICE_RANDOM_GENERATOR=y
 
 # IO
+CONFIG_ADC=y
 CONFIG_GPIO=y
 CONFIG_I2C=y
 CONFIG_PINCTRL=y
@@ -16,4 +17,8 @@ CONFIG_RTC=y
 CONFIG_SERIAL=y
 CONFIG_SPI=y
 CONFIG_SPI_ASYNC=y
-CONFIG_LED=y
\ No newline at end of file
+CONFIG_LED=y
+
+# Sensors
+CONFIG_SENSOR=y
+CONFIG_STM32_TEMP=y
\ No newline at end of file
diff --git a/boards/arm/power_module/power_module_defconfig b/boards/arm/power_module/power_module_defconfig
index c92e299d3..2ffca810f 100644
--- a/boards/arm/power_module/power_module_defconfig
+++ b/boards/arm/power_module/power_module_defconfig
@@ -9,6 +9,7 @@ CONFIG_ENTROPY_STM32_RNG=y
 CONFIG_ENTROPY_DEVICE_RANDOM_GENERATOR=y
 
 # IO
+CONFIG_ADC=y
 CONFIG_GPIO=y
 CONFIG_I2C=y
 #CONFIG_I2C_CALLBACK=y
@@ -24,6 +25,8 @@ CONFIG_LED=y
 
 # Sensors
 CONFIG_SENSOR=y
+CONFIG_SENSOR=y
 CONFIG_SENSOR_ASYNC_API=y
 CONFIG_SENSOR_INFO=y
-CONFIG_INA219=y
\ No newline at end of file
+CONFIG_INA219=y
+CONFIG_STM32_TEMP=y
diff --git a/boards/arm/radio_module/radio_module_defconfig b/boards/arm/radio_module/radio_module_defconfig
index 6f042b340..144324de2 100644
--- a/boards/arm/radio_module/radio_module_defconfig
+++ b/boards/arm/radio_module/radio_module_defconfig
@@ -8,6 +8,7 @@ CONFIG_FPU=y
 CONFIG_HW_STACK_PROTECTION=y
 
 # IO
+CONFIG_ADC=y
 CONFIG_GPIO=y
 CONFIG_I2C=y
 #CONFIG_I2C_CALLBACK=y
@@ -26,3 +27,7 @@ CONFIG_POSIX_MAX_FDS=10
 # Devices
 CONFIG_LORA=y
 CONFIG_LORA_SX127X=y
+
+# Sensors
+CONFIG_SENSOR=y
+CONFIG_STM32_TEMP=y

From 7b4cc667fa977f11eec6ad139d981c6ae1a6a24d Mon Sep 17 00:00:00 2001
From: Aaron Chan <aarchan108@gmail.com>
Date: Tue, 17 Jun 2025 21:10:16 -0700
Subject: [PATCH 14/33] Add die temp adc to the rest of the modules

---
 boards/arm/deployment_module/deployment_module.dts | 8 ++++++++
 boards/arm/power_module/power_module.dts           | 7 +++++++
 boards/arm/radio_module/radio_module.dts           | 7 +++++++
 3 files changed, 22 insertions(+)

diff --git a/boards/arm/deployment_module/deployment_module.dts b/boards/arm/deployment_module/deployment_module.dts
index 06db0a6ab..db84cada5 100644
--- a/boards/arm/deployment_module/deployment_module.dts
+++ b/boards/arm/deployment_module/deployment_module.dts
@@ -253,6 +253,14 @@
 	status = "okay";
 };
 
+&adc1 {
+	pinctrl-0 = <&adc1_in0_pa0>;
+	pinctrl-names = "default";
+	st,adc-prescaler = <4>;
+	status = "okay";
+};
+
+
 &die_temp {
     status = "okay";
 };
diff --git a/boards/arm/power_module/power_module.dts b/boards/arm/power_module/power_module.dts
index f4546a5f6..2955f84b0 100644
--- a/boards/arm/power_module/power_module.dts
+++ b/boards/arm/power_module/power_module.dts
@@ -217,6 +217,13 @@
     status = "okay";
 };
 
+&adc1 {
+	pinctrl-0 = <&adc1_in0_pa0>;
+	pinctrl-names = "default";
+	st,adc-prescaler = <4>;
+	status = "okay";
+};
+
 &die_temp {
     status = "okay";
 };
diff --git a/boards/arm/radio_module/radio_module.dts b/boards/arm/radio_module/radio_module.dts
index 143b4b337..4462faaca 100644
--- a/boards/arm/radio_module/radio_module.dts
+++ b/boards/arm/radio_module/radio_module.dts
@@ -244,6 +244,13 @@
     status = "okay";
 };
 
+&adc1 {
+	pinctrl-0 = <&adc1_in0_pa0>;
+	pinctrl-names = "default";
+	st,adc-prescaler = <4>;
+	status = "okay";
+};
+
 &die_temp {
     status = "okay";
 };

From 15b3455af84f52b7f17d8d785a835b6df5cede9a Mon Sep 17 00:00:00 2001
From: Aaron Chan <aarchan108@gmail.com>
Date: Tue, 17 Jun 2025 21:12:20 -0700
Subject: [PATCH 15/33] Delete unnecessary code

---
 lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp b/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp
index dd105b56d..49c74ebfb 100644
--- a/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp
+++ b/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp
@@ -16,15 +16,10 @@ void CCpuMonitorTenant::Run() {
         if (sensor_sample_fetch(dieTempSensor) == 0 &&
             sensor_channel_get(dieTempSensor, SENSOR_CHAN_DIE_TEMP, &dieTempValue) == 0) {
             cpuMonitorData.DieTemperature = dieTempValue.val1;
-        } else {
-            cpuMonitorData.DieTemperature = 0; // Default value if sensor fetch fails
         }
-    } else {
-        cpuMonitorData.DieTemperature = 0; // Default value if sensor is not ready
     }
 #endif
 
-
     if (outputPort.Send(cpuMonitorData, K_NO_WAIT) != 0) {
         outputPort.Clear();
     }

From f54844ded67a79aeb28244aaa13a026e74989078 Mon Sep 17 00:00:00 2001
From: Aaron Chan <aarchan108@gmail.com>
Date: Tue, 17 Jun 2025 21:20:44 -0700
Subject: [PATCH 16/33] Code for setting the cpu load

---
 lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp b/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp
index 49c74ebfb..8073d5030 100644
--- a/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp
+++ b/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp
@@ -1,15 +1,19 @@
 #include "f_core/os/tenants/c_cpu_monitor_tenant.h"
 
+#include <zephyr/debug/cpu_load.h>
 #include "zephyr/drivers/sensor.h"
 
+void CCpuMonitorTenant::Startup() {
+    cpu_load_init();
+}
 
-void CCpuMonitorTenant::Startup() {}
 void CCpuMonitorTenant::PostStartup() {}
+
 void CCpuMonitorTenant::Run() {
     NTypes::CPUMonitor cpuMonitorData{0};
 
     cpuMonitorData.Uptime = k_uptime_get_32();
-
+    cpuMonitorData.Utilization = cpu_load_get(true);
 #if DT_NODE_EXISTS(DT_ALIAS(die_temp))
     if (device_is_ready(dieTempSensor)) {
         sensor_value dieTempValue{0};
@@ -24,4 +28,5 @@ void CCpuMonitorTenant::Run() {
         outputPort.Clear();
     }
 }
+
 void CCpuMonitorTenant::Cleanup() {}

From e7451ea3833dee8edd5140d5ab9f83e4516efb6d Mon Sep 17 00:00:00 2001
From: Aaron Chan <aarchan108@gmail.com>
Date: Tue, 17 Jun 2025 21:32:13 -0700
Subject: [PATCH 17/33] Break out into functions. Cant use cpu load debug
 functions so lets try thread runtime stats maybe?

---
 .../f_core/os/tenants/c_cpu_monitor_tenant.h  |  6 ++++
 .../os/tenants/c_cpu_monitor_tenant.cpp       | 30 ++++++++++++++-----
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/include/f_core/os/tenants/c_cpu_monitor_tenant.h b/include/f_core/os/tenants/c_cpu_monitor_tenant.h
index 891d20634..cfef6d925 100644
--- a/include/f_core/os/tenants/c_cpu_monitor_tenant.h
+++ b/include/f_core/os/tenants/c_cpu_monitor_tenant.h
@@ -27,6 +27,12 @@ class CCpuMonitorTenant : public CTenant {
 #if DT_NODE_EXISTS(DT_ALIAS(die_temp))
     const device *dieTempSensor = DEVICE_DT_GET(DT_ALIAS(die_temp));
 #endif
+
+    uint8_t getUtilization();
+
+    uint32_t getUptime();
+
+    int32_t getDieTemperature();
 };
 
 #endif //C_CPU_MONITOR_TENANT_H
diff --git a/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp b/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp
index 8073d5030..817e4f501 100644
--- a/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp
+++ b/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp
@@ -1,7 +1,7 @@
 #include "f_core/os/tenants/c_cpu_monitor_tenant.h"
 
 #include <zephyr/debug/cpu_load.h>
-#include "zephyr/drivers/sensor.h"
+#include <zephyr/drivers/sensor.h>
 
 void CCpuMonitorTenant::Startup() {
     cpu_load_init();
@@ -12,21 +12,35 @@ void CCpuMonitorTenant::PostStartup() {}
 void CCpuMonitorTenant::Run() {
     NTypes::CPUMonitor cpuMonitorData{0};
 
-    cpuMonitorData.Uptime = k_uptime_get_32();
-    cpuMonitorData.Utilization = cpu_load_get(true);
+    cpuMonitorData.Uptime = getUptime();
+    cpuMonitorData.Utilization = getUtilization();
+    cpuMonitorData.DieTemperature = getDieTemperature();
+
+    if (outputPort.Send(cpuMonitorData, K_NO_WAIT) != 0) {
+        outputPort.Clear();
+    }
+}
+
+void CCpuMonitorTenant::Cleanup() {}
+
+int32_t CCpuMonitorTenant::getDieTemperature() {
+    int32_t result = 0;
 #if DT_NODE_EXISTS(DT_ALIAS(die_temp))
     if (device_is_ready(dieTempSensor)) {
         sensor_value dieTempValue{0};
         if (sensor_sample_fetch(dieTempSensor) == 0 &&
             sensor_channel_get(dieTempSensor, SENSOR_CHAN_DIE_TEMP, &dieTempValue) == 0) {
-            cpuMonitorData.DieTemperature = dieTempValue.val1;
+            result = dieTempValue.val1;
         }
     }
 #endif
+    return result;
+}
 
-    if (outputPort.Send(cpuMonitorData, K_NO_WAIT) != 0) {
-        outputPort.Clear();
-    }
+uint32_t CCpuMonitorTenant::getUptime() {
+    return k_uptime_get_32();
 }
 
-void CCpuMonitorTenant::Cleanup() {}
+uint8_t CCpuMonitorTenant::getUtilization() {
+
+}

From add4f4b1256881d6e31e94f1ac0646a2ffff1c19 Mon Sep 17 00:00:00 2001
From: Aaron Chan <aarchan108@gmail.com>
Date: Tue, 17 Jun 2025 21:33:41 -0700
Subject: [PATCH 18/33] Utilization function

---
 lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp b/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp
index 817e4f501..cab85340f 100644
--- a/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp
+++ b/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp
@@ -1,11 +1,8 @@
 #include "f_core/os/tenants/c_cpu_monitor_tenant.h"
 
-#include <zephyr/debug/cpu_load.h>
 #include <zephyr/drivers/sensor.h>
 
-void CCpuMonitorTenant::Startup() {
-    cpu_load_init();
-}
+void CCpuMonitorTenant::Startup() {}
 
 void CCpuMonitorTenant::PostStartup() {}
 
@@ -42,5 +39,12 @@ uint32_t CCpuMonitorTenant::getUptime() {
 }
 
 uint8_t CCpuMonitorTenant::getUtilization() {
+    k_thread_runtime_stats stats{0};
+
+    k_thread_runtime_stats_all_get(&stats);
+    if (stats.total_cycles == 0) {
+        return 0; // Avoid division by zero
+    }
 
+    return static_cast<uint8_t>((stats.execution_cycles * 100) / stats.total_cycles);
 }

From 0b5fe091b74b3152424a6f0071fccec8c15cafdf Mon Sep 17 00:00:00 2001
From: Aaron Chan <aarchan108@gmail.com>
Date: Tue, 17 Jun 2025 21:38:31 -0700
Subject: [PATCH 19/33] Add new sample for cpu monitor testing

---
 app/samples/cpu_monitor/.idea/.gitignore |  6 ++++++
 app/samples/cpu_monitor/CMakeLists.txt   | 12 ++++++++++++
 app/samples/cpu_monitor/Kconfig          |  1 +
 app/samples/cpu_monitor/prj.conf         | 18 ++++++++++++++++++
 app/samples/cpu_monitor/sample.yaml      |  9 +++++++++
 app/samples/cpu_monitor/src/main.cpp     |  3 +++
 6 files changed, 49 insertions(+)
 create mode 100644 app/samples/cpu_monitor/.idea/.gitignore
 create mode 100644 app/samples/cpu_monitor/CMakeLists.txt
 create mode 100644 app/samples/cpu_monitor/Kconfig
 create mode 100644 app/samples/cpu_monitor/prj.conf
 create mode 100644 app/samples/cpu_monitor/sample.yaml
 create mode 100644 app/samples/cpu_monitor/src/main.cpp

diff --git a/app/samples/cpu_monitor/.idea/.gitignore b/app/samples/cpu_monitor/.idea/.gitignore
new file mode 100644
index 000000000..8bf4d45d6
--- /dev/null
+++ b/app/samples/cpu_monitor/.idea/.gitignore
@@ -0,0 +1,6 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/app/samples/cpu_monitor/CMakeLists.txt b/app/samples/cpu_monitor/CMakeLists.txt
new file mode 100644
index 000000000..7a1ef90b4
--- /dev/null
+++ b/app/samples/cpu_monitor/CMakeLists.txt
@@ -0,0 +1,12 @@
+cmake_minimum_required(VERSION 3.20.0)
+
+set(FSW_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
+include(${FSW_ROOT}/cmake/Autocoders.cmake)
+
+AddCommonSnippets()
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(template LANGUAGES CXX)
+
+target_compile_options(app PRIVATE -Wall -Wextra -Wno-unused-parameter -Wno-unused-function -Wno-ignored-qualifiers)
+FILE(GLOB app_sources src/*.cpp)
+target_sources(app PRIVATE ${app_sources})
diff --git a/app/samples/cpu_monitor/Kconfig b/app/samples/cpu_monitor/Kconfig
new file mode 100644
index 000000000..5ba198ca5
--- /dev/null
+++ b/app/samples/cpu_monitor/Kconfig
@@ -0,0 +1 @@
+source "Kconfig.zephyr"
diff --git a/app/samples/cpu_monitor/prj.conf b/app/samples/cpu_monitor/prj.conf
new file mode 100644
index 000000000..7f839fd57
--- /dev/null
+++ b/app/samples/cpu_monitor/prj.conf
@@ -0,0 +1,18 @@
+CONFIG_CPP=y
+CONFIG_REQUIRES_FULL_LIBCPP=y
+CONFIG_STD_CPP20=y
+
+CONFIG_F_CORE=y
+CONFIG_F_CORE_OS=y
+
+ # outputs
+CONFIG_SERIAL=y
+CONFIG_FILE_SYSTEM_SHELL=y
+CONFIG_HEAP_MEM_POOL_SIZE=8192
+
+CONFIG_DEBUG=y
+CONFIG_CBPRINTF_FP_SUPPORT=y
+
+CONFIG_LZ4=y
+CONFIG_MAIN_STACK_SIZE=4096
+
diff --git a/app/samples/cpu_monitor/sample.yaml b/app/samples/cpu_monitor/sample.yaml
new file mode 100644
index 000000000..481ed84af
--- /dev/null
+++ b/app/samples/cpu_monitor/sample.yaml
@@ -0,0 +1,9 @@
+sample:
+  description:
+  name: template
+common:
+  build_only: true
+  platform_allow:
+    - native_sim
+tests:
+  samples.template.default: {}
diff --git a/app/samples/cpu_monitor/src/main.cpp b/app/samples/cpu_monitor/src/main.cpp
new file mode 100644
index 000000000..4cce7f667
--- /dev/null
+++ b/app/samples/cpu_monitor/src/main.cpp
@@ -0,0 +1,3 @@
+int main() {
+  return 0;
+}

From a8316138a51dc04a82a9efa89ea99bae4e3f7344 Mon Sep 17 00:00:00 2001
From: Aaron Chan <aarchan108@gmail.com>
Date: Tue, 17 Jun 2025 21:45:42 -0700
Subject: [PATCH 20/33] Sample

---
 app/samples/cpu_monitor/CMakeLists.txt |  4 +++-
 app/samples/cpu_monitor/src/main.cpp   | 26 +++++++++++++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/app/samples/cpu_monitor/CMakeLists.txt b/app/samples/cpu_monitor/CMakeLists.txt
index 7a1ef90b4..74b925846 100644
--- a/app/samples/cpu_monitor/CMakeLists.txt
+++ b/app/samples/cpu_monitor/CMakeLists.txt
@@ -3,10 +3,12 @@ cmake_minimum_required(VERSION 3.20.0)
 set(FSW_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
 include(${FSW_ROOT}/cmake/Autocoders.cmake)
 
-AddCommonSnippets()
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(template LANGUAGES CXX)
 
 target_compile_options(app PRIVATE -Wall -Wextra -Wno-unused-parameter -Wno-unused-function -Wno-ignored-qualifiers)
 FILE(GLOB app_sources src/*.cpp)
 target_sources(app PRIVATE ${app_sources})
+
+AutocodeTypes()
+add_dependencies(app ac_types)
\ No newline at end of file
diff --git a/app/samples/cpu_monitor/src/main.cpp b/app/samples/cpu_monitor/src/main.cpp
index 4cce7f667..093a435a1 100644
--- a/app/samples/cpu_monitor/src/main.cpp
+++ b/app/samples/cpu_monitor/src/main.cpp
@@ -1,3 +1,27 @@
+
+
+#include <f_core/os/tenants/c_cpu_monitor_tenant.h>
+#include <f_core/messaging/c_msgq_message_port.h>
+#include <n_autocoder_types.h>
+#include <zephyr/kernel.h>
+
+K_MSGQ_DEFINE(cpuMonitorQueue, sizeof(NTypes::CPUMonitor), 4, 4);
+static auto cpuMonitorMsgQueue = CMsgqMessagePort<NTypes::CPUMonitor>(cpuMonitorQueue);
+
 int main() {
-  return 0;
+    CCpuMonitorTenant cpuMonitorTenant(cpuMonitorMsgQueue);
+
+    cpuMonitorTenant.Startup();
+
+    while (true) {
+        NTypes::CPUMonitor cpuMonitorData{0};
+        cpuMonitorTenant.Run();
+        cpuMonitorMsgQueue.Receive(cpuMonitorData, K_FOREVER);
+        printk("Uptime: %u seconds, Utilization: %u%%, Die Temperature: %d °C\n",
+               cpuMonitorData.Uptime, cpuMonitorData.Utilization, cpuMonitorData.DieTemperature);
+
+        k_msleep(1000);
+    }
+
+    return 0;
 }

From 6e3c591b84b603ff25e3a8229c880143b4402a54 Mon Sep 17 00:00:00 2001
From: Aaron Chan <aarchan108@gmail.com>
Date: Tue, 17 Jun 2025 21:58:34 -0700
Subject: [PATCH 21/33] Update sample.yaml and prj.conf and cmake for sample

---
 app/samples/cpu_monitor/CMakeLists.txt           | 2 +-
 app/samples/cpu_monitor/prj.conf                 | 1 +
 app/samples/cpu_monitor/sample.yaml              | 5 +++--
 app/samples/cpu_monitor/src/main.cpp             | 4 +---
 include/f_core/os/tenants/c_cpu_monitor_tenant.h | 1 -
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/samples/cpu_monitor/CMakeLists.txt b/app/samples/cpu_monitor/CMakeLists.txt
index 74b925846..00f47fe98 100644
--- a/app/samples/cpu_monitor/CMakeLists.txt
+++ b/app/samples/cpu_monitor/CMakeLists.txt
@@ -4,7 +4,7 @@ set(FSW_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
 include(${FSW_ROOT}/cmake/Autocoders.cmake)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(template LANGUAGES CXX)
+project(cpu-monitor LANGUAGES CXX)
 
 target_compile_options(app PRIVATE -Wall -Wextra -Wno-unused-parameter -Wno-unused-function -Wno-ignored-qualifiers)
 FILE(GLOB app_sources src/*.cpp)
diff --git a/app/samples/cpu_monitor/prj.conf b/app/samples/cpu_monitor/prj.conf
index 7f839fd57..3cb588065 100644
--- a/app/samples/cpu_monitor/prj.conf
+++ b/app/samples/cpu_monitor/prj.conf
@@ -4,6 +4,7 @@ CONFIG_STD_CPP20=y
 
 CONFIG_F_CORE=y
 CONFIG_F_CORE_OS=y
+CONFIG_SCHED_THREAD_USAGE=y
 
  # outputs
 CONFIG_SERIAL=y
diff --git a/app/samples/cpu_monitor/sample.yaml b/app/samples/cpu_monitor/sample.yaml
index 481ed84af..4d66e4c0d 100644
--- a/app/samples/cpu_monitor/sample.yaml
+++ b/app/samples/cpu_monitor/sample.yaml
@@ -1,9 +1,10 @@
 sample:
-  description:
-  name: template
+  description: Sample application monitoring CPU utilization, uptime and die-temp.
+  name: cpu-monitor
 common:
   build_only: true
   platform_allow:
     - native_sim
+    - nucleo_f446re
 tests:
   samples.template.default: {}
diff --git a/app/samples/cpu_monitor/src/main.cpp b/app/samples/cpu_monitor/src/main.cpp
index 093a435a1..0c679e09b 100644
--- a/app/samples/cpu_monitor/src/main.cpp
+++ b/app/samples/cpu_monitor/src/main.cpp
@@ -1,11 +1,9 @@
-
-
 #include <f_core/os/tenants/c_cpu_monitor_tenant.h>
 #include <f_core/messaging/c_msgq_message_port.h>
 #include <n_autocoder_types.h>
 #include <zephyr/kernel.h>
 
-K_MSGQ_DEFINE(cpuMonitorQueue, sizeof(NTypes::CPUMonitor), 4, 4);
+K_MSGQ_DEFINE(cpuMonitorQueue, sizeof(NTypes::CPUMonitor), 1, 4);
 static auto cpuMonitorMsgQueue = CMsgqMessagePort<NTypes::CPUMonitor>(cpuMonitorQueue);
 
 int main() {
diff --git a/include/f_core/os/tenants/c_cpu_monitor_tenant.h b/include/f_core/os/tenants/c_cpu_monitor_tenant.h
index cfef6d925..031e8a221 100644
--- a/include/f_core/os/tenants/c_cpu_monitor_tenant.h
+++ b/include/f_core/os/tenants/c_cpu_monitor_tenant.h
@@ -6,7 +6,6 @@
 
 #include <FSW/n_autocoder_types.h>
 
-
 class CCpuMonitorTenant : public CTenant {
 public:
     CCpuMonitorTenant(CMessagePort<NTypes::CPUMonitor> &outputPort) :

From f3cda631f533ca087e4bcdbb81d3497d9be4ef2a Mon Sep 17 00:00:00 2001
From: Aaron Chan <aarchan108@gmail.com>
Date: Tue, 17 Jun 2025 22:06:12 -0700
Subject: [PATCH 22/33] Fix thread runtime stats struct

---
 app/samples/cpu_monitor/CMakeLists.txt | 5 +++++
 app/samples/cpu_monitor/prj.conf       | 1 +
 2 files changed, 6 insertions(+)

diff --git a/app/samples/cpu_monitor/CMakeLists.txt b/app/samples/cpu_monitor/CMakeLists.txt
index 00f47fe98..54d313ab6 100644
--- a/app/samples/cpu_monitor/CMakeLists.txt
+++ b/app/samples/cpu_monitor/CMakeLists.txt
@@ -2,6 +2,11 @@ cmake_minimum_required(VERSION 3.20.0)
 
 set(FSW_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
 include(${FSW_ROOT}/cmake/Autocoders.cmake)
+include(${FSW_ROOT}/cmake/Snippets.cmake)
+
+AddCommonSnippets()
+
+list(APPEND CONF_FILE ${CMAKE_CURRENT_SOURCE_DIR}/prj.conf)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(cpu-monitor LANGUAGES CXX)
diff --git a/app/samples/cpu_monitor/prj.conf b/app/samples/cpu_monitor/prj.conf
index 3cb588065..134d931d1 100644
--- a/app/samples/cpu_monitor/prj.conf
+++ b/app/samples/cpu_monitor/prj.conf
@@ -4,6 +4,7 @@ CONFIG_STD_CPP20=y
 
 CONFIG_F_CORE=y
 CONFIG_F_CORE_OS=y
+CONFIG_THREAD_RUNTIME_STATS=y
 CONFIG_SCHED_THREAD_USAGE=y
 
  # outputs

From aa9233edfb0aab87bd954008d25ebbed2aca07b6 Mon Sep 17 00:00:00 2001
From: Aaron Chan <aarchan108@gmail.com>
Date: Tue, 17 Jun 2025 22:17:45 -0700
Subject: [PATCH 23/33] Reverse cycles naming in equation because zephyr has
 sane naming

---
 app/samples/cpu_monitor/src/main.cpp          |  2 +-
 .../f_core/os/tenants/c_cpu_monitor_tenant.h  |  3 +++
 .../os/tenants/c_cpu_monitor_tenant.cpp       | 22 ++++++++++++++++---
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/app/samples/cpu_monitor/src/main.cpp b/app/samples/cpu_monitor/src/main.cpp
index 0c679e09b..fef064913 100644
--- a/app/samples/cpu_monitor/src/main.cpp
+++ b/app/samples/cpu_monitor/src/main.cpp
@@ -15,7 +15,7 @@ int main() {
         NTypes::CPUMonitor cpuMonitorData{0};
         cpuMonitorTenant.Run();
         cpuMonitorMsgQueue.Receive(cpuMonitorData, K_FOREVER);
-        printk("Uptime: %u seconds, Utilization: %u%%, Die Temperature: %d °C\n",
+        printk("Uptime: %u ms, Utilization: %u%%, Die Temperature: %d °C\n",
                cpuMonitorData.Uptime, cpuMonitorData.Utilization, cpuMonitorData.DieTemperature);
 
         k_msleep(1000);
diff --git a/include/f_core/os/tenants/c_cpu_monitor_tenant.h b/include/f_core/os/tenants/c_cpu_monitor_tenant.h
index 031e8a221..60273818a 100644
--- a/include/f_core/os/tenants/c_cpu_monitor_tenant.h
+++ b/include/f_core/os/tenants/c_cpu_monitor_tenant.h
@@ -23,6 +23,9 @@ class CCpuMonitorTenant : public CTenant {
     static CCpuMonitorTenant instance;
     CMessagePort<NTypes::CPUMonitor> &outputPort;
 
+    uint32_t prevExecutionCycles = 0;
+    uint32_t prevTotalCycles = 0;
+
 #if DT_NODE_EXISTS(DT_ALIAS(die_temp))
     const device *dieTempSensor = DEVICE_DT_GET(DT_ALIAS(die_temp));
 #endif
diff --git a/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp b/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp
index cab85340f..dfc9f1924 100644
--- a/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp
+++ b/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp
@@ -1,8 +1,18 @@
 #include "f_core/os/tenants/c_cpu_monitor_tenant.h"
 
+#include "zephyr/logging/log.h"
+
 #include <zephyr/drivers/sensor.h>
 
-void CCpuMonitorTenant::Startup() {}
+LOG_MODULE_REGISTER(CCpuMonitorTenant);
+
+void CCpuMonitorTenant::Startup() {
+    k_thread_runtime_stats stats{0};
+    k_thread_runtime_stats_all_get(&stats);
+
+    prevExecutionCycles = stats.execution_cycles;
+    prevTotalCycles = stats.total_cycles;
+}
 
 void CCpuMonitorTenant::PostStartup() {}
 
@@ -30,6 +40,8 @@ int32_t CCpuMonitorTenant::getDieTemperature() {
             result = dieTempValue.val1;
         }
     }
+#else
+    LOG_WRN_ONCE("No die temperature sensor available. Defaulting to 0 °C.");
 #endif
     return result;
 }
@@ -42,9 +54,13 @@ uint8_t CCpuMonitorTenant::getUtilization() {
     k_thread_runtime_stats stats{0};
 
     k_thread_runtime_stats_all_get(&stats);
-    if (stats.total_cycles == 0) {
+    if (stats.execution_cycles == 0) {
         return 0; // Avoid division by zero
     }
 
-    return static_cast<uint8_t>((stats.execution_cycles * 100) / stats.total_cycles);
+
+    // Note that total cycles is non-idle cycles
+    // and execution cycles is the sum of non-idle + idle cycles.
+    return static_cast<uint8_t>(
+        ((stats.total_cycles) * 100) / (stats.execution_cycles));
 }

From cae0edde37864c4d31d8bb87167480866f998458 Mon Sep 17 00:00:00 2001
From: Aaron Chan <aarchan108@gmail.com>
Date: Tue, 17 Jun 2025 22:27:21 -0700
Subject: [PATCH 24/33] Add die temp support in sample for f446

---
 app/samples/.template-project/prj.conf           |  3 ---
 app/samples/cpu_monitor/CMakeLists.txt           |  3 ---
 .../cpu_monitor/boards/nucleo_f446re.overlay     | 16 ++++++++++++++++
 app/samples/cpu_monitor/prj.conf                 | 14 ++++++++++----
 app/samples/cpu_monitor/src/main.cpp             |  3 +--
 5 files changed, 27 insertions(+), 12 deletions(-)
 create mode 100644 app/samples/cpu_monitor/boards/nucleo_f446re.overlay

diff --git a/app/samples/.template-project/prj.conf b/app/samples/.template-project/prj.conf
index 7f839fd57..f000b3bf8 100644
--- a/app/samples/.template-project/prj.conf
+++ b/app/samples/.template-project/prj.conf
@@ -6,13 +6,10 @@ CONFIG_F_CORE=y
 CONFIG_F_CORE_OS=y
 
  # outputs
-CONFIG_SERIAL=y
-CONFIG_FILE_SYSTEM_SHELL=y
 CONFIG_HEAP_MEM_POOL_SIZE=8192
 
 CONFIG_DEBUG=y
 CONFIG_CBPRINTF_FP_SUPPORT=y
 
-CONFIG_LZ4=y
 CONFIG_MAIN_STACK_SIZE=4096
 
diff --git a/app/samples/cpu_monitor/CMakeLists.txt b/app/samples/cpu_monitor/CMakeLists.txt
index 54d313ab6..ee7d4d99d 100644
--- a/app/samples/cpu_monitor/CMakeLists.txt
+++ b/app/samples/cpu_monitor/CMakeLists.txt
@@ -2,9 +2,6 @@ cmake_minimum_required(VERSION 3.20.0)
 
 set(FSW_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
 include(${FSW_ROOT}/cmake/Autocoders.cmake)
-include(${FSW_ROOT}/cmake/Snippets.cmake)
-
-AddCommonSnippets()
 
 list(APPEND CONF_FILE ${CMAKE_CURRENT_SOURCE_DIR}/prj.conf)
 
diff --git a/app/samples/cpu_monitor/boards/nucleo_f446re.overlay b/app/samples/cpu_monitor/boards/nucleo_f446re.overlay
new file mode 100644
index 000000000..cbd35d7a5
--- /dev/null
+++ b/app/samples/cpu_monitor/boards/nucleo_f446re.overlay
@@ -0,0 +1,16 @@
+/ {
+	aliases {
+		die-temp = &die_temp;
+	};
+};
+
+&die_temp {
+	status = "okay";
+};
+
+&adc1 {
+	pinctrl-0 = <&adc1_in0_pa0>;
+	pinctrl-names = "default";
+	st,adc-prescaler = <4>;
+	status = "okay";
+};
diff --git a/app/samples/cpu_monitor/prj.conf b/app/samples/cpu_monitor/prj.conf
index 134d931d1..7eb66af8b 100644
--- a/app/samples/cpu_monitor/prj.conf
+++ b/app/samples/cpu_monitor/prj.conf
@@ -4,10 +4,7 @@ CONFIG_STD_CPP20=y
 
 CONFIG_F_CORE=y
 CONFIG_F_CORE_OS=y
-CONFIG_THREAD_RUNTIME_STATS=y
-CONFIG_SCHED_THREAD_USAGE=y
 
- # outputs
 CONFIG_SERIAL=y
 CONFIG_FILE_SYSTEM_SHELL=y
 CONFIG_HEAP_MEM_POOL_SIZE=8192
@@ -15,6 +12,15 @@ CONFIG_HEAP_MEM_POOL_SIZE=8192
 CONFIG_DEBUG=y
 CONFIG_CBPRINTF_FP_SUPPORT=y
 
-CONFIG_LZ4=y
 CONFIG_MAIN_STACK_SIZE=4096
 
+# CPU Utilization Support
+CONFIG_THREAD_RUNTIME_STATS=y
+CONFIG_SCHED_THREAD_USAGE=y
+
+# Die Temperature Support
+# .conf overlay didnt work :(
+CONFIG_ADC=y
+CONFIG_SENSOR=y
+CONFIG_STM32_TEMP=y
+
diff --git a/app/samples/cpu_monitor/src/main.cpp b/app/samples/cpu_monitor/src/main.cpp
index fef064913..eee773a33 100644
--- a/app/samples/cpu_monitor/src/main.cpp
+++ b/app/samples/cpu_monitor/src/main.cpp
@@ -4,9 +4,9 @@
 #include <zephyr/kernel.h>
 
 K_MSGQ_DEFINE(cpuMonitorQueue, sizeof(NTypes::CPUMonitor), 1, 4);
-static auto cpuMonitorMsgQueue = CMsgqMessagePort<NTypes::CPUMonitor>(cpuMonitorQueue);
 
 int main() {
+    auto cpuMonitorMsgQueue = CMsgqMessagePort<NTypes::CPUMonitor>(cpuMonitorQueue);
     CCpuMonitorTenant cpuMonitorTenant(cpuMonitorMsgQueue);
 
     cpuMonitorTenant.Startup();
@@ -17,7 +17,6 @@ int main() {
         cpuMonitorMsgQueue.Receive(cpuMonitorData, K_FOREVER);
         printk("Uptime: %u ms, Utilization: %u%%, Die Temperature: %d °C\n",
                cpuMonitorData.Uptime, cpuMonitorData.Utilization, cpuMonitorData.DieTemperature);
-
         k_msleep(1000);
     }
 

From 573b3d3fad952d975c3af62902d36271982da0e0 Mon Sep 17 00:00:00 2001
From: Aaron Chan <aarchan108@gmail.com>
Date: Tue, 17 Jun 2025 22:30:18 -0700
Subject: [PATCH 25/33] Update sample.yaml

---
 app/samples/cpu_monitor/sample.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/samples/cpu_monitor/sample.yaml b/app/samples/cpu_monitor/sample.yaml
index 4d66e4c0d..e5b3dbd5e 100644
--- a/app/samples/cpu_monitor/sample.yaml
+++ b/app/samples/cpu_monitor/sample.yaml
@@ -4,7 +4,6 @@ sample:
 common:
   build_only: true
   platform_allow:
-    - native_sim
     - nucleo_f446re
 tests:
   samples.template.default: {}

From b65b8ad924313bef2f5df388801c7427d08c07ca Mon Sep 17 00:00:00 2001
From: Aaron Chan <aarchan108@gmail.com>
Date: Tue, 17 Jun 2025 22:34:49 -0700
Subject: [PATCH 26/33] Fix warnings

---
 .github/workflows/build_samples.yml    | 1 +
 app/samples/cpu_monitor/CMakeLists.txt | 2 +-
 app/samples/cpu_monitor/src/main.cpp   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_samples.yml b/.github/workflows/build_samples.yml
index f15dfea15..5c155d3a1 100644
--- a/.github/workflows/build_samples.yml
+++ b/.github/workflows/build_samples.yml
@@ -28,6 +28,7 @@ env:
     app/samples/phase_detection
     app/samples/horus
     app/samples/compression
+    app/samples/cpu_monitor
   platforms: |
     nucleo_f446re
     radio_module
diff --git a/app/samples/cpu_monitor/CMakeLists.txt b/app/samples/cpu_monitor/CMakeLists.txt
index ee7d4d99d..4ee9625ca 100644
--- a/app/samples/cpu_monitor/CMakeLists.txt
+++ b/app/samples/cpu_monitor/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND CONF_FILE ${CMAKE_CURRENT_SOURCE_DIR}/prj.conf)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(cpu-monitor LANGUAGES CXX)
 
-target_compile_options(app PRIVATE -Wall -Wextra -Wno-unused-parameter -Wno-unused-function -Wno-ignored-qualifiers)
+target_compile_options(app PRIVATE -Wall -Wextra -Wno-unused-parameter -Wno-unused-function -Wno-ignored-qualifiers -Wno-missing-field-initializers)
 FILE(GLOB app_sources src/*.cpp)
 target_sources(app PRIVATE ${app_sources})
 
diff --git a/app/samples/cpu_monitor/src/main.cpp b/app/samples/cpu_monitor/src/main.cpp
index eee773a33..8fe3dcfa9 100644
--- a/app/samples/cpu_monitor/src/main.cpp
+++ b/app/samples/cpu_monitor/src/main.cpp
@@ -12,7 +12,7 @@ int main() {
     cpuMonitorTenant.Startup();
 
     while (true) {
-        NTypes::CPUMonitor cpuMonitorData{0};
+        NTypes::CPUMonitor cpuMonitorData{0, 0, 0};
         cpuMonitorTenant.Run();
         cpuMonitorMsgQueue.Receive(cpuMonitorData, K_FOREVER);
         printk("Uptime: %u ms, Utilization: %u%%, Die Temperature: %d °C\n",

From 98afed9d3864c2ac9870100a7a3a77751a2db7f9 Mon Sep 17 00:00:00 2001
From: Aaron Chan <aarchan108@gmail.com>
Date: Tue, 24 Jun 2025 23:27:39 -0400
Subject: [PATCH 27/33] Have CpuMonitorData defined in header and not an
 autocoder type

---
 app/backplane/power_module/.idea/editor.xml    | 13 -------------
 app/backplane/sensor_module/.idea/editor.xml   | 13 -------------
 app/samples/cpu_monitor/src/main.cpp           |  6 +++---
 data/autocoder_inputs/types.yaml               | 13 +------------
 .../f_core/os/tenants/c_cpu_monitor_tenant.h   | 18 ++++++++++++------
 lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp |  9 +++++----
 6 files changed, 21 insertions(+), 51 deletions(-)

diff --git a/app/backplane/power_module/.idea/editor.xml b/app/backplane/power_module/.idea/editor.xml
index e42167fe8..ec902243e 100644
--- a/app/backplane/power_module/.idea/editor.xml
+++ b/app/backplane/power_module/.idea/editor.xml
@@ -243,18 +243,5 @@
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=IfStdIsConstantEvaluatedCanBeReplaced/@EntryIndexedValue" value="SUGGESTION" type="string" />
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=StdIsConstantEvaluatedWillAlwaysEvaluateToConstant/@EntryIndexedValue" value="WARNING" type="string" />
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringLiteralTypo/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALLOW_COMMENT_AFTER_LBRACE/@EntryValue" value="true" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ANONYMOUS_METHOD_DECLARATION_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/CASE_BLOCK_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/EMPTY_BLOCK_STYLE/@EntryValue" value="TOGETHER" type="string" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/EXPORT_DECLARATION_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INVOCABLE_DECLARATION_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/NAMESPACE_DECLARATION_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/OTHER_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/PLACE_CATCH_ON_NEW_LINE/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/PLACE_ELSE_ON_NEW_LINE/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/PLACE_WHILE_ON_NEW_LINE/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/REQUIRES_EXPRESSION_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/TYPE_DECLARATION_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/backplane/sensor_module/.idea/editor.xml b/app/backplane/sensor_module/.idea/editor.xml
index e42167fe8..ec902243e 100644
--- a/app/backplane/sensor_module/.idea/editor.xml
+++ b/app/backplane/sensor_module/.idea/editor.xml
@@ -243,18 +243,5 @@
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=IfStdIsConstantEvaluatedCanBeReplaced/@EntryIndexedValue" value="SUGGESTION" type="string" />
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=StdIsConstantEvaluatedWillAlwaysEvaluateToConstant/@EntryIndexedValue" value="WARNING" type="string" />
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringLiteralTypo/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALLOW_COMMENT_AFTER_LBRACE/@EntryValue" value="true" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ANONYMOUS_METHOD_DECLARATION_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/CASE_BLOCK_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/EMPTY_BLOCK_STYLE/@EntryValue" value="TOGETHER" type="string" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/EXPORT_DECLARATION_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INVOCABLE_DECLARATION_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/NAMESPACE_DECLARATION_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/OTHER_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/PLACE_CATCH_ON_NEW_LINE/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/PLACE_ELSE_ON_NEW_LINE/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/PLACE_WHILE_ON_NEW_LINE/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/REQUIRES_EXPRESSION_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/TYPE_DECLARATION_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/samples/cpu_monitor/src/main.cpp b/app/samples/cpu_monitor/src/main.cpp
index 8fe3dcfa9..1f1892856 100644
--- a/app/samples/cpu_monitor/src/main.cpp
+++ b/app/samples/cpu_monitor/src/main.cpp
@@ -3,16 +3,16 @@
 #include <n_autocoder_types.h>
 #include <zephyr/kernel.h>
 
-K_MSGQ_DEFINE(cpuMonitorQueue, sizeof(NTypes::CPUMonitor), 1, 4);
+K_MSGQ_DEFINE(cpuMonitorQueue, sizeof(CpuMonitorData), 1, 4);
 
 int main() {
-    auto cpuMonitorMsgQueue = CMsgqMessagePort<NTypes::CPUMonitor>(cpuMonitorQueue);
+    auto cpuMonitorMsgQueue = CMsgqMessagePort<CpuMonitorData>(cpuMonitorQueue);
     CCpuMonitorTenant cpuMonitorTenant(cpuMonitorMsgQueue);
 
     cpuMonitorTenant.Startup();
 
     while (true) {
-        NTypes::CPUMonitor cpuMonitorData{0, 0, 0};
+        CpuMonitorData cpuMonitorData{0, 0, 0};
         cpuMonitorTenant.Run();
         cpuMonitorMsgQueue.Receive(cpuMonitorData, K_FOREVER);
         printk("Uptime: %u ms, Utilization: %u%%, Die Temperature: %d °C\n",
diff --git a/data/autocoder_inputs/types.yaml b/data/autocoder_inputs/types.yaml
index 4f811df53..bba5e7eac 100644
--- a/data/autocoder_inputs/types.yaml
+++ b/data/autocoder_inputs/types.yaml
@@ -220,15 +220,4 @@ LoRaReceiveStatistics:
     - name: ReceivedSignalStrengthIndicator
       type: int16_t
     - name: SignalToNoiseRatio
-      type: int8_t
-
-CPUMonitor:
-    description: CPU monitor data.
-    fields:
-      - name: Uptime
-        type: uint32_t
-      - name: Utilization
-        type: uint8_t
-      - name: DieTemperature
-        type: int32_t
-    timestamp: false
\ No newline at end of file
+      type: int8_t
\ No newline at end of file
diff --git a/include/f_core/os/tenants/c_cpu_monitor_tenant.h b/include/f_core/os/tenants/c_cpu_monitor_tenant.h
index 60273818a..a39786cca 100644
--- a/include/f_core/os/tenants/c_cpu_monitor_tenant.h
+++ b/include/f_core/os/tenants/c_cpu_monitor_tenant.h
@@ -4,12 +4,19 @@
 #include "f_core/messaging/c_message_port.h"
 #include "f_core/os/c_tenant.h"
 
-#include <FSW/n_autocoder_types.h>
+#include <stdint.h>
+
+struct __attribute__((packed)) CpuMonitorData {
+    uint32_t Uptime;
+    int32_t DieTemperature;
+    uint8_t Utilization;
+};
 
 class CCpuMonitorTenant : public CTenant {
 public:
-    CCpuMonitorTenant(CMessagePort<NTypes::CPUMonitor> &outputPort) :
-        CTenant("CPU Monitor Tenant"), outputPort(outputPort) {};
+    CCpuMonitorTenant(CMessagePort<CpuMonitorData>& outputPort) :
+        CTenant("CPU Monitor Tenant"), outputPort(outputPort) {
+    };
 
     void Startup() override;
 
@@ -18,10 +25,9 @@ class CCpuMonitorTenant : public CTenant {
     void Run() override;
 
     void Cleanup() override;
-    
+
 private:
-    static CCpuMonitorTenant instance;
-    CMessagePort<NTypes::CPUMonitor> &outputPort;
+    CMessagePort<CpuMonitorData>& outputPort;
 
     uint32_t prevExecutionCycles = 0;
     uint32_t prevTotalCycles = 0;
diff --git a/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp b/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp
index dfc9f1924..94bb97992 100644
--- a/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp
+++ b/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp
@@ -14,10 +14,11 @@ void CCpuMonitorTenant::Startup() {
     prevTotalCycles = stats.total_cycles;
 }
 
-void CCpuMonitorTenant::PostStartup() {}
+void CCpuMonitorTenant::PostStartup() {
+}
 
 void CCpuMonitorTenant::Run() {
-    NTypes::CPUMonitor cpuMonitorData{0};
+    CpuMonitorData cpuMonitorData{0};
 
     cpuMonitorData.Uptime = getUptime();
     cpuMonitorData.Utilization = getUtilization();
@@ -28,7 +29,8 @@ void CCpuMonitorTenant::Run() {
     }
 }
 
-void CCpuMonitorTenant::Cleanup() {}
+void CCpuMonitorTenant::Cleanup() {
+}
 
 int32_t CCpuMonitorTenant::getDieTemperature() {
     int32_t result = 0;
@@ -58,7 +60,6 @@ uint8_t CCpuMonitorTenant::getUtilization() {
         return 0; // Avoid division by zero
     }
 
-
     // Note that total cycles is non-idle cycles
     // and execution cycles is the sum of non-idle + idle cycles.
     return static_cast<uint8_t>(

From 15dca24f437cbb2b74e83eb22b31644d93807458 Mon Sep 17 00:00:00 2001
From: Aaron Chan <aarchan108@gmail.com>
Date: Tue, 24 Jun 2025 23:30:20 -0400
Subject: [PATCH 28/33] Dont integrate CpuMonitorTenant for now into backplane
 FSW

---
 app/backplane/sensor_module/include/c_sensor_module.h | 4 ----
 app/backplane/sensor_module/src/c_sensor_module.cpp   | 5 +----
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/app/backplane/sensor_module/include/c_sensor_module.h b/app/backplane/sensor_module/include/c_sensor_module.h
index 3e05e97b9..8c8db5e18 100644
--- a/app/backplane/sensor_module/include/c_sensor_module.h
+++ b/app/backplane/sensor_module/include/c_sensor_module.h
@@ -12,7 +12,6 @@
 #include <f_core/os/c_task.h>
 #include <f_core/os/flight_log.hpp>
 #include <f_core/os/tenants/c_datalogger_tenant.h>
-#include <f_core/os/tenants/c_cpu_monitor_tenant.h>
 #include <n_autocoder_network_defs.h>
 #include <n_autocoder_types.h>
 #include <f_core/device/c_rtc.h>
@@ -60,7 +59,6 @@ class CSensorModule : public CProjectConfiguration {
     CMessagePort<NTypes::SensorData>& sensorDataBroadcastMessagePort;
     CMessagePort<NTypes::LoRaBroadcastSensorData>& downlinkMessagePort;
     CMessagePort<NTypes::TimestampedSensorData>& sensorDataLogMessagePort;
-    CMessagePort<NTypes::CPUMonitor>& cpuMonitorMessagePort;
     CMessagePort<NAlerts::AlertPacket>& alertMessagePort;
 
     CFlightLog flight_log;
@@ -74,8 +72,6 @@ class CSensorModule : public CProjectConfiguration {
     CUdpBroadcastTenant<NTypes::LoRaBroadcastSensorData> downlinkTelemTenant{"Telemetry Downlink Tenant", ipAddrStr.c_str(), telemetryDownlinkPort, telemetryDownlinkPort, downlinkMessagePort};
     CUdpBroadcastTenant<NAlerts::AlertPacket> udpAlertTenant{"UDP Alert Tenant", ipAddrStr.c_str(), alertPort, alertPort, alertMessagePort};
     CDataLoggerTenant<NTypes::TimestampedSensorData> dataLoggerTenant{"Data Logger Tenant", "/lfs/sensor_module_data.bin", LogMode::Growing, 0, sensorDataLogMessagePort, K_SECONDS(3), 64};
-    CCpuMonitorTenant cpuMonitorTenant{cpuMonitorMessagePort};
-
 
     // Tasks
     CTask networkTask{"Networking Task", 15, 3072, 0};
diff --git a/app/backplane/sensor_module/src/c_sensor_module.cpp b/app/backplane/sensor_module/src/c_sensor_module.cpp
index 09201f709..0279e9e00 100644
--- a/app/backplane/sensor_module/src/c_sensor_module.cpp
+++ b/app/backplane/sensor_module/src/c_sensor_module.cpp
@@ -19,12 +19,9 @@ static auto dataLogMsgQueue = CMsgqMessagePort<NTypes::TimestampedSensorData>(da
 K_MSGQ_DEFINE(alertQueue, sizeof(NAlerts::AlertPacket), 4, 4);
 static auto alertMsgQueue = CMsgqMessagePort<NAlerts::AlertPacket>(alertQueue);
 
-K_MSGQ_DEFINE(cpuMonitorQueue, sizeof(NTypes::CPUMonitor), 4, 4);
-static auto cpuMonitorMsgQueue = CMsgqMessagePort<NTypes::CPUMonitor>(cpuMonitorQueue);
-
 CSensorModule::CSensorModule()
     : CProjectConfiguration(), sensorDataBroadcastMessagePort(broadcastMsgQueue), downlinkMessagePort(downlinkMsgQueue),
-      sensorDataLogMessagePort(dataLogMsgQueue), cpuMonitorMessagePort(cpuMonitorMsgQueue),
+      sensorDataLogMessagePort(dataLogMsgQueue),
       alertMessagePort(alertMsgQueue), flight_log{"/lfs/flight_log.txt"} {}
 
 void CSensorModule::AddTenantsToTasks() {

From 844347bfd9a3c3ad52a841b01c633aaf95f21a5f Mon Sep 17 00:00:00 2001
From: Aaron Chan <aarchan108@gmail.com>
Date: Tue, 24 Jun 2025 23:40:06 -0400
Subject: [PATCH 29/33] Select relevant configs in F-Core

---
 lib/f_core/Kconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/f_core/Kconfig b/lib/f_core/Kconfig
index 817a97786..9cda21859 100644
--- a/lib/f_core/Kconfig
+++ b/lib/f_core/Kconfig
@@ -35,6 +35,8 @@ config F_CORE_OS
     bool "OS"
     help
       This option enables OS functionality for F-Core
+    select THREAD_RUNTIME_STATS
+    select SCHED_THREAD_USAGE
 
 config F_CORE_UTILS
     bool "Utility"

From cbe5fca9787c5bd102dc5d32f9f04018587e5d49 Mon Sep 17 00:00:00 2001
From: Aaron Chan <aarchan108@gmail.com>
Date: Tue, 24 Jun 2025 23:40:34 -0400
Subject: [PATCH 30/33] Fix power mod build

---
 boards/arm/power_module/power_module.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boards/arm/power_module/power_module.dts b/boards/arm/power_module/power_module.dts
index 2955f84b0..857e0531b 100644
--- a/boards/arm/power_module/power_module.dts
+++ b/boards/arm/power_module/power_module.dts
@@ -28,7 +28,7 @@
         ina5v0 = &ina2;
 
         vin = &adc1;
-
+        rtc = &rtc;
 		die-temp = &die_temp;
     };
 

From e2a02daf143671be04a7f160b624e36a1700ac21 Mon Sep 17 00:00:00 2001
From: Aaron Chan <aarchan108@gmail.com>
Date: Tue, 24 Jun 2025 23:50:57 -0400
Subject: [PATCH 31/33] Wipe duplicate

---
 boards/arm/power_module/power_module_defconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/boards/arm/power_module/power_module_defconfig b/boards/arm/power_module/power_module_defconfig
index 2ffca810f..5fba2fd20 100644
--- a/boards/arm/power_module/power_module_defconfig
+++ b/boards/arm/power_module/power_module_defconfig
@@ -25,7 +25,6 @@ CONFIG_LED=y
 
 # Sensors
 CONFIG_SENSOR=y
-CONFIG_SENSOR=y
 CONFIG_SENSOR_ASYNC_API=y
 CONFIG_SENSOR_INFO=y
 CONFIG_INA219=y

From 280b2f98432d0a6f65baab4a1f0a2e35382dca15 Mon Sep 17 00:00:00 2001
From: Aaron Chan <aarchan108@gmail.com>
Date: Tue, 24 Jun 2025 23:52:57 -0400
Subject: [PATCH 32/33] Delta

---
 include/f_core/os/tenants/c_cpu_monitor_tenant.h |  5 ++---
 lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp   | 16 ++++++++++------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/include/f_core/os/tenants/c_cpu_monitor_tenant.h b/include/f_core/os/tenants/c_cpu_monitor_tenant.h
index a39786cca..b416d41f1 100644
--- a/include/f_core/os/tenants/c_cpu_monitor_tenant.h
+++ b/include/f_core/os/tenants/c_cpu_monitor_tenant.h
@@ -28,9 +28,8 @@ class CCpuMonitorTenant : public CTenant {
 
 private:
     CMessagePort<CpuMonitorData>& outputPort;
-
-    uint32_t prevExecutionCycles = 0;
-    uint32_t prevTotalCycles = 0;
+    uint64_t prevExecutionCycles = 0;
+    uint64_t prevTotalCycles = 0;
 
 #if DT_NODE_EXISTS(DT_ALIAS(die_temp))
     const device *dieTempSensor = DEVICE_DT_GET(DT_ALIAS(die_temp));
diff --git a/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp b/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp
index 94bb97992..e2723c067 100644
--- a/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp
+++ b/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp
@@ -54,14 +54,18 @@ uint32_t CCpuMonitorTenant::getUptime() {
 
 uint8_t CCpuMonitorTenant::getUtilization() {
     k_thread_runtime_stats stats{0};
-
     k_thread_runtime_stats_all_get(&stats);
-    if (stats.execution_cycles == 0) {
+
+    uint64_t deltaExecution = stats.execution_cycles - prevExecutionCycles;
+    uint64_t deltaTotal = stats.total_cycles - prevTotalCycles;
+
+    prevExecutionCycles = stats.execution_cycles;
+    prevTotalCycles = stats.total_cycles;
+
+    if (deltaExecution == 0) {
         return 0; // Avoid division by zero
     }
 
-    // Note that total cycles is non-idle cycles
-    // and execution cycles is the sum of non-idle + idle cycles.
-    return static_cast<uint8_t>(
-        ((stats.total_cycles) * 100) / (stats.execution_cycles));
+    // Utilization is the percentage of non-idle cycles in the interval
+    return static_cast<uint8_t>((deltaTotal * 100) / deltaExecution);
 }

From 3886abc1d64735fbc8ffee73fa3326151cc74746 Mon Sep 17 00:00:00 2001
From: Aaron Chan <aarchan108@gmail.com>
Date: Mon, 25 Aug 2025 18:12:08 -0400
Subject: [PATCH 33/33] Improve accuracy

---
 .../f_core/os/tenants/c_cpu_monitor_tenant.h  |  5 ++--
 .../os/tenants/c_cpu_monitor_tenant.cpp       | 25 +++++++++++++++----
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/include/f_core/os/tenants/c_cpu_monitor_tenant.h b/include/f_core/os/tenants/c_cpu_monitor_tenant.h
index b416d41f1..91d36332b 100644
--- a/include/f_core/os/tenants/c_cpu_monitor_tenant.h
+++ b/include/f_core/os/tenants/c_cpu_monitor_tenant.h
@@ -28,8 +28,9 @@ class CCpuMonitorTenant : public CTenant {
 
 private:
     CMessagePort<CpuMonitorData>& outputPort;
-    uint64_t prevExecutionCycles = 0;
-    uint64_t prevTotalCycles = 0;
+    uint64_t prevExecutionCycles = 0;  // All cycles (active + idle) - Based on Zephyr naming
+    uint64_t prevTotalCycles = 0;      // Active cycles only - Based on Zephyr naming
+    uint32_t prevUptime = 0;
 
 #if DT_NODE_EXISTS(DT_ALIAS(die_temp))
     const device *dieTempSensor = DEVICE_DT_GET(DT_ALIAS(die_temp));
diff --git a/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp b/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp
index e2723c067..1f72f5ac3 100644
--- a/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp
+++ b/lib/f_core/os/tenants/c_cpu_monitor_tenant.cpp
@@ -12,6 +12,7 @@ void CCpuMonitorTenant::Startup() {
 
     prevExecutionCycles = stats.execution_cycles;
     prevTotalCycles = stats.total_cycles;
+    prevUptime = k_uptime_get_32();
 }
 
 void CCpuMonitorTenant::PostStartup() {
@@ -55,17 +56,31 @@ uint32_t CCpuMonitorTenant::getUptime() {
 uint8_t CCpuMonitorTenant::getUtilization() {
     k_thread_runtime_stats stats{0};
     k_thread_runtime_stats_all_get(&stats);
+    uint32_t currentUptime = k_uptime_get_32();
 
-    uint64_t deltaExecution = stats.execution_cycles - prevExecutionCycles;
-    uint64_t deltaTotal = stats.total_cycles - prevTotalCycles;
+    // Zephyr's naming is confusing! Based on kernel/thread.h comments:
+    // execution_cycles = total # of cycles (cpu: non-idle + idle) = ALL cycles
+    // total_cycles = total # of non-idle cycles = ACTIVE/BUSY cycles only
+    uint64_t deltaAllCycles = stats.execution_cycles - prevExecutionCycles;  // All cycles (active + idle)
+    uint64_t deltaActiveCycles = stats.total_cycles - prevTotalCycles;       // Active cycles only
+    uint32_t deltaTime = currentUptime - prevUptime;
 
     prevExecutionCycles = stats.execution_cycles;
     prevTotalCycles = stats.total_cycles;
+    prevUptime = currentUptime;
 
-    if (deltaExecution == 0) {
+    if (deltaAllCycles == 0 || deltaTime == 0) {
         return 0; // Avoid division by zero
     }
 
-    // Utilization is the percentage of non-idle cycles in the interval
-    return static_cast<uint8_t>((deltaTotal * 100) / deltaExecution);
+    if (deltaTime < 10) {
+        LOG_WRN_ONCE("CPU utilization measurement interval too short for accuracy");
+    }
+
+    // CPU Utilization = (Active cycles / All cycles) × 100
+    // gives the percentage of time the CPU is NOT idle
+    uint64_t utilization = (deltaActiveCycles * 100) / deltaAllCycles;
+    
+    // Clamp to 100% in case of any edge cases
+    return static_cast<uint8_t>(utilization > 100 ? 100 : utilization);
 }