Merge branch 'devel' into Lex-ari-FpySequencer-Cancel-Port

Author: Lex-ari

Svc/CmdSequencer/CmdSequencerImpl.cpp

@@ -100,7 +100,10 @@ void CmdSequencerComponentImpl::CS_RUN_cmdHandler(FwOpcodeType opCode,
     if (AUTO == this->m_stepMode) {
         this->m_runMode = RUNNING;
         if (this->isConnected_seqStartOut_OutputPort(0)) {
-            this->seqStartOut_out(0, this->m_sequence->getStringFileName());
+            // Create empty SeqArgs as placeholder
+            // Use parameterized constructor to ensure m_size is initialized to 0
+            Svc::SeqArgs emptyArgs{0, 0};
+            this->seqStartOut_out(0, this->m_sequence->getStringFileName(), emptyArgs);
         }
         this->performCmd_Step();
     }
@@ -162,15 +165,21 @@ void CmdSequencerComponentImpl::doSequenceRun(const Fw::StringBase& filename) {
     if (AUTO == this->m_stepMode) {
         this->m_runMode = RUNNING;
         if (this->isConnected_seqStartOut_OutputPort(0)) {
-            this->seqStartOut_out(0, this->m_sequence->getStringFileName());
+            // Create empty SeqArgs as placeholder
+            // Use parameterized constructor to ensure m_size is initialized to 0
+            Svc::SeqArgs emptyArgs{0, 0};
+            this->seqStartOut_out(0, this->m_sequence->getStringFileName(), emptyArgs);
         }
         this->performCmd_Step();
     }
 
     this->log_ACTIVITY_HI_CS_PortSequenceStarted(this->m_sequence->getLogFileName());
 }
 
-void CmdSequencerComponentImpl::seqRunIn_handler(FwIndexType portNum, const Fw::StringBase& filename) {
+void CmdSequencerComponentImpl::seqRunIn_handler(FwIndexType portNum,
+                                                 const Fw::StringBase& filename,
+                                                 const Svc::SeqArgs& args) {
+    (void)args;  // Suppress unused parameter warning
     this->doSequenceRun(filename);
 }
 
@@ -322,7 +331,9 @@ void CmdSequencerComponentImpl ::CS_START_cmdHandler(FwOpcodeType opcode, U32 cm
     this->performCmd_Step();
     this->log_ACTIVITY_HI_CS_CmdStarted(this->m_sequence->getLogFileName());
     if (this->isConnected_seqStartOut_OutputPort(0)) {
-        this->seqStartOut_out(0, this->m_sequence->getStringFileName());
+        // Create empty SeqArgs as placeholder
+        Svc::SeqArgs emptyArgs{0, 0};
+        this->seqStartOut_out(0, this->m_sequence->getStringFileName(), emptyArgs);
     }
     this->cmdResponse_out(opcode, cmdSeq, Fw::CmdResponse::OK);
 }

Svc/CmdSequencer/CmdSequencerImpl.hpp

@@ -519,8 +519,9 @@ class CmdSequencerComponentImpl final : public CmdSequencerComponentBase {
                          ) override;
 
     //! Handler for input port seqRunIn
-    void seqRunIn_handler(FwIndexType portNum,            //!< The port number
-                          const Fw::StringBase& filename  //!< The sequence file
+    void seqRunIn_handler(FwIndexType portNum,             //!< The port number
+                          const Fw::StringBase& filename,  //!< The sequence file
+                          const Svc::SeqArgs& args         //!< Sequence arguments (not currently used)
                           ) override;
 
     //! Handler implementation for seqDispatchIn

Svc/CmdSequencer/Commands.fppi

@@ -2,14 +2,14 @@
 
 @ Run a command sequence file
 async command CS_RUN(
-                      fileName: string size 240 @< The name of the sequence file
+                      fileName: string size FileNameStringSize @< The name of the sequence file
                       $block: BlockState @< Return command status when complete or not
                     ) \
   opcode 0
 
 @ Validate a command sequence file
 async command CS_VALIDATE(
-                           fileName: string size 240 @< The name of the sequence file
+                           fileName: string size FileNameStringSize @< The name of the sequence file
                          ) \
   opcode 1
 

Svc/CmdSequencer/test/ut/CmdSequencerTester.cpp

@@ -271,7 +271,8 @@ void CmdSequencerTester ::parameterizedDataReadErrors(SequenceFiles::File& file)
 void CmdSequencerTester ::parameterizedNeverLoaded() {
     // Try to run a sequence
     Fw::String fArg("");
-    this->invoke_to_seqRunIn(0, fArg);
+    Svc::SeqArgs emptyArgs{0, 0};
+    this->invoke_to_seqRunIn(0, fArg, emptyArgs);
     this->clearAndDispatch();
     // Assert seqDone response
     ASSERT_from_seqDone_SIZE(1);
@@ -474,7 +475,8 @@ void CmdSequencerTester ::runSequence(const U32 cmdSeq, const char* const fileNa
 void CmdSequencerTester ::runSequenceByPortCall(const char* const fileName) {
     // Invoke the seqRun port
     Fw::String fArg(fileName);
-    this->invoke_to_seqRunIn(0, fArg);
+    Svc::SeqArgs emptyArgs{0, 0};
+    this->invoke_to_seqRunIn(0, fArg, emptyArgs);
     this->clearAndDispatch();
     // Assert no command response
     ASSERT_CMD_RESPONSE_SIZE(0);
@@ -500,7 +502,8 @@ void CmdSequencerTester ::runSequenceByFileDispatcherPortCall(const char* const
 void CmdSequencerTester ::runLoadedSequence() {
     // Invoke the port
     Fw::String fArg("");
-    this->invoke_to_seqRunIn(0, fArg);
+    Svc::SeqArgs emptyArgs{0, 0};
+    this->invoke_to_seqRunIn(0, fArg, emptyArgs);
     this->clearAndDispatch();
     // Assert no command response
     ASSERT_CMD_RESPONSE_SIZE(0);
@@ -530,7 +533,8 @@ void CmdSequencerTester ::startNewSequence(const char* const fileName) {
     ASSERT_EVENTS_CS_InvalidMode_SIZE(1);
     // Invoke sequence port
     Fw::String fArg(fileName);
-    this->invoke_to_seqRunIn(0, fArg);
+    Svc::SeqArgs emptyArgs{0, 0};
+    this->invoke_to_seqRunIn(0, fArg, emptyArgs);
     this->clearAndDispatch();
     // Assert response on seqDone
     ASSERT_from_seqDone_SIZE(1);

Svc/CmdSequencer/test/ut/ImmediateBase.cpp

@@ -166,7 +166,8 @@ void CmdSequencerTester ::parameterizedLoadRunRun(SequenceFiles::File& file, con
     this->parameterizedAutoByPort(file, numCommands, bound);
     // Try to run a loaded sequence
     Fw::String fArg("");
-    this->invoke_to_seqRunIn(0, fArg);
+    Svc::SeqArgs emptyArgs{0, 0};
+    this->invoke_to_seqRunIn(0, fArg, emptyArgs);
     this->clearAndDispatch();
     // Assert seqDone response
     ASSERT_from_seqDone_SIZE(1);

Svc/CmdSequencer/test/ut/InvalidFiles.cpp

@@ -218,7 +218,8 @@ void CmdSequencerTester ::MissingCRC() {
     ASSERT_TLM_CS_Errors(0, 2);
     // Run the sequence by port call
     Fw::String fArg(file.getName());
-    this->invoke_to_seqRunIn(0, fArg);
+    Svc::SeqArgs emptyArgs{0, 0};
+    this->invoke_to_seqRunIn(0, fArg, emptyArgs);
     this->clearAndDispatch();
     // Assert seqDone response
     ASSERT_from_seqDone_SIZE(1);

Svc/FileWorker/CMakeLists.txt

@@ -10,9 +10,6 @@
 #
 ####
 
-if (BUILD_TESTING AND NOT __FPRIME_NO_UT_GEN__)
-    add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/test/FileTester")
-endif()
 
 register_fprime_module(
   AUTOCODER_INPUTS
@@ -39,18 +36,31 @@ register_fprime_ut(
     "${CMAKE_CURRENT_LIST_DIR}"
 )
 
-register_fprime_ut(
-    FileWorkerTestError
-  AUTOCODER_INPUTS
-    "${CMAKE_CURRENT_LIST_DIR}/FileWorker.fpp"
-  SOURCES
-    "${CMAKE_CURRENT_LIST_DIR}/test/ut/FileWorkerErrTestMain.cpp"
-    "${CMAKE_CURRENT_LIST_DIR}/test/ut/FileWorkerErrTester.cpp"
-  CHOOSES_IMPLEMENTATIONS
-    Svc_FileWorker_test_FileTester
-  DEPENDS
-    STest
-  UT_AUTO_HELPERS
-  WORKING_DIRECTORY
-    "${CMAKE_CURRENT_LIST_DIR}"
-)
+# FileTester is a test dependency and only supported on Posix platforms, therefore:
+# - only attempt to add the FileTester module in BUILD_TESTING
+# - only add the FileWorkerTestError test if the FileTester module was successfully added
+if (BUILD_TESTING AND NOT __FPRIME_NO_UT_GEN__)
+    add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/test/FileTester")
+
+    # Target will not exist on non-Posix platforms, so guard against its existence
+    if (TARGET Svc_FileWorker_test_FileTester)
+      register_fprime_ut(
+          FileWorkerTestError
+        AUTOCODER_INPUTS
+          "${CMAKE_CURRENT_LIST_DIR}/FileWorker.fpp"
+        SOURCES
+          "${CMAKE_CURRENT_LIST_DIR}/test/ut/FileWorkerErrTestMain.cpp"
+          "${CMAKE_CURRENT_LIST_DIR}/test/ut/FileWorkerErrTester.cpp"
+        CHOOSES_IMPLEMENTATIONS
+          Svc_FileWorker_test_FileTester
+        DEPENDS
+          STest
+        UT_AUTO_HELPERS
+        WORKING_DIRECTORY
+          "${CMAKE_CURRENT_LIST_DIR}"
+      )
+    else()
+      # Only print message if we're in BUILD_TESTING *and* FileTester isn't available
+      message(STATUS "Svc/FileWorker: FileTester test dependency is only supported on Posix, skipping FileWorkerTestError")
+    endif()
+endif()

Svc/FileWorker/test/FileTester/CMakeLists.txt

@@ -1,3 +1,5 @@
+restrict_platforms(Posix)
+
 register_fprime_implementation(
         Svc_FileWorker_test_FileTester
     IMPLEMENTS

Svc/FpySequencer/FpySequencer.cpp

@@ -39,6 +39,17 @@ void FpySequencer::RUN_cmdHandler(FwOpcodeType opCode,               //!< The op
                                   U32 cmdSeq,                        //!< The command sequence number
                                   const Fw::CmdStringArg& fileName,  //!< The name of the sequence file
                                   FpySequencer_BlockState block      //!< Return command status when complete or not
+) {
+    // Empty args and delegate to RUN_ARGS handler
+    this->RUN_ARGS_cmdHandler(opCode, cmdSeq, fileName, block, Svc::SeqArgs{0, 0});
+}
+
+void FpySequencer ::RUN_ARGS_cmdHandler(
+    FwOpcodeType opCode,                 //!< The opcode
+    U32 cmdSeq,                          //!< The command sequence number
+    const Fw::CmdStringArg& fileName,    //!< The name of the sequence file
+    Svc::FpySequencer_BlockState block,  //!< Return command status when complete or not
+    Svc::SeqArgs args                    //!< Arguments to pass to the sequencer
 ) {
     // can only run a seq while in idle
     if (sequencer_getState() != State::IDLE) {
@@ -53,7 +64,8 @@ void FpySequencer::RUN_cmdHandler(FwOpcodeType opCode,               //!< The op
         this->m_savedCmdSeq = cmdSeq;
     }
 
-    this->sequencer_sendSignal_cmd_RUN(FpySequencer_SequenceExecutionArgs(fileName, block));
+    // Store args for pushArgsToStack action
+    this->sequencer_sendSignal_cmd_RUN(FpySequencer_SequenceExecutionArgs(fileName, block, args));
 
     // only respond if the user doesn't want us to block further execution
     if (block == FpySequencer_BlockState::NO_BLOCK) {
@@ -68,6 +80,16 @@ void FpySequencer::VALIDATE_cmdHandler(FwOpcodeType opCode,              //!< Th
                                        U32 cmdSeq,                       //!< The command sequence number
                                        const Fw::CmdStringArg& fileName  //!< The name of the sequence file
 ) {
+    this->VALIDATE_ARGS_cmdHandler(opCode, cmdSeq, fileName, Svc::SeqArgs{0, 0});
+}
+
+//! Handler implementation for command VALIDATE_ARGS
+//!
+//! Loads and validates a sequence with arguments
+void FpySequencer ::VALIDATE_ARGS_cmdHandler(FwOpcodeType opCode,
+                                             U32 cmdSeq,
+                                             const Fw::CmdStringArg& fileName,
+                                             Svc::SeqArgs buffer) {
     // can only validate a seq while in idle
     if (sequencer_getState() != State::IDLE) {
         this->log_WARNING_HI_InvalidCommand(static_cast<I32>(sequencer_getState()));
@@ -80,13 +102,12 @@ void FpySequencer::VALIDATE_cmdHandler(FwOpcodeType opCode,              //!< Th
     this->m_savedOpCode = opCode;
     this->m_savedCmdSeq = cmdSeq;
 
+    // VALIDATE_ARGS receives args via command interface
+    // Store args for pushArgsToStack action when RUN_VALIDATED is called
     this->sequencer_sendSignal_cmd_VALIDATE(
-        FpySequencer_SequenceExecutionArgs(fileName, FpySequencer_BlockState::BLOCK));
+        FpySequencer_SequenceExecutionArgs(fileName, FpySequencer_BlockState::BLOCK, buffer));
 }
 
-//! Handler for command RUN_VALIDATED
-//!
-//! Runs a previously validated sequence
 void FpySequencer::RUN_VALIDATED_cmdHandler(
     FwOpcodeType opCode,           //!< The opcode
     U32 cmdSeq,                    //!< The command sequence number
@@ -105,7 +126,8 @@ void FpySequencer::RUN_VALIDATED_cmdHandler(
         this->m_savedCmdSeq = cmdSeq;
     }
 
-    this->sequencer_sendSignal_cmd_RUN_VALIDATED(FpySequencer_SequenceExecutionArgs(this->m_sequenceFilePath, block));
+    this->sequencer_sendSignal_cmd_RUN_VALIDATED(
+        FpySequencer_SequenceExecutionArgs(this->m_sequenceFilePath, block, this->m_sequenceArgs));
 
     // only respond if the user doesn't want us to block further execution
     if (block == FpySequencer_BlockState::NO_BLOCK) {
@@ -367,15 +389,17 @@ void FpySequencer ::seqCancelIn_handler(FwIndexType portNum) {
 }
 
 //! Handler for input port seqRunIn
-void FpySequencer::seqRunIn_handler(FwIndexType portNum, const Fw::StringBase& filename) {
+void FpySequencer::seqRunIn_handler(FwIndexType portNum, const Fw::StringBase& filename, const Svc::SeqArgs& args) {
     // can only run a seq while in idle
     if (sequencer_getState() != State::IDLE) {
         this->log_WARNING_HI_InvalidSeqRunCall(static_cast<I32>(sequencer_getState()));
         return;
     }
 
-    // seqRunIn is never blocking
-    this->sequencer_sendSignal_cmd_RUN(FpySequencer_SequenceExecutionArgs(filename, FpySequencer_BlockState::NO_BLOCK));
+    // seqRunIn is never blocking - store args for pushArgsToStack action
+    // Args must be serialized in F' big-endian format by the caller before being sent
+    this->sequencer_sendSignal_cmd_RUN(
+        FpySequencer_SequenceExecutionArgs(filename, FpySequencer_BlockState::NO_BLOCK, args));
 }
 
 //! Handler for input port tlmWrite