Skip to content

Part cFS/Documents#11, Merge Internal Updates #127

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

Open
dzbaker wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Part cFS/Documents#11, Merge Internal Updates #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
487a1c6
Fix #23, support runtime MIDs
Cameron-Sykes Feb 2, 2026
ea07ff9
Whitespace and formatting changes (applied via clang-format)
jphickey Feb 4, 2026
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
1 change: 0 additions & 1 deletion config/default_fm_extern_typedefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
#define FM_TABLE_ENTRY_DISABLED 0
#define FM_TABLE_ENTRY_ENABLED 1


/* ======== */
/* Typedefs */
/* ======== */
Expand Down
48 changes: 24 additions & 24 deletions config/default_fm_msgdefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
*/
typedef struct
{
uint16 Overwrite; /**< \brief Allow overwrite */
uint16 Overwrite; /**< \brief Allow overwrite */
char Source[CFE_MISSION_MAX_PATH_LEN]; /**< \brief Source filename */
char Target[CFE_MISSION_MAX_PATH_LEN]; /**< \brief Target filename */
} FM_OvwSourceTargetFilename_Payload_t;
Expand Down Expand Up @@ -109,7 +109,7 @@ typedef struct
typedef struct
{
char Filename[CFE_MISSION_MAX_PATH_LEN]; /**< \brief Filename */
uint32 FileInfoCRC; /**< \brief File info CRC method */
uint32 FileInfoCRC; /**< \brief File info CRC method */
} FM_FilenameAndCRC_Payload_t;

/**
Expand All @@ -122,8 +122,8 @@ typedef struct
{
char Directory[CFE_MISSION_MAX_PATH_LEN]; /**< \brief Directory name */
char Filename[CFE_MISSION_MAX_PATH_LEN]; /**< \brief Filename */
uint8 GetSizeTimeMode; /**< \brief Option to query size, time, and mode of files (CPU intensive) */
uint8 Spare01[3]; /**< \brief Padding to 32 bit boundary */
uint8 GetSizeTimeMode; /**< \brief Option to query size, time, and mode of files (CPU intensive) */
uint8 Spare01[3]; /**< \brief Padding to 32 bit boundary */
} FM_GetDirectoryToFile_Payload_t;

/**
Expand All @@ -135,9 +135,9 @@ typedef struct
typedef struct
{
char Directory[CFE_MISSION_MAX_PATH_LEN]; /**< \brief Directory name */
uint32 DirListOffset; /**< \brief Index of 1st dir entry to put in packet */
uint8 GetSizeTimeMode; /**< \brief Option to query size, time, and mode of files (CPU intensive) */
uint8 Spare01[3]; /**< \brief Padding to 32 bit boundary */
uint32 DirListOffset; /**< \brief Index of 1st dir entry to put in packet */
uint8 GetSizeTimeMode; /**< \brief Option to query size, time, and mode of files (CPU intensive) */
uint8 Spare01[3]; /**< \brief Padding to 32 bit boundary */
} FM_GetDirectoryToPkt_Payload_t;

/**
Expand All @@ -159,7 +159,7 @@ typedef struct
typedef struct
{
char FileName[CFE_MISSION_MAX_PATH_LEN]; /**< \brief File name of the permissions to set */
uint32 Mode; /**< \brief Permissions, passed directly to OS_chmod */
uint32 Mode; /**< \brief Permissions, passed directly to OS_chmod */
} FM_FilenameAndMode_Payload_t;

/**\}*/
Expand All @@ -177,17 +177,17 @@ typedef struct
typedef struct
{
char EntryName[CFE_MISSION_MAX_PATH_LEN]; /**< \brief Directory Listing Filename */
uint32 EntrySize; /**< \brief Directory Listing File Size */
uint32 ModifyTime; /**< \brief Directory Listing File Last Modification Times */
uint32 Mode; /**< \brief Mode of the file (Permissions from #OS_FILESTAT_MODE) */
uint32 EntrySize; /**< \brief Directory Listing File Size */
uint32 ModifyTime; /**< \brief Directory Listing File Last Modification Times */
uint32 Mode; /**< \brief Mode of the file (Permissions from #OS_FILESTAT_MODE) */
} FM_DirListEntry_t;

/**
* \brief Get Directory Listing telemetry payload
*/
typedef struct
{
char DirName[CFE_MISSION_MAX_PATH_LEN]; /**< \brief Directory Name */
char DirName[CFE_MISSION_MAX_PATH_LEN]; /**< \brief Directory Name */
uint32 TotalFiles; /**< \brief Number of files in the directory */
uint32 PacketFiles; /**< \brief Number of files in this packet */
uint32 FirstFile; /**< \brief Index into directory files of first packet file */
Expand All @@ -199,13 +199,13 @@ typedef struct
*/
typedef struct
{
uint8 FileStatus; /**< \brief Status indicating whether the file is open or closed */
uint8 CRC_Computed; /**< \brief Flag indicating whether a CRC was computed or not */
uint8 Spare[2]; /**< \brief Structure padding */
uint32 CRC; /**< \brief CRC value if computed */
uint32 FileSize; /**< \brief File Size */
uint32 LastModifiedTime; /**< \brief Last Modification Time of File */
uint32 Mode; /**< \brief Mode of the file (Permissions) */
uint8 FileStatus; /**< \brief Status indicating whether the file is open or closed */
uint8 CRC_Computed; /**< \brief Flag indicating whether a CRC was computed or not */
uint8 Spare[2]; /**< \brief Structure padding */
uint32 CRC; /**< \brief CRC value if computed */
uint32 FileSize; /**< \brief File Size */
uint32 LastModifiedTime; /**< \brief Last Modification Time of File */
uint32 Mode; /**< \brief Mode of the file (Permissions) */
char Filename[CFE_MISSION_MAX_PATH_LEN]; /**< \brief Name of File */
} FM_FileInfoPkt_Payload_t;

Expand All @@ -215,15 +215,15 @@ typedef struct
typedef struct
{
char LogicalName[CFE_MISSION_MAX_PATH_LEN]; /**< \brief Logical filename */
char AppName[CFE_MISSION_MAX_API_LEN]; /**< \brief Application that opened file */
char AppName[CFE_MISSION_MAX_API_LEN]; /**< \brief Application that opened file */
} FM_OpenFilesEntry_t;

/**
* \brief Get Open Files telemetry payload
*/
typedef struct
{
uint32 NumOpenFiles; /**< \brief Number of files opened via cFE */
uint32 NumOpenFiles; /**< \brief Number of files opened via cFE */
FM_OpenFilesEntry_t OpenFilesList[CFE_MISSION_MAX_NUM_FILES]; /**< \brief List of files opened via cFE */
} FM_OpenFilesPkt_Payload_t;

Expand All @@ -233,10 +233,10 @@ typedef struct
typedef struct
{
uint8 ReportType;
uint8 Padding[7]; /**< \brief Padding to align Name (and subsequent members) to 64-bit boundaries */
uint8 Padding[7]; /**< \brief Padding to align Name (and subsequent members) to 64-bit boundaries */
char Name[CFE_MISSION_MAX_PATH_LEN]; /**< \brief File system name */
uint64 Blocks; /**< \brief Block count from last check/poll, 0 if unknown */
uint64 Bytes; /**< \brief Byte count from last check/poll, 0 if unknown */
uint64 Blocks; /**< \brief Block count from last check/poll, 0 if unknown */
uint64 Bytes; /**< \brief Byte count from last check/poll, 0 if unknown */
} FM_MonitorReportEntry_t;

/**
Expand Down
2 changes: 1 addition & 1 deletion config/default_fm_msgids.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
#define FM_FILE_INFO_TLM_MID FM_TLM_PLATFORM_MIDVAL(FILE_INFO_TLM)
#define FM_DIR_LIST_TLM_MID FM_TLM_PLATFORM_MIDVAL(DIR_LIST_TLM)
#define FM_OPEN_FILES_TLM_MID FM_TLM_PLATFORM_MIDVAL(OPEN_FILES_TLM)
#define FM_MONITOR_TLM_MID FM_TLM_PLATFORM_MIDVAL(MONITOR_TLM)
#define FM_MONITOR_TLM_MID FM_TLM_PLATFORM_MIDVAL(MONITOR_TLM)

/**\}*/

Expand Down
65 changes: 32 additions & 33 deletions config/default_fm_msgstruct.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
/* Typedefs */
/* ======== */


/**
* \defgroup cfsfmcmdstructs CFS File Manager Command Structures
* \{
Expand Down Expand Up @@ -83,8 +82,8 @@ typedef struct
*/
typedef struct
{
CFE_MSG_CommandHeader_t CommandHeader; /** \brief Command header */
FM_OvwSourceTargetFilename_Payload_t Payload; /** \brief Command payload */
CFE_MSG_CommandHeader_t CommandHeader; /** \brief Command header */
FM_OvwSourceTargetFilename_Payload_t Payload; /** \brief Command payload */
} FM_CopyFileCmd_t;

/**
Expand All @@ -94,8 +93,8 @@ typedef struct
*/
typedef struct
{
CFE_MSG_CommandHeader_t CommandHeader; /** \brief Command header */
FM_OvwSourceTargetFilename_Payload_t Payload; /** \brief Command payload */
CFE_MSG_CommandHeader_t CommandHeader; /** \brief Command header */
FM_OvwSourceTargetFilename_Payload_t Payload; /** \brief Command payload */
} FM_MoveFileCmd_t;

/**
Expand All @@ -105,8 +104,8 @@ typedef struct
*/
typedef struct
{
CFE_MSG_CommandHeader_t CommandHeader; /** \brief Command header */
FM_SourceTargetFileName_Payload_t Payload; /** \brief Command payload */
CFE_MSG_CommandHeader_t CommandHeader; /** \brief Command header */
FM_SourceTargetFileName_Payload_t Payload; /** \brief Command payload */
} FM_RenameFileCmd_t;

/**
Expand All @@ -116,8 +115,8 @@ typedef struct
*/
typedef struct
{
CFE_MSG_CommandHeader_t CommandHeader; /** \brief Command header */
FM_SingleFilename_Payload_t Payload; /** \brief Command Payload */
CFE_MSG_CommandHeader_t CommandHeader; /** \brief Command header */
FM_SingleFilename_Payload_t Payload; /** \brief Command Payload */
} FM_DeleteFileCmd_t;

/**
Expand All @@ -127,8 +126,8 @@ typedef struct
*/
typedef struct
{
CFE_MSG_CommandHeader_t CommandHeader; /** \brief Command header */
FM_DirectoryName_Payload_t Payload; /** \brief Command Payload */
CFE_MSG_CommandHeader_t CommandHeader; /** \brief Command header */
FM_DirectoryName_Payload_t Payload; /** \brief Command Payload */
} FM_DeleteAllFilesCmd_t;

/**
Expand All @@ -138,8 +137,8 @@ typedef struct
*/
typedef struct
{
CFE_MSG_CommandHeader_t CommandHeader; /** \brief Command header */
FM_SourceTargetFileName_Payload_t Payload; /** \brief Command Payload */
CFE_MSG_CommandHeader_t CommandHeader; /** \brief Command header */
FM_SourceTargetFileName_Payload_t Payload; /** \brief Command Payload */
} FM_DecompressFileCmd_t;

/**
Expand All @@ -149,8 +148,8 @@ typedef struct
*/
typedef struct
{
CFE_MSG_CommandHeader_t CommandHeader; /** \brief Command header */
FM_TwoSourceOneTarget_Payload_t Payload; /** \brief Command Payload */
CFE_MSG_CommandHeader_t CommandHeader; /** \brief Command header */
FM_TwoSourceOneTarget_Payload_t Payload; /** \brief Command Payload */
} FM_ConcatFilesCmd_t;

/**
Expand All @@ -160,8 +159,8 @@ typedef struct
*/
typedef struct
{
CFE_MSG_CommandHeader_t CommandHeader; /** \brief Command header */
FM_FilenameAndCRC_Payload_t Payload; /** \brief Command Payload */
CFE_MSG_CommandHeader_t CommandHeader; /** \brief Command header */
FM_FilenameAndCRC_Payload_t Payload; /** \brief Command Payload */
} FM_GetFileInfoCmd_t;

/**
Expand All @@ -181,8 +180,8 @@ typedef struct
*/
typedef struct
{
CFE_MSG_CommandHeader_t CommandHeader; /** \brief Command header */
FM_DirectoryName_Payload_t Payload; /** \brief Command Payload */
CFE_MSG_CommandHeader_t CommandHeader; /** \brief Command header */
FM_DirectoryName_Payload_t Payload; /** \brief Command Payload */
} FM_CreateDirectoryCmd_t;

/**
Expand All @@ -192,8 +191,8 @@ typedef struct
*/
typedef struct
{
CFE_MSG_CommandHeader_t CommandHeader; /** \brief Command header */
FM_DirectoryName_Payload_t Payload; /** \brief Command Payload */
CFE_MSG_CommandHeader_t CommandHeader; /** \brief Command header */
FM_DirectoryName_Payload_t Payload; /** \brief Command Payload */
} FM_DeleteDirectoryCmd_t;

/**
Expand All @@ -203,8 +202,8 @@ typedef struct
*/
typedef struct
{
CFE_MSG_CommandHeader_t CommandHeader; /** \brief Command header */
FM_GetDirectoryToFile_Payload_t Payload; /** \brief Command Payload */
CFE_MSG_CommandHeader_t CommandHeader; /** \brief Command header */
FM_GetDirectoryToFile_Payload_t Payload; /** \brief Command Payload */
} FM_GetDirListFileCmd_t;

/**
Expand All @@ -214,8 +213,8 @@ typedef struct
*/
typedef struct
{
CFE_MSG_CommandHeader_t CommandHeader; /** \brief Command header */
FM_GetDirectoryToPkt_Payload_t Payload; /** \brief Command Payload */
CFE_MSG_CommandHeader_t CommandHeader; /** \brief Command header */
FM_GetDirectoryToPkt_Payload_t Payload; /** \brief Command Payload */
} FM_GetDirListPktCmd_t;

/**
Expand All @@ -235,8 +234,8 @@ typedef struct
*/
typedef struct
{
CFE_MSG_CommandHeader_t CommandHeader; /** \brief Command header */
FM_TableIndexAndState_Payload_t Payload; /** \brief Command Payload */
CFE_MSG_CommandHeader_t CommandHeader; /** \brief Command header */
FM_TableIndexAndState_Payload_t Payload; /** \brief Command Payload */
} FM_SetTableStateCmd_t;

/**
Expand All @@ -246,7 +245,7 @@ typedef struct
*/
typedef struct
{
CFE_MSG_CommandHeader_t CommandHeader; /** \brief Command header */
CFE_MSG_CommandHeader_t CommandHeader; /** \brief Command header */
FM_FilenameAndMode_Payload_t Payload;
} FM_SetPermissionsCmd_t;

Expand All @@ -265,7 +264,7 @@ typedef struct
typedef struct
{
CFE_MSG_TelemetryHeader_t TelemetryHeader; /** \brief Telemetry Header */
FM_DirListPkt_Payload_t Payload; /** \brief Telemetry Payload */
FM_DirListPkt_Payload_t Payload; /** \brief Telemetry Payload */
} FM_DirListPkt_t;

/**
Expand All @@ -274,7 +273,7 @@ typedef struct
typedef struct
{
CFE_MSG_TelemetryHeader_t TelemetryHeader; /** \brief Telemetry Header */
FM_FileInfoPkt_Payload_t Payload; /** \brief Telemetry Payload */
FM_FileInfoPkt_Payload_t Payload; /** \brief Telemetry Payload */
} FM_FileInfoPkt_t;

/**
Expand All @@ -291,8 +290,8 @@ typedef struct
*/
typedef struct
{
CFE_MSG_TelemetryHeader_t TelemetryHeader; /** \brief Telemetry Header */
FM_MonitorReportPkt_Payload_t Payload; /** \brief Telemetry Payload */
CFE_MSG_TelemetryHeader_t TelemetryHeader; /** \brief Telemetry Header */
FM_MonitorReportPkt_Payload_t Payload; /** \brief Telemetry Payload */
} FM_MonitorReportPkt_t;

/**
Expand All @@ -301,7 +300,7 @@ typedef struct
typedef struct
{
CFE_MSG_TelemetryHeader_t TelemetryHeader; /** \brief Telemetry Header */
FM_HkTlm_Payload_t Payload; /** \brief Telemetry Payload */
FM_HkTlm_Payload_t Payload; /** \brief Telemetry Payload */
} FM_HkTlm_t;

/**\}*/
Expand Down
1 change: 0 additions & 1 deletion config/default_fm_tbl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,4 @@
*/
#define FM_TABLE_VALIDATION_ERR (-1)


#endif /* DEFAULT_FM_TBL_H */
13 changes: 5 additions & 8 deletions config/eds_fm_extern_typedefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
#include "common_types.h"
#include "fm_eds_typedefs.h"

#define FM_NAME_IS_INVALID EdsLabel_FM_FileNameStates_IS_INVALID
#define FM_NAME_IS_NOT_IN_USE EdsLabel_FM_FileNameStates_IS_NOT_IN_USE
#define FM_NAME_IS_FILE_OPEN EdsLabel_FM_FileNameStates_IS_FILE_OPEN
#define FM_NAME_IS_FILE_CLOSED EdsLabel_FM_FileNameStates_IS_FILE_CLOSED
#define FM_NAME_IS_DIRECTORY EdsLabel_FM_FileNameStates_IS_DIRECTORY
#define FM_NAME_IS_INVALID EdsLabel_FM_FileNameStates_IS_INVALID
#define FM_NAME_IS_NOT_IN_USE EdsLabel_FM_FileNameStates_IS_NOT_IN_USE
#define FM_NAME_IS_FILE_OPEN EdsLabel_FM_FileNameStates_IS_FILE_OPEN
#define FM_NAME_IS_FILE_CLOSED EdsLabel_FM_FileNameStates_IS_FILE_CLOSED
#define FM_NAME_IS_DIRECTORY EdsLabel_FM_FileNameStates_IS_DIRECTORY

#define FM_FILE_CLOSED EdsLabel_FM_FileStates_FILE_CLOSED
#define FM_FILE_EXISTS EdsLabel_FM_FileStates_FILE_EXISTS
Expand All @@ -38,7 +38,4 @@
#define FM_TABLE_ENTRY_DISABLED EdsLabel_FM_TableEntryState_DISABLED
#define FM_TABLE_ENTRY_ENABLED EdsLabel_FM_TableEntryState_ENABLED




#endif /* EDS_FM_EXTERN_TYPEDEFS_H */
2 changes: 1 addition & 1 deletion fsw/inc/fm_eventids.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1328,7 +1328,7 @@
#define FM_FNAME_ISOPEN_EID_OFFSET 3
#define FM_FNAME_ISCLOSED_EID_OFFSET 4
/* Unused EID offset 5 */
#define FM_FNAME_NUM_OFFSETS 6
#define FM_FNAME_NUM_OFFSETS 6

#define FM_CHILD_DISABLED_EID_OFFSET 0
#define FM_CHILD_Q_FULL_EID_OFFSET 1
Expand Down
Loading
Loading