From 1d5e531e4821960e44ff2e1db1178931a236c1f3 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Wed, 23 Mar 2022 09:49:02 -0600 Subject: [PATCH 1/4] Fix #207, Remove old copyright headers --- GroundSystem.py | 21 +++++++++------------ RoutingService.py | 18 ++++++++---------- Subsystems/cmdGui/CHeaderParser.py | 17 +++++++---------- Subsystems/cmdGui/CommandParser.py | 15 +++++++-------- Subsystems/cmdGui/CommandSystem.py | 19 +++++++++---------- Subsystems/cmdGui/HTMLDocsParser.py | 14 ++++++-------- Subsystems/cmdGui/MiniCmdUtil.py | 14 ++++++-------- Subsystems/cmdGui/Parameter.py | 15 +++++++-------- Subsystems/cmdGui/UdpCommands.py | 18 +++++++++--------- Subsystems/cmdUtil/SendUdp.c | 20 -------------------- Subsystems/cmdUtil/SendUdp.h | 19 ------------------- Subsystems/cmdUtil/cmdUtil.c | 20 -------------------- Subsystems/tlmGUI/EventMessage.py | 18 +++++++++--------- Subsystems/tlmGUI/GenericTelemetry.py | 18 ++++++++---------- Subsystems/tlmGUI/TelemetrySystem.py | 19 +++++++++---------- TlmMQRecv.py | 18 ++++++++---------- TlmUDPSender.py | 18 ++++++++---------- _version.py | 15 ++++++--------- setup.py | 18 ++++++++++++++++++ 19 files changed, 134 insertions(+), 200 deletions(-) diff --git a/GroundSystem.py b/GroundSystem.py index a7f9863..8dd9d49 100644 --- a/GroundSystem.py +++ b/GroundSystem.py @@ -1,15 +1,15 @@ +# !/usr/bin/env python3 + # -# GSC-18128-1, "Core Flight Executive Version 6.7" +# NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” # -# Copyright (c) 2006-2019 United States Government as represented by -# the Administrator of the National Aeronautics and Space Administration. +# 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 +# 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, @@ -17,10 +17,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# cFS Ground System Version 2.0.0 -# -# !/usr/bin/env python3 -# + import shlex import subprocess import sys diff --git a/RoutingService.py b/RoutingService.py index f361d8b..5e8ff70 100644 --- a/RoutingService.py +++ b/RoutingService.py @@ -1,15 +1,15 @@ +#!/usr/bin/env python3 + # -# GSC-18128-1, "Core Flight Executive Version 6.7" +# NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” # -# Copyright (c) 2006-2019 United States Government as represented by -# the Administrator of the National Aeronautics and Space Administration. +# 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 +# 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, @@ -17,8 +17,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # -#!/usr/bin/env python3 -# import socket from struct import unpack diff --git a/Subsystems/cmdGui/CHeaderParser.py b/Subsystems/cmdGui/CHeaderParser.py index f687f89..a0e4872 100644 --- a/Subsystems/cmdGui/CHeaderParser.py +++ b/Subsystems/cmdGui/CHeaderParser.py @@ -1,15 +1,13 @@ # -# GSC-18128-1, "Core Flight Executive Version 6.7" +# NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” # -# Copyright (c) 2006-2019 United States Government as represented by -# the Administrator of the National Aeronautics and Space Administration. +# 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 +# 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, @@ -17,9 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # + ############################################################################## -# Filename: CHeaderParser.py -# # Created in Winter 2014-15 # Created by Winter Intern for NASA GSFC Code 582 # diff --git a/Subsystems/cmdGui/CommandParser.py b/Subsystems/cmdGui/CommandParser.py index 177844c..41aa138 100644 --- a/Subsystems/cmdGui/CommandParser.py +++ b/Subsystems/cmdGui/CommandParser.py @@ -1,15 +1,13 @@ # -# GSC-18128-1, "Core Flight Executive Version 6.7" +# NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” # -# Copyright (c) 2006-2019 United States Government as represented by -# the Administrator of the National Aeronautics and Space Administration. +# 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 +# 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, @@ -17,6 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # + import glob import pickle import re diff --git a/Subsystems/cmdGui/CommandSystem.py b/Subsystems/cmdGui/CommandSystem.py index 5a9233b..9c10774 100644 --- a/Subsystems/cmdGui/CommandSystem.py +++ b/Subsystems/cmdGui/CommandSystem.py @@ -1,15 +1,15 @@ +# !/usr/bin/env python3 + # -# GSC-18128-1, "Core Flight Executive Version 6.7" +# NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” # -# Copyright (c) 2006-2019 United States Government as represented by -# the Administrator of the National Aeronautics and Space Administration. +# 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 +# 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, @@ -17,8 +17,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# !/usr/bin/env python3 -# + import csv import pickle import shlex diff --git a/Subsystems/cmdGui/HTMLDocsParser.py b/Subsystems/cmdGui/HTMLDocsParser.py index f47965d..b2ec598 100644 --- a/Subsystems/cmdGui/HTMLDocsParser.py +++ b/Subsystems/cmdGui/HTMLDocsParser.py @@ -1,15 +1,13 @@ # -# GSC-18128-1, "Core Flight Executive Version 6.7" +# NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” # -# Copyright (c) 2006-2019 United States Government as represented by -# the Administrator of the National Aeronautics and Space Administration. +# 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 +# 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, diff --git a/Subsystems/cmdGui/MiniCmdUtil.py b/Subsystems/cmdGui/MiniCmdUtil.py index 52f5187..2e24636 100644 --- a/Subsystems/cmdGui/MiniCmdUtil.py +++ b/Subsystems/cmdGui/MiniCmdUtil.py @@ -1,15 +1,13 @@ # -# GSC-18128-1, "Core Flight Executive Version 6.7" +# NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” # -# Copyright (c) 2006-2019 United States Government as represented by -# the Administrator of the National Aeronautics and Space Administration. +# 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 +# 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, diff --git a/Subsystems/cmdGui/Parameter.py b/Subsystems/cmdGui/Parameter.py index 1b73b02..4c420f2 100644 --- a/Subsystems/cmdGui/Parameter.py +++ b/Subsystems/cmdGui/Parameter.py @@ -1,15 +1,13 @@ # -# GSC-18128-1, "Core Flight Executive Version 6.7" +# NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” # -# Copyright (c) 2006-2019 United States Government as represented by -# the Administrator of the National Aeronautics and Space Administration. +# 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 +# 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, @@ -17,6 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # + import getopt import pickle import re diff --git a/Subsystems/cmdGui/UdpCommands.py b/Subsystems/cmdGui/UdpCommands.py index f448a64..1617353 100644 --- a/Subsystems/cmdGui/UdpCommands.py +++ b/Subsystems/cmdGui/UdpCommands.py @@ -1,15 +1,15 @@ +# !/usr/bin/env python3 + # -# GSC-18128-1, "Core Flight Executive Version 6.7" +# NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” # -# Copyright (c) 2006-2019 United States Government as represented by -# the Administrator of the National Aeronautics and Space Administration. +# 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 +# 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, @@ -17,7 +17,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# !/usr/bin/env python3 + # # UdpCommands.py -- This is a class that creates a simple command dialog and # sends commands using the cmdUtil UDP C program. diff --git a/Subsystems/cmdUtil/SendUdp.c b/Subsystems/cmdUtil/SendUdp.c index efc707f..26edd0b 100644 --- a/Subsystems/cmdUtil/SendUdp.c +++ b/Subsystems/cmdUtil/SendUdp.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. -*/ - /* * Udp packet send routine */ diff --git a/Subsystems/cmdUtil/SendUdp.h b/Subsystems/cmdUtil/SendUdp.h index a51b214..d487f59 100644 --- a/Subsystems/cmdUtil/SendUdp.h +++ b/Subsystems/cmdUtil/SendUdp.h @@ -1,22 +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 SENDUDP_H #define SENDUDP_H diff --git a/Subsystems/cmdUtil/cmdUtil.c b/Subsystems/cmdUtil/cmdUtil.c index 751919a..98bd4b7 100644 --- a/Subsystems/cmdUtil/cmdUtil.c +++ b/Subsystems/cmdUtil/cmdUtil.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. - */ - /* * Command utility. This program will build a Command packet * with variable parameters and send it on a UDP network socket. diff --git a/Subsystems/tlmGUI/EventMessage.py b/Subsystems/tlmGUI/EventMessage.py index df2e359..1d22cbb 100644 --- a/Subsystems/tlmGUI/EventMessage.py +++ b/Subsystems/tlmGUI/EventMessage.py @@ -1,15 +1,15 @@ +# !/usr/bin/env python3 + # -# GSC-18128-1, "Core Flight Executive Version 6.7" +# NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” # -# Copyright (c) 2006-2019 United States Government as represented by -# the Administrator of the National Aeronautics and Space Administration. +# 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 +# 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, @@ -17,7 +17,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# !/usr/bin/env python3 + # # EVS Events page # diff --git a/Subsystems/tlmGUI/GenericTelemetry.py b/Subsystems/tlmGUI/GenericTelemetry.py index 8171601..315f1cc 100644 --- a/Subsystems/tlmGUI/GenericTelemetry.py +++ b/Subsystems/tlmGUI/GenericTelemetry.py @@ -1,15 +1,14 @@ +#!/usr/bin/env python3 # -# GSC-18128-1, "Core Flight Executive Version 6.7" +# NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” # -# Copyright (c) 2006-2019 United States Government as represented by -# the Administrator of the National Aeronautics and Space Administration. +# 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 +# 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, @@ -17,8 +16,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -#!/usr/bin/env python3 -# + import csv import getopt import mmap diff --git a/Subsystems/tlmGUI/TelemetrySystem.py b/Subsystems/tlmGUI/TelemetrySystem.py index 7fcfd39..621e460 100644 --- a/Subsystems/tlmGUI/TelemetrySystem.py +++ b/Subsystems/tlmGUI/TelemetrySystem.py @@ -1,15 +1,15 @@ +#!/usr/bin/env python3 + # -# GSC-18128-1, "Core Flight Executive Version 6.7" +# NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” # -# Copyright (c) 2006-2019 United States Government as represented by -# the Administrator of the National Aeronautics and Space Administration. +# 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 +# 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, @@ -17,8 +17,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -#!/usr/bin/env python3 -# + import csv import getopt import shlex diff --git a/TlmMQRecv.py b/TlmMQRecv.py index f2f2fae..e99c370 100644 --- a/TlmMQRecv.py +++ b/TlmMQRecv.py @@ -1,15 +1,15 @@ +#!/usr/bin/env python3 + # -# GSC-18128-1, "Core Flight Executive Version 6.7" +# NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” # -# Copyright (c) 2006-2019 United States Government as represented by -# the Administrator of the National Aeronautics and Space Administration. +# 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 +# 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, @@ -17,8 +17,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # -#!/usr/bin/env python3 -# import zmq diff --git a/TlmUDPSender.py b/TlmUDPSender.py index 108299b..f4f01c3 100644 --- a/TlmUDPSender.py +++ b/TlmUDPSender.py @@ -1,15 +1,15 @@ +#!/usr/bin/env python3 + # -# GSC-18128-1, "Core Flight Executive Version 6.7" +# NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” # -# Copyright (c) 2006-2019 United States Government as represented by -# the Administrator of the National Aeronautics and Space Administration. +# 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 +# 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, @@ -17,8 +17,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # -#!/usr/bin/env python3 -# # # Send UDP messages for debugging (not used by Ground System) diff --git a/_version.py b/_version.py index 5326403..a9bc3f9 100644 --- a/_version.py +++ b/_version.py @@ -1,15 +1,13 @@ # -# GSC-18128-1, "Core Flight Executive Version 6.7" +# NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” # -# Copyright (c) 2006-2019 United States Government as represented by -# the Administrator of the National Aeronautics and Space Administration. +# 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 +# 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, @@ -17,7 +15,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# # Development Build Macro Definitions _cFS_GrndSys_build_number = 12 diff --git a/setup.py b/setup.py index cd61db7..2d5de43 100644 --- a/setup.py +++ b/setup.py @@ -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. +# + from setuptools import setup from _version import __version__ as _version From 576893a64997faf5857354b6ec330c2d060e764d Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Wed, 23 Mar 2022 12:30:02 -0600 Subject: [PATCH 2/4] Fix #207, Add new copyright header --- Subsystems/cmdUtil/SendUdp.c | 18 ++++++++++++++++++ Subsystems/cmdUtil/SendUdp.h | 18 ++++++++++++++++++ Subsystems/cmdUtil/cmdUtil.c | 18 ++++++++++++++++++ 3 files changed, 54 insertions(+) diff --git a/Subsystems/cmdUtil/SendUdp.c b/Subsystems/cmdUtil/SendUdp.c index 26edd0b..3742a86 100644 --- a/Subsystems/cmdUtil/SendUdp.c +++ b/Subsystems/cmdUtil/SendUdp.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. + ************************************************************************/ + /* * Udp packet send routine */ diff --git a/Subsystems/cmdUtil/SendUdp.h b/Subsystems/cmdUtil/SendUdp.h index d487f59..c3850a0 100644 --- a/Subsystems/cmdUtil/SendUdp.h +++ b/Subsystems/cmdUtil/SendUdp.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 SENDUDP_H #define SENDUDP_H diff --git a/Subsystems/cmdUtil/cmdUtil.c b/Subsystems/cmdUtil/cmdUtil.c index 98bd4b7..08de7f1 100644 --- a/Subsystems/cmdUtil/cmdUtil.c +++ b/Subsystems/cmdUtil/cmdUtil.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. + ************************************************************************/ + /* * Command utility. This program will build a Command packet * with variable parameters and send it on a UDP network socket. From bfdc9717288cd94ea6a98ffc5b94a49fb87f3c8f Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Fri, 25 Mar 2022 19:01:31 -0400 Subject: [PATCH 3/4] HOTFIX #201, Standardize version information --- _version.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/_version.py b/_version.py index 5326403..b241e1e 100644 --- a/_version.py +++ b/_version.py @@ -23,12 +23,18 @@ _cFS_GrndSys_build_number = 12 _cFS_GrndSys_build_baseline = "v3.0.0-rc4" -# Version Number Definitions -# ONLY APPLY for OFFICIAL release builds -_cFS_GrndSys_MAJOR = 2 -_cFS_GrndSys_MINOR = 1 -_cFS_GrndSys_REVISION = 0 -_cFS_GrndSys_MISSIONREV = 255 +# Version Number Definitions see doxygen docs for definitions +_cFS_GrndSys_MAJOR = 2 # Major version number +_cFS_GrndSys_MINOR = 1 # Minor version number +_cFS_GrndSys_REVISION = 0 # Revision version number + + +# Mission revision. +# +# 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) +_cFS_GrndSys_MISSIONREV = 255 # Development Build format for __version__ # Baseline git tag + Number of commits since baseline From 6d554eb47e54df00c4dc98be2f891caeb77db69f Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Fri, 25 Mar 2022 19:06:05 -0400 Subject: [PATCH 4/4] Bump to v3.0.0-rc4+dev19 IC:Caelum-rc4+dev7, nasa/cFS#445 --- README.md | 6 ++++++ _version.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a0e4cbc..6727ec9 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,12 @@ See [Guide-GroundSystem.md](https://github.com/nasa/cFS-GroundSystem/blob/master ## Version History +### Development Build: v3.0.0-rc4+dev19 + +- Update Copyright Headers +- Standardize version information +- See and + ### Development Build: v3.0.0-rc4+dev12 - Apply header guard standard diff --git a/_version.py b/_version.py index db68c9d..dda23e5 100644 --- a/_version.py +++ b/_version.py @@ -17,7 +17,7 @@ # # Development Build Macro Definitions -_cFS_GrndSys_build_number = 12 +_cFS_GrndSys_build_number = 19 _cFS_GrndSys_build_baseline = "v3.0.0-rc4" # Version Number Definitions see doxygen docs for definitions