From 40093172090dc8e976abdfcee40662ac8cdb5a69 Mon Sep 17 00:00:00 2001 From: DL2MF Date: Mon, 1 Jan 2018 22:34:44 +0100 Subject: [PATCH] Destination callsign added to statusline --- applet/src/display.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/applet/src/display.c b/applet/src/display.c index 8934e52e..63b4b57a 100755 --- a/applet/src/display.c +++ b/applet/src/display.c @@ -497,6 +497,7 @@ void draw_alt_statusline() } user_t usr; + user_t dst; src = rst_src; if( src == 0 ) { @@ -512,9 +513,17 @@ void draw_alt_statusline() gfx_printf_pos2(RX_POPUP_X_START, 96, 157, "TA: %s", talkerAlias.text); } else { // 2017-02-18 otherwise show lastheard in status line if( usr_find_by_dmrid(&usr, src) == 0 ) { - gfx_printf_pos2(RX_POPUP_X_START, 96, 157, "lh:%d->%d %c", src, rst_dst, mode); + if( usr_find_by_dmrid(&usr, rst_dst) != 0 ) { + gfx_printf_pos2(RX_POPUP_X_START, 96, 157, "lh:%d->%s %c", src, usr.callsign, mode); + } else { + gfx_printf_pos2(RX_POPUP_X_START, 96, 157, "lh:%d->%d %c", src, rst_dst, mode); + } } else { - gfx_printf_pos2(RX_POPUP_X_START, 96, 157, "lh:%s->%d %c", usr.callsign, rst_dst, mode); + if( usr_find_by_dmrid(&dst, rst_dst) != 0 ) { + gfx_printf_pos2(RX_POPUP_X_START, 96, 157, "lh:%s->%s %c", usr.callsign, dst.callsign, mode); + } else { + gfx_printf_pos2(RX_POPUP_X_START, 96, 157, "lh:%s->%d %c", usr.callsign, rst_dst, mode); + } } } }