From 9545afae053c69a0de2162dde4652523c2316b76 Mon Sep 17 00:00:00 2001
From: Jacob Hageman <jacob.hageman@nasa.gov>
Date: Wed, 15 Nov 2023 16:32:06 +0000
Subject: [PATCH] Fix #146, Support scheduled uplink check

---
 config/default_ci_lab_msgids.h   |  7 ++++---
 config/default_ci_lab_topicids.h |  7 ++++---
 fsw/inc/ci_lab_eventids.h        |  1 +
 fsw/src/ci_lab_app.c             | 11 +++++++++--
 fsw/src/ci_lab_app.h             |  1 +
 fsw/src/ci_lab_dispatch.c        |  5 +++++
 6 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/config/default_ci_lab_msgids.h b/config/default_ci_lab_msgids.h
index 5cced65..ca6c62f 100644
--- a/config/default_ci_lab_msgids.h
+++ b/config/default_ci_lab_msgids.h
@@ -26,8 +26,9 @@
 #include "cfe_core_api_base_msgids.h"
 #include "ci_lab_topicids.h"
 
-#define CI_LAB_CMD_MID     CFE_PLATFORM_CMD_TOPICID_TO_MIDV(CFE_MISSION_CI_LAB_CMD_TOPICID)
-#define CI_LAB_SEND_HK_MID CFE_PLATFORM_CMD_TOPICID_TO_MIDV(CFE_MISSION_CI_LAB_SEND_HK_TOPICID)
-#define CI_LAB_HK_TLM_MID  CFE_PLATFORM_TLM_TOPICID_TO_MIDV(CFE_MISSION_CI_LAB_HK_TLM_TOPICID)
+#define CI_LAB_CMD_MID         CFE_PLATFORM_CMD_TOPICID_TO_MIDV(CFE_MISSION_CI_LAB_CMD_TOPICID)
+#define CI_LAB_SEND_HK_MID     CFE_PLATFORM_CMD_TOPICID_TO_MIDV(CFE_MISSION_CI_LAB_SEND_HK_TOPICID)
+#define CI_LAB_READ_UPLINK_MID CFE_PLATFORM_CMD_TOPICID_TO_MIDV(CFE_MISSION_CI_LAB_READ_UPLINK_TOPICID)
+#define CI_LAB_HK_TLM_MID      CFE_PLATFORM_TLM_TOPICID_TO_MIDV(CFE_MISSION_CI_LAB_HK_TLM_TOPICID)
 
 #endif
diff --git a/config/default_ci_lab_topicids.h b/config/default_ci_lab_topicids.h
index 09abe9e..dd5eaf3 100644
--- a/config/default_ci_lab_topicids.h
+++ b/config/default_ci_lab_topicids.h
@@ -23,8 +23,9 @@
 #ifndef CI_LAB_TOPICIDS_H
 #define CI_LAB_TOPICIDS_H
 
-#define CFE_MISSION_CI_LAB_CMD_TOPICID     0x84
-#define CFE_MISSION_CI_LAB_SEND_HK_TOPICID 0x85
-#define CFE_MISSION_CI_LAB_HK_TLM_TOPICID  0x84
+#define CFE_MISSION_CI_LAB_CMD_TOPICID         0x84
+#define CFE_MISSION_CI_LAB_SEND_HK_TOPICID     0x85
+#define CFE_MISSION_CI_LAB_READ_UPLINK_TOPICID 0x86
+#define CFE_MISSION_CI_LAB_HK_TLM_TOPICID      0x84
 
 #endif
diff --git a/fsw/inc/ci_lab_eventids.h b/fsw/inc/ci_lab_eventids.h
index 74b2842..f547063 100644
--- a/fsw/inc/ci_lab_eventids.h
+++ b/fsw/inc/ci_lab_eventids.h
@@ -37,6 +37,7 @@
 #define CI_LAB_CR_PIPE_ERR_EID          11
 #define CI_LAB_SB_SUBSCRIBE_CMD_ERR_EID 12
 #define CI_LAB_SB_SUBSCRIBE_HK_ERR_EID  13
+#define CI_LAB_SB_SUBSCRIBE_UL_ERR_EID  14
 #define CI_LAB_CMD_LEN_ERR_EID          16
 
 #endif
diff --git a/fsw/src/ci_lab_app.c b/fsw/src/ci_lab_app.c
index c37b3c6..9083b30 100644
--- a/fsw/src/ci_lab_app.c
+++ b/fsw/src/ci_lab_app.c
@@ -74,8 +74,8 @@ void CI_LAB_AppMain(void)
             CI_LAB_TaskPipe(SBBufPtr);
         }
 
-        /* Regardless of packet vs timeout, always process uplink queue      */
-        if (CI_LAB_Global.SocketConnected)
+        /* Regardless of packet vs timeout, always process uplink queue if not scheduled */
+        if (CI_LAB_Global.SocketConnected && !CI_LAB_Global.Scheduled)
         {
             CI_LAB_ReadUpLink();
         }
@@ -129,6 +129,13 @@ void CI_LAB_TaskInit(void)
             CFE_EVS_SendEvent(CI_LAB_SB_SUBSCRIBE_HK_ERR_EID, CFE_EVS_EventType_ERROR,
                               "Error subscribing to SB HK Request, RC = 0x%08X", (unsigned int)status);
         }
+
+        status = CFE_SB_Subscribe(CFE_SB_ValueToMsgId(CI_LAB_READ_UPLINK_MID), CI_LAB_Global.CommandPipe);
+        if (status != CFE_SUCCESS)
+        {
+            CFE_EVS_SendEvent(CI_LAB_SB_SUBSCRIBE_UL_ERR_EID, CFE_EVS_EventType_ERROR,
+                              "Error subscribing to SB Read Uplink Request, RC = 0x%08X", (unsigned int)status);
+        }
     }
     else
     {
diff --git a/fsw/src/ci_lab_app.h b/fsw/src/ci_lab_app.h
index cb1510e..4706359 100644
--- a/fsw/src/ci_lab_app.h
+++ b/fsw/src/ci_lab_app.h
@@ -53,6 +53,7 @@
 typedef struct
 {
     bool            SocketConnected;
+    bool            Scheduled;
     CFE_SB_PipeId_t CommandPipe;
     osal_id_t       SocketID;
     OS_SockAddr_t   SocketAddress;
diff --git a/fsw/src/ci_lab_dispatch.c b/fsw/src/ci_lab_dispatch.c
index 038002d..174b00c 100644
--- a/fsw/src/ci_lab_dispatch.c
+++ b/fsw/src/ci_lab_dispatch.c
@@ -122,6 +122,11 @@ void CI_LAB_TaskPipe(const CFE_SB_Buffer_t *SBBufPtr)
             CI_LAB_SendHkCmd((const CI_LAB_SendHkCmd_t *)SBBufPtr);
             break;
 
+        case CI_LAB_READ_UPLINK_MID:
+            CI_LAB_Global.Scheduled = true;
+            CI_LAB_ReadUpLink();
+            break;
+
         default:
             CI_LAB_Global.HkTlm.Payload.CommandErrorCounter++;
             CFE_EVS_SendEvent(CI_LAB_MID_ERR_EID, CFE_EVS_EventType_ERROR, "CI: invalid command packet,MID = 0x%x",