Update to use aggregation

Author: LeStarch

FprimeZephyrReference/Components/ComDelay/ComDelay.cpp

@@ -51,6 +51,7 @@ void ComDelay ::run_handler(FwIndexType portNum, U32 context) {
         bool valid = this->m_last_status_valid.compare_exchange_strong(expected, false);
         if (valid) {
             this->comStatusOut_out(0, this->m_last_status);
+            this->timeout_out(0, 0);
         }
     }
 

FprimeZephyrReference/Components/ComDelay/ComDelay.fpp

@@ -5,6 +5,9 @@ module Components {
         @ Rate schedule port used to trigger radio transmission
         sync input port run: Svc.Sched
 
+        @ Rate schedule port used to trigger aggregation timeout
+        output port timeout: Svc.Sched
+
         @ Input comStatus from radio component
         sync input port comStatusIn: Fw.SuccessCondition
 

FprimeZephyrReference/ReferenceDeployment/Top/topology.fpp

@@ -80,6 +80,8 @@ module ReferenceDeployment {
       lora.dataReturnOut -> ComCcsds.framer.dataReturnIn
       lora.comStatusOut -> comDelay.comStatusIn
       comDelay.comStatusOut ->ComCcsds.framer.comStatusIn
+
+      comDelay.timeout -> ComCcsds.aggregator.timeout
     }
 
     connections RateGroups {

FprimeZephyrReference/project/config/ComCcsdsConfig.fpp

@@ -4,10 +4,12 @@ module ComCcsdsConfig {
 
     module QueueSizes {
         constant comQueue    = 10
+        constant aggregator = 2
     }
 
     module StackSizes {
         constant comQueue   = 8 * 1024 # Must match prj.conf thread stack size
+        constant aggregator = 8 * 1024 # Must match prj.conf thread stack size
     }
 
     module Priorities {

FprimeZephyrReference/project/config/ComCfg.fpp

@@ -17,6 +17,7 @@ module ComCfg {
     # - potentially APID enum ?
     constant SpacecraftId = 0x0044    # Spacecraft ID (10 bits)
     constant TmFrameFixedSize = 248   # Needs to be at least COM_BUFFER_MAX_SIZE + (2 * SpacePacketHeaderSize) + 1
+    constant AggregationSize = TmFrameFixedSize - 6 - 6 - 1 - 2  # 2 header (6) + 1 idle byte + 2 trailer bytes
 
     @ APIDs are 11 bits in the Space Packet protocol, so we use U16. Max value 7FF
     enum Apid : FwPacketDescriptorType {

FprimeZephyrReference/project/config/FpConfig.h

@@ -166,7 +166,7 @@ extern "C" {
 
 // Specifies the size of the buffer that contains a communications packet.
 #ifndef FW_COM_BUFFER_MAX_SIZE
-#define FW_COM_BUFFER_MAX_SIZE 235
+#define FW_COM_BUFFER_MAX_SIZE 233
 #endif
 
 // Specifies the size of the buffer attached to state machine signals.