From 76a0d314c1505a56d2d0e01f3c1b3914ad634a01 Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Thu, 7 May 2020 14:57:02 -0400 Subject: [PATCH 1/2] Fix #36, Use OS_MAX_QUEUE_DEPTH rather than 64. This should configure the maximum depth supported by OSAL, rather than a hard coded 64. Moved both pipe depth configurations to a macro in the header file. --- fsw/src/to_lab_app.c | 4 ++-- fsw/src/to_lab_app.h | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/fsw/src/to_lab_app.c b/fsw/src/to_lab_app.c index 0dc644a..af3100e 100644 --- a/fsw/src/to_lab_app.c +++ b/fsw/src/to_lab_app.c @@ -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"); /* diff --git a/fsw/src/to_lab_app.h b/fsw/src/to_lab_app.h index e9a3590..ae797c1 100644 --- a/fsw/src/to_lab_app.h +++ b/fsw/src/to_lab_app.h @@ -49,6 +49,16 @@ #define TO_TASK_MSEC 500 /* run at 2 Hz */ #define TO_UNUSED 0 +/** + * 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" From b9b76e21173becef7ac9f906068322f9b8cea966 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Fri, 22 May 2020 10:52:17 -0400 Subject: [PATCH 2/2] Increase version to 2.3.4 and update Readme --- README.md | 5 +++++ fsw/src/to_lab_version.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 994dec6..525c653 100644 --- a/README.md +++ b/README.md @@ -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 + ### 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. diff --git a/fsw/src/to_lab_version.h b/fsw/src/to_lab_version.h index a40dbaa..a961459 100644 --- a/fsw/src/to_lab_version.h +++ b/fsw/src/to_lab_version.h @@ -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