Merge pull request #50 from nasa/integration-candidate

Integration Candidate: 2020-05-27
nasa · Jun 10, 2020 · e4a1bb8 · e4a1bb8
2 parents a589163 + 50ce862
commit e4a1bb8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -8,6 +8,11 @@ ci_lab is a simple command uplink application that accepts CCSDS telecommand pac
 
 ## Version History
 
+### Development Build: 2.3.5
+
+- Replace references to `ccsds.h` types with the `cfe_sb.h`-provided type. 
+- See <https://github.com/nasa/ci_lab/pull/50> 
+
 ### Development Build: 2.3.4
 
 - 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/ci_lab_app.c b/fsw/src/ci_lab_app.c
@@ -87,7 +87,7 @@ static CFE_EVS_BinFilter_t CI_LAB_EventFilters[] =
  */
 int32 CI_LAB_Noop(const CI_LAB_Noop_t *data);
 int32 CI_LAB_ResetCounters(const CI_LAB_ResetCounters_t *data);
-int32 CI_LAB_ReportHousekeeping(const CCSDS_CommandPacket_t *data);
+int32 CI_LAB_ReportHousekeeping(const CFE_SB_CmdHdr_t *data);
 
 /** * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /* CI_Lab_AppMain() -- Application entry point and main process loop          */
@@ -232,7 +232,7 @@ void CI_LAB_ProcessCommandPacket(void)
             break;
 
         case CI_LAB_SEND_HK_MID:
-            CI_LAB_ReportHousekeeping((const CCSDS_CommandPacket_t *)CI_LAB_Global.MsgPtr);
+            CI_LAB_ReportHousekeeping((const CFE_SB_CmdHdr_t *)CI_LAB_Global.MsgPtr);
             break;
 
         default:
@@ -318,7 +318,7 @@ int32 CI_LAB_ResetCounters(const CI_LAB_ResetCounters_t *data)
 /*         telemetry, packetize it and send it to the housekeeping task via   */
 /*         the software bus                                                   */
 /* * * * * * * * * * * * * * * * * * * * * * * *  * * * * * * *  * *  * * * * */
-int32 CI_LAB_ReportHousekeeping(const CCSDS_CommandPacket_t *data)
+int32 CI_LAB_ReportHousekeeping(const CFE_SB_CmdHdr_t *data)
 {
     CI_LAB_Global.HkBuffer.HkTlm.Payload.SocketConnected = CI_LAB_Global.SocketConnected;
     CFE_SB_TimeStampMsg(&CI_LAB_Global.HkBuffer.MsgHdr);

diff --git a/fsw/src/ci_lab_app.h b/fsw/src/ci_lab_app.h
@@ -38,7 +38,6 @@
 #include "cfe_es.h"
 
 #include "osapi.h"
-#include "ccsds.h"
 
 #include <string.h>
 #include <errno.h>

diff --git a/fsw/src/ci_lab_version.h b/fsw/src/ci_lab_version.h
@@ -31,7 +31,7 @@
 
 #define CI_LAB_MAJOR_VERSION 2
 #define CI_LAB_MINOR_VERSION 3
-#define CI_LAB_REVISION      4
+#define CI_LAB_REVISION      5
 #define CI_LAB_MISSION_REV   0
 
 #endif /* _ci_lab_version_h_ */