Merge pull request #163 from nasa/integration-candidate

ci_lab Integration candidate: Caelum-rc4+dev65
nasa · Dec 5, 2023 · 0c5cea2 · 0c5cea2
2 parents 6e55bb4 + c82cab5
commit 0c5cea2
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Development Build: v2.5.0-rc4+dev77
+- Remove unused PDU related function codes
+- Remove obsolete README comment
+- Configurable timeouts and loops
+- See <https://github.com/nasa/ci_lab/pull/157>, <https://github.com/nasa/ci_lab/pull/159>, and <https://github.com/nasa/ci_lab/pull/161>
+
 ## Development Build: v2.5.0-rc4+dev69
 - add decode hooks
 - Add version information to NOOP event

diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ ci_lab is a simple command uplink application that accepts CCSDS telecommand pac
 
 ## Known issues
 
-Dependence on cfe platform config header is undesirable, and the check is not endian safe. As a lab application, extensive testing is not performed prior to release and only minimal functionality is included.
+As a lab application, extensive testing is not performed prior to release and only minimal functionality is included.
 
 ## Getting Help
 

diff --git a/config/default_ci_lab_fcncodes.h b/config/default_ci_lab_fcncodes.h
@@ -37,10 +37,5 @@
 */
 #define CI_LAB_NOOP_CC                 0
 #define CI_LAB_RESET_COUNTERS_CC       1
-#define CI_LAB_MODIFY_PDU_FILESIZE_CC  2
-#define CI_LAB_CORRUPT_PDU_CHECKSUM_CC 3
-#define CI_LAB_DROP_PDUS_CC            4
-#define CI_LAB_CAPTURE_PDUS_CC         5
-#define CI_LAB_STOP_PDU_CAPTURE_CC     6
 
 #endif
diff --git a/config/default_ci_lab_internal_cfg.h b/config/default_ci_lab_internal_cfg.h
@@ -40,6 +40,21 @@
  */
 #define CI_LAB_MAX_INGEST 768
 
+/**
+ * @brief Number of packets to process per ingest cycle
+ */
+#define CI_LAB_MAX_INGEST_PKTS 10
+
+/**
+ * @brief SB Receive timeout
+ */
+#define CI_LAB_SB_RECEIVE_TIMEOUT 500
+
+/**
+ * @brief Uplink Receive timeout
+ */
+#define CI_LAB_UPLINK_RECEIVE_TIMEOUT OS_CHECK
+
 /**
  * @brief The depth of the command input pipe
  *

diff --git a/fsw/src/ci_lab_app.c b/fsw/src/ci_lab_app.c
@@ -64,8 +64,8 @@ void CI_LAB_AppMain(void)
     {
         CFE_ES_PerfLogExit(CI_LAB_MAIN_TASK_PERF_ID);
 
-        /* Pend on receipt of command packet -- timeout set to 500 millisecs */
-        status = CFE_SB_ReceiveBuffer(&SBBufPtr, CI_LAB_Global.CommandPipe, 500);
+        /* Receive SB buffer, configurable timeout */
+        status = CFE_SB_ReceiveBuffer(&SBBufPtr, CI_LAB_Global.CommandPipe, CI_LAB_SB_RECEIVE_TIMEOUT);
 
         CFE_ES_PerfLogEntry(CI_LAB_MAIN_TASK_PERF_ID);
 
@@ -207,7 +207,7 @@ void CI_LAB_ReadUpLink(void)
     CFE_Status_t     CfeStatus;
     CFE_SB_Buffer_t *SBBufPtr;
 
-    for (i = 0; i <= 10; i++)
+    for (i = 0; i <= CI_LAB_MAX_INGEST_PKTS; i++)
     {
         if (CI_LAB_Global.NetBufPtr == NULL)
         {
@@ -220,7 +220,7 @@ void CI_LAB_ReadUpLink(void)
         }
 
         OsStatus = OS_SocketRecvFrom(CI_LAB_Global.SocketID, CI_LAB_Global.NetBufPtr, CI_LAB_Global.NetBufSize,
-                                     &CI_LAB_Global.SocketAddress, OS_CHECK);
+                                     &CI_LAB_Global.SocketAddress, CI_LAB_UPLINK_RECEIVE_TIMEOUT);
         if (OsStatus > 0)
         {
             CFE_ES_PerfLogEntry(CI_LAB_SOCKET_RCV_PERF_ID);

diff --git a/fsw/src/ci_lab_version.h b/fsw/src/ci_lab_version.h
@@ -25,7 +25,7 @@
 
 /* Development Build Macro Definitions */
 
-#define CI_LAB_BUILD_NUMBER 69 /*!< Development Build: Number of commits since baseline */
+#define CI_LAB_BUILD_NUMBER 77 /*!< Development Build: Number of commits since baseline */
 #define CI_LAB_BUILD_BASELINE \
     "v2.5.0-rc4" /*!< Development Build: git tag that is the base for the current development */