From 5977f865e3b97d7a09b282ebafb132abae690c2c Mon Sep 17 00:00:00 2001 From: lwvmobile Date: Mon, 5 Jun 2023 02:43:37 -0400 Subject: [PATCH] Remove Min/Max Test (mixed results); #123 --- src/dsd_frame_sync.c | 10 ++-------- src/dsd_main.c | 2 +- src/dsd_ncurses.c | 4 ++-- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/dsd_frame_sync.c b/src/dsd_frame_sync.c index cfb24e5..6b75b54 100644 --- a/src/dsd_frame_sync.c +++ b/src/dsd_frame_sync.c @@ -448,11 +448,6 @@ getFrameSync (dsd_opts * opts, dsd_state * state) state->minref = state->min; } - //Test Using this as an improvement to framesync and good initial decodes - //better initial decodes observed on NXDN when using this, and also on P25 - //test on other system types as well - state->max = ((state->max) + lmax) / 2; - state->min = ((state->min) + lmin) / 2; //if using an rtl input method, do not look for sync patterns if the rms value is lower than our 'soft squelch' level if (opts->audio_in_type == 3 && opts->rtl_rms < opts->rtl_squelch_level) //tests show floor level around 40, and signal breaking 100, default is 100 for level @@ -460,10 +455,9 @@ getFrameSync (dsd_opts * opts, dsd_state * state) if (opts->frame_nxdn48 == 1 || opts->frame_nxdn96 == 1 || opts->frame_dpmr == 1) { //should we update min/max here? yes or no? - //NOTE: Startup on Sync seems to respond much faster with this on, perhaps this needs to move to always occur on every sync type - // state->max = ((state->max) + lmax) / 2; - // state->min = ((state->min) + lmin) / 2; + state->max = ((state->max) + lmax) / 2; + state->min = ((state->min) + lmin) / 2; goto SYNC_TEST_END; } diff --git a/src/dsd_main.c b/src/dsd_main.c index 7691990..3df1cc0 100644 --- a/src/dsd_main.c +++ b/src/dsd_main.c @@ -1358,7 +1358,7 @@ main (int argc, char **argv) } #ifdef AERO_BUILD - fprintf (stderr, "Build Version: v2.0.1-24 Win32 \n"); + fprintf (stderr, "Build Version: v2.0.1-25 Win32 \n"); #else fprintf (stderr, "Build Version: %s \n", GIT_TAG); #endif diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c index ffab6ff..9429342 100644 --- a/src/dsd_ncurses.c +++ b/src/dsd_ncurses.c @@ -2072,7 +2072,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.0.1-24 Win32"); + printw ("| Digital Speech Decoder: Florida Man Edition - Aero %s \n", "v2.0.1-25 Win32"); printw ("------------------------------------------------------------------------------\n"); } #elif LIMAZULUTWEAKS @@ -2101,7 +2101,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state) if (i == 4) printw (" MBElib %s", versionstr); #ifdef AERO_BUILD if (i == 5) printw (" %s ", "Aero Win32"); - if (i == 6) printw (" v2.0.1-24 Win32 \n"); + if (i == 6) printw (" v2.0.1-25 Win32 \n"); #else if (i == 5) printw (" %s ", "zDEV BUILD"); // if (i == 5) printw (" %s ", "MAIN BUILD");