From 831f50dd77a48690f900fdf4e302d3361bed0137 Mon Sep 17 00:00:00 2001 From: gnorbury Date: Mon, 14 Aug 2023 18:31:39 -0400 Subject: [PATCH] Improve display of held tg's when using web terminal --- op25/gr-op25_repeater/apps/tk_p25.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/op25/gr-op25_repeater/apps/tk_p25.py b/op25/gr-op25_repeater/apps/tk_p25.py index 32b6f8d1..75e05b26 100644 --- a/op25/gr-op25_repeater/apps/tk_p25.py +++ b/op25/gr-op25_repeater/apps/tk_p25.py @@ -1977,13 +1977,14 @@ def hold_talkgroup(self, tgid, curr_time): self.expire_talkgroup(reason="clear hold", auto_hold = False) def get_status(self): + _tgid = self.hold_tgid if self.hold_tgid is not None else self.current_tgid cc_tag = "Control Channel" if self.system.has_cc(self.msgq_id) else None d = {} d['freq'] = self.tuned_frequency d['tdma'] = self.current_slot - d['tgid'] = self.hold_tgid if self.hold_tgid is not None else self.current_tgid + d['tgid'] = _tgid d['system'] = self.config['trunking_sysname'] - d['tag'] = self.talkgroups[self.current_tgid]['tag'] if self.current_tgid is not None else cc_tag + d['tag'] = self.talkgroups[_tgid]['tag'] if _tgid is not None else cc_tag d['srcaddr'] = self.talkgroups[self.current_tgid]['srcaddr'] if self.current_tgid is not None else 0 d['srctag'] = self.system.get_rid_tag(self.talkgroups[self.current_tgid]['srcaddr']) if self.current_tgid is not None else "" d['encrypted'] = self.talkgroups[self.current_tgid]['encrypted'] if self.current_tgid is not None else 0