From 5ea8bca1c191b35e381a3c91ad3912e20fc4036e Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Wed, 23 Mar 2022 09:43:55 -0600 Subject: [PATCH 1/4] Fix #105, Remove old copyright headers --- fsw/mission_inc/ci_lab_perfids.h | 21 --------------------- fsw/platform_inc/ci_lab_msgids.h | 21 --------------------- fsw/src/ci_lab_app.c | 30 ++++-------------------------- fsw/src/ci_lab_app.h | 21 --------------------- fsw/src/ci_lab_events.h | 21 --------------------- fsw/src/ci_lab_msg.h | 21 --------------------- fsw/src/ci_lab_version.h | 22 ---------------------- 7 files changed, 4 insertions(+), 153 deletions(-) diff --git a/fsw/mission_inc/ci_lab_perfids.h b/fsw/mission_inc/ci_lab_perfids.h index 209c6a6..f8ae8c0 100644 --- a/fsw/mission_inc/ci_lab_perfids.h +++ b/fsw/mission_inc/ci_lab_perfids.h @@ -1,24 +1,3 @@ -/************************************************************************ -** -** GSC-18128-1, "Core Flight Executive Version 6.7" -** -** Copyright (c) 2006-2019 United States Government as represented by -** the Administrator of the National Aeronautics and Space Administration. -** All Rights Reserved. -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ - /** * @file * Define CI Lab Performance IDs diff --git a/fsw/platform_inc/ci_lab_msgids.h b/fsw/platform_inc/ci_lab_msgids.h index 73d0891..56b16a4 100644 --- a/fsw/platform_inc/ci_lab_msgids.h +++ b/fsw/platform_inc/ci_lab_msgids.h @@ -1,24 +1,3 @@ -/************************************************************************ -** -** GSC-18128-1, "Core Flight Executive Version 6.7" -** -** Copyright (c) 2006-2019 United States Government as represented by -** the Administrator of the National Aeronautics and Space Administration. -** All Rights Reserved. -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ - /** * @file * Define CI Lab Message IDs diff --git a/fsw/src/ci_lab_app.c b/fsw/src/ci_lab_app.c index eb760cf..27ab8b7 100644 --- a/fsw/src/ci_lab_app.c +++ b/fsw/src/ci_lab_app.c @@ -1,29 +1,7 @@ -/******************************************************************************* -** -** GSC-18128-1, "Core Flight Executive Version 6.7" -** -** Copyright (c) 2006-2019 United States Government as represented by -** the Administrator of the National Aeronautics and Space Administration. -** All Rights Reserved. -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -** -** File: ci_lab_app.c -** -** Purpose: -** This file contains the source code for the Command Ingest task. -** -*******************************************************************************/ +/** + * \file + * This file contains the source code for the Command Ingest task. + */ /* ** Include Files: diff --git a/fsw/src/ci_lab_app.h b/fsw/src/ci_lab_app.h index a45cdf7..c31fa6e 100644 --- a/fsw/src/ci_lab_app.h +++ b/fsw/src/ci_lab_app.h @@ -1,24 +1,3 @@ -/******************************************************************************* -** -** GSC-18128-1, "Core Flight Executive Version 6.7" -** -** Copyright (c) 2006-2019 United States Government as represented by -** the Administrator of the National Aeronautics and Space Administration. -** All Rights Reserved. -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ - /** * @file * This file is main hdr file for the Command Ingest lab application. diff --git a/fsw/src/ci_lab_events.h b/fsw/src/ci_lab_events.h index 3e4cee5..f29287b 100644 --- a/fsw/src/ci_lab_events.h +++ b/fsw/src/ci_lab_events.h @@ -1,24 +1,3 @@ -/************************************************************************ -** -** GSC-18128-1, "Core Flight Executive Version 6.7" -** -** Copyright (c) 2006-2019 United States Government as represented by -** the Administrator of the National Aeronautics and Space Administration. -** All Rights Reserved. -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ - /** * @file * Define CI Lab Events IDs diff --git a/fsw/src/ci_lab_msg.h b/fsw/src/ci_lab_msg.h index 85143da..bcc2374 100644 --- a/fsw/src/ci_lab_msg.h +++ b/fsw/src/ci_lab_msg.h @@ -1,24 +1,3 @@ -/******************************************************************************* -** -** GSC-18128-1, "Core Flight Executive Version 6.7" -** -** Copyright (c) 2006-2019 United States Government as represented by -** the Administrator of the National Aeronautics and Space Administration. -** All Rights Reserved. -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ - /** * @file * Define CI Lab Messages and info diff --git a/fsw/src/ci_lab_version.h b/fsw/src/ci_lab_version.h index c14608d..3a55733 100644 --- a/fsw/src/ci_lab_version.h +++ b/fsw/src/ci_lab_version.h @@ -1,25 +1,3 @@ -/************************************************************************ -** -** GSC-18128-1, "Core Flight Executive Version 6.7" -** -** Copyright (c) 2006-2019 United States Government as represented by -** the Administrator of the National Aeronautics and Space Administration. -** All Rights Reserved. -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -** -*************************************************************************/ - /** * @file * The CI Lab App header file containing version information From 215dd57bf203b3affff799db9c9047a5a3d06e1c Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Wed, 23 Mar 2022 09:53:29 -0600 Subject: [PATCH 2/4] Fix #105, Add new copyright header --- fsw/mission_inc/ci_lab_perfids.h | 18 ++++++++++++++++++ fsw/platform_inc/ci_lab_msgids.h | 18 ++++++++++++++++++ fsw/src/ci_lab_app.c | 18 ++++++++++++++++++ fsw/src/ci_lab_app.h | 18 ++++++++++++++++++ fsw/src/ci_lab_events.h | 18 ++++++++++++++++++ fsw/src/ci_lab_msg.h | 18 ++++++++++++++++++ fsw/src/ci_lab_version.h | 18 ++++++++++++++++++ 7 files changed, 126 insertions(+) diff --git a/fsw/mission_inc/ci_lab_perfids.h b/fsw/mission_inc/ci_lab_perfids.h index f8ae8c0..ca40922 100644 --- a/fsw/mission_inc/ci_lab_perfids.h +++ b/fsw/mission_inc/ci_lab_perfids.h @@ -1,3 +1,21 @@ +/************************************************************************ + * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * + * Copyright (c) 2020 United States Government as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. You may obtain + * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + ************************************************************************/ + /** * @file * Define CI Lab Performance IDs diff --git a/fsw/platform_inc/ci_lab_msgids.h b/fsw/platform_inc/ci_lab_msgids.h index 56b16a4..45bc205 100644 --- a/fsw/platform_inc/ci_lab_msgids.h +++ b/fsw/platform_inc/ci_lab_msgids.h @@ -1,3 +1,21 @@ +/************************************************************************ + * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * + * Copyright (c) 2020 United States Government as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. You may obtain + * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + ************************************************************************/ + /** * @file * Define CI Lab Message IDs diff --git a/fsw/src/ci_lab_app.c b/fsw/src/ci_lab_app.c index 27ab8b7..a60122e 100644 --- a/fsw/src/ci_lab_app.c +++ b/fsw/src/ci_lab_app.c @@ -1,3 +1,21 @@ +/************************************************************************ + * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * + * Copyright (c) 2020 United States Government as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. You may obtain + * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + ************************************************************************/ + /** * \file * This file contains the source code for the Command Ingest task. diff --git a/fsw/src/ci_lab_app.h b/fsw/src/ci_lab_app.h index c31fa6e..16e245f 100644 --- a/fsw/src/ci_lab_app.h +++ b/fsw/src/ci_lab_app.h @@ -1,3 +1,21 @@ +/************************************************************************ + * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * + * Copyright (c) 2020 United States Government as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. You may obtain + * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + ************************************************************************/ + /** * @file * This file is main hdr file for the Command Ingest lab application. diff --git a/fsw/src/ci_lab_events.h b/fsw/src/ci_lab_events.h index f29287b..6ddf651 100644 --- a/fsw/src/ci_lab_events.h +++ b/fsw/src/ci_lab_events.h @@ -1,3 +1,21 @@ +/************************************************************************ + * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * + * Copyright (c) 2020 United States Government as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. You may obtain + * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + ************************************************************************/ + /** * @file * Define CI Lab Events IDs diff --git a/fsw/src/ci_lab_msg.h b/fsw/src/ci_lab_msg.h index bcc2374..c72335e 100644 --- a/fsw/src/ci_lab_msg.h +++ b/fsw/src/ci_lab_msg.h @@ -1,3 +1,21 @@ +/************************************************************************ + * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * + * Copyright (c) 2020 United States Government as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. You may obtain + * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + ************************************************************************/ + /** * @file * Define CI Lab Messages and info diff --git a/fsw/src/ci_lab_version.h b/fsw/src/ci_lab_version.h index 3a55733..37569e7 100644 --- a/fsw/src/ci_lab_version.h +++ b/fsw/src/ci_lab_version.h @@ -1,3 +1,21 @@ +/************************************************************************ + * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * + * Copyright (c) 2020 United States Government as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. You may obtain + * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + ************************************************************************/ + /** * @file * The CI Lab App header file containing version information From 00ee8cddec8a2dc0491ee3e83cc8b084781d5333 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Fri, 25 Mar 2022 16:59:46 -0400 Subject: [PATCH 3/4] HOTFIX #101, Standardize version information --- fsw/src/ci_lab_version.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/fsw/src/ci_lab_version.h b/fsw/src/ci_lab_version.h index c14608d..9a36299 100644 --- a/fsw/src/ci_lab_version.h +++ b/fsw/src/ci_lab_version.h @@ -33,17 +33,19 @@ #define CI_LAB_BUILD_BASELINE \ "v2.5.0-rc4" /*!< Development Build: git tag that is the base for the current development */ -/* Version Macro Definitions */ - -#define CI_LAB_MAJOR_VERSION 2 /*!< @brief ONLY APPLY for OFFICIAL releases. Major version number. */ -#define CI_LAB_MINOR_VERSION 3 /*!< @brief ONLY APPLY for OFFICIAL releases. Minor version number. */ -#define CI_LAB_REVISION 0 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision version number. */ +/* + * Version Macros, see \ref cfsversions for definitions. + */ +#define CI_LAB_MAJOR_VERSION 2 /*!< @brief Major version number */ +#define CI_LAB_MINOR_VERSION 3 /*!< @brief Minor version number */ +#define CI_LAB_REVISION 99 /*!< @brief Revision version number. Value of 99 indicates a development version.*/ /*! * @brief Mission revision. * - * Set to 0 on OFFICIAL releases, and set to 255 (0xFF) on development versions. - * Values 1-254 are reserved for mission use to denote patches/customizations as needed. + * Reserved for mission use to denote patches/customizations as needed. + * Values 1-254 are reserved for mission use to denote patches/customizations as needed. NOTE: Reserving 0 and 0xFF for + * cFS open-source development use (pending resolution of nasa/cFS#440) */ #define CI_LAB_MISSION_REV 0xFF From 7ff2d7df2ef8f86389b8abf0bfea97e63aa148de Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Fri, 25 Mar 2022 17:12:48 -0400 Subject: [PATCH 4/4] Bump to v2.5.0-rc4+dev17 IC:Caelum-rc4+dev7, nasa/cFS#445 --- README.md | 6 ++++++ fsw/src/ci_lab_version.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index fa49e95..bc0e7f6 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,12 @@ ci_lab is a simple command uplink application that accepts CCSDS telecommand pac ## Version History +### Development Build: v2.5.0-rc4+dev17 + +- Update Copyright Headers +- Standardize version.h +- See and + ### Development Build: v2.5.0-rc4+dev10 - Apply header guard standard diff --git a/fsw/src/ci_lab_version.h b/fsw/src/ci_lab_version.h index 13d84cf..5fe344d 100644 --- a/fsw/src/ci_lab_version.h +++ b/fsw/src/ci_lab_version.h @@ -25,7 +25,7 @@ /* Development Build Macro Definitions */ -#define CI_LAB_BUILD_NUMBER 10 /*!< Development Build: Number of commits since baseline */ +#define CI_LAB_BUILD_NUMBER 17 /*!< Development Build: Number of commits since baseline */ #define CI_LAB_BUILD_BASELINE \ "v2.5.0-rc4" /*!< Development Build: git tag that is the base for the current development */