Merge branch 'startup' of github.com:Open-Source-Space-Foundation/proves-core-reference into startup

Author: LeStarch

FprimeZephyrReference/ReferenceDeployment/Top/ReferenceDeploymentPackets.fppi

@@ -61,6 +61,19 @@ telemetry packets ReferenceDeploymentPackets {
     ReferenceDeployment.antennaDeployer.LastDistance
   }
 
+  packet FileStatus id 9 group 4{
+
+    FileHandling.fileUplink.FilesReceived
+    FileHandling.fileUplink.PacketsReceived
+    FileHandling.fileDownlink.FilesSent
+    FileHandling.fileDownlink.PacketsSent
+    FileHandling.fileManager.CommandsExecuted
+    FileHandling.fileManager.Errors
+    FileHandling.fileUplink.Warnings
+    FileHandling.fileDownlink.Warnings
+
+  }
+
 } omit {
   CdhCore.cmdDisp.CommandErrors
   # Only has one library, no custom versions

FprimeZephyrReference/ReferenceDeployment/Top/topology.fpp

@@ -17,6 +17,7 @@ module ReferenceDeployment {
     import CdhCore.Subtopology
     import ComCcsds.FramingSubtopology
     import ComCcsdsUart.Subtopology
+    import FileHandling.Subtopology
 
   # ----------------------------------------------------------------------
   # Instances used in the topology
@@ -56,7 +57,7 @@ module ReferenceDeployment {
     health connections instance CdhCore.$health
     time connections instance rtcManager
     telemetry connections instance CdhCore.tlmSend
-    param connections instance prmDb
+    param connections instance FileHandling.prmDb
 
   # ----------------------------------------------------------------------
   # Telemetry packets (only used when TlmPacketizer is used)
@@ -124,6 +125,7 @@ module ReferenceDeployment {
       rateGroup10Hz.RateGroupMemberOut[0] -> comDriver.schedIn
       rateGroup10Hz.RateGroupMemberOut[1] -> ComCcsdsUart.aggregator.timeout
       rateGroup10Hz.RateGroupMemberOut[2] -> ComCcsds.aggregator.timeout
+      rateGroup10Hz.RateGroupMemberOut[3] -> FileHandling.fileManager.schedIn
 
       # Slow rate (1Hz) rate group
       rateGroupDriver.CycleOut[Ports_RateGroups.rateGroup1Hz] -> rateGroup1Hz.CycleIn
@@ -137,6 +139,7 @@ module ReferenceDeployment {
       rateGroup1Hz.RateGroupMemberOut[7] -> burnwire.schedIn
       rateGroup1Hz.RateGroupMemberOut[8] -> antennaDeployer.schedIn
       rateGroup1Hz.RateGroupMemberOut[9] -> fsSpace.run
+      rateGroup1Hz.RateGroupMemberOut[10] -> FileHandling.fileDownlink.Run
 
     }
 
@@ -161,5 +164,17 @@ module ReferenceDeployment {
       imuManager.magneticFieldGet -> lis2mdlManager.magneticFieldGet
       imuManager.temperatureGet -> lsm6dsoManager.temperatureGet
     }
+
+    connections ComCcsds_FileHandling {
+      # File Downlink <-> ComQueue
+      FileHandling.fileDownlink.bufferSendOut -> ComCcsds.comQueue.bufferQueueIn[ComCcsds.Ports_ComBufferQueue.FILE]
+      ComCcsds.comQueue.bufferReturnOut[ComCcsds.Ports_ComBufferQueue.FILE] -> FileHandling.fileDownlink.bufferReturn
+
+      # Router <-> FileUplink
+      ComCcsds.fprimeRouter.fileOut     -> FileHandling.fileUplink.bufferSendIn
+      FileHandling.fileUplink.bufferSendOut -> ComCcsds.fprimeRouter.fileBufferReturnIn
+    }
+
+
   }
 }

FprimeZephyrReference/project/config/AcConstants.fpp

@@ -0,0 +1,70 @@
+# ======================================================================
+# AcConstants.fpp
+# F Prime configuration constants
+# ======================================================================
+
+@ Number of rate group member output ports for ActiveRateGroup
+constant ActiveRateGroupOutputPorts = 15
+
+@ Number of rate group member output ports for PassiveRateGroup
+constant PassiveRateGroupOutputPorts = 10
+
+@ Used to drive rate groups
+constant RateGroupDriverRateGroupPorts = 3
+
+@ Used for command and registration ports
+constant CmdDispatcherComponentCommandPorts = 30
+
+@ Used for uplink/sequencer buffer/response ports
+constant CmdDispatcherSequencePorts = 5
+
+@ Used for dispatching sequences to command sequencers
+constant SeqDispatcherSequencerPorts = 2
+
+@ Used for sizing the command splitter input arrays
+constant CmdSplitterPorts = CmdDispatcherSequencePorts
+
+@ Number of static memory allocations
+constant StaticMemoryAllocations = 4
+
+@ Used to ping active components
+constant HealthPingPorts = 25
+
+@ Used for broadcasting completed file downlinks
+constant FileDownCompletePorts = 1
+
+@ Used for number of Fw::Com type ports supported by Svc::ComQueue
+constant ComQueueComPorts = 2
+
+@ Used for number of Fw::Buffer type ports supported by Svc::ComQueue
+constant ComQueueBufferPorts = 1
+
+@ Used for maximum number of connected buffer repeater consumers
+constant BufferRepeaterOutputPorts = 10
+
+@ Size of port array for DpManager
+constant DpManagerNumPorts = 5
+
+@ Size of processing port array for DpWriter
+constant DpWriterNumProcPorts = 5
+
+@ The size of a file name string
+constant FileNameStringSize = 200
+
+@ The size of an assert text string
+constant FwAssertTextSize = 256
+
+@ The size of a file name in an AssertFatalAdapter event
+@ Note: File names in assertion failures are also truncated by
+@ the constants FW_ASSERT_TEXT_SIZE and FW_LOG_STRING_MAX_SIZE, set
+@ in FpConfig.h.
+constant AssertFatalAdapterEventFileSize = FileNameStringSize
+
+# ----------------------------------------------------------------------
+# Hub connections. Connections on all deployments should mirror these settings.
+# ----------------------------------------------------------------------
+
+constant GenericHubInputPorts = 10
+constant GenericHubOutputPorts = 10
+constant GenericHubInputBuffers = 10
+constant GenericHubOutputBuffers = 10

FprimeZephyrReference/project/config/CMakeLists.txt

@@ -14,5 +14,6 @@ register_fprime_config(
         "${CMAKE_CURRENT_LIST_DIR}/LoRaCfg.hpp"
         "${CMAKE_CURRENT_LIST_DIR}/FpConfig.h"
         "${CMAKE_CURRENT_LIST_DIR}/TlmPacketizerCfg.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/AcConstants.fpp"
     INTERFACE
 )