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.

Sign up for GitHub

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

FPP v2.2.1a2 #3042

Merged
merged 3 commits into from
Nov 22, 2024
Merged

FPP v2.2.1a2 #3042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
17a599c
Update fpp version; revise Ref topology
bocchino Nov 21, 2024
40343b8
Merge branch 'devel' into fpp-v2.2.1a2
bocchino Nov 22, 2024
37bb6d8
Update fpp version
bocchino Nov 22, 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
27 changes: 5 additions & 22 deletions Ref/Top/RefTopology.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
// acknowledged.
// ======================================================================
// Provides access to autocoded functions
#include <Ref/Top/RefTopologyAc.hpp>
#include <Ref/Top/RefPacketsAc.hpp>
#include <Ref/Top/RefTopologyAc.hpp>

// Necessary project-specified types
#include <Fw/Types/MallocAllocator.hpp>
Expand Down Expand Up @@ -62,24 +62,6 @@ enum TopologyConstants {
DP_BUFFER_MANAGER_ID = 300
};

// Ping entries are autocoded, however; this code is not properly exported. Thus, it is copied here.
Svc::Health::PingEntry pingEntries[] = {
{PingEntries::Ref_blockDrv::WARN, PingEntries::Ref_blockDrv::FATAL, "blockDrv"},
{PingEntries::Ref_tlmSend::WARN, PingEntries::Ref_tlmSend::FATAL, "chanTlm"},
{PingEntries::Ref_cmdDisp::WARN, PingEntries::Ref_cmdDisp::FATAL, "cmdDisp"},
{PingEntries::Ref_cmdSeq::WARN, PingEntries::Ref_cmdSeq::FATAL, "cmdSeq"},
{PingEntries::Ref_eventLogger::WARN, PingEntries::Ref_eventLogger::FATAL, "eventLogger"},
{PingEntries::Ref_fileDownlink::WARN, PingEntries::Ref_fileDownlink::FATAL, "fileDownlink"},
{PingEntries::Ref_fileManager::WARN, PingEntries::Ref_fileManager::FATAL, "fileManager"},
{PingEntries::Ref_fileUplink::WARN, PingEntries::Ref_fileUplink::FATAL, "fileUplink"},
{PingEntries::Ref_pingRcvr::WARN, PingEntries::Ref_pingRcvr::FATAL, "pingRcvr"},
{PingEntries::Ref_prmDb::WARN, PingEntries::Ref_prmDb::FATAL, "prmDb"},
{PingEntries::Ref_rateGroup1Comp::WARN, PingEntries::Ref_rateGroup1Comp::FATAL, "rateGroup1Comp"},
{PingEntries::Ref_rateGroup2Comp::WARN, PingEntries::Ref_rateGroup2Comp::FATAL, "rateGroup2Comp"},
{PingEntries::Ref_rateGroup3Comp::WARN, PingEntries::Ref_rateGroup3Comp::FATAL, "rateGroup3Comp"},
{PingEntries::Ref_dpCat::WARN, PingEntries::Ref_dpCat::FATAL, "rateGroup3Comp"},
};

/**
* \brief configure/setup components in project-specific way
*
Expand Down Expand Up @@ -108,7 +90,8 @@ void configureTopology() {
prmDb.readParamFile();

// Health is supplied a set of ping entires.
health.setPingEntries(pingEntries, FW_NUM_ARRAY_ELEMENTS(pingEntries), HEALTH_WATCHDOG_CODE);
health.setPingEntries(ConfigObjects::Ref_health::pingEntries,
FW_NUM_ARRAY_ELEMENTS(ConfigObjects::Ref_health::pingEntries), HEALTH_WATCHDOG_CODE);

// Buffer managers need a configured set of buckets and an allocator used to allocate memory for those buckets.
Svc::BufferManager::BufferBins upBuffMgrBins;
Expand All @@ -132,11 +115,11 @@ void configureTopology() {
// create the DP directory if it doesn't exist
Os::FileSystem::createDirectory(dpDir.toChar());

dpCat.configure(&dpDir,1,0,mallocator);
dpCat.configure(&dpDir, 1, 0, mallocator);
dpWriter.configure(dpDir);

// Note: Uncomment when using Svc:TlmPacketizer
//tlmSend.setPacketList(RefPacketsPkts, RefPacketsIgnore, 1);
// tlmSend.setPacketList(RefPacketsPkts, RefPacketsIgnore, 1);
}

// Public functions for use in main program are namespaced with deployment name Ref
Expand Down
24 changes: 12 additions & 12 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@ fprime-fpl-convert-xml==1.0.3
fprime-fpl-extract-xml==1.0.3
fprime-fpl-layout==1.0.3
fprime-fpl-write-pic==1.0.3
fprime-fpp-check==2.2.1a1
fprime-fpp-depend==2.2.1a1
fprime-fpp-filenames==2.2.1a1
fprime-fpp-format==2.2.1a1
fprime-fpp-from-xml==2.2.1a1
fprime-fpp-locate-defs==2.2.1a1
fprime-fpp-locate-uses==2.2.1a1
fprime-fpp-syntax==2.2.1a1
fprime-fpp-to-cpp==2.2.1a1
fprime-fpp-to-dict==2.2.1a1
fprime-fpp-to-json==2.2.1a1
fprime-fpp-to-xml==2.2.1a1
fprime-fpp-check==2.2.1a2
fprime-fpp-depend==2.2.1a2
fprime-fpp-filenames==2.2.1a2
fprime-fpp-format==2.2.1a2
fprime-fpp-from-xml==2.2.1a2
fprime-fpp-locate-defs==2.2.1a2
fprime-fpp-locate-uses==2.2.1a2
fprime-fpp-syntax==2.2.1a2
fprime-fpp-to-cpp==2.2.1a2
fprime-fpp-to-dict==2.2.1a2
fprime-fpp-to-json==2.2.1a2
fprime-fpp-to-xml==2.2.1a2
fprime-gds==3.5.0
fprime-tools==3.5.1a2
fprime-visual==1.0.2
Expand Down
Loading