|
|
|
|
@ -1925,7 +1925,8 @@ class routerHBP(HBSYSTEM):
|
|
|
|
|
continue
|
|
|
|
|
#We only want to send data calls to individual IDs vis OpenBridge
|
|
|
|
|
if CONFIG['SYSTEMS'][system]['MODE'] == 'OPENBRIDGE' and _int_dst_id >= 1000000:
|
|
|
|
|
self.sendDatatoOBP(system,_data,dmrpkt,pkt_time,_stream_id,_dst_id,_peer_id,_rf_src,_bits)
|
|
|
|
|
#Disabled in master for now
|
|
|
|
|
#self.sendDatatoOBP(system,_data,dmrpkt,pkt_time,_stream_id,_dst_id,_peer_id,_rf_src,_bits)
|
|
|
|
|
|
|
|
|
|
#Send UNIT data to data gateway
|
|
|
|
|
#if CONFIG['GLOBAL']['DATA_GATEWAY'] and (CONFIG['GLOBAL']['DATA_GATEWAY'] in systems) \
|
|
|
|
|
@ -1959,7 +1960,7 @@ class routerHBP(HBSYSTEM):
|
|
|
|
|
_tmp_bits = _bits ^ 1 << 7
|
|
|
|
|
else:
|
|
|
|
|
_tmp_bits = _bits
|
|
|
|
|
self.sendDataToHBP(_d_system,_d_slot,_dst_id,_tmp_bits,_data,dmrpkt,_rf_src)
|
|
|
|
|
self.sendDataToHBP(_d_system,_d_slot,_dst_id,_tmp_bits,_data,dmrpkt,_rf_src)
|
|
|
|
|
|
|
|
|
|
else:
|
|
|
|
|
logger.info('(%s) UNIT Data not bridged to HBP on slot 1 - target busy: %s DST_ID: %s',self._system,_d_system,_int_dst_id)
|
|
|
|
|
|