Skip to content

CDHCore Subtopology improvements #3751

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

Merged
merged 6 commits into from
Jun 18, 2025
Merged

CDHCore Subtopology improvements #3751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4b0ba51
Simplified config naming scheme, FatalHandler back in CDHCore
moisesmata Jun 17, 2025
12e0f7e
Merge branch 'nasa:devel' into fix-cdhcore-subtopology
moisesmata Jun 17, 2025
5c5ad12
Remove unneeded add_dependencies in TestDeployment CMakeLists.txt
moisesmata Jun 17, 2025
7739b48
Changed config name to CDHCore config
moisesmata Jun 18, 2025
1b7eb2d
Merge branch 'devel' into fix-cdhcore-subtopology
moisesmata Jun 18, 2025
87aa3fb
Merge branch 'nasa:devel' into fix-cdhcore-subtopology
moisesmata Jun 18, 2025
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
4 changes: 1 addition & 3 deletions Ref/Top/instances.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,7 @@ module Ref {
# ----------------------------------------------------------------------

@ Communications driver. May be swapped with other comm drivers like UART
instance comDriver: Drv.TcpClient base id 0x4000

instance fatalHandler: Svc.FatalHandler base id 0x4100
instance comDriver: Drv.TcpClient base id 0x4100

instance commsBufferManager: Svc.BufferManager base id 0x4200

Expand Down
5 changes: 0 additions & 5 deletions Ref/Top/topology.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ module Ref {
instance dpWriter
instance dpBufferManager
instance linuxTimer
instance fatalHandler

# ----------------------------------------------------------------------
# Pattern graph specifiers
Expand Down Expand Up @@ -222,10 +221,6 @@ module Ref {

}

connections FaultProtection {
CDHCore.events.FatalAnnounce -> fatalHandler.FatalReceive
}

}

}
5 changes: 5 additions & 0 deletions Svc/Subtopologies/CDHCore/CDHCore.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ module CDHCore {
instance version
instance textLogger
instance fatalAdapter
instance fatalHandler

connections FaultProtection {
events.FatalAnnounce -> fatalHandler.FatalReceive
}

} # end topology
} # end CDHCore Subtopology
2 changes: 2 additions & 0 deletions Svc/Subtopologies/CDHCore/CDHCoreConfig/CDHCoreConfig.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,7 @@ module CDHCore {
# """
#}

# Update this as a custom fatal handler if needed
instance fatalHandler: Svc.FatalHandler base id CDHCoreConfig.BASE_ID + 0x0800

}
3 changes: 1 addition & 2 deletions cmake/test/data/TestDeployment/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,4 @@ add_fprime_subdirectory(./TestRelative)

set(SOURCE_FILES "${CMAKE_CURRENT_LIST_DIR}/Main.cpp")
set(MOD_DEPS Svc_CmdDispatcher TestLibrary_TestComponent TestLibrary2_TestComponent)
register_fprime_deployment()
add_dependencies(TestDeployment Svc_Subtopologies_CDHCore)
register_fprime_deployment()
Loading