Skip to content

Commit

Permalink
Fix #49, reorg schedule table to conform with std (#50)
Browse files Browse the repository at this point in the history
* fix #49, reorg schedule table to conform with std
  • Loading branch information
CDKnightNASA authored Aug 19, 2020
1 parent 450075f commit ec1b0c8
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
*/
Expand Down
2 changes: 1 addition & 1 deletion fsw/src/sch_lab_app.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 17 additions & 1 deletion fsw/src/sch_lab_table.c → fsw/tables/sch_lab_table.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit ec1b0c8

Please sign in to comment.