diff --git a/Defines.h b/Defines.h index 3a166803..23e59101 100644 --- a/Defines.h +++ b/Defines.h @@ -12,7 +12,7 @@ // /* * Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX -* Copyright (C) 2018-2020 by Bryan Biedenkapp N2PLL +* Copyright (C) 2018-2022 by Bryan Biedenkapp N2PLL * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/HostMain.cpp b/HostMain.cpp index cf0c8d65..537161ea 100644 --- a/HostMain.cpp +++ b/HostMain.cpp @@ -12,7 +12,7 @@ // /* * Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX -* Copyright (C) 2020,2021 by Bryan Biedenkapp N2PLL +* Copyright (C) 2020-2022 by Bryan Biedenkapp N2PLL * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/HostMain.h b/HostMain.h index 62461119..8b7e5568 100644 --- a/HostMain.h +++ b/HostMain.h @@ -12,7 +12,7 @@ // /* * Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX -* Copyright (C) 2020 by Bryan Biedenkapp N2PLL +* Copyright (C) 2020,2022 by Bryan Biedenkapp N2PLL * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/Utils.cpp b/Utils.cpp index b40f462b..f656d26d 100644 --- a/Utils.cpp +++ b/Utils.cpp @@ -50,6 +50,8 @@ const uint8_t BITS_TABLE[] = { void getHostVersion() { LogInfo(__PROG_NAME__ " %s (built %s)", __VER__, __BUILD__); + LogInfo("Copyright (c) 2017-2022 Bryan Biedenkapp, N2PLL and DVMProject (https://github.com/dvmproject) Authors."); + LogInfo("Portions Copyright (c) 2015-2021 by Jonathan Naylor, G4KLX and others"); } // --------------------------------------------------------------------------- diff --git a/dmr/Control.cpp b/dmr/Control.cpp index bdfe1e46..639763ca 100644 --- a/dmr/Control.cpp +++ b/dmr/Control.cpp @@ -12,7 +12,7 @@ // /* * Copyright (C) 2015,2016,2017 Jonathan Naylor, G4KLX -* Copyright (C) 2017-2021 by Bryan Biedenkapp +* Copyright (C) 2017-2022 by Bryan Biedenkapp * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/dmr/Control.h b/dmr/Control.h index d6c0b18a..04c4e8c0 100644 --- a/dmr/Control.h +++ b/dmr/Control.h @@ -12,7 +12,7 @@ // /* * Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX -* Copyright (C) 2017,2020 by Bryan Biedenkapp N2PLL +* Copyright (C) 2017,2020-2022 by Bryan Biedenkapp N2PLL * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/dmr/Slot.cpp b/dmr/Slot.cpp index 2687f2c8..b1cc8f67 100644 --- a/dmr/Slot.cpp +++ b/dmr/Slot.cpp @@ -12,7 +12,7 @@ // /* * Copyright (C) 2015,2016,2017,2018 Jonathan Naylor, G4KLX -* Copyright (C) 2017-2021 by Bryan Biedenkapp N2PLL +* Copyright (C) 2017-2022 by Bryan Biedenkapp N2PLL * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/dmr/Slot.h b/dmr/Slot.h index 65bc8a84..09882b0d 100644 --- a/dmr/Slot.h +++ b/dmr/Slot.h @@ -12,7 +12,7 @@ // /* * Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX -* Copyright (C) 2017-2021 by Bryan Biedenkapp N2PLL +* Copyright (C) 2017-2022 by Bryan Biedenkapp N2PLL * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/dmr/packet/ControlSignaling.cpp b/dmr/packet/ControlSignaling.cpp index ec76bda4..a4c11480 100644 --- a/dmr/packet/ControlSignaling.cpp +++ b/dmr/packet/ControlSignaling.cpp @@ -12,7 +12,7 @@ // /* * Copyright (C) 2015,2016,2017,2018 Jonathan Naylor, G4KLX -* Copyright (C) 2017-2020 by Bryan Biedenkapp N2PLL +* Copyright (C) 2017-2022 by Bryan Biedenkapp N2PLL * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/dmr/packet/ControlSignaling.h b/dmr/packet/ControlSignaling.h index effeb8cf..7bc512c7 100644 --- a/dmr/packet/ControlSignaling.h +++ b/dmr/packet/ControlSignaling.h @@ -12,7 +12,7 @@ // /* * Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX -* Copyright (C) 2017-2020 by Bryan Biedenkapp N2PLL +* Copyright (C) 2017-2022 by Bryan Biedenkapp N2PLL * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/dmr/packet/Data.cpp b/dmr/packet/Data.cpp index 7598657a..c0f9264b 100644 --- a/dmr/packet/Data.cpp +++ b/dmr/packet/Data.cpp @@ -12,7 +12,7 @@ // /* * Copyright (C) 2015,2016,2017,2018 Jonathan Naylor, G4KLX -* Copyright (C) 2017-2020 by Bryan Biedenkapp N2PLL +* Copyright (C) 2017-2022 by Bryan Biedenkapp N2PLL * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/dmr/packet/Data.h b/dmr/packet/Data.h index 6f7df374..aed7660b 100644 --- a/dmr/packet/Data.h +++ b/dmr/packet/Data.h @@ -12,7 +12,7 @@ // /* * Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX -* Copyright (C) 2017-2020 by Bryan Biedenkapp N2PLL +* Copyright (C) 2017-2022 by Bryan Biedenkapp N2PLL * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/dmr/packet/Voice.cpp b/dmr/packet/Voice.cpp index 6ed21b5a..cafac909 100644 --- a/dmr/packet/Voice.cpp +++ b/dmr/packet/Voice.cpp @@ -12,7 +12,7 @@ // /* * Copyright (C) 2015,2016,2017,2018 Jonathan Naylor, G4KLX -* Copyright (C) 2017-2019 by Bryan Biedenkapp N2PLL +* Copyright (C) 2017-2022 by Bryan Biedenkapp N2PLL * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/dmr/packet/Voice.h b/dmr/packet/Voice.h index 94671106..3fc98244 100644 --- a/dmr/packet/Voice.h +++ b/dmr/packet/Voice.h @@ -12,7 +12,7 @@ // /* * Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX -* Copyright (C) 2017-2021 by Bryan Biedenkapp N2PLL +* Copyright (C) 2017-2022 by Bryan Biedenkapp N2PLL * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/host/Host.cpp b/host/Host.cpp index ea900f82..499b6728 100644 --- a/host/Host.cpp +++ b/host/Host.cpp @@ -12,7 +12,7 @@ // /* * Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX -* Copyright (C) 2017-2021,2022 by Bryan Biedenkapp N2PLL +* Copyright (C) 2017-2022 by Bryan Biedenkapp N2PLL * Copyright (C) 2021 by Nat Moore * * This program is free software; you can redistribute it and/or modify @@ -669,12 +669,12 @@ int Host::run() } // Macro to start DMR duplex idle transmission (or beacon) - #define START_DMR_DUPLEX_IDLE(x) \ - if (dmr != NULL) { \ - if (m_duplex) { \ - m_modem->writeDMRStart(x); \ - m_dmrTXTimer.start(); \ - } \ + #define START_DMR_DUPLEX_IDLE(x) \ + if (dmr != NULL) { \ + if (m_duplex) { \ + m_modem->writeDMRStart(x); \ + m_dmrTXTimer.start(); \ + } \ } // main execution loop diff --git a/host/Host.h b/host/Host.h index 5084058d..8e570d9b 100644 --- a/host/Host.h +++ b/host/Host.h @@ -12,7 +12,7 @@ // /* * Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX -* Copyright (C) 2017-2021 by Bryan Biedenkapp N2PLL +* Copyright (C) 2017-2022 by Bryan Biedenkapp N2PLL * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/lookups/IdenTableLookup.cpp b/lookups/IdenTableLookup.cpp index 06f070e8..114c07ce 100644 --- a/lookups/IdenTableLookup.cpp +++ b/lookups/IdenTableLookup.cpp @@ -7,7 +7,7 @@ * */ /* -* Copyright (C) 2018-2019 by Bryan Biedenkapp N2PLL +* Copyright (C) 2018-2022 by Bryan Biedenkapp N2PLL * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/lookups/IdenTableLookup.h b/lookups/IdenTableLookup.h index f334afc3..61a5fe85 100644 --- a/lookups/IdenTableLookup.h +++ b/lookups/IdenTableLookup.h @@ -7,7 +7,7 @@ * */ /* -* Copyright (C) 2018-2019 by Bryan Biedenkapp N2PLL +* Copyright (C) 2018-2022 by Bryan Biedenkapp N2PLL * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/lookups/LookupTable.h b/lookups/LookupTable.h index d0fdb67f..cad2a162 100644 --- a/lookups/LookupTable.h +++ b/lookups/LookupTable.h @@ -7,7 +7,7 @@ * */ /* -* Copyright (C) 2018-2019,2021 by Bryan Biedenkapp N2PLL +* Copyright (C) 2018-2022 by Bryan Biedenkapp N2PLL * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/lookups/RadioIdLookup.cpp b/lookups/RadioIdLookup.cpp index 8afeebbe..7ea70ad5 100644 --- a/lookups/RadioIdLookup.cpp +++ b/lookups/RadioIdLookup.cpp @@ -12,7 +12,7 @@ // /* * Copyright (C) 2016 by Jonathan Naylor G4KLX -* Copyright (C) 2017-2019 by Bryan Biedenkapp N2PLL +* Copyright (C) 2017-2022 by Bryan Biedenkapp N2PLL * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/lookups/RadioIdLookup.h b/lookups/RadioIdLookup.h index 30b7cc37..152432ec 100644 --- a/lookups/RadioIdLookup.h +++ b/lookups/RadioIdLookup.h @@ -12,7 +12,7 @@ // /* * Copyright (C) 2016 by Jonathan Naylor G4KLX -* Copyright (C) 2017-2019 by Bryan Biedenkapp N2PLL +* Copyright (C) 2017-2022 by Bryan Biedenkapp N2PLL * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/lookups/TalkgroupIdLookup.cpp b/lookups/TalkgroupIdLookup.cpp index edc70b4b..020aec19 100644 --- a/lookups/TalkgroupIdLookup.cpp +++ b/lookups/TalkgroupIdLookup.cpp @@ -12,7 +12,7 @@ // /* * Copyright (C) 2016 by Jonathan Naylor G4KLX -* Copyright (C) 2017-2019 by Bryan Biedenkapp N2PLL +* Copyright (C) 2017-2022 by Bryan Biedenkapp N2PLL * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/lookups/TalkgroupIdLookup.h b/lookups/TalkgroupIdLookup.h index fb8f229f..ba1470d3 100644 --- a/lookups/TalkgroupIdLookup.h +++ b/lookups/TalkgroupIdLookup.h @@ -12,7 +12,7 @@ // /* * Copyright (C) 2016 by Jonathan Naylor G4KLX -* Copyright (C) 2017-2019 by Bryan Biedenkapp N2PLL +* Copyright (C) 2017-2022 by Bryan Biedenkapp N2PLL * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/modem/Modem.h b/modem/Modem.h index 02d8dadc..bf19fa54 100644 --- a/modem/Modem.h +++ b/modem/Modem.h @@ -12,7 +12,7 @@ // /* * Copyright (C) 2011-2021 by Jonathan Naylor G4KLX -* Copyright (C) 2017-2021 by Bryan Biedenkapp N2PLL +* Copyright (C) 2017-2022 by Bryan Biedenkapp N2PLL * Copyright (C) 2021 by Nat Moore * * This program is free software; you can redistribute it and/or modify diff --git a/network/BaseNetwork.cpp b/network/BaseNetwork.cpp index 4a22cf23..056eabc5 100644 --- a/network/BaseNetwork.cpp +++ b/network/BaseNetwork.cpp @@ -12,7 +12,7 @@ // /* * Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX -* Copyright (C) 2020,2022 by Bryan Biedenkapp N2PLL +* Copyright (C) 2020-2022 by Bryan Biedenkapp N2PLL * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/network/BaseNetwork.h b/network/BaseNetwork.h index da2c6768..3e535ad0 100644 --- a/network/BaseNetwork.h +++ b/network/BaseNetwork.h @@ -12,7 +12,7 @@ // /* * Copyright (C) 2015,2016,2017,2018 by Jonathan Naylor G4KLX -* Copyright (C) 2020,2022 by Bryan Biedenkapp N2PLL +* Copyright (C) 2020-2022 by Bryan Biedenkapp N2PLL * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/network/Network.cpp b/network/Network.cpp index 39b0725c..b7ef2963 100644 --- a/network/Network.cpp +++ b/network/Network.cpp @@ -12,7 +12,7 @@ // /* * Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX -* Copyright (C) 2017-2020,2022 by Bryan Biedenkapp N2PLL +* Copyright (C) 2017-2022 by Bryan Biedenkapp N2PLL * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/network/Network.h b/network/Network.h index ae187bb5..eea96817 100644 --- a/network/Network.h +++ b/network/Network.h @@ -12,7 +12,7 @@ // /* * Copyright (C) 2015,2016,2017,2018 by Jonathan Naylor G4KLX -* Copyright (C) 2017-2020 by Bryan Biedenkapp N2PLL +* Copyright (C) 2017-2022 by Bryan Biedenkapp N2PLL * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by