From 180fd1bfb04e2942b93b035a28852fdaa254215d Mon Sep 17 00:00:00 2001 From: lwvmobile Date: Wed, 27 Dec 2023 04:05:46 -0500 Subject: [PATCH] DMR - More Compact Vendor/Site Info Ncurses; --- src/dmr_csbk.c | 8 +++++--- src/dmr_flco.c | 12 ++++++++---- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/dmr_csbk.c b/src/dmr_csbk.c index 129a087..1ab9957 100644 --- a/src/dmr_csbk.c +++ b/src/dmr_csbk.c @@ -2242,7 +2242,7 @@ void dmr_decode_syscode(dsd_opts * opts, dsd_state * state, uint8_t * cs_pdu_bit opts->dmr_dmrla_is_set = 1; opts->dmr_dmrla_n = 0; sprintf (state->dmr_branding, "%s", "Motorola"); - sprintf (state->dmr_branding_sub, "%s", "CapMax "); + // sprintf (state->dmr_branding_sub, "%s", "CapMax "); } if (opts->dmr_dmrla_is_set == 1) n = opts->dmr_dmrla_n; @@ -2294,8 +2294,10 @@ void dmr_decode_syscode(dsd_opts * opts, dsd_state * state, uint8_t * cs_pdu_bit } //add string for ncurses terminal display - if (n != 0) sprintf (state->dmr_site_parms, "TIII - %s %d-%d.%d; SYS: %04X; ", model_str, net+1, (site>>n)+1, (site & sub_mask)+1, syscode ); - else sprintf (state->dmr_site_parms, "TIII - %s %d-%d; SYS: %04X; ", model_str, net, site, syscode); + // if (n != 0) sprintf (state->dmr_site_parms, "TIII - %s %d-%d.%d; SYS: %04X; ", model_str, net+1, (site>>n)+1, (site & sub_mask)+1, syscode ); + // else sprintf (state->dmr_site_parms, "TIII - %s %d-%d; SYS: %04X; ", model_str, net, site, syscode); + if (n != 0) sprintf (state->dmr_site_parms, "TIII %s:%d-%d.%d;%04X; ", model_str, net+1, (site>>n)+1, (site & sub_mask)+1, syscode ); + else sprintf (state->dmr_site_parms, "TIII %s:%d-%d;%04X; ", model_str, net, site, syscode); } if (type == 1) diff --git a/src/dmr_flco.c b/src/dmr_flco.c index 828de02..ecfa70e 100644 --- a/src/dmr_flco.c +++ b/src/dmr_flco.c @@ -940,8 +940,10 @@ void dmr_slco (dsd_opts * opts, dsd_state * state, uint8_t slco_bits[]) fprintf (stderr, " SYS: %04X;", syscode); //#192 //add string for ncurses terminal display - if (n != 0) sprintf (state->dmr_site_parms, "TIII - %s %d-%d.%d; SYS: %04X; ", model_str, net+1, (site>>n)+1, (site & sub_mask)+1, syscode ); - else sprintf (state->dmr_site_parms, "TIII - %s %d-%d; SYS: %04X; ", model_str, net, site, syscode); + // if (n != 0) sprintf (state->dmr_site_parms, "TIII - %s %d-%d.%d; SYS: %04X; ", model_str, net+1, (site>>n)+1, (site & sub_mask)+1, syscode ); + // else sprintf (state->dmr_site_parms, "TIII - %s %d-%d; SYS: %04X; ", model_str, net, site, syscode); + if (n != 0) sprintf (state->dmr_site_parms, "TIII %s:%d-%d.%d;%04X; ", model_str, net+1, (site>>n)+1, (site & sub_mask)+1, syscode ); + else sprintf (state->dmr_site_parms, "TIII %s:%d-%d;%04X; ", model_str, net, site, syscode); //if using rigctl we can set an unknown cc frequency by polling rigctl for the current frequency if (opts->use_rigctl == 1 && state->p25_cc_freq == 0) //if not set from channel map 0 @@ -959,8 +961,10 @@ void dmr_slco (dsd_opts * opts, dsd_state * state, uint8_t slco_bits[]) fprintf (stderr, " SYS: %04X;", syscode); //#192 //add string for ncurses terminal display - if (n != 0) sprintf (state->dmr_site_parms, "TIII - %s %d-%d.%d; SYS: %04X; ", model_str, net+1, (site>>n)+1, (site & sub_mask)+1, syscode ); - else sprintf (state->dmr_site_parms, "TIII - %s %d-%d; SYS: %04X; ", model_str, net, site, syscode); + // if (n != 0) sprintf (state->dmr_site_parms, "TIII - %s %d-%d.%d; SYS: %04X; ", model_str, net+1, (site>>n)+1, (site & sub_mask)+1, syscode ); + // else sprintf (state->dmr_site_parms, "TIII - %s %d-%d; SYS: %04X; ", model_str, net, site, syscode); + if (n != 0) sprintf (state->dmr_site_parms, "TIII %s:%d-%d.%d;%04X; ", model_str, net+1, (site>>n)+1, (site & sub_mask)+1, syscode ); + else sprintf (state->dmr_site_parms, "TIII %s:%d-%d;%04X; ", model_str, net, site, syscode); } else if (slco == 0x0) //null fprintf (stderr, " SLCO NULL ");