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.

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

Integration Candidate 2020-05-13 #39

Merged
merged 3 commits into from
May 22, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ To send telemtry to the "ground" or UDP/IP port, edit the subscription table in

## Version History

### Development Build: 2.3.4

- Configure the maximum depth supported by OSAL, rather than a hard coded 64.
- See <https://github.com/nasa/to_lab/pull/39>

### Development Build: 2.3.3

- Apply the CFE_SB_MsgIdToValue() and CFE_SB_ValueToMsgId() routines where compatibility with an integer MsgId is necessary - syslog prints, events, compile-time MID #define values.
Expand Down
4 changes: 2 additions & 2 deletions fsw/src/to_lab_app.c
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,9 @@ void TO_LAB_init(void)

CFE_ES_RegisterApp();
TO_LAB_Global.downlink_on = false;
PipeDepth = 8;
PipeDepth = TO_LAB_CMD_PIPE_DEPTH;
strcpy(PipeName, "TO_LAB_CMD_PIPE");
ToTlmPipeDepth = 64;
ToTlmPipeDepth = TO_LAB_TLM_PIPE_DEPTH;
strcpy(ToTlmPipeName, "TO_LAB_TLM_PIPE");

/*
Expand Down
10 changes: 10 additions & 0 deletions fsw/src/to_lab_app.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,16 @@
#define TO_TASK_MSEC 500 /* run at 2 Hz */
#define TO_UNUSED CFE_SB_MSGID_RESERVED

/**
* Depth of pipe for commands to the TO_LAB application itself
*/
#define TO_LAB_CMD_PIPE_DEPTH 8

/**
* Depth of pipe for telemetry forwarded through the TO_LAB application
*/
#define TO_LAB_TLM_PIPE_DEPTH OS_QUEUE_MAX_DEPTH

#define cfgTLM_ADDR "192.168.1.81"
#define cfgTLM_PORT 1235
#define TO_LAB_VERSION_NUM "5.1.0"
Expand Down
2 changes: 1 addition & 1 deletion fsw/src/to_lab_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

#define TO_LAB_MAJOR_VERSION 2
#define TO_LAB_MINOR_VERSION 3
#define TO_LAB_REVISION 3
#define TO_LAB_REVISION 4
#define TO_LAB_MISSION_REV 0


Expand Down