Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sch_lab Integration candidate: 2021-06-01 #82

Merged
merged 3 commits into from
Jun 8, 2021
Merged

sch_lab Integration candidate: 2021-06-01 #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f82001
Fix #80, exit the main loop if init fails
jphickey May 24, 2021
bd02803
Merge pull request #81 from jphickey/fix-80-init-fail
astrogeco Jun 3, 2021
36f1fbd
IC:2021-06-01, Bump to v2.4.0-rc1+dev36
astrogeco Jun 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions README.md
View file
Open in desktop
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+dev36

- Fix infinite loop by making sch_lab exit by making "RunStatus" return ERROR if initialization fails. This causes the `CFE_ES_RunLoop` function to return false.
- See <https://github.com/nasa/sch_lab/pull/82> and <https://github.com/nasa/cFS/pull/263/>

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

- Removes app registration call, `CFE_ES_RegisterApp()` since applications do not need to register themselves.
Expand Down
1 change: 1 addition & 0 deletions fsw/src/sch_lab_app.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ void SCH_Lab_AppMain(void)
if (Status != CFE_SUCCESS)
{
CFE_ES_WriteToSysLog("SCH_LAB: Error Initializing RC = 0x%08lX\n", (unsigned long)Status);
RunStatus = CFE_ES_RunStatus_APP_ERROR;
}

/* Loop Forever */
Expand Down
2 changes: 1 addition & 1 deletion fsw/src/sch_lab_version.h
View file
Open in desktop
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 32 /*!< Development Build: Number of commits since baseline */
#define SCH_LAB_BUILD_NUMBER 36 /*!< 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