Cleaned superfluous "stuff"
Significantly simplified this file.
This commit is contained in:
parent
a4a339aabf
commit
6ab3fa7bc3
24
bridge.py
24
bridge.py
@ -51,7 +51,7 @@ class bridgeIPSC(IPSC):
|
||||
#************************************************
|
||||
# CALLBACK FUNCTIONS FOR USER PACKET TYPES
|
||||
#************************************************
|
||||
|
||||
#
|
||||
def group_voice(self, _network, _src_sub, _dst_group, _ts, _end, _peerid, _data):
|
||||
if _ts not in self.ACTIVE_CALLS:
|
||||
self.ACTIVE_CALLS.append(_ts)
|
||||
@ -81,28 +81,6 @@ class bridgeIPSC(IPSC):
|
||||
# Send the packet to all peers in the target IPSC
|
||||
send_to_ipsc(_target, _tmp_data)
|
||||
|
||||
def private_voice(self, _network, _src_sub, _dst_sub, _ts, _end, _peerid, _data):
|
||||
pass
|
||||
|
||||
def group_data(self, _network, _src_sub, _dst_sub, _ts, _end, _peerid, _data):
|
||||
pass
|
||||
|
||||
def private_data(self, _network, _src_sub, _dst_sub, _ts, _end, _peerid, _data):
|
||||
pass
|
||||
|
||||
def call_mon_origin(self, _network, _data):
|
||||
pass
|
||||
|
||||
def call_mon_rpt(self, _network, _data):
|
||||
pass
|
||||
|
||||
def call_mon_nack(self, _network, _data):
|
||||
pass
|
||||
|
||||
def xcmp_xnl(self, _network, _data):
|
||||
pass
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
logger.info('DMRlink \'bridge.py\' (c) 2013, 2014 N0MJS & the K0USY Group - SYSTEM STARTING...')
|
||||
for ipsc_network in NETWORK:
|
||||
|
@ -43,7 +43,7 @@ class playbackIPSC(IPSC):
|
||||
#************************************************
|
||||
# CALLBACK FUNCTIONS FOR USER PACKET TYPES
|
||||
#************************************************
|
||||
|
||||
#
|
||||
def group_voice(self, _network, _src_sub, _dst_sub, _ts, _end, _peerid, _data):
|
||||
if HEX_TGID == _dst_sub and TS == _ts:
|
||||
if not _end:
|
||||
|
26
rcm.py
26
rcm.py
@ -45,7 +45,7 @@ class rcmIPSC(IPSC):
|
||||
#************************************************
|
||||
# CALLBACK FUNCTIONS FOR USER PACKET TYPES
|
||||
#************************************************
|
||||
|
||||
#
|
||||
def call_mon_origin(self, _network, _data):
|
||||
_source = _data[1:5]
|
||||
_ipsc_src = _data[5:9]
|
||||
@ -74,30 +74,6 @@ class rcmIPSC(IPSC):
|
||||
print('Target Sub: ', _rf_tgt)
|
||||
print()
|
||||
|
||||
def call_mon_rpt(self, _network, _data):
|
||||
#print('({}) Repeater Call Monitor Repeating Packet: {}' .format(_network, h(_data)))
|
||||
pass
|
||||
|
||||
def call_mon_nack(self, _network, _data):
|
||||
#print('({}) Repeater Call Monitor NACK Packet: {}' .format(_network, h(_data)))
|
||||
pass
|
||||
|
||||
def xcmp_xnl(self, _network, _data):
|
||||
#print('({}) XCMP/XNL Packet Received From: {}' .format(_network, h(_data)))
|
||||
pass
|
||||
|
||||
def group_voice(self, _network, _src_sub, _dst_sub, _ts, _end, _peerid, _data):
|
||||
pass
|
||||
|
||||
def private_voice(self, _network, _src_sub, _dst_sub, _ts, _end, _peerid, _data):
|
||||
pass
|
||||
|
||||
def group_data(self, _network, _src_sub, _dst_sub, _ts, _end, _peerid, _data):
|
||||
pass
|
||||
|
||||
def private_data(self, _network, _src_sub, _dst_sub, _ts, _end, _peerid, _data):
|
||||
pass
|
||||
|
||||
def repeater_wake_up(self, _network, _data):
|
||||
_source = _data[1:5]
|
||||
_source_dec = int_id(_source)
|
||||
|
Loading…
Reference in New Issue
Block a user