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

Jump to bottom

Integration candidate 2019-10-09 #378

Merged
merged 4 commits into from
Oct 23, 2019
Merged

Integration candidate 2019-10-09 #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8fe60c3
Fix #25: Ensure table file header definition is consistent
jphickey Sep 13, 2019
b7e1307
Fix #298, fix inifinite loop
avan989 Oct 9, 2019
6934452
Fix #199, Update obj creation failure requirement
skliper Oct 10, 2019
6fff82e
CCB 2019-10-09: Approved pull requests #27, #367, #369
jphickey Oct 11, 2019
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
83 changes: 65 additions & 18 deletions cmake/sample_defs/sample_mission_cfg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,9 @@
**
**
** \par Limits
** Not Applicable
** This value should be kept as a multiple of 4, to maintain alignment of
** any possible neighboring fields without implicit padding.
**
*/
#define CFE_MISSION_ES_CDS_MAX_NAME_LENGTH 16

Expand All @@ -310,7 +312,7 @@
** \cfeevscfg Maximum Event Message Length
**
** \par Description:
** Indicates the maximum length (in characers) of the formatted text
** Indicates the maximum length (in characters) of the formatted text
** string portion of an event message
**
** \par Limits
Expand Down Expand Up @@ -349,7 +351,8 @@
** form: "ApplicationName.TblName"
**
** \par Limits
** Not Applicable
** This value should be kept as a multiple of 4, to maintain alignment of
** any possible neighboring fields without implicit padding.
*/
#define CFE_MISSION_TBL_MAX_NAME_LENGTH 16

Expand Down Expand Up @@ -500,6 +503,8 @@
** Note this affects the size of messages, so it must not cause any message
** to exceed the max length.
**
** This value should be kept as a multiple of 4, to maintain alignment of
** any possible neighboring fields without implicit padding.
*/
#define CFE_MISSION_ES_MAX_SHELL_CMD 64

Expand All @@ -522,6 +527,9 @@
** Note this affects the size of messages, so it must not cause any message
** to exceed the max length.
**
** This value should be kept as a multiple of 4, to maintain alignment of
** any possible neighboring fields without implicit padding.
**
*/
#define CFE_MISSION_ES_MAX_SHELL_PKT 64

Expand All @@ -547,7 +555,8 @@
**
** \par Description:
** Indicates the maximum length (in characters) of the entire table name
** within software bus messages
** within software bus messages, in "AppName.TableName" notation.
**
** This affects the layout of command/telemetry messages but does not affect run
** time behavior or internal allocation.
**
Expand All @@ -556,8 +565,10 @@
** Note this affects the size of messages, so it must not cause any message
** to exceed the max length.
**
** This value should be kept as a multiple of 4, to maintain alignment of
** any possible neighboring fields without implicit padding.
*/
#define CFE_MISSION_TBL_MAX_FULL_NAME_LEN (CFE_MISSION_TBL_MAX_NAME_LENGTH + CFE_MISSION_MAX_API_LEN + 2)
#define CFE_MISSION_TBL_MAX_FULL_NAME_LEN (CFE_MISSION_TBL_MAX_NAME_LENGTH + CFE_MISSION_MAX_API_LEN + 4)

/**
** \cfesbcfg Maximum Number of pipes that SB command/telemetry messages may hold
Expand All @@ -578,43 +589,76 @@


/**
** \cfemissioncfg cFE Maximum length for filenames in messages
** \cfemissioncfg cFE Maximum length for pathnames within data exchange structures
**
** \par Description:
** The value of this constant dictates the size of filenames within SB messages.
** The value of this constant dictates the size of pathnames within all structures
** used for external data exchange, such as Software bus messages and table definitions.
** This is typically the same as OS_MAX_PATH_LEN but that is OSAL dependent --
** and as such it definable on a per-processor/OS basis and hence may be different
** across multiple processors. Since this defines a message format, it must be
** consistent across ALL processors exchanging SB messages.
** across multiple processors. It is recommended to set this to the value of the
** largest OS_MAX_PATH_LEN in use on any CPU on the mission.
**
** This affects the layout of command/telemetry messages but does not affect run
** time behavior or internal allocation.
** This affects only the layout of command/telemetry messages and table definitions;
** internal allocation may use the platform-specific OS_MAX_PATH_LEN value.
**
** \par Limits
** All CPUs within the same SB domain (mission) must share the same definition
** All CPUs within the same SB domain (mission) and ground tools must share the
** same definition.
** Note this affects the size of messages, so it must not cause any message
** to exceed the max length.
**
** This value should be kept as a multiple of 4, to maintain alignment of
** any possible neighboring fields without implicit padding.
*/
#define CFE_MISSION_MAX_PATH_LEN 64

/**
** \cfemissioncfg cFE Maximum length for API names in messages
** \cfemissioncfg cFE Maximum length for filenames within data exchange structures
**
** \par Description:
** The value of this constant dictates the size of API names within SB messages.
** The value of this constant dictates the size of filenames within all structures
** used for external data exchange, such as Software bus messages and table definitions.
** This is typically the same as OS_MAX_FILE_LEN but that is OSAL dependent --
** and as such it definable on a per-processor/OS basis and hence may be different
** across multiple processors. It is recommended to set this to the value of the
** largest OS_MAX_FILE_LEN in use on any CPU on the mission.
**
** This affects only the layout of command/telemetry messages and table definitions;
** internal allocation may use the platform-specific OS_MAX_FILE_LEN value.
**
** \par Limits
** All CPUs within the same SB domain (mission) and ground tools must share the
** same definition.
** Note this affects the size of messages, so it must not cause any message
** to exceed the max length.
**
** This value should be kept as a multiple of 4, to maintain alignment of
** any possible neighboring fields without implicit padding.
*/
#define CFE_MISSION_MAX_FILE_LEN 20

/**
** \cfemissioncfg cFE Maximum length for API names within data exchange structures
**
** \par Description:
** The value of this constant dictates the size of filenames within all structures
** used for external data exchange, such as Software bus messages and table definitions.
** This is typically the same as OS_MAX_API_LEN but that is OSAL dependent --
** and as such it definable on a per-processor/OS basis and hence may be different
** across multiple processors.
** across multiple processors. It is recommended to set this to the value of the
** largest OS_MAX_API_LEN in use on any CPU on the mission.
**
** This affects the layout of command/telemetry messages but does not affect run
** time behavior or internal allocation.
** This affects only the layout of command/telemetry messages and table definitions;
** internal allocation may use the platform-specific OS_MAX_API_LEN value.
**
** \par Limits
** All CPUs within the same SB domain (mission) must share the same definition
** Note this affects the size of messages, so it must not cause any message
** to exceed the max length.
**
** This value should be kept as a multiple of 4, to maintain alignment of
** any possible neighboring fields without implicit padding.
*/
#define CFE_MISSION_MAX_API_LEN 20

Expand All @@ -632,8 +676,11 @@
** All CPUs within the same SB domain (mission) must share the same definition
** Note this affects the size of messages, so it must not cause any message
** to exceed the max length.
**
** This value should be kept as a multiple of 4, to maintain alignment of
** any possible neighboring fields without implicit padding.
*/
#define CFE_MISSION_ES_CDS_MAX_NAME_LEN (CFE_MISSION_ES_CDS_MAX_NAME_LENGTH + CFE_MISSION_MAX_API_LEN + 2)
#define CFE_MISSION_ES_CDS_MAX_NAME_LEN (CFE_MISSION_ES_CDS_MAX_NAME_LENGTH + CFE_MISSION_MAX_API_LEN + 4)


/*
Expand Down
Loading