diff --git a/bridge_master.py b/bridge_master.py index cda9b99..9aaf1ae 100644 --- a/bridge_master.py +++ b/bridge_master.py @@ -1901,17 +1901,17 @@ class routerHBP(HBSYSTEM): if _dst_id in SUB_MAP: (_d_system,_d_slot,_d_time) = SUB_MAP[_dst_id] _dst_slot = systems[_d_system].STATUS[_d_slot] - logger.info('(%s) SUB_MAP matched, System: %s Slot: %s, Time: %s', _d_system,_d_slot,_d_time) + logger.info('(%s) SUB_MAP matched, System: %s Slot: %s, Time: %s'self._system _d_system,_d_slot,_d_time) #If slot is idle for RX and TX #print("RX:"+str(_slot['RX_TYPE'])+" TX:"+str(_slot['TX_TYPE'])+" TIME:"+str(time() - _slot['TX_TIME'])) if (_dst_slot['RX_TYPE'] == HBPF_SLT_VTERM) and (_dst_slot['TX_TYPE'] == HBPF_SLT_VTERM) and (time() - _dst_slot['TX_TIME'] > CONFIG['SYSTEMS'][_d_system]['GROUP_HANGTIME']): - #Clear the TS bit -- all inbound data on slot 1 - _tmp_bits = _bits # & ~(1 << 7) + #Currently we send on the same slot received on + _tmp_bits = _bits # & ~(1 << 7) #Assemble transmit HBP packet header _tmp_data = b''.join([_data[:15], _tmp_bits.to_bytes(1, 'big'), _data[16:20]]) _tmp_data = b''.join([_tmp_data, dmrpkt]) systems[_d_system].send_system(_tmp_data) - logger.info('(%s) UNIT Data Bridged to HBP on slot 1: %s DST_ID: %s',_d_system,_int_dst_id) + logger.info('(%s) UNIT Data Bridged to HBP on slot 1: %s DST_ID: %s',self._system,_d_system,_int_dst_id) if CONFIG['REPORTS']['REPORT']: systems[system]._report.send_bridgeEvent('UNIT DATA,START,TX,{},{},{},{},{},{}'.format(system, int_id(_stream_id), int_id(_peer_id), int_id(_rf_src), 1, _int_dst_id).encode(encoding='utf-8', errors='ignore'))