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: Caelum-rc4+dev66 #157

Merged
merged 3 commits into from
Dec 12, 2023
Merged

sch_lab Integration candidate: Caelum-rc4+dev66 #157

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
0dd89d2
Fix #155, correct inclusion for SCH_LAB example table
jphickey Dec 7, 2023
a9f5bdc
Merge pull request #156 from jphickey:fix-155-includefix
dzbaker Dec 12, 2023
8a0145c
Updating documentation and version numbers for v2.5.0-rc4+dev75
dzbaker Dec 12, 2023
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## Development Build: v2.5.0-rc4+dev75
- correct inclusion for SCH_LAB example table
- See <https://github.com/nasa/sch_lab/pull/156>

## Development Build: v2.5.0-rc4+dev71
- Standardize naming of SCH_LAB functions/macros
- Call CFE_ES_ExitApp with RunStatus rather than internal status variable
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 @@ -25,7 +25,7 @@
*/

/* Development Build Macro Definitions */
#define SCH_LAB_BUILD_NUMBER 71 /*!< Development Build: Number of commits since baseline */
#define SCH_LAB_BUILD_NUMBER 75 /*!< Development Build: Number of commits since baseline */
#define SCH_LAB_BUILD_BASELINE \
"v2.5.0-rc4" /*!< Development Build: git tag that is the base for the current development */

Expand Down
5 changes: 4 additions & 1 deletion fsw/tables/sch_lab_table.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@

#include "cfe_tbl_filedef.h" /* Required to obtain the CFE_TBL_FILEDEF macro definition */
#include "sch_lab_tbl.h"
#include "cfe_sb.h" /* Required to use the CFE_SB_MSGID_WRAP_VALUE macro */
#include "cfe_sb_api_typedefs.h" /* Required to use the CFE_SB_MSGID_WRAP_VALUE macro */

/* This is for the standard set of CFE core app MsgID values */
#include "cfe_msgids.h"

#ifdef HAVE_CI_LAB
#include "ci_lab_msgids.h"
Expand Down
Loading