diff --git a/monitor.py b/monitor.py index 0545b06..f38f734 100644 --- a/monitor.py +++ b/monitor.py @@ -659,8 +659,10 @@ def rts_update(p): CTABLE['MASTERS'][system]['PEERS'][peer][timeSlot]['BGCOLOR'] = bgcolor CTABLE['MASTERS'][system]['PEERS'][peer][timeSlot]['TYPE'] = callType CTABLE['MASTERS'][system]['PEERS'][peer][timeSlot]['SUB'] = '{} ({})'.format(alias_short(sourceSub, subscriber_ids), sourceSub) + CTABLE['MASTERS'][system]['PEERS'][peer][timeSlot]['SUB'] = '{}'.format(alias_call(sourceSub, subscriber_ids)) CTABLE['MASTERS'][system]['PEERS'][peer][timeSlot]['SRC'] = peer CTABLE['MASTERS'][system]['PEERS'][peer][timeSlot]['DEST'] = 'TG {}    {}'.format(destination,alias_tgid(destination,talkgroup_ids)) + CTABLE['MASTERS'][system]['PEERS'][peer][timeSlot]['TG'] = 'TG {}'.format(destination) CTABLE['MASTERS'][system]['PEERS'][peer][timeSlot]['TRX'] = crxstatus if action == 'END': CTABLE['MASTERS'][system]['PEERS'][peer][timeSlot]['TS'] = False @@ -668,13 +670,15 @@ def rts_update(p): CTABLE['MASTERS'][system]['PEERS'][peer][timeSlot]['BGCOLOR'] = WHITE2 CTABLE['MASTERS'][system]['PEERS'][peer][timeSlot]['TYPE'] = '' CTABLE['MASTERS'][system]['PEERS'][peer][timeSlot]['SUB'] = '' + CTABLE['MASTERS'][system]['PEERS'][peer][timeSlot]['CALL'] = '' CTABLE['MASTERS'][system]['PEERS'][peer][timeSlot]['SRC'] = '' CTABLE['MASTERS'][system]['PEERS'][peer][timeSlot]['DEST'] = '' + CTABLE['MASTERS'][system]['PEERS'][peer][timeSlot]['TG'] = '' CTABLE['MASTERS'][system]['PEERS'][peer][timeSlot]['TRX'] = '' if system in CTABLE['OPENBRIDGES']: if action == 'START': - CTABLE['OPENBRIDGES'][system]['STREAMS'][streamId] = (trx, alias_call(sourceSub, subscriber_ids),'TG {}'.format(destination),timeout) + CTABLE['OPENBRIDGES'][system]['STREAMS'][streamId] = (trx, alias_call(sourceSub, subscriber_ids),'{}'.format(destination),timeout) if action == 'END': if streamId in CTABLE['OPENBRIDGES'][system]['STREAMS']: del CTABLE['OPENBRIDGES'][system]['STREAMS'][streamId] @@ -696,8 +700,10 @@ def rts_update(p): CTABLE['PEERS'][system][timeSlot]['COLOR'] = color CTABLE['PEERS'][system][timeSlot]['BGCOLOR'] = bgcolor CTABLE['PEERS'][system][timeSlot]['SUB'] = '{} ({})'.format(alias_short(sourceSub, subscriber_ids), sourceSub) + CTABLE['PEERS'][system][timeSlot]['CALL'] = '{}'.format(alias_call(sourceSub, subscriber_ids)) CTABLE['PEERS'][system][timeSlot]['SRC'] = sourcePeer CTABLE['PEERS'][system][timeSlot]['DEST'] = 'TG {}    {}'.format(destination,alias_tgid(destination,talkgroup_ids)) + CTABLE['PEERS'][system][timeSlot]['TG'] = 'TG {}'.format(destination) CTABLE['PEERS'][system][timeSlot]['TRX'] = prxstatus if action == 'END': CTABLE['PEERS'][system][timeSlot]['TS'] = False @@ -705,8 +711,10 @@ def rts_update(p): CTABLE['PEERS'][system][timeSlot]['BGCOLOR'] = WHITE2 CTABLE['PEERS'][system][timeSlot]['TYPE'] = '' CTABLE['PEERS'][system][timeSlot]['SUB'] = '' + CTABLE['PEERS'][system][timeSlot]['CALL'] = '' CTABLE['PEERS'][system][timeSlot]['SRC'] = '' CTABLE['PEERS'][system][timeSlot]['DEST'] = '' + CTABLE['PEERS'][system][timeSlot]['TG'] = '' CTABLE['PEERS'][system][timeSlot]['TRX'] = '' build_stats()