Skip to content

Commit

Permalink
Merge pull request #76 from nasa/integration-candidate
Browse files Browse the repository at this point in the history
sch_lab Integration candidate: 2021-03-30
  • Loading branch information
astrogeco authored Apr 1, 2021
2 parents f2ed3d2 + 9da4ef3 commit 4a1b72e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ To change the list of packets that sch_lab sends out, edit the schedule table lo

## Version History

### Development Build: v2.4.0-rc1+dev32

- Removes app registration call, `CFE_ES_RegisterApp()` since applications do not need to register themselves.
- See <https://github.com/nasa/sch_lab/pull/76>

### Development Build: v2.4.0-rc1+dev26

- Fix #67, Update sequence count in transmitted messages
Expand Down
2 changes: 0 additions & 2 deletions fsw/src/sch_lab_app.c
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,6 @@ void SCH_Lab_AppMain(void)

CFE_ES_PerfLogEntry(SCH_MAIN_TASK_PERF_ID);

CFE_ES_RegisterApp();

Status = SCH_LAB_AppInit();
if (Status != CFE_SUCCESS)
{
Expand Down
2 changes: 1 addition & 1 deletion fsw/src/sch_lab_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
*/

/* Development Build Macro Definitions */
#define SCH_LAB_BUILD_NUMBER 26 /*!< Development Build: Number of commits since baseline */
#define SCH_LAB_BUILD_NUMBER 32 /*!< 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 */

Expand Down

0 comments on commit 4a1b72e

Please sign in to comment.