From b40281fda3b33cedf8e15f4abe66ae1ce8cf8c4e Mon Sep 17 00:00:00 2001 From: lwvmobile Date: Mon, 19 Jun 2023 06:40:21 -0400 Subject: [PATCH] Renable DMR Late Entry SB; Misc; --- CMakeLists.txt | 2 +- src/dsd_main.c | 14 ++++++++------ src/dsd_ncurses.c | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7026c38..a3bddb8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,7 +54,7 @@ endif () #use cmake option -DZDEV to change designation of this build from MAIN to zDEV option(ZDEV - "change designation of this build from MAIN to zDEV" ON) + "change designation of this build from MAIN to zDEV" OFF) if (ZDEV) add_definitions(-DZDEV_BUILD) endif () diff --git a/src/dsd_main.c b/src/dsd_main.c index 510fc9b..bb107cf 100644 --- a/src/dsd_main.c +++ b/src/dsd_main.c @@ -628,7 +628,7 @@ initOpts (dsd_opts * opts) opts->dmr_dmrla_n = 0; //DMR Late Entry - opts->dmr_le = 0; //off by default until worked out some more + opts->dmr_le = 1; //re-enabled again //Trunking - Use Group List as Allow List opts->trunk_use_allow_list = 0; //disabled by default @@ -1157,9 +1157,11 @@ usage () printf (" \n"); printf (" -0 Force RC4 Key over Missing PI header/LE Encryption Identifiers (DMR) \n"); printf (" \n"); - printf (" -3 Enable DMR Late Entry Encryption Identifiers (VC6 Single Burst) \n"); - printf (" Note: This is experimental and may produce false positives depending on system type, notably Cap+. \n"); - printf (" Use -0 or -4 options above instead if needed. \n"); + printf (" -3 Disable DMR Late Entry Encryption Identifiers (VC6 Single Burst) \n"); + printf (" Note: Disable this if false positives on Voice ENC occur. \n"); + // printf (" -3 Enable DMR Late Entry Encryption Identifiers (VC6 Single Burst) \n"); + // printf (" Note: This is experimental and may produce false positives depending on system type, notably TXI. \n"); + // printf (" Use -0 or -4 options above instead if needed. \n"); printf ("\n"); printf (" Trunking Options:\n"); printf (" -C Import Channel to Frequency Map (channum, freq) from csv file. (Capital C) \n"); @@ -1372,7 +1374,7 @@ main (int argc, char **argv) } #ifdef AERO_BUILD - fprintf (stderr, "Build Version: v2.1 Beta 2\n"); + fprintf (stderr, "Build Version: v2.1 Beta 3\n"); #else fprintf (stderr, "Build Version: %s \n", GIT_TAG); #endif @@ -1424,7 +1426,7 @@ main (int argc, char **argv) case '3': opts.dmr_le = 1; - fprintf (stderr,"DMR Late Entry Encryption Identifiers Enabled (VC6 Single Burst)\n"); + fprintf (stderr,"DMR Late Entry Encryption Identifiers Disabled (VC6 Single Burst)\n"); break; case 'Y': //conventional scanner mode diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c index bbd4b00..a0cbd89 100644 --- a/src/dsd_ncurses.c +++ b/src/dsd_ncurses.c @@ -2158,7 +2158,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state) if (opts->ncurses_compact == 1) { printw ("------------------------------------------------------------------------------\n"); - printw ("| Digital Speech Decoder: Florida Man Edition - Aero %s \n", "v2.1 Beta 2"); + printw ("| Digital Speech Decoder: Florida Man Edition - Aero %s \n", "v2.1 Beta 3"); printw ("------------------------------------------------------------------------------\n"); } #elif LIMAZULUTWEAKS @@ -2194,7 +2194,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state) if (i == 4) printw (" MBElib %s", versionstr); #ifdef AERO_BUILD if (i == 5) printw (" %s ", "Aero Build"); - if (i == 6) printw (" v2.1 Beta 2\n"); + if (i == 6) printw (" v2.1 Beta 3\n"); #elif ZDEV_BUILD if (i == 5) printw (" %s ", "zDEV Build"); if (i == 6) printw (" %s \n", GIT_TAG);