From 93212ba534e736545137354d2720ea80f76394a3 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Wed, 23 Mar 2022 09:45:26 -0600 Subject: [PATCH 1/4] Fix #109, Remove old copyright headers --- fsw/mission_inc/sch_lab_perfids.h | 21 -------------------- fsw/platform_inc/sch_lab_table.h | 21 -------------------- fsw/src/sch_lab_app.c | 32 ++++--------------------------- fsw/src/sch_lab_version.h | 21 -------------------- fsw/tables/sch_lab_table.c | 22 --------------------- 5 files changed, 4 insertions(+), 113 deletions(-) diff --git a/fsw/mission_inc/sch_lab_perfids.h b/fsw/mission_inc/sch_lab_perfids.h index 2697172..5fc271c 100644 --- a/fsw/mission_inc/sch_lab_perfids.h +++ b/fsw/mission_inc/sch_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 SCH Lab Performance IDs diff --git a/fsw/platform_inc/sch_lab_table.h b/fsw/platform_inc/sch_lab_table.h index d67700f..8f937cd 100644 --- a/fsw/platform_inc/sch_lab_table.h +++ b/fsw/platform_inc/sch_lab_table.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 contains the schedule tables for the SCH Lab app. diff --git a/fsw/src/sch_lab_app.c b/fsw/src/sch_lab_app.c index 06c4e89..0bb6d93 100644 --- a/fsw/src/sch_lab_app.c +++ b/fsw/src/sch_lab_app.c @@ -1,31 +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: sch_lab_app.c -** -** Purpose: -** This file contains the source code for the SCH lab application -** -** Notes: -** -*************************************************************************/ +/** + * \file + * This file contains the source code for the SCH lab application + */ /* ** Include Files diff --git a/fsw/src/sch_lab_version.h b/fsw/src/sch_lab_version.h index 6e08739..0422f88 100644 --- a/fsw/src/sch_lab_version.h +++ b/fsw/src/sch_lab_version.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. -** -*************************************************************************/ #ifndef SCH_LAB_VERSION_H #define SCH_LAB_VERSION_H diff --git a/fsw/tables/sch_lab_table.c b/fsw/tables/sch_lab_table.c index db4d87c..308925f 100644 --- a/fsw/tables/sch_lab_table.c +++ b/fsw/tables/sch_lab_table.c @@ -1,25 +1,3 @@ -/* -** -** GSC-18128-1, "Core Flight Executive Version 6.6" -** -** 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. -** -*/ - #include "cfe_tbl_filedef.h" /* Required to obtain the CFE_TBL_FILEDEF macro definition */ #include "sch_lab_table.h" #include "cfe_sb.h" /* Required to use the CFE_SB_MSGID_WRAP_VALUE macro */ From 7254abbf0da365b3ff47d3e6ce9cb9a3ce1a8156 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Wed, 23 Mar 2022 12:00:34 -0600 Subject: [PATCH 2/4] Fix #109, Add new copyright header --- fsw/mission_inc/sch_lab_perfids.h | 18 ++++++++++++++++++ fsw/platform_inc/sch_lab_table.h | 18 ++++++++++++++++++ fsw/src/sch_lab_app.c | 18 ++++++++++++++++++ fsw/src/sch_lab_version.h | 18 ++++++++++++++++++ fsw/tables/sch_lab_table.c | 18 ++++++++++++++++++ 5 files changed, 90 insertions(+) diff --git a/fsw/mission_inc/sch_lab_perfids.h b/fsw/mission_inc/sch_lab_perfids.h index 5fc271c..370004a 100644 --- a/fsw/mission_inc/sch_lab_perfids.h +++ b/fsw/mission_inc/sch_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 SCH Lab Performance IDs diff --git a/fsw/platform_inc/sch_lab_table.h b/fsw/platform_inc/sch_lab_table.h index 8f937cd..8cb46fc 100644 --- a/fsw/platform_inc/sch_lab_table.h +++ b/fsw/platform_inc/sch_lab_table.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 contains the schedule tables for the SCH Lab app. diff --git a/fsw/src/sch_lab_app.c b/fsw/src/sch_lab_app.c index 0bb6d93..022c4c6 100644 --- a/fsw/src/sch_lab_app.c +++ b/fsw/src/sch_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 SCH lab application diff --git a/fsw/src/sch_lab_version.h b/fsw/src/sch_lab_version.h index 0422f88..b0d8632 100644 --- a/fsw/src/sch_lab_version.h +++ b/fsw/src/sch_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. + ************************************************************************/ + #ifndef SCH_LAB_VERSION_H #define SCH_LAB_VERSION_H diff --git a/fsw/tables/sch_lab_table.c b/fsw/tables/sch_lab_table.c index 308925f..d08cdfa 100644 --- a/fsw/tables/sch_lab_table.c +++ b/fsw/tables/sch_lab_table.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. + ************************************************************************/ + #include "cfe_tbl_filedef.h" /* Required to obtain the CFE_TBL_FILEDEF macro definition */ #include "sch_lab_table.h" #include "cfe_sb.h" /* Required to use the CFE_SB_MSGID_WRAP_VALUE macro */ From 3d50838a7b6104a2107c7ba56a41af55a19495bd Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Fri, 25 Mar 2022 17:43:39 -0400 Subject: [PATCH 3/4] HOTFIX #102, Standardize version information --- fsw/src/sch_lab_version.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/fsw/src/sch_lab_version.h b/fsw/src/sch_lab_version.h index 6e08739..22b57f5 100644 --- a/fsw/src/sch_lab_version.h +++ b/fsw/src/sch_lab_version.h @@ -32,17 +32,19 @@ #define SCH_LAB_BUILD_BASELINE \ "v2.5.0-rc4" /*!< Development Build: git tag that is the base for the current development */ -/* Version Macro Definitions */ - -#define SCH_LAB_MAJOR_VERSION 2 /*!< @brief ONLY APPLY for OFFICIAL releases. Major version number. */ -#define SCH_LAB_MINOR_VERSION 3 /*!< @brief ONLY APPLY for OFFICIAL releases. Minor version number. */ -#define SCH_LAB_REVISION 0 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision version number. */ +/* + * Version Macros, see \ref cfsversions for definitions. + */ +#define SCH_LAB_MAJOR_VERSION 2 /*!< @brief Major version number */ +#define SCH_LAB_MINOR_VERSION 3 /*!< @brief Minor version number */ +#define SCH_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 SCH_LAB_MISSION_REV 0xFF From 431354944cfad1c9d56c0bb6ef48cff33ffbf2d5 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Fri, 25 Mar 2022 17:51:18 -0400 Subject: [PATCH 4/4] Bump to v2.5.0-rc4+dev23 IC:Caelum-rc4+dev7, nasa/cFS#445 --- README.md | 6 ++++++ fsw/src/sch_lab_version.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 4baeb03..d0a7467 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,12 @@ To change the list of packets that sch_lab sends out, edit the schedule table lo ## Version History +### Development Build: v2.5.0-rc4+dev23 + +- Update Copyright Headers +- Standardize version.h +- See and + ### Development Build: v2.5.0-rc4+dev16 - Apply header guard standard diff --git a/fsw/src/sch_lab_version.h b/fsw/src/sch_lab_version.h index 0918e88..1eccefc 100644 --- a/fsw/src/sch_lab_version.h +++ b/fsw/src/sch_lab_version.h @@ -25,7 +25,7 @@ */ /* Development Build Macro Definitions */ -#define SCH_LAB_BUILD_NUMBER 16 /*!< Development Build: Number of commits since baseline */ +#define SCH_LAB_BUILD_NUMBER 23 /*!< Development Build: Number of commits since baseline */ #define SCH_LAB_BUILD_BASELINE \ "v2.5.0-rc4" /*!< Development Build: git tag that is the base for the current development */