diff --git a/.gitignore b/.gitignore index d5e7287..192fd9b 100755 --- a/.gitignore +++ b/.gitignore @@ -93,5 +93,8 @@ hblink.cfg *.config *.bak rules.py -subscriber_ids.csv -peer_ids.csv +subscriber_ids.* +local_subscriber_ids.* +peer_ids.* +local_peer_ids.* +talkgroup_ids.* diff --git a/LICENSE.txt b/LICENSE.txt index e681d25..3ba6a2b 100755 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -238,4 +238,4 @@ The hypothetical commands `show w' and `show c' should show the appropriate part You should also get your employer (if you work as a programmer) or school, if any, to sign a “copyright disclaimer” for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see . -The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read . \ No newline at end of file +The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read . diff --git a/app_template.py b/app_template.py index 9308ac6..b919960 100755 --- a/app_template.py +++ b/app_template.py @@ -107,7 +107,7 @@ if __name__ == '__main__': if cli_args.LOG_LEVEL: CONFIG['LOGGER']['LOG_LEVEL'] = cli_args.LOG_LEVEL logger = log.config_logging(CONFIG['LOGGER']) - logger.info('\n\nCopyright (c) 2013, 2014, 2015, 2016, 2018\n\tThe Founding Members of the K0USY Group. All rights reserved.\n') + logger.info('\n\nCopyright (c) 2013, 2014, 2015, 2016, 2018\n\tThe Regents of the K0USY Group. All rights reserved.\n') logger.debug('(GLOBAL) Logging system started, anything from here on gets logged') # Set up the signal handler diff --git a/bridge.py b/bridge.py index e3e1b03..62f55d4 100755 --- a/bridge.py +++ b/bridge.py @@ -755,7 +755,7 @@ if __name__ == '__main__': if cli_args.LOG_LEVEL: CONFIG['LOGGER']['LOG_LEVEL'] = cli_args.LOG_LEVEL logger = log.config_logging(CONFIG['LOGGER']) - logger.info('\n\nCopyright (c) 2013, 2014, 2015, 2016, 2018\n\tThe Founding Members of the K0USY Group. All rights reserved.\n') + logger.info('\n\nCopyright (c) 2013, 2014, 2015, 2016, 2018\n\tThe Regents of the K0USY Group. All rights reserved.\n') logger.debug('(GLOBAL) Logging system started, anything from here on gets logged') # Set up the signal handler diff --git a/hblink.py b/hblink.py index 55366a6..8bc283d 100755 --- a/hblink.py +++ b/hblink.py @@ -767,7 +767,7 @@ if __name__ == '__main__': if cli_args.LOG_LEVEL: CONFIG['LOGGER']['LOG_LEVEL'] = cli_args.LOG_LEVEL logger = log.config_logging(CONFIG['LOGGER']) - logger.info('\n\nCopyright (c) 2013, 2014, 2015, 2016, 2018\n\tThe Founding Members of the K0USY Group. All rights reserved.\n') + logger.info('\n\nCopyright (c) 2013, 2014, 2015, 2016, 2018\n\tThe Regents of the K0USY Group. All rights reserved.\n') logger.debug('(GLOBAL) Logging system started, anything from here on gets logged') # Set up the signal handler diff --git a/log.py b/log.py index 41726c1..96d5c21 100755 --- a/log.py +++ b/log.py @@ -90,4 +90,4 @@ def config_logging(_logger): }, }) - return logging.getLogger(_logger['LOG_NAME']) \ No newline at end of file + return logging.getLogger(_logger['LOG_NAME']) diff --git a/mk_voice.py b/mk_voice.py index b2fa292..1f74aa5 100755 --- a/mk_voice.py +++ b/mk_voice.py @@ -102,4 +102,4 @@ if __name__ == '__main__': pkt = next(speech) except StopIteration: break - print(len(pkt), pkt[4], pkt) \ No newline at end of file + print(len(pkt), pkt[4], pkt) diff --git a/play_ambe.py b/play_ambe.py index ea0a091..f5cbb47 100755 --- a/play_ambe.py +++ b/play_ambe.py @@ -126,7 +126,7 @@ if __name__ == '__main__': if cli_args.LOG_LEVEL: CONFIG['LOGGER']['LOG_LEVEL'] = cli_args.LOG_LEVEL logger = log.config_logging(CONFIG['LOGGER']) - logger.info('\n\nCopyright (c) 2013, 2014, 2015, 2016, 2018\n\tThe Founding Members of the K0USY Group. All rights reserved.\n') + logger.info('\n\nCopyright (c) 2013, 2014, 2015, 2016, 2018\n\tThe Regents of the K0USY Group. All rights reserved.\n') logger.debug('(GLOBAL) Logging system started, anything from here on gets logged') # Set up the signal handler diff --git a/rules_SAMPLE.py b/rules_SAMPLE.py index c1fa40a..3781e57 100755 --- a/rules_SAMPLE.py +++ b/rules_SAMPLE.py @@ -47,4 +47,4 @@ BRIDGES = { if __name__ == '__main__': from pprint import pprint - pprint(BRIDGES) \ No newline at end of file + pprint(BRIDGES)