Add Core Subtopologies: ComFprime, ComCcsds, DataProducts, FileHandling

.github/actions/spelling/expect.txt

@@ -67,7 +67,6 @@ CComponent
 ccsds
 ccsparc
 CDH
-CDHCORE
 cerrno
 CFDP
 cff
@@ -148,7 +147,6 @@ DHTML
 diafile
 diles
 dinkel
-dnf
 dnp
 docbook
 docset
@@ -211,6 +209,7 @@ ffff
 Ffs
 FILEDOWNLINK
 FILEDOWNLINKCFG
+FILEHANDLINGSUBTOPOLOGY
 FILEID
 FILEOPENERROR
 FILEWRITEERROR
@@ -240,8 +239,6 @@ gcgandhi
 gcov
 gdiplus
 GENHUB
-getfooter
-getstatements
 gettime
 getty
 ghprb
@@ -392,7 +389,6 @@ NACI
 nasafprime
 nbits
 ncsl
-netinet
 newtio
 nmsgs
 NOBLOCK
@@ -407,8 +403,6 @@ NSHUFF
 NSPACES
 ntohs
 objcopy
-OCF
-ODR
 oflag
 okidocki
 OLDINCLUDEDIR
@@ -493,7 +487,6 @@ ptbool
 ptf
 pthread
 ptrt
-Pvn
 qch
 qhelpgenerator
 QHG
@@ -515,7 +508,6 @@ rcvd
 rdwr
 Readback
 Recvd
-redhat
 refspec
 REFTOPOLOGY
 REFTOPOLOGYDEFS
@@ -539,7 +531,6 @@ sats
 SBF
 SBINDIR
 sbom
-scid
 scm
 sdd
 searchdata
@@ -620,7 +611,6 @@ TCPCLIENT
 TCPHELPER
 TCPSERVER
 TCSANOW
-Telecommand
 telem
 TELEMCHANIMPL
 testerbase
@@ -669,9 +659,6 @@ useconds
 usecs
 valgrind
 vbai
-VCA
-vcid
-VCP
 VFILE
 VID
 vla

RPI/Top/topology.fpp

@@ -162,6 +162,7 @@ module RPI {
       fileUplink.bufferSendOut -> fprimeRouter.fileBufferReturnIn
     }
 
+
   }
 
 }

Ref/CMakeLists.txt

@@ -45,7 +45,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/../cmake/FPrime.cmake")
 # NOTE: register custom targets between these two lines
 fprime_setup_included_code()
 ##
-# Section 3: Components and Topology
+# Section 3: Components and Topology and Subtopologies
 #
 # This section includes deployment specific directories. This allows use of non-
 # core components in the topology, which is also added here.

Ref/Top/CMakeLists.txt

@@ -7,6 +7,7 @@
 add_compile_options(
   -Wno-shadow
 )
+
 set(SOURCE_FILES
   "${CMAKE_CURRENT_LIST_DIR}/instances.fpp"
   "${CMAKE_CURRENT_LIST_DIR}/topology.fpp"

Ref/Top/RefPackets.fppi

@@ -1,39 +1,43 @@
 telemetry packets RefPackets {
 
   packet CDH id 1 group 1 {
-    CDHCore.cmdDisp.CommandsDispatched
+
+    #Ref.cmdDisp.CommandsDispatched
+
+    CdhCore.cmdDisp.CommandsDispatched
     Ref.rateGroup1Comp.RgMaxTime
     Ref.rateGroup2Comp.RgMaxTime
     Ref.rateGroup3Comp.RgMaxTime
-    Ref.cmdSeq.CS_LoadCommands
-    Ref.cmdSeq.CS_CancelCommands
-    Ref.cmdSeq.CS_CommandsExecuted
-    Ref.cmdSeq.CS_SequencesCompleted
-    Ref.fileUplink.FilesReceived
-    Ref.fileUplink.PacketsReceived
-    Ref.commsBufferManager.TotalBuffs
-    Ref.commsBufferManager.CurrBuffs
-    Ref.commsBufferManager.HiBuffs
-    Ref.fileDownlink.FilesSent
-    Ref.fileDownlink.PacketsSent
-    Ref.fileManager.CommandsExecuted
-    Ref.comQueue.comQueueDepth
-    Ref.comQueue.buffQueueDepth
-    #CDHCore.tlmSend.SendLevel
+    ComCcsds.cmdSeq.CS_LoadCommands
+    ComCcsds.cmdSeq.CS_CancelCommands
+    ComCcsds.cmdSeq.CS_CommandsExecuted
+    ComCcsds.cmdSeq.CS_SequencesCompleted
+    FileHandling.fileUplink.FilesReceived
+    FileHandling.fileUplink.PacketsReceived
+    ComCcsds.commsBufferManager.TotalBuffs
+    ComCcsds.commsBufferManager.CurrBuffs
+    ComCcsds.commsBufferManager.HiBuffs
+    FileHandling.fileDownlink.FilesSent
+    FileHandling.fileDownlink.PacketsSent
+    FileHandling.fileManager.CommandsExecuted
+    ComCcsds.comQueue.comQueueDepth
+    ComCcsds.comQueue.buffQueueDepth
+    # Ref.tlmSend.SendLevel
   }
 
   packet CDHErrors id 2 group 1 {
     Ref.rateGroup1Comp.RgCycleSlips
     Ref.rateGroup2Comp.RgCycleSlips
     Ref.rateGroup3Comp.RgCycleSlips
-    Ref.cmdSeq.CS_Errors
-    Ref.fileUplink.Warnings
-    Ref.fileDownlink.Warnings
-    CDHCore.$health.PingLateWarnings
-    Ref.fileManager.Errors
-    Ref.commsBufferManager.NoBuffs
-    Ref.commsBufferManager.EmptyBuffs
-    Ref.fileManager.Errors
+    ComCcsds.cmdSeq.CS_Errors
+    FileHandling.fileUplink.Warnings
+    FileHandling.fileDownlink.Warnings
+    CdhCore.$health.PingLateWarnings
+    FileHandling.fileManager.Errors
+    ComCcsds.commsBufferManager.NoBuffs
+    ComCcsds.commsBufferManager.EmptyBuffs
+    FileHandling.fileManager.Errors
+
   }
 
   packet DriveTlm id 3 group 1 {
@@ -175,94 +179,94 @@
   }
 
   packet DataProducts id 21 group 3 {
-    Ref.dpCat.CatalogDps
-    Ref.dpCat.DpsSent
-    Ref.dpMgr.NumSuccessfulAllocations
-    Ref.dpMgr.NumFailedAllocations
-    Ref.dpMgr.NumDataProducts
-    Ref.dpMgr.NumBytes
-    Ref.dpWriter.NumBuffersReceived
-    Ref.dpWriter.NumBytesWritten
-    Ref.dpWriter.NumSuccessfulWrites
-    Ref.dpWriter.NumFailedWrites
-    Ref.dpWriter.NumErrors
-    Ref.dpBufferManager.TotalBuffs
-    Ref.dpBufferManager.CurrBuffs
-    Ref.dpBufferManager.HiBuffs
-    Ref.dpBufferManager.NoBuffs
-    Ref.dpBufferManager.EmptyBuffs
+    DataProducts.dpCat.CatalogDps
+    DataProducts.dpCat.DpsSent
+    DataProducts.dpMgr.NumSuccessfulAllocations
+    DataProducts.dpMgr.NumFailedAllocations
+    DataProducts.dpMgr.NumDataProducts
+    DataProducts.dpMgr.NumBytes
+    DataProducts.dpWriter.NumBuffersReceived
+    DataProducts.dpWriter.NumBytesWritten
+    DataProducts.dpWriter.NumSuccessfulWrites
+    DataProducts.dpWriter.NumFailedWrites
+    DataProducts.dpWriter.NumErrors
+    DataProducts.dpBufferManager.TotalBuffs
+    DataProducts.dpBufferManager.CurrBuffs
+    DataProducts.dpBufferManager.HiBuffs
+    DataProducts.dpBufferManager.NoBuffs
+    DataProducts.dpBufferManager.EmptyBuffs
   }
 
   packet Version1 id 22 group 2 {
-    CDHCore.version.FrameworkVersion
-    CDHCore.version.ProjectVersion
+    CdhCore.version.FrameworkVersion
+    CdhCore.version.ProjectVersion
   }
 
   packet Version_Library1 id 23 group 2 {
-    CDHCore.version.LibraryVersion01
-    CDHCore.version.LibraryVersion02
+    CdhCore.version.LibraryVersion01
+    CdhCore.version.LibraryVersion02
   }
 
   packet Version_Library2 id 24 group 2 {
-    CDHCore.version.LibraryVersion03
-    CDHCore.version.LibraryVersion04
+    CdhCore.version.LibraryVersion03
+    CdhCore.version.LibraryVersion04
   }
 
   packet Version_Library3 id 25 group 2 {
-    CDHCore.version.LibraryVersion05
-    CDHCore.version.LibraryVersion06
+    CdhCore.version.LibraryVersion05
+    CdhCore.version.LibraryVersion06
   }
 
   packet Version_Library4 id 26 group 2 {
-    CDHCore.version.LibraryVersion07
-    CDHCore.version.LibraryVersion08
+    CdhCore.version.LibraryVersion07
+    CdhCore.version.LibraryVersion08
   }
 
   packet Version_Library5 id 27 group 2 {
-    CDHCore.version.LibraryVersion09
-    CDHCore.version.LibraryVersion10
+    CdhCore.version.LibraryVersion09
+    CdhCore.version.LibraryVersion10
   }
 
   packet Version_Custom1 id 28 group 2 {
-    CDHCore.version.CustomVersion01
+    CdhCore.version.CustomVersion01
   }
 
   packet Version_Custom2 id 29 group 2 {
-    CDHCore.version.CustomVersion02
+    CdhCore.version.CustomVersion02
   }
 
   packet Version_Custom3 id 30 group 2 {
-    CDHCore.version.CustomVersion03
+    CdhCore.version.CustomVersion03
   }
 
   packet Version_Custom4 id 31 group 2 {
-    CDHCore.version.CustomVersion04
+    CdhCore.version.CustomVersion04
   }
 
   packet Version_Custom5 id 32 group 2 {
-    CDHCore.version.CustomVersion05
+    CdhCore.version.CustomVersion05
   }
 
   packet Version_Custom6 id 33 group 2 {
-    CDHCore.version.CustomVersion06
+    CdhCore.version.CustomVersion06
   }
 
   packet Version_Custom7 id 34 group 2 {
-    CDHCore.version.CustomVersion07
+    CdhCore.version.CustomVersion07
   }
 
   packet Version_Custom8 id 35 group 2 {
-    CDHCore.version.CustomVersion08
+    CdhCore.version.CustomVersion08
   }
 
   packet Version_Custom9 id 36 group 2 {
-    CDHCore.version.CustomVersion09
+    CdhCore.version.CustomVersion09
   }
 
   packet Version_Custom10 id 37 group 2 {
-    CDHCore.version.CustomVersion10
+    CdhCore.version.CustomVersion10
   }
 
 } omit {
-  CDHCore.cmdDisp.CommandErrors
-}
+  CdhCore.cmdDisp.CommandErrors
+}