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

sch_lab Integration candidate: Caelum-rc4+dev66
thnkslprpt · Dec 12, 2023 · e13cec6 · e13cec6
2 parents 5f5ce8d + 8a0145c
commit e13cec6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Development Build: v2.5.0-rc4+dev75
+- correct inclusion for SCH_LAB example table
+- See <https://github.com/nasa/sch_lab/pull/156>
+
 ## Development Build: v2.5.0-rc4+dev71
 - Standardize naming of SCH_LAB functions/macros
 - Call CFE_ES_ExitApp with RunStatus rather than internal status variable

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

diff --git a/fsw/tables/sch_lab_table.c b/fsw/tables/sch_lab_table.c
@@ -18,7 +18,10 @@
 
 #include "cfe_tbl_filedef.h" /* Required to obtain the CFE_TBL_FILEDEF macro definition */
 #include "sch_lab_tbl.h"
-#include "cfe_sb.h" /* Required to use the CFE_SB_MSGID_WRAP_VALUE macro */
+#include "cfe_sb_api_typedefs.h" /* Required to use the CFE_SB_MSGID_WRAP_VALUE macro */
+
+/* This is for the standard set of CFE core app MsgID values */
+#include "cfe_msgids.h"
 
 #ifdef HAVE_CI_LAB
 #include "ci_lab_msgids.h"