merge

Author: ineskhou

.clang-format

@@ -3,3 +3,9 @@ BasedOnStyle: Chromium
 IndentWidth: 4
 ColumnLimit: 120
 AccessModifierOffset: -2
+SortIncludes: true
+IncludeBlocks: Regroup
+IncludeCategories:
+  # Zephyr headers come last
+  - Regex: '^<zephyr/.*>'
+    Priority: 3

.gitignore

@@ -24,3 +24,4 @@ settings.ini
 **/*.egg-info/
 
 bin/
+_codeql_detected_source_root

CMakeLists.txt

@@ -34,11 +34,5 @@ fprime_setup_included_code()
 
 # This includes project-wide objects
 add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/FprimeZephyrReference")
-if (FPRIME_USE_POSIX)
-    set_target_properties(Drv_Ip PROPERTIES EXCLUDE_FROM_ALL TRUE)
-    set_target_properties(Drv_TcpServer PROPERTIES EXCLUDE_FROM_ALL TRUE)
-    set_target_properties(Drv_TcpClient PROPERTIES EXCLUDE_FROM_ALL TRUE)
-    set_target_properties(Drv_Udp PROPERTIES EXCLUDE_FROM_ALL TRUE)
-endif()
 set_target_properties(Svc_FatalHandler PROPERTIES EXCLUDE_FROM_ALL TRUE)
 set_target_properties(fprime-zephyr_Drv_ZephyrSpiDriver PROPERTIES EXCLUDE_FROM_ALL TRUE)

FprimeZephyrReference/ComCcsdsUart/SubtopologyTopologyDefs.hpp

@@ -4,6 +4,7 @@
 #include <Fw/Types/MallocAllocator.hpp>
 #include <Svc/BufferManager/BufferManager.hpp>
 #include <Svc/FrameAccumulator/FrameDetector/CcsdsTcFrameDetector.hpp>
+
 #include "ComCcsdsConfig/ComCcsdsSubtopologyConfig.hpp"
 #include "Svc/Subtopologies/ComCcsds/ComCcsdsConfig/FppConstantsAc.hpp"
 

FprimeZephyrReference/Components/AntennaDeployer/AntennaDeployer.cpp

@@ -115,6 +115,7 @@ void AntennaDeployer ::startNextAttempt() {
 
     this->m_totalAttempts++;
     this->tlmWrite_DeployAttemptCount(this->m_totalAttempts);
+    this->m_burnTicksThisAttempt = 0;
 
     if (this->isConnected_burnStart_OutputPort(0)) {
         this->burnStart_out(0);
@@ -140,6 +141,7 @@ void AntennaDeployer ::handleQuietWaitTick() {
 
 void AntennaDeployer ::handleBurningTick() {
     this->m_ticksInState++;
+    this->m_burnTicksThisAttempt = this->m_ticksInState;
 
     if (this->m_stopRequested) {
         this->finishDeployment(Components::DeployResult::DEPLOY_RESULT_ABORT);
@@ -154,6 +156,7 @@ void AntennaDeployer ::handleBurningTick() {
     const U32 burnDuration = this->paramGet_BURN_DURATION_SEC(valid);
     if (this->m_ticksInState >= burnDuration) {
         this->ensureBurnwireStopped();
+        this->logBurnSignalCount();
 
         if (this->m_successDetected) {
             this->finishDeployment(Components::DeployResult::DEPLOY_RESULT_SUCCESS);
@@ -205,6 +208,7 @@ void AntennaDeployer ::finishDeployment(Components::DeployResult result) {
     }
 
     this->ensureBurnwireStopped();
+    this->logBurnSignalCount();
 
     if (result == Components::DeployResult::DEPLOY_RESULT_SUCCESS) {
         this->log_ACTIVITY_HI_DeploySuccess(this->m_currentAttempt);
@@ -222,6 +226,7 @@ void AntennaDeployer ::resetDeploymentState() {
     this->m_stopRequested = false;
     this->m_successDetected = false;
     this->m_lastDistanceValid = false;
+    this->m_burnTicksThisAttempt = 0;
 }
 
 bool AntennaDeployer ::isDistanceWithinValidRange(F32 distance) {
@@ -240,6 +245,7 @@ bool AntennaDeployer ::isDistanceDeployed(F32 distance) {
 
     if (distance <= threshold) {
         this->m_successDetected = true;
+        this->logBurnSignalCount();
         return true;
     }
 
@@ -252,4 +258,11 @@ void AntennaDeployer ::ensureBurnwireStopped() {
     }
 }
 
+void AntennaDeployer ::logBurnSignalCount() {
+    if (this->m_burnTicksThisAttempt > 0U) {
+        this->log_ACTIVITY_LO_AntennaBurnSignalCount(this->m_burnTicksThisAttempt);
+        this->m_burnTicksThisAttempt = 0;
+    }
+}
+
 }  // namespace Components

FprimeZephyrReference/Components/AntennaDeployer/AntennaDeployer.fpp

@@ -28,7 +28,7 @@ module Components {
         ######################################################################
         # Telemetry
         ######################################################################
-        @ Counts the number of deployment attempts across boots
+        @ Counts the number of deployment attempts
         telemetry DeployAttemptCount: U32
 
         @ Tracks the last observed distance reading
@@ -68,6 +68,12 @@ module Components {
         ) severity activity high \
           format "Quiet time expired after {} seconds, starting deployment attempt"
 
+        @ Reports how many scheduler ticks the burn signal was held active for the latest attempt
+        event AntennaBurnSignalCount(
+            ticks: U32 @< Number of scheduler ticks spent in the burn state
+        ) severity activity low \
+          format "Burn signal active for {} scheduler ticks"
+
         ######################################################################
         # Ports
         ######################################################################

FprimeZephyrReference/Components/AntennaDeployer/AntennaDeployer.hpp

@@ -52,6 +52,7 @@ class AntennaDeployer final : public AntennaDeployerComponentBase {
     bool isDistanceWithinValidRange(F32 distance);
     bool isDistanceDeployed(F32 distance);
     void ensureBurnwireStopped();
+    void logBurnSignalCount();
 
     DeploymentState m_state = DeploymentState::IDLE;
     U32 m_currentAttempt = 0;
@@ -61,6 +62,7 @@ class AntennaDeployer final : public AntennaDeployerComponentBase {
     bool m_successDetected = false;
     bool m_lastDistanceValid = false;
     F32 m_lastDistance = 0.0F;
+    U32 m_burnTicksThisAttempt = 0;
 };
 
 }  // namespace Components

FprimeZephyrReference/Components/Burnwire/Burnwire.hpp

@@ -7,6 +7,7 @@
 #define Components_Burnwire_HPP
 
 #include <atomic>
+
 #include "FprimeZephyrReference/Components/Burnwire/BurnwireComponentAc.hpp"
 
 namespace Components {

FprimeZephyrReference/Components/CMakeLists.txt

@@ -11,3 +11,5 @@ add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/ImuManager/")
 add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/NullPrmDb/")
 add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/PowerMonitor/")
 add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/Watchdog")
+add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/StartupManager/")
+add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/LoadSwitch/")

FprimeZephyrReference/Components/ComDelay/ComDelay.cpp

@@ -5,6 +5,7 @@
 // ======================================================================
 
 #include "FprimeZephyrReference/Components/ComDelay/ComDelay.hpp"
+
 #include "FprimeZephyrReference/Components/ComDelay/FppConstantsAc.hpp"
 
 namespace Components {