Skip to content

Commit f28b4ed

Browse files
committed
Add back in startup manager
1 parent dc3b07e commit f28b4ed

File tree

5 files changed

+22
-3
lines changed

5 files changed

+22
-3
lines changed

FprimeZephyrReference/Components/StartupManager/StartupManager.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,13 @@ Fw::Time StartupManager ::get_quiescence_start() {
108108
return time;
109109
}
110110

111+
void StartupManager ::completeSequence_handler(FwIndexType portNum,
112+
FwOpcodeType opCode,
113+
U32 cmdSeq,
114+
const Fw::CmdResponse& response) {
115+
// TODO
116+
}
117+
111118
void StartupManager ::run_handler(FwIndexType portNum, U32 context) {
112119
Fw::ParamValid is_valid;
113120

FprimeZephyrReference/Components/StartupManager/StartupManager.fpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ module Components {
77
@ Port for sending sequence dispatches
88
output port runSequence: Svc.CmdSeqIn
99

10+
sync input port completeSequence: Fw.CmdResponse
11+
1012
@ Command to wait for system quiescence before proceeding with start-up
1113
sync command WAIT_FOR_QUIESCENCE()
1214

FprimeZephyrReference/Components/StartupManager/StartupManager.hpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,13 @@ class StartupManager final : public StartupManagerComponentBase {
3636
// Handler implementations for typed input ports
3737
// ----------------------------------------------------------------------
3838

39+
//! Handler implementation for completeSequence
40+
void completeSequence_handler(FwIndexType portNum, //!< The port number
41+
FwOpcodeType opCode, //!< Command Op Code
42+
U32 cmdSeq, //!< Command Sequence
43+
const Fw::CmdResponse& response //!< The command response argument
44+
) override;
45+
3946
//! Handler implementation for run
4047
//!
4148
//! Check RTC time diff

FprimeZephyrReference/ReferenceDeployment/Top/ReferenceDeploymentPackets.fppi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ telemetry packets ReferenceDeploymentPackets {
99
ComCcsdsUart.commsBufferManager.HiBuffs
1010
ReferenceDeployment.rateGroup10Hz.RgMaxTime
1111
ReferenceDeployment.rateGroup1Hz.RgMaxTime
12-
# ReferenceDeployment.startupManager.BootCount
12+
ReferenceDeployment.startupManager.BootCount
1313
}
1414

1515
packet HealthWarnings id 2 group 1 {

FprimeZephyrReference/ReferenceDeployment/Top/topology.fpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ module ReferenceDeployment {
4545
instance comDriver
4646
instance fsSpace
4747
instance cmdSeq
48-
#instance startupManager
48+
instance startupManager
4949

5050

5151
# ----------------------------------------------------------------------
@@ -104,6 +104,9 @@ module ReferenceDeployment {
104104
lora.dataReturnOut -> ComCcsds.framer.dataReturnIn
105105
lora.comStatusOut -> comDelay.comStatusIn
106106
comDelay.comStatusOut ->ComCcsds.framer.comStatusIn
107+
108+
startupManager.runSequence -> cmdSeq.seqRunIn
109+
cmdSeq.seqDone -> startupManager.completeSequence
107110
}
108111

109112
connections CommunicationsUart {
@@ -145,7 +148,7 @@ module ReferenceDeployment {
145148
rateGroup1Hz.RateGroupMemberOut[8] -> antennaDeployer.schedIn
146149
rateGroup1Hz.RateGroupMemberOut[9] -> fsSpace.run
147150
rateGroup1Hz.RateGroupMemberOut[10] -> FileHandling.fileDownlink.Run
148-
#rateGroup1Hz.RateGroupMemberOut[11] -> startupManager.run
151+
rateGroup1Hz.RateGroupMemberOut[11] -> startupManager.run
149152

150153
}
151154

0 commit comments

Comments
 (0)