From 1a6d9404accb2a26e3f5f9401811a76052951cdb Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 18 Feb 2022 22:57:57 +0000 Subject: [PATCH] fklm --- bridge_master.py | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/bridge_master.py b/bridge_master.py index b1aae01..1c755de 100644 --- a/bridge_master.py +++ b/bridge_master.py @@ -2235,26 +2235,19 @@ class routerHBP(HBSYSTEM): #Handle AMI private calls if _call_type == 'unit' and not _data_call and self.STATUS[_slot]['_allStarMode']: - - self.STATUS[_slot]['TX_TIME'] = self.STATUS[_slot]['TX_TIME'] - 20 - - if (_stream_id != self.STATUS[_slot]['RX_STREAM_ID']): - pass - - if (_frame_type == HBPF_DATA_SYNC) and (_dtype_vseq == HBPF_SLT_VTERM) and (self.STATUS[_slot]['RX_TYPE'] != HBPF_SLT_VTERM): - if _int_dst_id == 4000: - logger.info('(%s) AMI: Private call from %s to %s (Disconnect)',self._system, int_id(_rf_src), _int_dst_id) - AMIOBJ.send_command('ilink 6 0') - elif _int_dst_id == 5000: - logger.info('(%s) AMI: Private call from %s to %s (Status)',self._system, int_id(_rf_src), _int_dst_id) - AMIOBJ.send_command('ilink 5 0') - else: - logger.info('(%s) AMI: Private call from %s to %s (Link)',self._system, int_id(_rf_src), _int_dst_id) - AMIOBJ.send_command('ilink 6 0') - AMIOBJ.send_command('ilink 3 ' + str(_int_dst_id)) + if _int_dst_id == 4000: + logger.info('(%s) AMI: Private call from %s to %s (Disconnect)',self._system, int_id(_rf_src), _int_dst_id) + AMIOBJ.send_command('ilink 6 0') + elif _int_dst_id == 5000: + logger.info('(%s) AMI: Private call from %s to %s (Status)',self._system, int_id(_rf_src), _int_dst_id) + AMIOBJ.send_command('ilink 5 0') + else: + logger.info('(%s) AMI: Private call from %s to %s (Link)',self._system, int_id(_rf_src), _int_dst_id) + AMIOBJ.send_command('ilink 6 0') + AMIOBJ.send_command('ilink 3 ' + str(_int_dst_id)) #Handle private voice calls (for reflectors) - if _call_type == 'unit' and not _data_call and not self.STATUS[_slot]['_allStarMode']: + elif _call_type == 'unit' and not _data_call and not self.STATUS[_slot]['_allStarMode']: if (_stream_id != self.STATUS[_slot]['RX_STREAM_ID']): self.STATUS[_slot]['packets'] = 0