CPU Monitor Tenant

app/backplane/sensor_module/src/c_sensor_module.cpp

@@ -21,7 +21,8 @@ static auto alertMsgQueue = CMsgqMessagePort<NAlerts::AlertPacket>(alertQueue);
 
 CSensorModule::CSensorModule()
     : CProjectConfiguration(), sensorDataBroadcastMessagePort(broadcastMsgQueue), downlinkMessagePort(downlinkMsgQueue),
-      sensorDataLogMessagePort(dataLogMsgQueue), alertMessagePort(alertMsgQueue), flight_log{"/lfs/flight_log.txt"} {}
+      sensorDataLogMessagePort(dataLogMsgQueue),
+      alertMessagePort(alertMsgQueue), flight_log{"/lfs/flight_log.txt"} {}
 
 void CSensorModule::AddTenantsToTasks() {
     // Networking

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
 

app/samples/cpu_monitor/CMakeLists.txt

@@ -0,0 +1,16 @@
+cmake_minimum_required(VERSION 3.20.0)
+
+set(FSW_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
+include(${FSW_ROOT}/cmake/Autocoders.cmake)
+
+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 -Wno-missing-field-initializers)
+FILE(GLOB app_sources src/*.cpp)
+target_sources(app PRIVATE ${app_sources})
+
+AutocodeTypes()
+add_dependencies(app ac_types)

app/samples/cpu_monitor/Kconfig

@@ -0,0 +1 @@
+source "Kconfig.zephyr"

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";
+};

app/samples/cpu_monitor/prj.conf

@@ -0,0 +1,26 @@
+CONFIG_CPP=y
+CONFIG_REQUIRES_FULL_LIBCPP=y
+CONFIG_STD_CPP20=y
+
+CONFIG_F_CORE=y
+CONFIG_F_CORE_OS=y
+
+CONFIG_SERIAL=y
+CONFIG_FILE_SYSTEM_SHELL=y
+CONFIG_HEAP_MEM_POOL_SIZE=8192
+
+CONFIG_DEBUG=y
+CONFIG_CBPRINTF_FP_SUPPORT=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
+

app/samples/cpu_monitor/sample.yaml

@@ -0,0 +1,9 @@
+sample:
+  description: Sample application monitoring CPU utilization, uptime and die-temp.
+  name: cpu-monitor
+common:
+  build_only: true
+  platform_allow:
+    - nucleo_f446re
+tests:
+  samples.template.default: {}

app/samples/cpu_monitor/src/main.cpp

@@ -0,0 +1,24 @@
+#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(CpuMonitorData), 1, 4);
+
+int main() {
+    auto cpuMonitorMsgQueue = CMsgqMessagePort<CpuMonitorData>(cpuMonitorQueue);
+    CCpuMonitorTenant cpuMonitorTenant(cpuMonitorMsgQueue);
+
+    cpuMonitorTenant.Startup();
+
+    while (true) {
+        CpuMonitorData cpuMonitorData{0, 0, 0};
+        cpuMonitorTenant.Run();
+        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);
+    }
+
+    return 0;
+}

boards/arm/deployment_module/deployment_module.dts

@@ -59,6 +59,8 @@
 		pyro-ctrl-1 = &pyro_ctrl_1;
 		pyro-ctrl-2 = &pyro_ctrl_2;
 		pyro-ctrl-3 = &pyro_ctrl_3;
+
+		die-temp = &die_temp;
 	};
 
 	leds: leds {
@@ -251,6 +253,18 @@
 	status = "okay";
 };
 
+&adc1 {
+	pinctrl-0 = <&adc1_in0_pa0>;
+	pinctrl-names = "default";
+	st,adc-prescaler = <4>;
+	status = "okay";
+};
+
+
+&die_temp {
+    status = "okay";
+};
+
 &flash0 {
 	partitions {
 		compatible = "fixed-partitions";

boards/arm/deployment_module/deployment_module_defconfig

@@ -9,11 +9,16 @@ CONFIG_ENTROPY_STM32_RNG=y
 CONFIG_ENTROPY_DEVICE_RANDOM_GENERATOR=y
 
 # IO
+CONFIG_ADC=y
 CONFIG_GPIO=y
 CONFIG_I2C=y
 CONFIG_PINCTRL=y
 CONFIG_RTC=y
 CONFIG_SERIAL=y
 CONFIG_SPI=y
 CONFIG_SPI_ASYNC=y
-CONFIG_LED=y
+CONFIG_LED=y
+
+# Sensors
+CONFIG_SENSOR=y
+CONFIG_STM32_TEMP=y

boards/arm/power_module/power_module.dts

@@ -19,14 +19,17 @@
 
         storage = &w25q128;
         logfs = &lfs1;
+        rtc = &rtc;
     };
 
     aliases {
         inabatt = &ina0;
         ina3v3 = &ina1;
         ina5v0 = &ina2;
+
         vin = &adc1;
         rtc = &rtc;
+		die-temp = &die_temp;
     };
 
     leds: leds {
@@ -214,6 +217,17 @@
     status = "okay";
 };
 
+&adc1 {
+	pinctrl-0 = <&adc1_in0_pa0>;
+	pinctrl-names = "default";
+	st,adc-prescaler = <4>;
+	status = "okay";
+};
+
+&die_temp {
+    status = "okay";
+};
+
 &flash0 {
 
     partitions {

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
@@ -26,4 +27,5 @@ CONFIG_LED=y
 CONFIG_SENSOR=y
 CONFIG_SENSOR_ASYNC_API=y
 CONFIG_SENSOR_INFO=y
-CONFIG_INA219=y
+CONFIG_INA219=y
+CONFIG_STM32_TEMP=y

boards/arm/radio_module/radio_module.dts

@@ -23,6 +23,7 @@
 
         storage = &w25q128;
         logfs = &lfs1;
+        rtc = &rtc;
     };
 
     fstab {
@@ -94,6 +95,8 @@
 
         lora = &lora0;
         gnss = &maxm10s;
+
+		rtc = &rtc;
     };
 };
 
@@ -241,6 +244,17 @@
     status = "okay";
 };
 
+&adc1 {
+	pinctrl-0 = <&adc1_in0_pa0>;
+	pinctrl-names = "default";
+	st,adc-prescaler = <4>;
+	status = "okay";
+};
+
+&die_temp {
+    status = "okay";
+};
+
 &flash0 {
     partitions {
         compatible = "fixed-partitions";

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

boards/arm/sensor_module/sensor_module.dts

@@ -19,11 +19,13 @@
 		logfs = &lfs1;
 
 		rtc = &rtc;
+		die-temp = &die_temp;
 	};
 
 	aliases {
 		led0 = &red_led_1;
 		led1 = &red_led_2;
+		die-temp = &die_temp;
 	};
 
 	leds: leds {
@@ -248,6 +250,17 @@
 	status = "okay";
 };
 
+&adc1 {
+	pinctrl-0 = <&adc1_in0_pa0>;
+	pinctrl-names = "default";
+	st,adc-prescaler = <4>;
+	status = "okay";
+};
+
+&die_temp {
+    status = "okay";
+};
+
 &flash0 {
 	partitions {
 		compatible = "fixed-partitions";

boards/arm/sensor_module/sensor_module_defconfig

@@ -27,11 +27,13 @@ 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
 CONFIG_TMP116=y
 CONFIG_BMP388=y
 CONFIG_LSM6DSL=y
 CONFIG_ADXL375=y
-CONFIG_MS5611=y
+CONFIG_MS5611=y
+CONFIG_STM32_TEMP=y

data/autocoder_inputs/types.yaml

@@ -220,4 +220,4 @@ LoRaReceiveStatistics:
     - name: ReceivedSignalStrengthIndicator
       type: int16_t
     - name: SignalToNoiseRatio
-      type: int8_t
+      type: int8_t