Merge pull request nasa#44 from nasa/integration-candidate

Integration Candidate: 2020-05-27

README.md

@@ -10,6 +10,10 @@ To send telemtry to the "ground" or UDP/IP port, edit the subscription table in
 
 ## Version History
 
+### Development Build: 2.3.6
+- Replace references to `ccsds.h` types with the `cfe_sb.h`-provided type. 
+- See <https://github.com/nasa/to_lab/pull/44>
+
 ### Development Build: 2.3.5
 
 - Apply code style

fsw/src/to_lab_app.c

@@ -100,7 +100,7 @@ int32 TO_LAB_RemoveAll(const TO_LAB_RemoveAll_t *data);
 int32 TO_LAB_RemovePacket(const TO_LAB_RemovePacket_t *data);
 int32 TO_LAB_ResetCounters(const TO_LAB_ResetCounters_t *data);
 int32 TO_LAB_SendDataTypes(const TO_LAB_SendDataTypes_t *data);
-int32 TO_LAB_SendHousekeeping(const CCSDS_CommandPacket_t *data);
+int32 TO_LAB_SendHousekeeping(const CFE_SB_CmdHdr_t *data);
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /* */
@@ -273,7 +273,7 @@ void TO_LAB_process_commands(void)
  break;
 
  case TO_LAB_SEND_HK_MID:
- TO_LAB_SendHousekeeping((const CCSDS_CommandPacket_t *)MsgPtr);
+ TO_LAB_SendHousekeeping((const CFE_SB_CmdHdr_t *)MsgPtr);
  break;
 
  default:
@@ -417,7 +417,7 @@ int32 TO_LAB_SendDataTypes(const TO_LAB_SendDataTypes_t *data)
 /* TO_LAB_SendHousekeeping() -- HK status */
 /* Does not increment CommandCounter */
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-int32 TO_LAB_SendHousekeeping(const CCSDS_CommandPacket_t *data)
+int32 TO_LAB_SendHousekeeping(const CFE_SB_CmdHdr_t *data)
 {
  CFE_SB_TimeStampMsg(&TO_LAB_Global.HkBuf.MsgHdr);
  CFE_SB_SendMsg(&TO_LAB_Global.HkBuf.MsgHdr);

fsw/src/to_lab_version.h

@@ -31,7 +31,7 @@
 
 #define TO_LAB_MAJOR_VERSION 2
 #define TO_LAB_MINOR_VERSION 3
-#define TO_LAB_REVISION 5
+#define TO_LAB_REVISION 6
 #define TO_LAB_MISSION_REV 0
 
 #endif /* _to_lab_version_h_ */