Skip to content
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

Fix #424, Add EDS #425

Merged
merged 2 commits into from
Jan 22, 2024
Merged

Fix #424, Add EDS #425

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
a18ec4d
Fix #422, initial add of EDS
jphickey Dec 13, 2023
72bda01
Fix #424, Rename mismatched argument
jphickey Jan 22, 2024
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
7 changes: 6 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,16 @@ set(APP_SRC_FILES
fsw/src/cf_codec.c
fsw/src/cf_cmd.c
fsw/src/cf_crc.c
fsw/src/cf_dispatch.c
fsw/src/cf_timer.c
fsw/src/cf_utils.c
)

if (CFE_EDS_ENABLED_BUILD)
list(APPEND APP_SRC_FILES fsw/src/cf_eds_dispatch.c)
else()
list(APPEND APP_SRC_FILES fsw/src/cf_dispatch.c)
endif()

# Create the app module
add_cfe_app(cf ${APP_SRC_FILES})

Expand Down
24 changes: 24 additions & 0 deletions config/default_cf_extern_typedefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,28 @@
/* constants such as CF_FILENAME_MAX_LEN are in mission_cfg.h */
#include "cf_mission_cfg.h"

#ifdef CFE_EDS_ENABLED_BUILD

#include "cf_eds_typedefs.h"

typedef CF_QueueIdx_Enum_t CF_QueueIdx_t;
#define CF_QueueIdx_NUM (1 + CF_QueueIdx_Enum_t_MAX)
#define CF_GetSet_ValueID_MAX (1 + CF_GetSet_ValueID_Enum_t_MAX)

typedef CF_EntityId_Atom_t CF_EntityId_t;
typedef CF_TransactionSeq_Atom_t CF_TransactionSeq_t;

typedef CF_CFDP_Enum_t CF_CFDP_Class_t;
typedef CF_GetSet_ValueID_Enum_t CF_GetSet_ValueID_t;

typedef BASE_TYPES_PathName_String_t CF_PathName_t;
typedef BASE_TYPES_FileName_String_t CF_FileName_t;

#define CF_FILENAME_MAX_NAME ((int)sizeof(CF_FileName_t))
#define CF_FILENAME_MAX_LEN ((int)sizeof(CF_PathName_t))

#else

/**
* @brief Values for CFDP file transfer class
*
Expand Down Expand Up @@ -113,4 +135,6 @@ typedef uint32 CF_EntityId_t;
*/
typedef uint32 CF_TransactionSeq_t;

#endif

#endif /* CF_EXTERN_TYPEDEFS_H */
Loading