Skip to content

Commit cf23880

Browse files
Lex-ariLex-ari
committed
Formatting
1 parent c8724e2 commit cf23880

4 files changed

Lines changed: 27 additions & 27 deletions

File tree

‎Svc/FpySequencer/FpySequencer.cpp‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,12 @@ void FpySequencer::RUN_cmdHandler(FwOpcodeType opCode, //!< The op
4444
this->RUN_ARGS_cmdHandler(opCode, cmdSeq, fileName, block, Svc::SeqArgs{0, 0});
4545
}
4646

47-
void FpySequencer ::RUN_ARGS_cmdHandler(FwOpcodeType opCode, //!< The opcode
48-
U32 cmdSeq, //!< The command sequence number
49-
const Fw::CmdStringArg& fileName, //!< The name of the sequence file
50-
Svc::FpySequencer_BlockState block, //!< Return command status when complete or not
51-
Svc::SeqArgs args //!< Arguments to pass to the sequencer
47+
void FpySequencer ::RUN_ARGS_cmdHandler(
48+
FwOpcodeType opCode, //!< The opcode
49+
U32 cmdSeq, //!< The command sequence number
50+
const Fw::CmdStringArg& fileName, //!< The name of the sequence file
51+
Svc::FpySequencer_BlockState block, //!< Return command status when complete or not
52+
Svc::SeqArgs args //!< Arguments to pass to the sequencer
5253
) {
5354
// can only run a seq while in idle
5455
if (sequencer_getState() != State::IDLE) {
@@ -125,7 +126,8 @@ void FpySequencer::RUN_VALIDATED_cmdHandler(
125126
this->m_savedCmdSeq = cmdSeq;
126127
}
127128

128-
this->sequencer_sendSignal_cmd_RUN_VALIDATED(FpySequencer_SequenceExecutionArgs(this->m_sequenceFilePath, block, this->m_sequenceArgs));
129+
this->sequencer_sendSignal_cmd_RUN_VALIDATED(
130+
FpySequencer_SequenceExecutionArgs(this->m_sequenceFilePath, block, this->m_sequenceArgs));
129131

130132
// only respond if the user doesn't want us to block further execution
131133
if (block == FpySequencer_BlockState::NO_BLOCK) {
@@ -387,7 +389,8 @@ void FpySequencer::seqRunIn_handler(FwIndexType portNum, const Fw::StringBase& f
387389

388390
// seqRunIn is never blocking - store args for pushArgsToStack action
389391
// Args must be serialized in F' big-endian format by the caller before being sent
390-
this->sequencer_sendSignal_cmd_RUN(FpySequencer_SequenceExecutionArgs(filename, FpySequencer_BlockState::NO_BLOCK, args));
392+
this->sequencer_sendSignal_cmd_RUN(
393+
FpySequencer_SequenceExecutionArgs(filename, FpySequencer_BlockState::NO_BLOCK, args));
391394
}
392395

393396
//! Handler for input port tlmWrite

‎Svc/FpySequencer/FpySequencer.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ class FpySequencer : public FpySequencerComponentBase {
145145
const Fw::CmdStringArg& fileName, //!< The name of the sequence file
146146
FpySequencer_BlockState block //!< Return command status when complete or not
147147
) override;
148-
148+
149149
//! Handler implementation for command RUN_ARGS
150150
void RUN_ARGS_cmdHandler(FwOpcodeType opCode, //!< The opcode
151151
U32 cmdSeq, //!< The command sequence number
@@ -161,7 +161,7 @@ class FpySequencer : public FpySequencerComponentBase {
161161
U32 cmdSeq, //!< The command sequence number
162162
const Fw::CmdStringArg& fileName //!< The name of the sequence file
163163
) override;
164-
164+
165165
//! Handler implementation for command VALIDATE_ARGS
166166
//!
167167
//! Loads and validates a sequence with arguments
@@ -269,8 +269,8 @@ class FpySequencer : public FpySequencerComponentBase {
269269
Svc_FpySequencer_SequencerStateMachine::Signal signal, //!< The signal
270270
const Svc::FpySequencer_SequenceExecutionArgs& value //!< The value
271271
) override;
272-
273-
//! Implementation for action setSequenceArguments of state machine Svc_FpySequencer_SequencerStateMachine
272+
273+
//! Implementation for action setSequenceArguments of state machine Svc_FpySequencer_SequencerStateMachine
274274
//!
275275
//! sets the arguments to pass to the sequence
276276
void Svc_FpySequencer_SequencerStateMachine_action_setSequenceArguments(
@@ -359,7 +359,7 @@ class FpySequencer : public FpySequencerComponentBase {
359359
SmId smId, //!< The state machine id
360360
Svc_FpySequencer_SequencerStateMachine::Signal signal //!< The signal
361361
) override;
362-
362+
363363
//! Implementation for action clearSequenceArguments of state machine Svc_FpySequencer_SequencerStateMachine
364364
//!
365365
//! clears arguments

‎Svc/FpySequencer/FpySequencerStateMachine.cpp‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ void FpySequencer::Svc_FpySequencer_SequencerStateMachine_action_setSequenceBloc
4747
void FpySequencer ::Svc_FpySequencer_SequencerStateMachine_action_setSequenceArguments(
4848
SmId smId,
4949
Svc_FpySequencer_SequencerStateMachine::Signal signal,
50-
const Svc::FpySequencer_SequenceExecutionArgs& value
51-
) {
50+
const Svc::FpySequencer_SequenceExecutionArgs& value) {
5251
this->m_sequenceArgs = value.get_buffer();
5352
}
5453

@@ -283,8 +282,7 @@ void FpySequencer::Svc_FpySequencer_SequencerStateMachine_action_pushArgsToStack
283282

284283
// Push args buffer to stack. Args are already serialized in big-endian format
285284
// by F' serialization system, so no endianness conversion is needed.
286-
this->m_runtime.stack.push(args.get_buffer(),
287-
static_cast<Fpy::StackSizeType>(args.get_size()));
285+
this->m_runtime.stack.push(args.get_buffer(), static_cast<Fpy::StackSizeType>(args.get_size()));
288286
}
289287

290288
//! Implementation for action clearSequenceFile of state machine Svc_FpySequencer_SequencerStateMachine
@@ -302,8 +300,7 @@ void FpySequencer::Svc_FpySequencer_SequencerStateMachine_action_clearSequenceFi
302300
//! clears all arguments of the sequence file
303301
void FpySequencer ::Svc_FpySequencer_SequencerStateMachine_action_clearSequenceArguments(
304302
SmId smId,
305-
Svc_FpySequencer_SequencerStateMachine::Signal signal
306-
) {
303+
Svc_FpySequencer_SequencerStateMachine::Signal signal) {
307304
this->m_sequenceArgs = {0, 0};
308305
}
309306

‎Svc/FpySequencer/test/ut/FpySequencerTestMain.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2119,9 +2119,9 @@ TEST_F(FpySequencerTester, cmd_RUN) {
21192119

21202120
TEST_F(FpySequencerTester, cmd_RUN_ARGS) {
21212121
allocMem();
2122-
add_LOAD_REL(0, 4); // Load first arg (U32 at offset 0) - duplicates it on stack
2123-
add_LOAD_REL(4, 4); // Load second arg (U32 at offset 4) - duplicates it on stack
2124-
add_DISCARD(16); // Discard all: 2 loaded copies + 2 original args
2122+
add_LOAD_REL(0, 4); // Load first arg (U32 at offset 0) - duplicates it on stack
2123+
add_LOAD_REL(4, 4); // Load second arg (U32 at offset 4) - duplicates it on stack
2124+
add_DISCARD(16); // Discard all: 2 loaded copies + 2 original args
21252125
writeToFile("test.bin");
21262126

21272127
// Pass two U32 args: 10 and 20
@@ -2247,9 +2247,9 @@ TEST_F(FpySequencerTester, cmd_RUN_VALIDATED) {
22472247

22482248
TEST_F(FpySequencerTester, cmd_VALIDATE_ARGS) {
22492249
allocMem();
2250-
add_LOAD_REL(0, 4); // Load first arg (U32 at offset 0) - duplicates it on stack
2251-
add_LOAD_REL(4, 4); // Load second arg (U32 at offset 4) - duplicates it on stack
2252-
add_DISCARD(16); // Discard all: 2 loaded copies + 2 original args
2250+
add_LOAD_REL(0, 4); // Load first arg (U32 at offset 0) - duplicates it on stack
2251+
add_LOAD_REL(4, 4); // Load second arg (U32 at offset 4) - duplicates it on stack
2252+
add_DISCARD(16); // Discard all: 2 loaded copies + 2 original args
22532253
writeToFile("test.bin");
22542254

22552255
// Pass two U32 args: 10 and 20
@@ -3342,9 +3342,9 @@ TEST_F(FpySequencerTester, seqRunIn) {
33423342

33433343
TEST_F(FpySequencerTester, seqRunInArgs) {
33443344
allocMem();
3345-
add_LOAD_REL(0, 4); // Load first arg (U32 at offset 0) - duplicates it on stack
3346-
add_LOAD_REL(4, 4); // Load second arg (U32 at offset 4) - duplicates it on stack
3347-
add_DISCARD(16); // Discard all: 2 loaded copies + 2 original args
3345+
add_LOAD_REL(0, 4); // Load first arg (U32 at offset 0) - duplicates it on stack
3346+
add_LOAD_REL(4, 4); // Load second arg (U32 at offset 4) - duplicates it on stack
3347+
add_DISCARD(16); // Discard all: 2 loaded copies + 2 original args
33483348
writeToFile("test.bin");
33493349

33503350
// Pass two U32 args: 10 and 20

0 commit comments

Comments
 (0)