From 6ab3fa7bc38d6773908f1be7bd461606e8196e21 Mon Sep 17 00:00:00 2001 From: Cort Buffington Date: Mon, 28 Apr 2014 22:01:33 -0500 Subject: [PATCH] Cleaned superfluous "stuff" Significantly simplified this file. --- bridge.py | 24 +----------------------- playback.py | 2 +- rcm.py | 26 +------------------------- 3 files changed, 3 insertions(+), 49 deletions(-) diff --git a/bridge.py b/bridge.py index 436c164..284b528 100755 --- a/bridge.py +++ b/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: diff --git a/playback.py b/playback.py index eb1d8cf..29d7045 100755 --- a/playback.py +++ b/playback.py @@ -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: diff --git a/rcm.py b/rcm.py index 7046b04..f684ed7 100755 --- a/rcm.py +++ b/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] @@ -73,30 +73,6 @@ class rcmIPSC(IPSC): print('Source Sub: ', _rf_src) 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]