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

General Cleanup... Trying to improve it

Browse Source
This commit is contained in:
Cort Buffington 2016-05-01 16:13:03 -05:00
parent b068f3b090
commit 2d0bff17d1
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -3,6 +3,7 @@
*.out *.out
Icon Icon
dmrlink.cfg dmrlink.cfg
rcm.cfg
stats.py stats.py
pub* pub*
bridge_rules.py bridge_rules.py

16
rcm.py
View File

@ -35,8 +35,8 @@ except ImportError:
sys.exit('IPSC message types file not found or invalid') sys.exit('IPSC message types file not found or invalid')
status = True status = True
rpt = False rpt = True
nack = False nack = True
class rcmIPSC(IPSC): class rcmIPSC(IPSC):
@ -61,14 +61,14 @@ class rcmIPSC(IPSC):
_prio = _data[23] _prio = _data[23]
_sec = _data[24] _sec = _data[24]
_source = get_info(int_id(_source), peer_ids) _source = str(int_id(_source)) + ', ' + str(get_info(int_id(_source), peer_ids))
_ipsc_src = get_info(int_id(_ipsc_src), peer_ids) _ipsc_src = str(int_id(_ipsc_src)) + ', ' + str(get_info(int_id(_ipsc_src), peer_ids))
_rf_src = get_info(int_id(_rf_src), subscriber_ids) _rf_src = str(int_id(_rf_src)) + ', ' + str(get_info(int_id(_rf_src), subscriber_ids))
if _type == '\x4F' or '\x51': if _type == '\x4F' or '\x51':
_rf_tgt = get_info(int_id(_rf_tgt), talkgroup_ids) _rf_tgt = 'TGID: ' + str(int_id(_rf_tgt)) + ', ' + str(get_info(int_id(_rf_tgt), talkgroup_ids))
else: else:
_rf_tgt = get_info(int_id(_rf_tgt), subscriber_ids) _rf_tgt = 'SID: ' + str(int_id(_rf_tgt)) + ', ' + str(get_info(int_id(_rf_tgt), subscriber_ids))
print('Call Monitor - Call Status') print('Call Monitor - Call Status')
print('TIME: ', datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")) print('TIME: ', datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"))
@ -95,7 +95,7 @@ class rcmIPSC(IPSC):
_ts1_state = _data[5] _ts1_state = _data[5]
_ts2_state = _data[6] _ts2_state = _data[6]
_source = get_info(int_id(_source), peer_ids) _source = str(int_id(_source)) + ', ' + str(get_info(int_id(_source), peer_ids))
print('Call Monitor - Repeater State') print('Call Monitor - Repeater State')
print('TIME: ', datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")) print('TIME: ', datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"))