From df59dc1483bf8b98d6e801002252275591450a79 Mon Sep 17 00:00:00 2001
From: Cort Buffington <n0mjs@me.com>
Date: Wed, 16 Nov 2016 15:02:56 -0600
Subject: [PATCH] Last update for today
---
hb_router.py | 10 ++++------
talkgroup_ids.csv | 2 +-
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/hb_router.py b/hb_router.py
index 1e398ac..9ef3316 100755
--- a/hb_router.py
+++ b/hb_router.py
@@ -23,7 +23,7 @@ from twisted.internet import reactor
from twisted.internet import task
# Things we import from the main hblink module
-from hblink import CONFIG, HBSYSTEM, logger, systems, hex_str_3, int_id
+from hblink import CONFIG, HBSYSTEM, logger, systems, hex_str_3, int_id, sub_alias, peer_alias, tg_alias
import dec_dmr
import bptc
import constants as const
@@ -132,7 +132,7 @@ class routerSYSTEM(HBSYSTEM):
return
# This is a new call stream
- logger.info('(%s) Call stream START with STREAM ID: %s <FROM> SUB: %s REPEATER: %s <TO> TGID %s, SLOT %s', self._system, int_id(_stream_id), int_id(_rf_src), int_id(_radio_id), int_id(_dst_id), _slot)
+ logger.info('(%s) Call stream START with STREAM ID: %s <FROM> SUB: %s REPEATER: %s <TO> TGID %s, SLOT %s', self._system, int_id(_stream_id), sub_alias(_rf_src), peer_alias(_radio_id), tg_alias(_dst_id), _slot)
# If we can, use the LC from the voice header as to keep all options intact
if _frame_type == const.HBPF_DATA_SYNC and _dtype_vseq == const.HBPF_SLT_VHEAD:
@@ -217,10 +217,8 @@ class routerSYSTEM(HBSYSTEM):
# Final actions - Is this a voice terminator?
if (_frame_type == const.HBPF_DATA_SYNC) and (_dtype_vseq == const.HBPF_SLT_VTERM) and (self.STATUS[_slot]['RX_TYPE'] != const.HBPF_SLT_VTERM):
- #self.STATUS[_slot]['LC'] = '\x00\x00\x00'
- #self.STATUS[_slot]['EMB_LC'] = {2: '\x00', 3: '\x00', 4: '\x00', 5: '\x00'}
- logger.info('(%s) Call stream END with STREAM ID: %s <FROM> SUB: %s REPEATER: %s <TO> TGID %s, SLOT %s', self._system, int_id(_stream_id), int_id(_rf_src), int_id(_radio_id), int_id(_dst_id), _slot)
-
+ logger.info('(%s) Call stream END with STREAM ID: %s <FROM> SUB: %s REPEATER: %s <TO> TGID %s, SLOT %s', self._system, int_id(_stream_id), sub_alias(_rf_src), peer_alias(_radio_id), tg_alias(_dst_id), _slot)
+
# Mark status variables for use later
self.STATUS[_slot]['RX_TYPE'] = _dtype_vseq
self.STATUS[_slot]['RX_TGID'] = _dst_id
diff --git a/talkgroup_ids.csv b/talkgroup_ids.csv
index bd71ee4..85e4e27 100644
--- a/talkgroup_ids.csv
+++ b/talkgroup_ids.csv
@@ -1 +1 @@
-1,Worldwide
2,Local
3,North America
9,BrandMeister
13,Worldwide English
310,TAC 310
3100,DCI Bridge 2
3160,DCI 1
3169,Midwest
3172,Northeast
3174,Southeast
3112,Flordia
3120,Kansas Statewide
3125,Massachussetts
3129,Missouri
3777215,DCI Comm 1
9998,Echo Server
\ No newline at end of file
+1,Worldwide
2,Local
3,North America
9,BrandMeister
13,Worldwide English
310,TAC 310
3100,DCI Bridge 2
3160,DCI 1
3169,Midwest
3172,Northeast
3174,Southeast
3112,Flordia
3120,Kansas Statewide
3125,Massachussetts
3129,Missouri
31201,BYRG KC
3777215,DCI Comm 1
9998,Echo Server
\ No newline at end of file