Merge pull request #39 from nasa/integration-candidate

Integration Candidate 2020-05-13
nasa · May 22, 2020 · b0e577a · b0e577a
2 parents b59f32e + b9b76e2
commit b0e577a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git 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 <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.

diff --git 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
@@ -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"

diff --git 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