EDS: Correct merge issues with 2024-04-15 baseline

jphickey · Apr 15, 2024 · 0468c89 · 0468c89
1 parent 077cf28
commit 0468c89
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/modules/es/fsw/src/cfe_es_eds_dispatch.c b/modules/es/fsw/src/cfe_es_eds_dispatch.c
@@ -65,7 +65,7 @@ static const EdsDispatchTable_CFE_ES_Application_CFE_SB_Telecommand_t CFE_ES_TC_
     },
     .SEND_HK =
     {
-        .indication = CFE_ES_HousekeepingCmd
+        .indication = CFE_ES_SendHkCmd
     }
 };
 /* clang-format on */

diff --git a/modules/evs/fsw/src/cfe_evs_eds_dispatch.c b/modules/evs/fsw/src/cfe_evs_eds_dispatch.c
@@ -57,9 +57,9 @@ static const EdsDispatchTable_CFE_EVS_Application_CFE_SB_Telecommand_t CFE_EVS_T
         .SetFilterCmd_indication           = CFE_EVS_SetFilterCmd,
         .SetLogModeCmd_indication          = CFE_EVS_SetLogModeCmd
     },
-    .SEND_HK = 
+    .SEND_HK =
     {
-        .indication = CFE_EVS_ReportHousekeepingCmd
+        .indication = CFE_EVS_SendHkCmd
     }
 };
 /* clang-format on */

diff --git a/modules/tbl/fsw/src/cfe_tbl_internal.c b/modules/tbl/fsw/src/cfe_tbl_internal.c
@@ -746,8 +746,7 @@ int32 CFE_TBL_LoadFromFileAndDecode(const char *AppName, CFE_TBL_LoadBuff_t *Wor
         WorkingBufferPtr->DataSource[sizeof(WorkingBufferPtr->DataSource) - 1] = 0;
 
         /* Save file creation time for later storage into Registry */
-        WorkingBufferPtr->FileCreateTimeSecs    = ScratchBufferPtr->FileCreateTimeSecs;
-        WorkingBufferPtr->FileCreateTimeSubSecs = ScratchBufferPtr->FileCreateTimeSubSecs;
+        WorkingBufferPtr->FileTime    = ScratchBufferPtr->FileTime;
 
         /* Free the scratch buffer */
         ScratchBufferPtr->Taken = false;

diff --git a/modules/tbl/fsw/src/cfe_tbl_task_cmds.c b/modules/tbl/fsw/src/cfe_tbl_task_cmds.c
@@ -542,7 +542,6 @@ int32 CFE_TBL_DumpCmd(const CFE_TBL_DumpCmd_t *data)
     int32                            i;
     int32                            OsStatus;
     CFE_TBL_DumpControl_t *          DumpCtrlPtr;
-    CFE_TIME_SysTime_t               DumpTime;
 
     /* Make sure all strings are null terminated before attempting to process them */
     CFE_SB_MessageStringGet(DumpFilename, (char *)CmdPtr->DumpFilename, NULL, sizeof(DumpFilename),
@@ -707,10 +706,7 @@ int32 CFE_TBL_DumpCmd(const CFE_TBL_DumpCmd_t *data)
     WorkingBufferPtr->EdsContentId = SrcBufferPtr->EdsContentId;
 
     /* Save the current time so that the header in the dump file can have the correct time */
-    DumpTime = CFE_TIME_GetTime();
-
-    DumpCtrlPtr->DumpBufferPtr->FileCreateTimeSecs    = DumpTime.Seconds;
-    DumpCtrlPtr->DumpBufferPtr->FileCreateTimeSubSecs = DumpTime.Subseconds;
+    DumpCtrlPtr->DumpBufferPtr->FileTime = CFE_TIME_GetTime();
 
     /*
      * Normal status / finish up -