Skip to content

Commit a6c6b65

Browse files
astrogecoastrogeco
authored
Merge pull request #2074 from nasa/integration-candidate
cFE Integration candidate: Caelum-rc4+dev7
2 parents a39b0a6 + 830a738 commit a6c6b65

File tree

284 files changed

+4979
-5654
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

284 files changed

+4979
-5654
lines changed

‎README.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ The detailed cFE user's guide can be viewed at <https://github.com/nasa/cFS/blob
1010

1111
## Changelog
1212

13+
### Development Build: v7.0.0-rc4+dev94
14+
15+
- Resolve build failure for time cfg
16+
- Update Copyright Headers
17+
- Standardize version.h
18+
- See <https://github.com/nasa/cfe/pull/2074> and <https://github.com/nasa/cFS/445>
19+
1320
### Development Build: v7.0.0-rc4+dev87
1421

1522
- Revert development version identifier to 99 for revision number

‎cmake/sample_defs/cpu1_msgids.h‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
1-
/*
2-
** GSC-18128-1, "Core Flight Executive Version 6.7"
3-
**
4-
** Copyright (c) 2006-2019 United States Government as represented by
5-
** the Administrator of the National Aeronautics and Space Administration.
6-
** All Rights Reserved.
7-
**
8-
** Licensed under the Apache License, Version 2.0 (the "License");
9-
** you may not use this file except in compliance with the License.
10-
** You may obtain a copy of the License at
11-
**
12-
** http://www.apache.org/licenses/LICENSE-2.0
13-
**
14-
** Unless required by applicable law or agreed to in writing, software
15-
** distributed under the License is distributed on an "AS IS" BASIS,
16-
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
** See the License for the specific language governing permissions and
18-
** limitations under the License.
19-
*/
1+
/************************************************************************
2+
* NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes”
3+
*
4+
* Copyright (c) 2020 United States Government as represented by the
5+
* Administrator of the National Aeronautics and Space Administration.
6+
* All Rights Reserved.
7+
*
8+
* Licensed under the Apache License, Version 2.0 (the "License"); you may
9+
* not use this file except in compliance with the License. You may obtain
10+
* a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
************************************************************************/
2018

2119
/**
2220
* @file

‎cmake/sample_defs/cpu1_platform_cfg.h‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
1-
/*
2-
** GSC-18128-1, "Core Flight Executive Version 6.7"
3-
**
4-
** Copyright (c) 2006-2019 United States Government as represented by
5-
** the Administrator of the National Aeronautics and Space Administration.
6-
** All Rights Reserved.
7-
**
8-
** Licensed under the Apache License, Version 2.0 (the "License");
9-
** you may not use this file except in compliance with the License.
10-
** You may obtain a copy of the License at
11-
**
12-
** http://www.apache.org/licenses/LICENSE-2.0
13-
**
14-
** Unless required by applicable law or agreed to in writing, software
15-
** distributed under the License is distributed on an "AS IS" BASIS,
16-
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
** See the License for the specific language governing permissions and
18-
** limitations under the License.
19-
*/
1+
/************************************************************************
2+
* NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes”
3+
*
4+
* Copyright (c) 2020 United States Government as represented by the
5+
* Administrator of the National Aeronautics and Space Administration.
6+
* All Rights Reserved.
7+
*
8+
* Licensed under the Apache License, Version 2.0 (the "License"); you may
9+
* not use this file except in compliance with the License. You may obtain
10+
* a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
************************************************************************/
2018

2119
/**
2220
* @file

‎cmake/sample_defs/sample_mission_cfg.h‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
1-
/*
2-
** GSC-18128-1, "Core Flight Executive Version 6.7"
3-
**
4-
** Copyright (c) 2006-2019 United States Government as represented by
5-
** the Administrator of the National Aeronautics and Space Administration.
6-
** All Rights Reserved.
7-
**
8-
** Licensed under the Apache License, Version 2.0 (the "License");
9-
** you may not use this file except in compliance with the License.
10-
** You may obtain a copy of the License at
11-
**
12-
** http://www.apache.org/licenses/LICENSE-2.0
13-
**
14-
** Unless required by applicable law or agreed to in writing, software
15-
** distributed under the License is distributed on an "AS IS" BASIS,
16-
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
** See the License for the specific language governing permissions and
18-
** limitations under the License.
19-
*/
1+
/************************************************************************
2+
* NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes”
3+
*
4+
* Copyright (c) 2020 United States Government as represented by the
5+
* Administrator of the National Aeronautics and Space Administration.
6+
* All Rights Reserved.
7+
*
8+
* Licensed under the Apache License, Version 2.0 (the "License"); you may
9+
* not use this file except in compliance with the License. You may obtain
10+
* a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
************************************************************************/
2018

2119
/**
2220
* @file

‎cmake/sample_defs/sample_perfids.h‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
1-
/*
2-
** GSC-18128-1, "Core Flight Executive Version 6.7"
3-
**
4-
** Copyright (c) 2006-2019 United States Government as represented by
5-
** the Administrator of the National Aeronautics and Space Administration.
6-
** All Rights Reserved.
7-
**
8-
** Licensed under the Apache License, Version 2.0 (the "License");
9-
** you may not use this file except in compliance with the License.
10-
** You may obtain a copy of the License at
11-
**
12-
** http://www.apache.org/licenses/LICENSE-2.0
13-
**
14-
** Unless required by applicable law or agreed to in writing, software
15-
** distributed under the License is distributed on an "AS IS" BASIS,
16-
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
** See the License for the specific language governing permissions and
18-
** limitations under the License.
19-
*/
1+
/************************************************************************
2+
* NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes”
3+
*
4+
* Copyright (c) 2020 United States Government as represented by the
5+
* Administrator of the National Aeronautics and Space Administration.
6+
* All Rights Reserved.
7+
*
8+
* Licensed under the Apache License, Version 2.0 (the "License"); you may
9+
* not use this file except in compliance with the License. You may obtain
10+
* a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
************************************************************************/
2018

2119
/**
2220
* @file

‎cmake/target/inc/target_config.h‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
1-
/*
2-
** GSC-18128-1, "Core Flight Executive Version 6.7"
3-
**
4-
** Copyright (c) 2006-2019 United States Government as represented by
5-
** the Administrator of the National Aeronautics and Space Administration.
6-
** All Rights Reserved.
7-
**
8-
** Licensed under the Apache License, Version 2.0 (the "License");
9-
** you may not use this file except in compliance with the License.
10-
** You may obtain a copy of the License at
11-
**
12-
** http://www.apache.org/licenses/LICENSE-2.0
13-
**
14-
** Unless required by applicable law or agreed to in writing, software
15-
** distributed under the License is distributed on an "AS IS" BASIS,
16-
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
** See the License for the specific language governing permissions and
18-
** limitations under the License.
19-
*/
1+
/************************************************************************
2+
* NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes”
3+
*
4+
* Copyright (c) 2020 United States Government as represented by the
5+
* Administrator of the National Aeronautics and Space Administration.
6+
* All Rights Reserved.
7+
*
8+
* Licensed under the Apache License, Version 2.0 (the "License"); you may
9+
* not use this file except in compliance with the License. You may obtain
10+
* a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
************************************************************************/
2018

2119
/**
2220
* @file

‎cmake/target/src/target_config.c‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
1-
/*
2-
** GSC-18128-1, "Core Flight Executive Version 6.7"
3-
**
4-
** Copyright (c) 2006-2019 United States Government as represented by
5-
** the Administrator of the National Aeronautics and Space Administration.
6-
** All Rights Reserved.
7-
**
8-
** Licensed under the Apache License, Version 2.0 (the "License");
9-
** you may not use this file except in compliance with the License.
10-
** You may obtain a copy of the License at
11-
**
12-
** http://www.apache.org/licenses/LICENSE-2.0
13-
**
14-
** Unless required by applicable law or agreed to in writing, software
15-
** distributed under the License is distributed on an "AS IS" BASIS,
16-
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
** See the License for the specific language governing permissions and
18-
** limitations under the License.
19-
*/
1+
/************************************************************************
2+
* NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes”
3+
*
4+
* Copyright (c) 2020 United States Government as represented by the
5+
* Administrator of the National Aeronautics and Space Administration.
6+
* All Rights Reserved.
7+
*
8+
* Licensed under the Apache License, Version 2.0 (the "License"); you may
9+
* not use this file except in compliance with the License. You may obtain
10+
* a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
************************************************************************/
2018

2119
/**
2220
* \file

‎docs/src/cfs_versions.dox‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,26 @@
2222
bug fixes or major documentation updates.
2323
The Revision number may also be updated if there are other changes contained within a release that make
2424
it desirable for applications to distinguish one release from another.
25-
WARNING: The revision number is set to the number 0xFF in development builds. To distinguish between development
25+
WARNING: The revision number is set to the number 99 in development builds. To distinguish between development
2626
builds refer to the BUILD_NUMBER and BUILD_BASELINE detailed in the section "Identifying Development Builds".
2727

28-
The Mission Version number is set to zero in all official releases, and is reserved for the mission use.
28+
The Mission Rev Version number is set to zero in all official releases, and is reserved for the mission use.
2929

3030
<H2> How and Where Defined </H2>
3131

3232
The version numbers are provided as simple macros defined in the cfe_version.h header file as part of the
3333
API definition; these macros must expand to simple integer values, so that they can be used in simple if
3434
directives by the macro preprocessor.
3535

36-
Note the Mission Version number is provided for missions to be able to identify unique changes they
37-
have made to the released software (via clone and own).
36+
Note the Mission Rev number is provided for missions to be able to identify unique changes they have made to the released software (via clone and own). Specicifally, the values 1-254 are reserved for mission use to denote patches/customizations while 0 and 0xFF are reserved for cFS open-source development use (pending resolution of nasa/cFS#440).
3837

3938
<H2> Identifying Development Builds </H2>
4039

4140
In order to distinguish between development versions, we also provide a BUILD_NUMBER.
4241

4342
The BUILD_NUMBER reflects the number of commits since the BUILD_BASELINE, a baseline git tag, for each particular
4443
component. The BUILD_NUMBER integer monotonically increases for a given baseline. The BUILD_BASELINE
45-
identifies the current development cycle and is a git tag with format vX.Y.Z. The Codename used in the version
44+
identifies the current development cycle and is a git tag with format vMAJOR.MINOR.REVISION. The Codename used in the version
4645
string also refers to the current development cycle. When a new baseline tag and codename are created, the
4746
BUILD_NUMBER resets to zero and begins increasing from a new baseline.
4847

@@ -53,15 +52,15 @@
5352
name; for example, osal uses OS_, psp uses CFE_PSP_IMPL, and so on.
5453

5554
Suggested pattern for development:
56-
- XXX_SRC_VERSION: REFERENCE_GIT_TAG"+dev"BUILD_NUMBER
55+
- CFSCOMPONENT_SRC_VERSION: REFERENCE_GIT_TAG"+dev"BUILD_NUMBER
5756
- Example: "v6.8.0-rc1+dev123"
58-
- XXX_VERSION_STRING: "XXX DEVELOPMENT BUILD "XXX_SRC_VERSION" (Codename: YYY), Last Official Release: ZZZ"
57+
- CFSCOMPONENT_VERSION_STRING: "CFSCOMPONENT DEVELOPMENT BUILD "CFSCOMPONENT_SRC_VERSION" (Codename: CFSCONSTELLATION), Last Official Release: MAJOR.MINOR.REVISION"
5958
- Example: "cFE DEVELOPMENT BUILD v6.8.0-rc1+dev123 (Codename: Bootes), Last Official Release: cfe v6.7.0"
6059

6160
Suggested pattern for official releases:
62-
- XXX_SRC_VERSION: OFFICIAL_GIT_TAG
61+
- CFSCOMPONENT_SRC_VERSION: OFFICIAL_GIT_TAG
6362
- Example: "v7.0.0"
64-
- XXX_VERSION_STRING: "XXX OFFICIAL RELEASE "XXX_SRC_VERSION" (Codename: YYY)"
63+
- COMPONENT_VERSION_STRING: "CFSCOMPONENT OFFICIAL RELEASE "CFSCOMPONENT_SRC_VERSION" (Codename: CFSCONSTELLATION)"
6564
- Example: "cFE OFFICIAL RELEASE v7.0.0 (Codename: Caelum)"
6665

6766
**/

‎modules/cfe_assert/inc/cfe_assert.h‎

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,20 @@
1-
/*************************************************************************
2-
**
3-
** GSC-18128-1, "Core Flight Executive Version 6.7"
4-
**
5-
** Copyright (c) 2006-2019 United States Government as represented by
6-
** the Administrator of the National Aeronautics and Space Administration.
7-
** All Rights Reserved.
8-
**
9-
** Licensed under the Apache License, Version 2.0 (the "License");
10-
** you may not use this file except in compliance with the License.
11-
** You may obtain a copy of the License at
12-
**
13-
** http://www.apache.org/licenses/LICENSE-2.0
14-
**
15-
** Unless required by applicable law or agreed to in writing, software
16-
** distributed under the License is distributed on an "AS IS" BASIS,
17-
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18-
** See the License for the specific language governing permissions and
19-
** limitations under the License.
20-
**
21-
** File: cfe_assert.h
22-
**
23-
** Purpose:
24-
** Specification for the CFE assert (UT assert wrapper) functions.
25-
**
26-
*************************************************************************/
1+
/************************************************************************
2+
* NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes”
3+
*
4+
* Copyright (c) 2020 United States Government as represented by the
5+
* Administrator of the National Aeronautics and Space Administration.
6+
* All Rights Reserved.
7+
*
8+
* Licensed under the Apache License, Version 2.0 (the "License"); you may
9+
* not use this file except in compliance with the License. You may obtain
10+
* a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
************************************************************************/
2718

2819
/**
2920
* @file

0 commit comments

Comments
 (0)