Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Data Product Catalog prototype #2667

Merged
merged 41 commits into from
Apr 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
26c8765
Starting on FDD for DpCatalog
timcanham Jan 19, 2024
041a450
More DpCatalog SDD edits
timcanham Jan 22, 2024
c4f6294
More refined DpCatalog requirements
timcanham Jan 23, 2024
91a363e
Starting prototype code
timcanham Jan 24, 2024
3e7d121
Working on DpCatalog build command
timcanham Jan 24, 2024
e1a5783
More DpCatalog work
timcanham Jan 26, 2024
fe96b1a
More DpCatalog work
timcanham Jan 29, 2024
666e77b
Merge from devel
timcanham Feb 20, 2024
f99d851
More work on reading DP headers
timcanham Feb 21, 2024
4394336
More work...
timcanham Feb 21, 2024
f3af664
Continued work
timcanham Feb 26, 2024
c17652f
Spelling fixes
timcanham Feb 27, 2024
06c3fa6
More spelling fixes
timcanham Feb 27, 2024
c80d844
First run of init unit test
timcanham Feb 27, 2024
2848241
One DP works
timcanham Feb 29, 2024
7b9be73
Refactor unit test helpers
timcanham Mar 1, 2024
e51a07e
Working on multiple DPs
timcanham Mar 1, 2024
da0700e
More work on multiple DPs
timcanham Mar 3, 2024
0a1176d
Fixed filesRead bug
timcanham Mar 5, 2024
7425848
Merge from fprime devel
timcanham Mar 5, 2024
1e3452f
More merge fixes
timcanham Mar 5, 2024
cdd6b71
Adding DPs to SignalGen
timcanham Mar 11, 2024
1f0d4ec
Merge from F Prime devel
timcanham Mar 29, 2024
a0748fe
Adding DP components
timcanham Mar 29, 2024
7753fdd
Added DP directory to DpWriter
timcanham Mar 29, 2024
977a6a6
First working version of Data Products!
timcanham Mar 30, 2024
d4a3a0e
Added missing FileDownlink connection
timcanham Apr 3, 2024
3797067
Added early proto warning to SDD.
timcanham Apr 8, 2024
dc5dd7b
Switched to Fw::FileNameString
timcanham Apr 10, 2024
f8ac1cc
Fixed unit test compile
timcanham Apr 10, 2024
018f4ad
Add missing override keyword
timcanham Apr 10, 2024
38a3fd6
Fix unit test override
timcanham Apr 10, 2024
745b19f
Fixed format specifiers
timcanham Apr 10, 2024
d8991d6
Reformat code
bocchino Apr 11, 2024
715cc47
Revise DpWriter uts
bocchino Apr 11, 2024
52168ce
Revise dp writer
bocchino Apr 11, 2024
e3bc890
Revise dp writer
bocchino Apr 11, 2024
e62571c
Removed extra ;
timcanham Apr 25, 2024
623653a
Merge remote-tracking branch 'upstream/devel' into work/DpCatalog
timcanham Apr 25, 2024
da1065b
Fix markdown broken links
timcanham Apr 25, 2024
3c17315
Updated SDD to force CI to run again
timcanham Apr 25, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/actions/spelling/expect.txt
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,11 @@ doxysearch
Doxywizard
DPCFG
dpi
DPCAT
DPCATALOG
DPMANAGER
DPWRITER
dps
DRAINBUFFERS
drv
dsdl
Expand Down Expand Up @@ -399,6 +402,7 @@ getinput
getm
getpid
getquaternion
gett
gettime
gettimeofday
getty
Expand Down Expand Up @@ -430,6 +434,7 @@ handcoded
hardtoaccess
hashvalue
HEADERSIZE
hdr
headlessly
heapifying
hexid
Expand Down Expand Up @@ -860,6 +865,7 @@ relaxng
REMOVEDIRECTORY
REMOVEFILE
reparse
reprioritize
reserializing
resname
resultlist
Expand Down Expand Up @@ -912,6 +918,7 @@ serializables
setaffinity
setdata
SETFL
setid
setinheritsched
SETLOGGING
setm
Expand Down
3 changes: 3 additions & 0 deletions Fw/Dp/DpContainer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,9 @@
//! \return The time tag
Fw::Time getTimeTag() const { return this->m_timeTag; }

//! Get the product state
Fw::DpState getState() const { return this->m_dpState; }

Check notice

Code scanning / CodeQL

More than one statement per line Note

This line contains 2 statements; only one is allowed.

//! Get the processing types
//! \return The processing types
DpCfg::ProcType::SerialType getProcTypes() const { return this->m_procTypes; }
Expand Down
6 changes: 6 additions & 0 deletions Fw/Types/Types.fpp
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,10 @@ module Fw {
FAILURE @< Representing failure
SUCCESS @< Representing success
}

@ Wait or don't wait for something
enum Wait {
WAIT,
NO_WAIT
}
}
1 change: 1 addition & 0 deletions Ref/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ commands/
channels/
events/
dict/
DpCat

7 changes: 7 additions & 0 deletions Ref/SignalGen/Commands.fppi
Original file line number Diff line number Diff line change
Expand Up @@ -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

28 changes: 28 additions & 0 deletions Ref/SignalGen/Events.fppi
Original file line number Diff line number Diff line change
Expand Up @@ -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!"
Loading
Loading