Skip to content

Integration Candidate 2020-04-01 #151

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

Merged
merged 3 commits into from
Apr 9, 2020
Merged

Integration Candidate 2020-04-01 #151

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
5fd08ac
Fix #143, Resolve CI config warnings
Mar 25, 2020
a8e9709
Merge pull request #144 from skliper/fix143-resolve-ci-warn
astrogeco Apr 6, 2020
78af2db
Increase version to 1.4.8 and update ReadMe
Apr 9, 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
5 changes: 2 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
os: linux
dist: bionic
sudo: required
language:
- c
language: c
compiler:
- gcc
addons:
Expand Down
3 changes: 3 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ This repository contains NASA's Platform Support Package (PSP), which is a frame
This is a collection of APIs abstracting platform specific functionality to be located in the `psp` subdirectory of a cFS Mission Tree. The Core Flight System is bundled at https://github.com/nasa/cFS, which includes build and execution instructions.

## Version Notes

- 1.4.8 DEVELOPMENT
- Minor updates (see https://github.com/nasa/PSP/pull/151)
- 1.4.7 DEVELOPMENT
- Fixed some build warnings for MCP750
- Minor updates (see https://github.com/nasa/PSP/pull/142)
Expand Down
2 changes: 1 addition & 1 deletion fsw/mcp750-vxworks/inc/psp_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
*/
#define CFE_PSP_IMPL_MAJOR_VERSION 1
#define CFE_PSP_IMPL_MINOR_VERSION 4
#define CFE_PSP_IMPL_REVISION 7
#define CFE_PSP_IMPL_REVISION 8
#define CFE_PSP_IMPL_MISSION_REV 0

#endif /* _psp_version_ */
2 changes: 1 addition & 1 deletion fsw/pc-linux/inc/psp_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
*/
#define CFE_PSP_IMPL_MAJOR_VERSION 1
#define CFE_PSP_IMPL_MINOR_VERSION 4
#define CFE_PSP_IMPL_REVISION 7
#define CFE_PSP_IMPL_REVISION 8
#define CFE_PSP_IMPL_MISSION_REV 0

#endif /* _psp_version_ */
2 changes: 1 addition & 1 deletion fsw/pc-rtems/inc/psp_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
*/
#define CFE_PSP_IMPL_MAJOR_VERSION 1
#define CFE_PSP_IMPL_MINOR_VERSION 4
#define CFE_PSP_IMPL_REVISION 7
#define CFE_PSP_IMPL_REVISION 8
#define CFE_PSP_IMPL_MISSION_REV 0

#endif /* _psp_version_ */