From 5b678fa084084d0d886f26cf74ed1bd34861ecc9 Mon Sep 17 00:00:00 2001 From: w7ncx Date: Sat, 26 Jun 2021 20:11:44 -0700 Subject: [PATCH 1/4] Update config_SAMPLE.py (#3) * Update config_SAMPLE.py added support for local_talkgroup_ids.json * Update config_SAMPLE.py --- config_SAMPLE.py | 1 + 1 file changed, 1 insertion(+) diff --git a/config_SAMPLE.py b/config_SAMPLE.py index 59376f0..066c62d 100644 --- a/config_SAMPLE.py +++ b/config_SAMPLE.py @@ -21,6 +21,7 @@ SUBSCRIBER_FILE = 'subscriber_ids.json' # Will auto-download TGID_FILE = 'talkgroup_ids.json' # User provided LOCAL_SUB_FILE = 'local_subscriber_ids.json' # User provided (optional, leave '' if you don't use it) LOCAL_PEER_FILE = 'local_peer_ids.json' # User provided (optional, leave '' if you don't use it) +LOCAL_TGID_FILE = 'local_talkgroup_ids.json' # User provided (optional, leave '' if you don't use it) FILE_RELOAD = 15 # Number of days before we reload DMR-MARC database files PEER_URL = 'https://database.radioid.net/static/rptrs.json' SUBSCRIBER_URL = 'https://database.radioid.net/static/users.json' From 1ff373bb1c1e852e100ad0cdded569cf94ca85fc Mon Sep 17 00:00:00 2001 From: w7ncx Date: Sat, 26 Jun 2021 20:12:32 -0700 Subject: [PATCH 2/4] Update monitor.py (#2) added support for local_talkgroup_ids.json --- monitor.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/monitor.py b/monitor.py index 0a33aa3..d280257 100644 --- a/monitor.py +++ b/monitor.py @@ -1008,6 +1008,11 @@ if __name__ == '__main__': logging.info('ID ALIAS MAPPER: local_subscriber_ids added to subscriber_ids dictionary') subscriber_ids.update(local_subscriber_ids) + local_talkgroup_ids = mk_full_id_dict(PATH, LOCAL_TGID_FILE, 'tgid') + if local_talkgroup_ids: + logging.info('ID ALIAS MAPPER: local_talkgroup_ids added to talkgroup_ids dictionary') + talkgroup_ids.update(local_talkgroup_ids) + local_peer_ids = mk_full_id_dict(PATH, LOCAL_PEER_FILE, 'peer') if local_peer_ids: logging.info('ID ALIAS MAPPER: local_peer_ids added peer_ids dictionary') From 333e18ab87c412f8ebb22e11d9099b30f95784bc Mon Sep 17 00:00:00 2001 From: w7ncx Date: Sat, 26 Jun 2021 20:12:50 -0700 Subject: [PATCH 3/4] Create local_talkgroup_ids.json (#4) add support for local_talkgroup_ids.json --- local_talkgroup_ids.json | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 local_talkgroup_ids.json diff --git a/local_talkgroup_ids.json b/local_talkgroup_ids.json new file mode 100644 index 0000000..ea1c37a --- /dev/null +++ b/local_talkgroup_ids.json @@ -0,0 +1,10 @@ +{ + "results": [ + { + "tgid": 9, + "callsign": "TG Local", + "country": "", + "id": "9" + } + ] +} From d00b02999493e4210749dadc6fd0f2dfee842813 Mon Sep 17 00:00:00 2001 From: w7ncx Date: Sat, 26 Jun 2021 20:13:15 -0700 Subject: [PATCH 4/4] Update info.php (#1) correct spelling --- html/info.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/info.php b/html/info.php index 0314853..a968803 100644 --- a/html/info.php +++ b/html/info.php @@ -46,7 +46,7 @@ include_once 'include/config.php';
-Hotspot: D - duplex | S - smiplex +Hotspot: D - duplex | S - simplex