diff --git a/src/dsd_frame_sync.c b/src/dsd_frame_sync.c index 6b75b54..598d863 100644 --- a/src/dsd_frame_sync.c +++ b/src/dsd_frame_sync.c @@ -1365,7 +1365,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state) ) { - state->carrier = 1; + // state->carrier = 1; state->offset = synctest_pos; state->max = ((state->max) + lmax) / 2; state->min = ((state->min) + lmin) / 2; @@ -1386,33 +1386,33 @@ getFrameSync (dsd_opts * opts, dsd_state * state) //Disabling Inverted Sync for testing -- using SDR++ or RTL Input, I only ever see positive sync pattern //This will also further reduce any FSW false positives, but at the cost of inverted sync - // else if ( + else if ( - // (strcmp (synctest10, "1313113313") == 0 ) - // || (strcmp (synctest10, "1113113313") == 0 ) - // || (strcmp (synctest10, "1313113333") == 0 ) - // || (strcmp (synctest10, "1113113333") == 0 ) - // || (strcmp (synctest10, "1313133313") == 0 ) // + (strcmp (synctest10, "1313113313") == 0 ) + || (strcmp (synctest10, "1113113313") == 0 ) + || (strcmp (synctest10, "1313113333") == 0 ) + || (strcmp (synctest10, "1113113333") == 0 ) + || (strcmp (synctest10, "1313133313") == 0 ) // - // ) - // { - // // state->carrier = 1; - // state->offset = synctest_pos; - // state->max = ((state->max) + lmax) / 2; - // state->min = ((state->min) + lmin) / 2; - // // state->last_cc_sync_time = time(NULL); + ) + { + // state->carrier = 1; + state->offset = synctest_pos; + state->max = ((state->max) + lmax) / 2; + state->min = ((state->min) + lmin) / 2; + // state->last_cc_sync_time = time(NULL); - // if (state->lastsynctype == 29) - // { - // state->last_cc_sync_time = time(NULL); - // // if (opts->payload == 1) - // // fprintf (stderr, "\n -FSW "); - // // if (opts->payload == 1) - // // fprintf (stderr, " %s \n", synctest10); - // return (29); - // } - // state->lastsynctype = 29; - // } + if (state->lastsynctype == 29) + { + state->last_cc_sync_time = time(NULL); + // if (opts->payload == 1) + // fprintf (stderr, "\n -FSW "); + // if (opts->payload == 1) + // fprintf (stderr, " %s \n", synctest10); + return (29); + } + state->lastsynctype = 29; + } } #else //use previously 'stable' NXDN Sync pattern detection diff --git a/src/dsd_main.c b/src/dsd_main.c index 3df1cc0..d272cce 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-25 Win32 \n"); + fprintf (stderr, "Build Version: v2.0.1-26 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 9429342..c289a19 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-25 Win32"); + printw ("| Digital Speech Decoder: Florida Man Edition - Aero %s \n", "v2.0.1-26 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-25 Win32 \n"); + if (i == 6) printw (" v2.0.1-26 Win32 \n"); #else if (i == 5) printw (" %s ", "zDEV BUILD"); // if (i == 5) printw (" %s ", "MAIN BUILD");