Merge pull request #140 from nasa/integration-candidate

sch_lab Integration candidate: Caelum-rc4+dev46
nasa · Apr 13, 2023 · a6a5559 · a6a5559
2 parents 74d1129 + ad07cde
commit a6a5559
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Development Build: 2.5.0-rc4+dev53
+- adjust table based on apps present
+- See <https://github.com/nasa/sch_lab/pull/139>
+
 ## Development Build: 2.5.0-rc4+dev49
 - update cmake recipe
 - See <https://github.com/nasa/sch_lab/pull/136>

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,12 +3,16 @@ project(CFS_SCH_LAB C)
 
 # These references are specifically needed for the table build
 # it is easiest to add them as directory properties so they won't
-# be considered include directories for SCH_LAB itself.
-include_directories(
-    $<TARGET_PROPERTY:ci_lab,INTERFACE_INCLUDE_DIRECTORIES>
-    $<TARGET_PROPERTY:to_lab,INTERFACE_INCLUDE_DIRECTORIES>
-    $<TARGET_PROPERTY:sample_app,INTERFACE_INCLUDE_DIRECTORIES>
-)
+# be considered include directories for TO_LAB itself.  Each one
+# gets a macro for conditional inclusion in the subscription table.
+foreach(EXT_APP ci_lab to_lab sample_app sc hs lc ds fm)
+  list (FIND TGTSYS_${SYSVAR}_APPS ${EXT_APP} HAVE_APP)
+  if (HAVE_APP GREATER_EQUAL 0)
+    include_directories($<TARGET_PROPERTY:${EXT_APP},INTERFACE_INCLUDE_DIRECTORIES>)
+    string(TOUPPER "HAVE_${EXT_APP}" APP_MACRO)
+    add_definitions(-D${APP_MACRO})
+  endif()
+endforeach()
 
 # Create the app module
 add_cfe_app(sch_lab fsw/src/sch_lab_app.c)

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 49 /*!< Development Build: Number of commits since baseline */
+#define SCH_LAB_BUILD_NUMBER 53 /*!< 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
@@ -23,16 +23,35 @@
 /*
 ** Include headers for message IDs here
 */
+#ifdef HAVE_CI_LAB
 #include "ci_lab_msgids.h"
+#endif
+
+#ifdef HAVE_TO_LAB
 #include "to_lab_msgids.h"
+#endif
 
+#ifdef HAVE_SAMPLE_APP
 #include "sample_app_msgids.h"
+#endif
 
-#if 0
-#include "sc_msgids.h"
+#ifdef HAVE_HS_APP
 #include "hs_msgids.h"
+#endif
+
+#ifdef HAVE_FM_APP
 #include "fm_msgids.h"
+#endif
+
+#ifdef HAVE_SC_APP
+#include "sc_msgids.h"
+#endif
+
+#ifdef HAVE_DS_APP
 #include "ds_msgids.h"
+#endif
+
+#ifdef HAVE_LC_APP
 #include "lc_msgids.h"
 #endif
 
@@ -45,25 +64,40 @@
 **  3. If the table grows too big, increase SCH_LAB_MAX_SCHEDULE_ENTRIES
 */
 
-SCH_LAB_ScheduleTable_t SCH_TBL_Structure = {.TickRate = 1,
-                                             .Config   = {
-                                                 {CFE_SB_MSGID_WRAP_VALUE(CFE_ES_SEND_HK_MID), 4, 0},
-                                                 {CFE_SB_MSGID_WRAP_VALUE(CFE_EVS_SEND_HK_MID), 4, 0},
-                                                 {CFE_SB_MSGID_WRAP_VALUE(CFE_TIME_SEND_HK_MID), 4, 0},
-                                                 {CFE_SB_MSGID_WRAP_VALUE(CFE_SB_SEND_HK_MID), 4, 0},
-                                                 {CFE_SB_MSGID_WRAP_VALUE(CFE_TBL_SEND_HK_MID), 4, 0},
-                                                 {CFE_SB_MSGID_WRAP_VALUE(CI_LAB_SEND_HK_MID), 4, 0},
-                                                 {CFE_SB_MSGID_WRAP_VALUE(TO_LAB_SEND_HK_MID), 4, 0},
-                                                 {CFE_SB_MSGID_WRAP_VALUE(SAMPLE_APP_SEND_HK_MID), 4, 0},
-#if 0
-                {CFE_SB_MSGID_WRAP_VALUE(SC_SEND_HK_MID),       4, 0},
-                {CFE_SB_MSGID_WRAP_VALUE(SC_1HZ_WAKEUP_MID),    1, 0},  /* Example of a 1hz packet */
-                {CFE_SB_MSGID_WRAP_VALUE(HS_SEND_HK_MID),       0, 0},  /* Example of a message that wouldn't be sent */
-                {CFE_SB_MSGID_WRAP_VALUE(FM_SEND_HK_MID),       4, 0},
-                {CFE_SB_MSGID_WRAP_VALUE(DS_SEND_HK_MID),       4, 0},
-                {CFE_SB_MSGID_WRAP_VALUE(LC_SEND_HK_MID),       4, 0},
-#endif
-                                             }};
+SCH_LAB_ScheduleTable_t SCH_TBL_Structure = {
+    .TickRate = 1,
+    .Config   = {
+        {CFE_SB_MSGID_WRAP_VALUE(CFE_ES_SEND_HK_MID), 4, 0},
+        {CFE_SB_MSGID_WRAP_VALUE(CFE_EVS_SEND_HK_MID), 4, 0},
+        {CFE_SB_MSGID_WRAP_VALUE(CFE_TIME_SEND_HK_MID), 4, 0},
+        {CFE_SB_MSGID_WRAP_VALUE(CFE_SB_SEND_HK_MID), 4, 0},
+        {CFE_SB_MSGID_WRAP_VALUE(CFE_TBL_SEND_HK_MID), 4, 0},
+#ifdef HAVE_CI_LAB
+        {CFE_SB_MSGID_WRAP_VALUE(CI_LAB_SEND_HK_MID), 4, 0},
+#endif
+#ifdef HAVE_TO_LAB
+        {CFE_SB_MSGID_WRAP_VALUE(TO_LAB_SEND_HK_MID), 4, 0},
+#endif
+#ifdef HAVE_SAMPLE_APP
+        {CFE_SB_MSGID_WRAP_VALUE(SAMPLE_APP_SEND_HK_MID), 4, 0},
+#endif
+#ifdef HAVE_SC_APP
+        {CFE_SB_MSGID_WRAP_VALUE(SC_SEND_HK_MID), 4, 0},
+        {CFE_SB_MSGID_WRAP_VALUE(SC_1HZ_WAKEUP_MID), 1, 0}, /* Example of a 1hz packet */
+#endif
+#ifdef HAVE_HS_APP
+        {CFE_SB_MSGID_WRAP_VALUE(HS_SEND_HK_MID), 0, 0}, /* Example of a message that wouldn't be sent */
+#endif
+#ifdef HAVE_FM_APP
+        {CFE_SB_MSGID_WRAP_VALUE(FM_SEND_HK_MID), 4, 0},
+#endif
+#ifdef HAVE_DS_APP
+        {CFE_SB_MSGID_WRAP_VALUE(DS_SEND_HK_MID), 4, 0},
+#endif
+#ifdef HAVE_LC_APP
+        {CFE_SB_MSGID_WRAP_VALUE(LC_SEND_HK_MID), 4, 0},
+#endif
+    }};
 
 /*
 ** The macro below identifies: