From 77bf3ec6ca0905a8ec9765d3abfa0293214b8b39 Mon Sep 17 00:00:00 2001 From: Serge Vakulenko Date: Wed, 12 Sep 2018 19:02:25 -0700 Subject: [PATCH] Fix incorrect printing of contact type. --- examples/Makefile | 2 +- md380.c | 2 +- uv380.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/Makefile b/examples/Makefile index 32ac882..9c0e900 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -12,7 +12,7 @@ VPATH = ../../dmrconfig.wiki/files all: $(CONF) clean: - rm -f *.conf + rm -f $(CONF) .SUFFIXES: .conf .rdt diff --git a/md380.c b/md380.c index 78cb879..c63e78c 100644 --- a/md380.c +++ b/md380.c @@ -1206,7 +1206,7 @@ static void md380_print_config(radio_device_t *radio, FILE *out, int verbose) fprintf(out, "%5d ", i+1); print_unicode(out, ct->name, 16, 1); fprintf(out, " %-7s %-8d %s\n", - CONTACT_TYPE[ct->type], CONTACT_ID(ct), ct->receive_tone ? "+" : "-"); + CONTACT_TYPE[ct->type & 3], CONTACT_ID(ct), ct->receive_tone ? "+" : "-"); } } diff --git a/uv380.c b/uv380.c index e87833f..40eb0e9 100644 --- a/uv380.c +++ b/uv380.c @@ -1294,7 +1294,7 @@ static void uv380_print_config(radio_device_t *radio, FILE *out, int verbose) fprintf(out, "%5d ", i+1); print_unicode(out, ct->name, 16, 1); fprintf(out, " %-7s %-8d %s\n", - CONTACT_TYPE[ct->type], CONTACT_ID(ct), ct->receive_tone ? "+" : "-"); + CONTACT_TYPE[ct->type & 3], CONTACT_ID(ct), ct->receive_tone ? "+" : "-"); } }