From 255d63fe6d9bf1bf59a911ba3ebf4b0a6bc4cd05 Mon Sep 17 00:00:00 2001 From: Cort Buffington Date: Wed, 5 Dec 2018 10:36:02 -0600 Subject: [PATCH] Revert "Update hb_confbridge.py" This reverts commit 13ce20d115fd35de8f0c807a9cb16ee07881d3de. --- hb_confbridge.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hb_confbridge.py b/hb_confbridge.py index 2cd521c..8a6aa7b 100755 --- a/hb_confbridge.py +++ b/hb_confbridge.py @@ -172,6 +172,8 @@ def stream_trimmer_loop(): logger.info('(%s) *TIME OUT* STREAM ID: %s SUB: %s TGID %s, TS %s, Duration: %s', \ system, int_id(_slot['RX_STREAM_ID']), int_id(_slot['RX_RFS']), int_id(_slot['RX_TGID']), slot, _slot['RX_TIME'] - _slot['RX_START']) systems[system]._report.send_bridgeEvent('GROUP VOICE,END,{},{},{},{},{},{},{:.2f}'.format(system, int_id(_slot['RX_STREAM_ID']), int_id(_slot['RX_PEER']), int_id(_slot['RX_RFS']), slot, int_id(_slot['RX_TGID']), _slot['RX_TIME'] - _slot['RX_START'])) + + # OBP systems # We can't delete items from a dicationry that's being iterated, so we have to make a temporarly list of entrys to remove later if CONFIG['SYSTEMS'][system]['MODE'] == 'OPENBRIDGE': @@ -614,6 +616,8 @@ class routerHBP(HBSYSTEM): # Create a voice terminator packet (FULL LC) elif _frame_type == hb_const.HBPF_DATA_SYNC and _dtype_vseq == hb_const.HBPF_SLT_VTERM: dmrbits = _target_status[_target['TS']]['TX_T_LC'][0:98] + dmrbits[98:166] + _target_status[_target['TS']]['TX_T_LC'][98:197] + + # Create a Burst B-E packet (Embedded LC) elif _dtype_vseq in [1,2,3,4]: dmrbits = dmrbits[0:116] + _target_status[_target['TS']]['TX_EMB_LC'][_dtype_vseq] + dmrbits[148:264]