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

Cleaned superfluous "stuff"

Browse Source 
Significantly simplified this file.
This commit is contained in:
Cort Buffington 2014-04-28 22:01:33 -05:00
parent a4a339aabf
commit 6ab3fa7bc3
3 changed files with 3 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
bridge.py
View File

@ -51,7 +51,7 @@ class bridgeIPSC(IPSC):
#************************************************ #************************************************
# CALLBACK FUNCTIONS FOR USER PACKET TYPES # CALLBACK FUNCTIONS FOR USER PACKET TYPES
#************************************************ #************************************************
#
def group_voice(self, _network, _src_sub, _dst_group, _ts, _end, _peerid, _data): def group_voice(self, _network, _src_sub, _dst_group, _ts, _end, _peerid, _data):
if _ts not in self.ACTIVE_CALLS: if _ts not in self.ACTIVE_CALLS:
self.ACTIVE_CALLS.append(_ts) self.ACTIVE_CALLS.append(_ts)
@ -81,28 +81,6 @@ class bridgeIPSC(IPSC):
# Send the packet to all peers in the target IPSC # Send the packet to all peers in the target IPSC
send_to_ipsc(_target, _tmp_data) 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__': if __name__ == '__main__':
logger.info('DMRlink \'bridge.py\' (c) 2013, 2014 N0MJS & the K0USY Group - SYSTEM STARTING...') logger.info('DMRlink \'bridge.py\' (c) 2013, 2014 N0MJS & the K0USY Group - SYSTEM STARTING...')
for ipsc_network in NETWORK: for ipsc_network in NETWORK:

2
playback.py
View File

@ -43,7 +43,7 @@ class playbackIPSC(IPSC):
#************************************************ #************************************************
# CALLBACK FUNCTIONS FOR USER PACKET TYPES # CALLBACK FUNCTIONS FOR USER PACKET TYPES
#************************************************ #************************************************
#
def group_voice(self, _network, _src_sub, _dst_sub, _ts, _end, _peerid, _data): def group_voice(self, _network, _src_sub, _dst_sub, _ts, _end, _peerid, _data):
if HEX_TGID == _dst_sub and TS == _ts: if HEX_TGID == _dst_sub and TS == _ts:
if not _end: if not _end:

26
rcm.py
View File

@ -45,7 +45,7 @@ class rcmIPSC(IPSC):
#************************************************ #************************************************
# CALLBACK FUNCTIONS FOR USER PACKET TYPES # CALLBACK FUNCTIONS FOR USER PACKET TYPES
#************************************************ #************************************************
#
def call_mon_origin(self, _network, _data): def call_mon_origin(self, _network, _data):
_source = _data[1:5] _source = _data[1:5]
_ipsc_src = _data[5:9] _ipsc_src = _data[5:9]
@ -74,30 +74,6 @@ class rcmIPSC(IPSC):
print('Target Sub: ', _rf_tgt) print('Target Sub: ', _rf_tgt)
print() 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): def repeater_wake_up(self, _network, _data):
_source = _data[1:5] _source = _data[1:5]
_source_dec = int_id(_source) _source_dec = int_id(_source)