From 593ffbbd661606828537582a2d6a0963398fcf09 Mon Sep 17 00:00:00 2001 From: lwvmobile Date: Sat, 26 Aug 2023 09:32:40 -0400 Subject: [PATCH] DMR LE Minor Code Fix; Print Tweaks; --- src/dmr_le.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/dmr_le.c b/src/dmr_le.c index 106cd00..c9d9f7a 100644 --- a/src/dmr_le.c +++ b/src/dmr_le.c @@ -314,7 +314,7 @@ void dmr_sbrc (dsd_opts * opts, dsd_state * state, uint8_t power) } - else if (sbrc_opcode != 0 || sbrc_opcode != 3) //all that should be left in this field is the potential ENC identifiers + else if (sbrc_opcode != 0 && sbrc_opcode != 3) //all that should be left in this field is the potential ENC identifiers { if (slot == 0) //may not need the state->errs anymore //&& state->errs < 3 @@ -325,9 +325,9 @@ void dmr_sbrc (dsd_opts * opts, dsd_state * state, uint8_t power) if (state->M == 0) { fprintf (stderr, "\n"); - fprintf (stderr, "%s ", KYEL); + fprintf (stderr, "%s", KCYN); fprintf (stderr, " Slot 1"); - fprintf (stderr, " DMR LE SB ALG ID: %X KEY ID: %0X", alg + 0x20, key); + fprintf (stderr, " DMR LE SB ALG ID: 0x%02X KEY ID: 0x%02X", alg + 0x20, key); // fprintf (stderr, "\n"); fprintf (stderr, "%s ", KNRM); @@ -346,9 +346,9 @@ void dmr_sbrc (dsd_opts * opts, dsd_state * state, uint8_t power) if (state->M == 0) { fprintf (stderr, "\n"); - fprintf (stderr, "%s ", KYEL); + fprintf (stderr, "%s", KCYN); fprintf (stderr, " Slot 2"); - fprintf (stderr, " DMR LE SB ALG ID: %X KEY ID: %0X", alg + 0x20, key); + fprintf (stderr, " DMR LE SB ALG ID: 0x%02X KEY ID: 0x%02X", alg + 0x20, key); // fprintf (stderr, "\n"); fprintf (stderr, "%s ", KNRM);