diff --git a/Svc/ActiveTextLogger/ActiveTextLogger.fpp b/Svc/ActiveTextLogger/ActiveTextLogger.fpp index 8429ecc3b19..660d79f506e 100644 --- a/Svc/ActiveTextLogger/ActiveTextLogger.fpp +++ b/Svc/ActiveTextLogger/ActiveTextLogger.fpp @@ -8,7 +8,7 @@ module Svc { @ Internal interface to send log text messages to component thread internal port TextQueue( - $text: string size 256 @< The text string + $text: string size FW_LOG_STRING_MAX_SIZE @< The text string ) \ priority 1 \ drop diff --git a/Svc/CmdDispatcher/CmdDispatcher.fpp b/Svc/CmdDispatcher/CmdDispatcher.fpp index 66343b886e8..422a4e6ab7e 100644 --- a/Svc/CmdDispatcher/CmdDispatcher.fpp +++ b/Svc/CmdDispatcher/CmdDispatcher.fpp @@ -75,7 +75,7 @@ module Svc { @ No-op string command async command CMD_NO_OP_STRING( - arg1: string size 40 @< The String command argument + arg1: string size Svc.CommandDispatcherCfg.NOOP_STRING_SIZE @< The String command argument ) \ opcode 1 @@ -162,7 +162,7 @@ module Svc { @ The command dispatcher has successfully received a NO-OP command from GUI with a string event NoOpStringReceived( - message: string size 40 @< The NO-OP string that is generated + message: string size FW_LOG_STRING_MAX_SIZE @< The NO-OP string that is generated ) \ severity activity high \ id 8 \ diff --git a/Svc/CmdSequencer/Events.fppi b/Svc/CmdSequencer/Events.fppi index 3b9b2ebb561..309ead6ae72 100644 --- a/Svc/CmdSequencer/Events.fppi +++ b/Svc/CmdSequencer/Events.fppi @@ -1,6 +1,6 @@ @ Sequence file was successfully loaded. event CS_SequenceLoaded( - fileName: string size 60 @< The name of the sequence file + fileName: string size FW_LOG_STRING_MAX_SIZE @< The name of the sequence file ) \ severity activity low \ id 0 \ @@ -8,7 +8,7 @@ event CS_SequenceLoaded( @ A command sequence was successfully canceled. event CS_SequenceCanceled( - fileName: string size 60 @< The name of the sequence file + fileName: string size FW_LOG_STRING_MAX_SIZE @< The name of the sequence file ) \ severity activity high \ id 1 \ @@ -16,7 +16,7 @@ event CS_SequenceCanceled( @ The Sequence File Loader could not read the sequence file. event CS_FileReadError( - fileName: string size 60 @< The name of the sequence file + fileName: string size FW_LOG_STRING_MAX_SIZE @< The name of the sequence file ) \ severity warning high \ id 2 \ @@ -24,7 +24,7 @@ event CS_FileReadError( @ The sequence file format was invalid. event CS_FileInvalid( - fileName: string size 60 @< The name of the sequence file + fileName: string size FW_LOG_STRING_MAX_SIZE @< The name of the sequence file stage: FileReadStage @< The read stage error: I32 @< The error code ) \ @@ -34,7 +34,7 @@ event CS_FileInvalid( @ The format of a command record was invalid. event CS_RecordInvalid( - fileName: string size 60 @< The name of the sequence file + fileName: string size FW_LOG_STRING_MAX_SIZE @< The name of the sequence file recordNumber: U32 @< The record number error: I32 @< The error code ) \ @@ -44,7 +44,7 @@ event CS_RecordInvalid( @ The sequence file was too large. event CS_FileSizeError( - fileName: string size 60 @< The name of the sequence file + fileName: string size FW_LOG_STRING_MAX_SIZE @< The name of the sequence file $size: U32 @< Invalid size ) \ severity warning high \ @@ -53,7 +53,7 @@ event CS_FileSizeError( @ The sequence file was not found event CS_FileNotFound( - fileName: string size 60 @< The sequence file + fileName: string size FW_LOG_STRING_MAX_SIZE @< The sequence file ) \ severity warning high \ id 6 \ @@ -62,7 +62,7 @@ event CS_FileNotFound( @ The sequence file validation failed event CS_FileCrcFailure( - fileName: string size 60 @< The sequence file + fileName: string size FW_LOG_STRING_MAX_SIZE @< The sequence file storedCRC: U32 @< The CRC stored in the file computedCRC: U32 @< The CRC computed over the file ) \ @@ -72,7 +72,7 @@ event CS_FileCrcFailure( @ The Command Sequencer issued a command and received a success status in return. event CS_CommandComplete( - fileName: string size 60 @< The name of the sequence file + fileName: string size FW_LOG_STRING_MAX_SIZE @< The name of the sequence file recordNumber: U32 @< The record number of the command opCode: FwOpcodeType @< The command opcode ) \ @@ -82,7 +82,7 @@ event CS_CommandComplete( @ A command sequence successfully completed. event CS_SequenceComplete( - fileName: string size 60 @< The name of the sequence file + fileName: string size FW_LOG_STRING_MAX_SIZE @< The name of the sequence file ) \ severity activity high \ id 9 \ @@ -90,7 +90,7 @@ event CS_SequenceComplete( @ The Command Sequencer issued a command and received an error status in return. event CS_CommandError( - fileName: string size 60 @< The name of the sequence file + fileName: string size FW_LOG_STRING_MAX_SIZE @< The name of the sequence file recordNumber: U32 @< The record number opCode: FwOpcodeType @< The opcode errorStatus: U32 @< The error status @@ -107,7 +107,7 @@ event CS_InvalidMode \ @ Number of records in header doesn't match number in file event CS_RecordMismatch( - fileName: string size 60 @< The name of the sequence file + fileName: string size FW_LOG_STRING_MAX_SIZE @< The name of the sequence file header_records: U32 @< The number of records in the header extra_bytes: U32 @< The number of bytes beyond last record ) \ @@ -117,7 +117,7 @@ event CS_RecordMismatch( @ The running time base doesn't match the time base in the sequence files event CS_TimeBaseMismatch( - fileName: string size 60 @< The name of the sequence file + fileName: string size FW_LOG_STRING_MAX_SIZE @< The name of the sequence file time_base: U16 @< The current time seq_time_base: U16 @< The sequence time base ) \ @@ -127,7 +127,7 @@ event CS_TimeBaseMismatch( @ The running time base doesn't match the time base in the sequence files event CS_TimeContextMismatch( - fileName: string size 60 @< The name of the sequence file + fileName: string size FW_LOG_STRING_MAX_SIZE @< The name of the sequence file currTimeBase: U8 @< The current time base seqTimeBase: U8 @< The sequence time base ) \ @@ -137,7 +137,7 @@ event CS_TimeContextMismatch( @ A local port request to run a sequence was started event CS_PortSequenceStarted( - filename: string size 60 @< The sequence file + filename: string size FW_LOG_STRING_MAX_SIZE @< The sequence file ) \ severity activity high \ id 15 \ @@ -167,7 +167,7 @@ event CS_NoSequenceActive \ @ A sequence passed validation event CS_SequenceValid( - filename: string size 60 @< The sequence file + filename: string size FW_LOG_STRING_MAX_SIZE @< The sequence file ) \ severity activity high \ id 19 \ @@ -175,7 +175,7 @@ event CS_SequenceValid( @ A sequence passed validation event CS_SequenceTimeout( - filename: string size 60 @< The sequence file + filename: string size FW_LOG_STRING_MAX_SIZE @< The sequence file $command: U32 @< The command that timed out ) \ severity warning high \ @@ -184,7 +184,7 @@ event CS_SequenceTimeout( @ A command in a sequence was stepped through event CS_CmdStepped( - filename: string size 60 @< The sequence file + filename: string size FW_LOG_STRING_MAX_SIZE @< The sequence file $command: U32 @< The command that was stepped ) \ severity activity high \ @@ -193,7 +193,7 @@ event CS_CmdStepped( @ A manual sequence was started event CS_CmdStarted( - filename: string size 60 @< The sequence file + filename: string size FW_LOG_STRING_MAX_SIZE @< The sequence file ) \ severity activity high \ id 22 \ @@ -201,7 +201,7 @@ event CS_CmdStarted( @ Wait for the current running sequence file complete event CS_JoinWaiting( - filename: string size 60 @< The sequence file + filename: string size FW_LOG_STRING_MAX_SIZE @< The sequence file recordNumber: U32 @< The record number opCode: FwOpcodeType @< The opcode ) \ @@ -216,7 +216,7 @@ event CS_JoinWaitingNotComplete() \ format "Still waiting for sequence file to complete" event CS_NoRecords( - fileName: string size 60 @< The name of the sequence file + fileName: string size FW_LOG_STRING_MAX_SIZE @< The name of the sequence file ) \ severity warning low \ id 25 \ diff --git a/Svc/FileManager/Commands.fppi b/Svc/FileManager/Commands.fppi index 5a4c97a6354..c33fc4801ab 100644 --- a/Svc/FileManager/Commands.fppi +++ b/Svc/FileManager/Commands.fppi @@ -26,7 +26,7 @@ async command RemoveFile( @ Perform a Linux shell command and write the output to a log file. async command ShellCommand( - $command: string size 256 @< The shell command string + $command: string size Svc.FileManagerCfg.FILE_MANAGER_SHELL_COMMAND_SIZE @< The shell command string logFileName: string size FileNameStringSize @< The name of the log file ) \ opcode 0x04 diff --git a/default/config/CMakeLists.txt b/default/config/CMakeLists.txt index 5e012aa8363..fff2c7c170e 100644 --- a/default/config/CMakeLists.txt +++ b/default/config/CMakeLists.txt @@ -7,6 +7,7 @@ register_fprime_config( AUTOCODER_INPUTS "${CMAKE_CURRENT_LIST_DIR}/AcConstants.fpp" "${CMAKE_CURRENT_LIST_DIR}/ComCfg.fpp" + "${CMAKE_CURRENT_LIST_DIR}/CommandDispatcherCfg.fpp" "${CMAKE_CURRENT_LIST_DIR}/DpCfg.fpp" "${CMAKE_CURRENT_LIST_DIR}/FileDispatcherCfg.fpp" "${CMAKE_CURRENT_LIST_DIR}/FpConfig.fpp" @@ -19,6 +20,7 @@ register_fprime_config( "${CMAKE_CURRENT_LIST_DIR}/PlatformCfg.fpp" "${CMAKE_CURRENT_LIST_DIR}/PolyDbCfg.fpp" "${CMAKE_CURRENT_LIST_DIR}/VersionCfg.fpp" + "${CMAKE_CURRENT_LIST_DIR}/FileManagerCfg.fpp" "${CMAKE_CURRENT_LIST_DIR}/TlmPacketizerCfg.fpp" HEADERS "${CMAKE_CURRENT_LIST_DIR}/EventManagerCfg.hpp" diff --git a/default/config/CommandDispatcherCfg.fpp b/default/config/CommandDispatcherCfg.fpp new file mode 100644 index 00000000000..fe3aaaed62a --- /dev/null +++ b/default/config/CommandDispatcherCfg.fpp @@ -0,0 +1,14 @@ +# ====================================================================== +# FPP file for data products configuration +# ====================================================================== + +module Svc { + + module CommandDispatcherCfg { + + @ Set the size of the shell execution string + constant NOOP_STRING_SIZE = FW_CMD_STRING_MAX_SIZE; + + } + +} diff --git a/default/config/FileManagerCfg.fpp b/default/config/FileManagerCfg.fpp new file mode 100644 index 00000000000..28db6545f5f --- /dev/null +++ b/default/config/FileManagerCfg.fpp @@ -0,0 +1,14 @@ +# ====================================================================== +# FPP file for data products configuration +# ====================================================================== + +module Svc { + + module FileManagerCfg { + + @ Set the size of the shell execution string + constant FILE_MANAGER_SHELL_COMMAND_SIZE = FW_CMD_STRING_MAX_SIZE; + + } + +}