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: Caelum-rc4+dev67 #165

Merged
merged 5 commits into from
Jan 10, 2024
Merged

sch_lab Integration candidate: Caelum-rc4+dev67 #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
990f120
Fix #162, CFE_TIME_1HZ_CMD_MID deprecated
skliper Jan 3, 2024
7864b37
Fix #158, SC_1HZ_WAKEUP_MID deprecated
skliper Jan 3, 2024
859637e
Merge pull request #164 from skliper:fix158_sc_1hz_wakeup_mid
dzbaker Jan 4, 2024
1ec32f4
Merge pull request #163 from skliper:fix162_cfe_time_1hz
dzbaker Jan 4, 2024
179d84a
Updating documentation and version numbers for v2.5.0-rc4+dev83
dzbaker Jan 4, 2024
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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

## Development Build: v2.5.0-rc4+dev83
- SC_1HZ_WAKEUP_MID deprecated
- CFE_TIME_1HZ_CMD_MID deprecated
- See <https://github.com/nasa/sch_lab/pull/164> and <https://github.com/nasa/sch_lab/pull/163>

## Development Build: v2.5.0-rc4+dev75
- correct inclusion for SCH_LAB example table
- See <https://github.com/nasa/sch_lab/pull/156>
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 @@ -285,7 +285,7 @@ CFE_Status_t SCH_LAB_AppInit(void)
OS_printf("SCH Error creating pipe!\n");
}

Status = CFE_SB_Subscribe(CFE_SB_ValueToMsgId(CFE_TIME_1HZ_CMD_MID), SCH_LAB_Global.CmdPipe);
Status = CFE_SB_Subscribe(CFE_SB_ValueToMsgId(CFE_TIME_ONEHZ_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 @@ -25,7 +25,7 @@
*/

/* Development Build Macro Definitions */
#define SCH_LAB_BUILD_NUMBER 75 /*!< Development Build: Number of commits since baseline */
#define SCH_LAB_BUILD_NUMBER 83 /*!< 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
2 changes: 1 addition & 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 @@ -85,7 +85,7 @@ SCH_LAB_ScheduleTable_t SCH_LAB_ScheduleTable = {
#endif
#ifdef HAVE_SC
{CFE_SB_MSGID_WRAP_VALUE(SC_SEND_HK_MID), 92, 0},
{CFE_SB_MSGID_WRAP_VALUE(SC_1HZ_WAKEUP_MID), 91, 0},
{CFE_SB_MSGID_WRAP_VALUE(SC_ONEHZ_WAKEUP_MID), 91, 0},
#endif
#ifdef HAVE_HS
{CFE_SB_MSGID_WRAP_VALUE(HS_SEND_HK_MID), 90, 0}, /* Example of a message that wouldn't be sent */
Expand Down
Loading