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: 2021-03-30 #97

Merged
merged 3 commits into from
Apr 1, 2021
Merged

to_lab Integration candidate: 2021-03-30 #97

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
9d53b24
Fix #95, remove app registration
jphickey Mar 23, 2021
9773686
Merge pull request #96 from jphickey/fix-95-task-registration
astrogeco Mar 29, 2021
08401a4
IC:2021-03-30, Bump to v2.4.0-rc1+dev47
astrogeco Apr 1, 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
5 changes: 5 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,11 @@ To send telemtry to the "ground" or UDP/IP port, edit the subscription table in

## Version History

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

- Removes app registration call, `CFE_ES_RegisterApp()` since applications do not need to register themselves.
- See <https://github.com/nasa/to_lab/pull/97>

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

- Use `cfe.h` header file
Expand Down
1 change: 0 additions & 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 @@ -151,7 +151,6 @@ int32 TO_LAB_init(void)
char ToTlmPipeName[16];
uint16 ToTlmPipeDepth;

CFE_ES_RegisterApp();
TO_LAB_Global.downlink_on = false;
PipeDepth = TO_LAB_CMD_PIPE_DEPTH;
strcpy(PipeName, "TO_LAB_CMD_PIPE");
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 @@ -30,7 +30,7 @@
*/

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

Expand Down