From 5f51cd4da8e22809fa6e3ef086a121d951b9a533 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Wed, 23 Mar 2022 09:49:56 -0600 Subject: [PATCH 1/4] Fix #64, Remove old copyright headers --- cfe_ts_crc.c | 20 -------------------- cfe_ts_crc_version.h | 20 -------------------- 2 files changed, 40 deletions(-) diff --git a/cfe_ts_crc.c b/cfe_ts_crc.c index 6b9ac70..a5f04e2 100644 --- a/cfe_ts_crc.c +++ b/cfe_ts_crc.c @@ -1,23 +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. -*/ - /* * This program calculates the CRC-16/ARC of a given table file. * diff --git a/cfe_ts_crc_version.h b/cfe_ts_crc_version.h index 11a2193..30e21e0 100644 --- a/cfe_ts_crc_version.h +++ b/cfe_ts_crc_version.h @@ -1,23 +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 * @brief Purpose: * @details Provide version identifiers for the ELF to cFE Table Converter. @n From ecfe5240c08b666dce18ea44f097b86f9b85e210 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Wed, 23 Mar 2022 12:45:08 -0600 Subject: [PATCH 2/4] Fix #64, Add new copyright header --- cfe_ts_crc.c | 18 ++++++++++++++++++ cfe_ts_crc_version.h | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/cfe_ts_crc.c b/cfe_ts_crc.c index a5f04e2..7995e65 100644 --- a/cfe_ts_crc.c +++ b/cfe_ts_crc.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. + ************************************************************************/ + /* * This program calculates the CRC-16/ARC of a given table file. * diff --git a/cfe_ts_crc_version.h b/cfe_ts_crc_version.h index 30e21e0..f2de9f2 100644 --- a/cfe_ts_crc_version.h +++ b/cfe_ts_crc_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 * @brief Purpose: * @details Provide version identifiers for the ELF to cFE Table Converter. @n From 7bc03384667c920ff5b38cee6c38789c3523aead Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Fri, 25 Mar 2022 18:48:23 -0400 Subject: [PATCH 3/4] HOTFIX #60, Standardize version information --- cfe_ts_crc_version.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/cfe_ts_crc_version.h b/cfe_ts_crc_version.h index 11a2193..ec17a08 100644 --- a/cfe_ts_crc_version.h +++ b/cfe_ts_crc_version.h @@ -36,17 +36,18 @@ "v1.3.0-rc4+dev" /*!< @brief Development Build: git tag that is the base for the current */ /* - * Version Macro Definitions + * Version Macros, see \ref cfsversions for definitions. */ -#define CFE_TS_CRC_MAJOR_VERSION 1 /*!< @brief ONLY APPLY for OFFICIAL releases. Major version number. */ -#define CFE_TS_CRC_MINOR_VERSION 1 /*!< @brief ONLY APPLY for OFFICIAL releases. Minor version number. */ -#define CFE_TS_CRC_REVISION 0 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision number. */ +#define CFE_TS_CRC_MAJOR_VERSION 1 /*!< @brief Major version number */ +#define CFE_TS_CRC_MINOR_VERSION 1 /*!< @brief Minor version number */ +#define CFE_TS_CRC_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 CFE_TS_CRC_MISSION_REV 0xFF From 3c47da87a3465e30dfd8aaf1e085ef20ebba58f2 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Fri, 25 Mar 2022 18:52:56 -0400 Subject: [PATCH 4/4] Bump to v1.3.0-rc4+dev14 IC:Caelum-rc4+dev7, nasa/cFS#445 --- README.md | 6 ++++++ cfe_ts_crc_version.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0f58197..ecf4f57 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,12 @@ This lab application is a ground utility to generate binary table CRCs for cFS. ## Version Notes +### Development Build: v1.3.0-rc4+dev14 + +- Update Copyright Headers +- Standardize version.h +- See and + ### Development Build: v1.3.0-rc4+dev7 - Remove explicit filename doxygen comments diff --git a/cfe_ts_crc_version.h b/cfe_ts_crc_version.h index 7145a65..f3d39fb 100644 --- a/cfe_ts_crc_version.h +++ b/cfe_ts_crc_version.h @@ -29,7 +29,7 @@ /* * Development Build Macro Definitions */ -#define CFE_TS_CRC_BUILD_NUMBER 7 /*!< @brief Number of commits since baseline */ +#define CFE_TS_CRC_BUILD_NUMBER 14 /*!< @brief Number of commits since baseline */ #define CFE_TS_CRC_BUILD_BASELINE \ "v1.3.0-rc4+dev" /*!< @brief Development Build: git tag that is the base for the current */