ShaYmez
/
DMRlink
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cleaned up superfluous spaces

This commit is contained in:
Cort Buffington 2018-03-12 21:26:33 -05:00
parent e8311b1f54
commit 25d6bc08d0
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
confbridge.py
View File

@ -266,7 +266,7 @@ class confbridgeIPSC(IPSC):
for _target in BRIDGES[_bridge]: for _target in BRIDGES[_bridge]:
if _target['SYSTEM'] != self._system: if _target['SYSTEM'] != self._system:
if _target['ACTIVE']: if _target['ACTIVE']:
_target_status = systems[_target['SYSTEM']].STATUS _target_status = systems[_target['SYSTEM']].STATUS
_target_system = self._CONFIG['SYSTEMS'][_target['SYSTEM']] _target_system = self._CONFIG['SYSTEMS'][_target['SYSTEM']]
@ -301,13 +301,12 @@ class confbridgeIPSC(IPSC):
# #
# END CONTENTION HANDLING # END CONTENTION HANDLING
# #
# #
# BEGIN FRAME FORWARDING # BEGIN FRAME FORWARDING
# #
# Make a copy of the payload # Make a copy of the payload
_tmp_data = _data _tmp_data = _data
# Re-Write the PEER ID in the IPSC Header: # Re-Write the PEER ID in the IPSC Header:
_tmp_data = _tmp_data.replace(_peerid, _target_system['LOCAL']['RADIO_ID'], 1) _tmp_data = _tmp_data.replace(_peerid, _target_system['LOCAL']['RADIO_ID'], 1)
@ -325,7 +324,7 @@ class confbridgeIPSC(IPSC):
_call_info |= 1 << 5 _call_info |= 1 << 5
_call_info = chr(_call_info) _call_info = chr(_call_info)
_tmp_data = _tmp_data[:17] + _call_info + _tmp_data[18:] _tmp_data = _tmp_data[:17] + _call_info + _tmp_data[18:]
# Re-Write DMR timeslot value # Re-Write DMR timeslot value
# Determine if the slot is present, so we can translate if need be # Determine if the slot is present, so we can translate if need be
if _burst_data_type == BURST_DATA_TYPE['SLOT1_VOICE'] or _burst_data_type == BURST_DATA_TYPE['SLOT2_VOICE']: if _burst_data_type == BURST_DATA_TYPE['SLOT1_VOICE'] or _burst_data_type == BURST_DATA_TYPE['SLOT2_VOICE']:
@ -341,12 +340,11 @@ class confbridgeIPSC(IPSC):
_tmp_data = _tmp_data[:30] + _burst_data_type + _tmp_data[31:] _tmp_data = _tmp_data[:30] + _burst_data_type + _tmp_data[31:]
# Send the packet to all peers in the target IPSC # Send the packet to all peers in the target IPSC
systems[_target['SYSTEM']].send_to_ipsc(_tmp_data) systems[_target['SYSTEM']].send_to_ipsc(_tmp_data)
# #
# END FRAME FORWARDING # END FRAME FORWARDING
# #
# Set values for the contention handler to test next time there is a frame to forward # Set values for the contention handler to test next time there is a frame to forward
_target_status[_target['TS']]['TX_TGID'] = _target['TGID'] _target_status[_target['TS']]['TX_TGID'] = _target['TGID']
_target_status[_target['TS']]['TX_TIME'] = now _target_status[_target['TS']]['TX_TIME'] = now