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

sch_lab Integration candidate: 2021-09-21 #92

Merged
merged 3 commits into from
Sep 22, 2021
Merged

sch_lab Integration candidate: 2021-09-21 #92

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
1bd3dd3
Fix #90, apply CFE_SB_ValueToMsgId where required
jphickey Sep 10, 2021
77e0c0e
Merge pull request #91 from jphickey/fix-90-msgidvalue
astrogeco Sep 21, 2021
d4d43f0
IC:2021-09-21, v2.4.0-rc1+dev53
astrogeco Sep 22, 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
4 changes: 4 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,10 @@ To change the list of packets that sch_lab sends out, edit the schedule table lo

## Version History

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

- Apply CFE_SB_ValueToMsgId where required
- See <https://github.com/nasa/sch_lab/pull/92> and <https://github.com/nasa/cFS/pull/359>
### Development Build: v2.4.0-rc1+dev47

- Allow command codes to be specified in sch_lab_table #85, add CmdCode to sch_lab_table
Expand Down
2 changes: 1 addition & 1 deletion fsw/src/sch_lab_app.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ int32 SCH_LAB_AppInit(void)
OS_printf("SCH Error creating pipe!\n");
}

Status = CFE_SB_Subscribe(CFE_TIME_1HZ_CMD_MID, SCH_LAB_Global.CmdPipe);
Status = CFE_SB_Subscribe(CFE_SB_ValueToMsgId(CFE_TIME_1HZ_CMD_MID), SCH_LAB_Global.CmdPipe);
if (Status != CFE_SUCCESS)
{
OS_printf("SCH Error subscribing to 1hz!\n");
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 47 /*!< Development Build: Number of commits since baseline */
#define SCH_LAB_BUILD_NUMBER 53 /*!< 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