Merge pull request #52 from nasa/integration-candidate

Integration Candidate: 2020-08-19
nasa · Aug 25, 2020 · 389db6d · 389db6d
2 parents 450075f + fb722f5
commit 389db6d
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 36 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,4 +9,4 @@ include_directories(${sample_app_MISSION_DIR}/fsw/platform_inc)
 
 # Create the app module
 add_cfe_app(sch_lab fsw/src/sch_lab_app.c)
-add_cfe_tables(sch_lab_table fsw/src/sch_lab_table.c)
+add_cfe_tables(sch_lab_table fsw/tables/sch_lab_table.c)
diff --git a/README.md b/README.md
@@ -10,6 +10,11 @@ To change the list of packets that sch_lab sends out, edit the schedule table lo
 
 ## Version History
 
+### Development Build: 2.4.0-rc1+dev2
+
+- Reorganize the sch_lab table so it matches the sample_app usage and format.
+- See <https://github.com/nasa/sch_lab/pull/52>
+
 ### Development Build: 2.3.0+dev37
 
 - Fixes schedule table documentation
@@ -20,7 +25,7 @@ To change the list of packets that sch_lab sends out, edit the schedule table lo
 
 - 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.
 - See <https://github.com/nasa/sch_lab/pull/41>
- 
+
 ### Development Build: 2.3.6
 
 - 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/platform_inc/sch_lab_sched_tab.h → fsw/platform_inc/sch_lab_table.h b/fsw/platform_inc/sch_lab_sched_tab.h → fsw/platform_inc/sch_lab_table.h
@@ -18,7 +18,7 @@
 **      See the License for the specific language governing permissions and
 **      limitations under the License.
 **
-** File: sch_lab_sched_tab.h
+** File: sch_lab_table.h
 **
 ** Purpose:
 **  This file contains the schedule tables for the SCH Lab app.
@@ -32,22 +32,6 @@
 #include "cfe_sb_extern_typedefs.h" /* for CFE_SB_MsgId_t */
 #include "cfe_msgids.h"
 
-/*
-** Include headers for message IDs here
-*/
-#include "ci_lab_msgids.h"
-#include "to_lab_msgids.h"
-
-#include "sample_app_msgids.h"
-
-#if 0
-#include "sc_msgids.h"
-#include "hs_msgids.h"
-#include "fm_msgids.h"
-#include "ds_msgids.h"
-#include "lc_msgids.h"
-#endif
-
 /*
 ** Defines
 */

diff --git a/fsw/src/sch_lab_app.c b/fsw/src/sch_lab_app.c
@@ -44,7 +44,7 @@
 /*
 ** SCH Lab Schedule table from the platform inc directory
 */
-#include "sch_lab_sched_tab.h"
+#include "sch_lab_table.h"
 
 /*
 ** Global Structure

diff --git a/fsw/src/sch_lab_version.h b/fsw/src/sch_lab_version.h
@@ -23,15 +23,15 @@
 #define SCH_LAB_VERSION_H
 
 /*! @file SCH_LAB_version.h
- * @brief Purpose: 
- * 
+ * @brief Purpose:
+ *
  *  The SCH Lab Application header file containing version information
- * 
+ *
  */
 
 /* Development Build Macro Definitions */
-#define SCH_LAB_BUILD_NUMBER 37 /*!< Development Build: Number of commits since baseline */
-#define SCH_LAB_BUILD_BASELINE "v2.3.0" /*!< Development Build: git tag that is the base for the current development */
+#define SCH_LAB_BUILD_NUMBER 2 /*!< Development Build: Number of commits since baseline */
+#define SCH_LAB_BUILD_BASELINE "v2.4.0-rc1" /*!< Development Build: git tag that is the base for the current development */
 
 /* Version Macro Definitions */
 
@@ -43,23 +43,22 @@
 #define SCH_LAB_STR_HELPER(x) #x /*!< @brief Helper function to concatenate strings from integer macros */
 #define SCH_LAB_STR(x)        SCH_LAB_STR_HELPER(x) /*!< @brief Helper function to concatenate strings from integer macros */
 
-/*! @brief Development Build Version Number. 
+/*! @brief Development Build Version Number.
  * @details Baseline git tag + Number of commits since baseline. @n
  * See @ref cfsversions for format differences between development and release versions.
  */
-#define SCH_LAB_VERSION SCH_LAB_BUILD_BASELINE "+dev" SCH_LAB_STR(SCH_LAB_BUILD_NUMBER) 
+#define SCH_LAB_VERSION SCH_LAB_BUILD_BASELINE "+dev" SCH_LAB_STR(SCH_LAB_BUILD_NUMBER)
 
 /*! @brief Development Build Version String.
- * @details Reports the current development build's baseline, number, and name. Also includes a note about the latest official version. @n
- * See @ref cfsversions for format differences between development and release versions. 
-*/          
-#define SCH_LAB_VERSION_STRING                                                          \
-    " SCH Lab DEVELOPMENT BUILD "                                                     \
-    SCH_LAB_VERSION                                                                     \
-    ", Last Official Release: v2.3.0"   /* For full support please use this version */
+ * @details Reports the current development build's baseline, number, and name. Also includes a note about the latest
+ * official version. @n See @ref cfsversions for format differences between development and release versions.
+ */
+#define SCH_LAB_VERSION_STRING                    \
+    " SCH Lab DEVELOPMENT BUILD " SCH_LAB_VERSION \
+    ", Last Official Release: v2.3.0" /* For full support please use this version */
 
 #endif /* SCH_LAB_VERSION_H */
 
 /************************/
 /*  End of File Comment */
-/************************/
+/************************/
diff --git a/fsw/src/sch_lab_table.c → fsw/tables/sch_lab_table.c b/fsw/src/sch_lab_table.c → fsw/tables/sch_lab_table.c
@@ -21,9 +21,25 @@
 */
 
 #include "cfe_tbl_filedef.h" /* Required to obtain the CFE_TBL_FILEDEF macro definition */
-#include "sch_lab_sched_tab.h"
+#include "sch_lab_table.h"
 #include "cfe_sb.h" /* Required to use the CFE_SB_MSGID_WRAP_VALUE macro */
 
+/*
+** Include headers for message IDs here
+*/
+#include "ci_lab_msgids.h"
+#include "to_lab_msgids.h"
+
+#include "sample_app_msgids.h"
+
+#if 0
+#include "sc_msgids.h"
+#include "hs_msgids.h"
+#include "fm_msgids.h"
+#include "ds_msgids.h"
+#include "lc_msgids.h"
+#endif
+
 /*
 ** SCH Lab schedule table
 ** When populating this table: