Data Product Catalog prototype (#2667)

* Starting on FDD for DpCatalog * More DpCatalog SDD edits * More refined DpCatalog requirements * Starting prototype code * Working on DpCatalog build command * More DpCatalog work * More DpCatalog work * More work on reading DP headers * More work... * Continued work * Spelling fixes * More spelling fixes * First run of init unit test * One DP works * Refactor unit test helpers * Working on multiple DPs * More work on multiple DPs * Fixed filesRead bug * More merge fixes * Adding DPs to SignalGen * Adding DP components * Added DP directory to DpWriter * First working version of Data Products! * Added missing FileDownlink connection * Added early proto warning to SDD. * Switched to Fw::FileNameString * Fixed unit test compile * Add missing override keyword * Fix unit test override * Fixed format specifiers * Reformat code * Revise DpWriter uts * Revise dp writer * Revise dp writer * Removed extra ; * Fix markdown broken links * Updated SDD to force CI to run again --------- Co-authored-by: Robert L. Bocchino Jr <[email protected]>
nasa · Apr 25, 2024 · 4557066 · 4557066
1 parent 88d65d7
commit 4557066
Show file tree

Hide file tree

Showing 33 changed files with 2,097 additions and 194 deletions.
diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
@@ -270,8 +270,11 @@ doxysearch
 Doxywizard
 DPCFG
 dpi
+DPCAT
+DPCATALOG
 DPMANAGER
 DPWRITER
+dps
 DRAINBUFFERS
 drv
 dsdl
@@ -399,6 +402,7 @@ getinput
 getm
 getpid
 getquaternion
+gett
 gettime
 gettimeofday
 getty
@@ -430,6 +434,7 @@ handcoded
 hardtoaccess
 hashvalue
 HEADERSIZE
+hdr
 headlessly
 heapifying
 hexid
@@ -860,6 +865,7 @@ relaxng
 REMOVEDIRECTORY
 REMOVEFILE
 reparse
+reprioritize
 reserializing
 resname
 resultlist
@@ -912,6 +918,7 @@ serializables
 setaffinity
 setdata
 SETFL
+setid
 setinheritsched
 SETLOGGING
 setm

diff --git a/Fw/Dp/DpContainer.hpp b/Fw/Dp/DpContainer.hpp
@@ -98,6 +98,9 @@ class DpContainer {
     //! \return The time tag
     Fw::Time getTimeTag() const { return this->m_timeTag; }
 
+    //! Get the product state
+    Fw::DpState getState() const { return this->m_dpState; }
+
     //! Get the processing types
     //! \return The processing types
     DpCfg::ProcType::SerialType getProcTypes() const { return this->m_procTypes; }

diff --git a/Fw/Types/Types.fpp b/Fw/Types/Types.fpp
@@ -71,4 +71,10 @@ module Fw {
       FAILURE @< Representing failure
       SUCCESS @< Representing success
   }
+
+  @ Wait or don't wait for something
+  enum Wait {
+    WAIT,
+    NO_WAIT
+  }
 }
diff --git a/Ref/.gitignore b/Ref/.gitignore
@@ -6,4 +6,5 @@ commands/
 channels/
 events/
 dict/
+DpCat
 
diff --git a/Ref/SignalGen/Commands.fppi b/Ref/SignalGen/Commands.fppi
@@ -14,3 +14,10 @@ async command SignalGen_Toggle \
 @ Skip next sample
 async command SignalGen_Skip \
   opcode 2
+
+@ Signal Generator Settings
+async command SignalGen_Dp(
+                                  records: U32
+                                ) \
+  opcode 3
+
diff --git a/Ref/SignalGen/Events.fppi b/Ref/SignalGen/Events.fppi
@@ -8,3 +8,31 @@ event SignalGen_SettingsChanged(
   severity activity low \
   id 0 \
   format "Set Frequency(Hz) {}, Amplitude {f}, Phase {f}, Signal Type {}"
+
+event SignalGen_DpStarted(
+                                 records: U32
+                               ) \
+  severity activity low \
+  id 1 \
+  format "Writing {} DP records"
+
+event SignalGen_DpComplete(
+                                 records: U32
+                                 bytes: U32
+                               ) \
+  severity activity low \
+  id 2 \
+  format "Writing {} DP records {} bytes total"
+
+event SignalGen_DpRecordFull(
+                                 records: U32
+                                 bytes: U32
+                               ) \
+  severity warning low \
+  id 3 \
+  format "DP container full with {} records and {} bytes. Closing DP."
+
+event SignalGen_DpsNotConnected \
+  severity warning high \
+  id 4 \
+  format "DP Ports not connected!"