diff --git a/README.md b/README.md index ec95bc4..d5bd002 100644 --- a/README.md +++ b/README.md @@ -2,33 +2,51 @@ This repository contains NASA's Scheduler Lab (sch_lab), which is a framework component of the Core Flight System. -This lab application is a non-flight packet scheduler application for the cFS Bundle. It is intended to be located in the `apps/sch_lab` subdirectory of a cFS Mission Tree. The Core Flight System is bundled at https://github.com/nasa/cFS (which includes sch_lab as a submodule), which includes build and execution instructions. +This lab application is a non-flight packet scheduler application for the cFS Bundle. It is intended to be located in the `apps/sch_lab` subdirectory of a cFS Mission Tree. The Core Flight System is bundled at (which includes sch_lab as a submodule), which includes build and execution instructions. sch_lab is a simple packet scheduler application with a one second resoluton. -To change the list of packets that sch_lab sends out, edit the schedule table located in the platform include file: -fsw/platform_inc/sch_lab_sched_tab.h - -## Version Notes -- 2.3.5: DEVELOPMENT - - Improved table handling - - sch_lab now builds on Raspbian OS - - Minor updates (see https://github.com/nasa/sch_lab/pull/36) -- 2.3.4: DEVELOPMENT - - Fix for clean build with OMIT_DEPRECATED - - Minor updates (see https://github.com/nasa/sch_lab/pull/35) -- 2.3.3: DEVELOPMENT - - Minor updates (see https://github.com/nasa/sch_lab/pull/28) -- 2.3.2: DEVELOPMENT - - Table definition include update (see https://github.com/nasa/sch_lab/pull/18) -- 2.3.1: DEVELOPMENT - - Minor updates (see https://github.com/nasa/sch_lab/pull/16) -- **2.3.0 OFFICIAL RELEASE**: - - Minor updates (see https://github.com/nasa/sch_lab/pull/13) - - Not backwards compatible with OSAL 4.2.1 - - Released as part of cFE 6.7.0, Apache 2.0 -- **2.2.0a OFFICIAL RELEASE**: - - Released as part of cFE 6.6.0a, Apache 2.0 +To change the list of packets that sch_lab sends out, edit the schedule table located in the platform include file: fsw/platform_inc/sch_lab_sched_tab.h + +## Version History + +### 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. +- See + +### Development Build: 2.3.5 + +- Improved table handling +- sch_lab now builds on Raspbian OS +- Minor updates (see ) + +### Development Build: 2.3.4 + +- Fix for clean build with OMIT_DEPRECATED +- Minor updates (see ) + + ### Development Build: 2.3.3 + +- Minor updates (see ) + + ### Development Build: 2.3.2 + +- Table definition include update (see ) + + ### Development Build: 2.3.1 + +- Minor updates (see ) + +### _**OFFICIAL RELEASE: 2.3.0**_ + +- Minor updates (see ) +- Not backwards compatible with OSAL 4.2.1 +- Released as part of cFE 6.7.0, Apache 2.0 + +### _**OFFICIAL RELEASE: 2.2.0a**_ + +- Released as part of cFE 6.6.0a, Apache 2.0 ## Known issues @@ -36,6 +54,6 @@ As a lab application, extensive testing is not performed prior to release and on ## Getting Help -For best results, submit issues:questions or issues:help wanted requests at https://github.com/nasa/cFS. +For best results, submit issues:questions or issues:help wanted requests at . -Official cFS page: http://cfs.gsfc.nasa.gov +Official cFS page: diff --git a/fsw/src/sch_lab_app.c b/fsw/src/sch_lab_app.c index f2f30bc..03b24a7 100644 --- a/fsw/src/sch_lab_app.c +++ b/fsw/src/sch_lab_app.c @@ -214,7 +214,7 @@ int32 SCH_LAB_AppInit(void) if (ConfigEntry->PacketRate != 0) { CFE_SB_InitMsg(&LocalStateEntry->MsgBuf.MsgHdr, - CFE_SB_ValueToMsgId(ConfigEntry->MessageID), + ConfigEntry->MessageID, sizeof(LocalStateEntry->MsgBuf), true); LocalStateEntry->PacketRate = ConfigEntry->PacketRate; } diff --git a/fsw/src/sch_lab_table.c b/fsw/src/sch_lab_table.c index 9a84ea0..4bd43fb 100644 --- a/fsw/src/sch_lab_table.c +++ b/fsw/src/sch_lab_table.c @@ -22,7 +22,7 @@ #include "cfe_tbl_filedef.h" /* Required to obtain the CFE_TBL_FILEDEF macro definition */ #include "sch_lab_sched_tab.h" - +#include "cfe_sb.h" /* Required to use the CFE_SB_MSGID_WRAP_VALUE macro */ /* ** SCH Lab schedule table @@ -37,14 +37,14 @@ SCH_LAB_ScheduleTable_t SCH_TBL_Structure = { .Config = { - { CFE_ES_SEND_HK_MID, 4 }, - { CFE_EVS_SEND_HK_MID, 4 }, - { CFE_TIME_SEND_HK_MID, 4 }, - { CFE_SB_SEND_HK_MID, 4 }, - { CFE_TBL_SEND_HK_MID, 4 }, - { CI_LAB_SEND_HK_MID, 4 }, - { TO_LAB_SEND_HK_MID, 4 }, - { SAMPLE_APP_SEND_HK_MID, 4 }, + { CFE_SB_MSGID_WRAP_VALUE(CFE_ES_SEND_HK_MID), 4 }, + { CFE_SB_MSGID_WRAP_VALUE(CFE_EVS_SEND_HK_MID), 4 }, + { CFE_SB_MSGID_WRAP_VALUE(CFE_TIME_SEND_HK_MID), 4 }, + { CFE_SB_MSGID_WRAP_VALUE(CFE_SB_SEND_HK_MID), 4 }, + { CFE_SB_MSGID_WRAP_VALUE(CFE_TBL_SEND_HK_MID), 4 }, + { CFE_SB_MSGID_WRAP_VALUE(CI_LAB_SEND_HK_MID), 4 }, + { CFE_SB_MSGID_WRAP_VALUE(TO_LAB_SEND_HK_MID), 4 }, + { CFE_SB_MSGID_WRAP_VALUE(SAMPLE_APP_SEND_HK_MID), 4 }, #if 0 { SC_SEND_HK_MID, 4, 0 }, { SC_1HZ_WAKEUP_MID, 1, 0 }, /* Example of a 1hz packet */ diff --git a/fsw/src/sch_lab_version.h b/fsw/src/sch_lab_version.h index 648ae52..ebb7251 100644 --- a/fsw/src/sch_lab_version.h +++ b/fsw/src/sch_lab_version.h @@ -32,7 +32,7 @@ #define SCH_LAB_MAJOR_VERSION 2 #define SCH_LAB_MINOR_VERSION 3 -#define SCH_LAB_REVISION 5 +#define SCH_LAB_REVISION 6 #define SCH_LAB_MISSION_REV 0