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

Integration Candidate: 2020-08-26 #93

Merged
merged 5 commits into from
Sep 1, 2020
Merged

Integration Candidate: 2020-08-26 #93

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
dc18851
Fix #89, Remove CFE_SB_InitMsg use in coverage test
skliper Aug 24, 2020
98e791c
Merge pull request #90 from skliper/fix89-replace-initmsg
yammajamma Aug 26, 2020
0553fc7
Fix #37, Apply standard code style
astrogeco Aug 27, 2020
f0c26b6
Merge pull request #92 from nasa/apply-style-again
yammajamma Aug 28, 2020
2a0c8d5
Increase verion to 1.2.0-rc1+dev5, update readme
yammajamma Sep 1, 2020
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
6 changes: 6 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ sample_app is an example for how to build and link an application in cFS. See al

## Version History

### Development Build: 1.2.0-rc1+dev5

- Applies standard coding style.
- Removes test code call of CFE_SB_InitMsg and sets the API/stub buffers directly.
- See <https://github.com/nasa/sample_app/pull/93>

### Development Build: 1.1.0+dev65

- Add build number and baseline to version report
Expand Down
5 changes: 2 additions & 3 deletions fsw/mission_inc/sample_app_perfids.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
**
** File: sample_app_perfids.h
**
** Purpose:
** Purpose:
** Define Sample App Performance IDs
**
** Notes:
Expand All @@ -29,8 +29,7 @@
#ifndef _sample_app_perfids_h_
#define _sample_app_perfids_h_


#define SAMPLE_APP_PERF_ID 91
#define SAMPLE_APP_PERF_ID 91

#endif /* _sample_app_perfids_h_ */

Expand Down
8 changes: 4 additions & 4 deletions fsw/platform_inc/sample_app_msgids.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
**
** File: sample_app_msgids.h
**
** Purpose:
** Purpose:
** Define Sample App Message IDs
**
** Notes:
Expand All @@ -30,9 +30,9 @@
#ifndef _sample_app_msgids_h_
#define _sample_app_msgids_h_

#define SAMPLE_APP_CMD_MID 0x1882
#define SAMPLE_APP_SEND_HK_MID 0x1883
#define SAMPLE_APP_HK_TLM_MID 0x0883
#define SAMPLE_APP_CMD_MID 0x1882
#define SAMPLE_APP_SEND_HK_MID 0x1883
#define SAMPLE_APP_HK_TLM_MID 0x0883

#endif /* _sample_app_msgids_h_ */

Expand Down
4 changes: 2 additions & 2 deletions fsw/platform_inc/sample_app_table.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
*/
typedef struct
{
uint16 Int1;
uint16 Int2;
uint16 Int1;
uint16 Int2;

} SAMPLE_APP_Table_t;

Expand Down
Loading