From ec1b0c82d28f7b084d7a7dbaac9b45547b040812 Mon Sep 17 00:00:00 2001
From: Chris Knight <Christopher.D.Knight@nasa.gov>
Date: Wed, 19 Aug 2020 14:00:20 -0700
Subject: [PATCH] Fix #49, reorg schedule table to conform with std (#50)

* fix #49, reorg schedule table to conform with std
---
 CMakeLists.txt                                 |  2 +-
 .../{sch_lab_sched_tab.h => sch_lab_table.h}   | 18 +-----------------
 fsw/src/sch_lab_app.c                          |  2 +-
 fsw/{src => tables}/sch_lab_table.c            | 18 +++++++++++++++++-
 4 files changed, 20 insertions(+), 20 deletions(-)
 rename fsw/platform_inc/{sch_lab_sched_tab.h => sch_lab_table.h} (85%)
 rename fsw/{src => tables}/sch_lab_table.c (91%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a8e000..db7c465 100644
--- 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/fsw/platform_inc/sch_lab_sched_tab.h b/fsw/platform_inc/sch_lab_table.h
similarity index 85%
rename from fsw/platform_inc/sch_lab_sched_tab.h
rename to fsw/platform_inc/sch_lab_table.h
index 37630c7..ad2cefa 100644
--- a/fsw/platform_inc/sch_lab_sched_tab.h
+++ b/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
index 360bf62..bf5e25e 100644
--- 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_table.c b/fsw/tables/sch_lab_table.c
similarity index 91%
rename from fsw/src/sch_lab_table.c
rename to fsw/tables/sch_lab_table.c
index 7de9a94..7f471c2 100644
--- a/fsw/src/sch_lab_table.c
+++ b/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: