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

IC - 20200226 #35

Merged
merged 3 commits into from
Feb 28, 2020
Merged

IC - 20200226 #35

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
845fa9a
Fixes #35, Build fails with deprecated cFE/OSAL elements removed
dmknutsen Jan 24, 2020
ca19528
Merge pull request #29 from dmknutsen/issue_35
astrogeco Feb 25, 2020
631dbd9
Increase version to 2.3.4 and update README
astrogeco Feb 28, 2020
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
7 changes: 4 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ To change the list of packets that sch_lab sends out, edit the schedule table lo
fsw/platform_inc/sch_lab_sched_tab.h

## Version Notes

- 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
Expand All @@ -32,5 +34,4 @@ As a lab application, extensive testing is not performed prior to release and on

For best results, submit issues:questions or issues:help wanted requests at https://github.com/nasa/cFS.

Official cFS page: http://cfs.gsfc.nasa.gov

Official cFS page: http://cfs.gsfc.nasa.gov
6 changes: 3 additions & 3 deletions fsw/src/sch_lab_app.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ void SCH_Lab_AppMain(void)
int i;
uint32 SCH_OneHzPktsRcvd = 0;
uint32 Status = CFE_SUCCESS;
uint32 RunStatus = CFE_ES_APP_RUN;
uint32 RunStatus = CFE_ES_RunStatus_APP_RUN;

CFE_ES_PerfLogEntry(SCH_MAIN_TASK_PERF_ID);

Expand All @@ -89,7 +89,7 @@ void SCH_Lab_AppMain(void)
}

/* Loop Forever */
while (CFE_ES_RunLoop(&RunStatus) == TRUE)
while (CFE_ES_RunLoop(&RunStatus) == true)
{
CFE_ES_PerfLogExit(SCH_MAIN_TASK_PERF_ID);

Expand Down Expand Up @@ -202,7 +202,7 @@ int32 SCH_LAB_AppInit(void)
{
CFE_SB_InitMsg(&SCH_CmdHeaderTable[i],
MySchTBL->MessageID[i],
sizeof(CFE_SB_CmdHdr_t), TRUE);
sizeof(CFE_SB_CmdHdr_t), true);
}
else
{
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 @@ -32,7 +32,7 @@

#define SCH_LAB_MAJOR_VERSION 2
#define SCH_LAB_MINOR_VERSION 3
#define SCH_LAB_REVISION 3
#define SCH_LAB_REVISION 4
#define SCH_LAB_MISSION_REV 0


Expand Down