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

to_lab Integration candidate: Caelum-rc4+dev59 #161

Merged
merged 3 commits into from
Sep 14, 2023
Merged

to_lab Integration candidate: Caelum-rc4+dev59 #161

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
a152ed2
Fix #159, Remove unused/unnecessary TO_LAB_UNUSED
skliper Sep 13, 2023
09f850c
Merge pull request #160 from skliper:fix159-rm_to_lab_unused
dzbaker Sep 14, 2023
7ed6b8b
Bump to v2.5.0-rc4+dev49
dzbaker Sep 14, 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+dev49
- Remove unused/unnecessary TO_LAB_UNUSED
- See <https://github.com/nasa/to_lab/pull/160>

## Development Build: v2.5.0-rc4+dev45
- adjust subscription table based on apps present
- See <https://github.com/nasa/to_lab/pull/153>
Expand Down
2 changes: 1 addition & 1 deletion fsw/src/to_lab_app.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ int32 TO_LAB_init(void)
{
if (!CFE_SB_IsValidMsgId(TO_LAB_Subs->Subs[i].Stream))
{
/* Only process until invalid MsgId (aka TO_LAB_UNUSED) is found*/
/* Only process until invalid MsgId is found*/
break;
}
else if (CFE_SB_IsValidMsgId(TO_LAB_Subs->Subs[i].Stream))
Expand Down
1 change: 0 additions & 1 deletion fsw/src/to_lab_app.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
/*****************************************************************************/

#define TO_LAB_TASK_MSEC 500 /* run at 2 Hz */
#define TO_LAB_UNUSED CFE_SB_MSGID_RESERVED

/**
* Depth of pipe for commands to the TO_LAB application itself
Expand Down
2 changes: 1 addition & 1 deletion fsw/src/to_lab_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#define TO_LAB_VERSION_H

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

Expand Down
Loading