From fbc9b5fab8345900f47053c6d216954a0b034daa Mon Sep 17 00:00:00 2001 From: lwvmobile Date: Fri, 19 May 2023 18:10:12 -0400 Subject: [PATCH] Reverting a few minor RTL tweaks; #125 --- src/dsd_frame_sync.c | 4 ++-- src/dsd_main.c | 2 +- src/dsd_ncurses.c | 6 ++---- src/rtl_sdr_fm.cpp | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/dsd_frame_sync.c b/src/dsd_frame_sync.c index c9770fe..228f6bc 100644 --- a/src/dsd_frame_sync.c +++ b/src/dsd_frame_sync.c @@ -455,8 +455,8 @@ getFrameSync (dsd_opts * opts, dsd_state * state) { goto SYNC_TEST_END; //should we update min/max here? yes or no? - state->max = ((state->max) + lmax) / 2; - state->min = ((state->min) + lmin) / 2; + // state->max = ((state->max) + lmax) / 2; + // state->min = ((state->min) + lmin) / 2; } } diff --git a/src/dsd_main.c b/src/dsd_main.c index 1f156f4..3dd8f7c 100644 --- a/src/dsd_main.c +++ b/src/dsd_main.c @@ -1346,7 +1346,7 @@ main (int argc, char **argv) } #ifdef AERO_BUILD - fprintf (stderr, "Build Version: v2.0.1-9 Win32 \n"); + fprintf (stderr, "Build Version: v2.0.1-10 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 0e5e4b4..3f5d6dd 100644 --- a/src/dsd_ncurses.c +++ b/src/dsd_ncurses.c @@ -2058,8 +2058,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", GIT_TAG); - printw ("| Digital Speech Decoder: Florida Man Edition - Aero %s \n", "v2.0.1-9 Win32"); + printw ("| Digital Speech Decoder: Florida Man Edition - Aero \n", "v2.0.1-10 Win32"); printw ("------------------------------------------------------------------------------\n"); } #elif LIMAZULUTWEAKS @@ -2088,8 +2087,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 (" %s \n", GIT_TAG); //don't have the git dev package on my cygwin32 bit environment and can't get it now (32-bit no longer supported) - // if (i == 6) printw (" v2.0.0-100-gae58fab \n"); //put appropriate version in here later, or find the GIT_TAG package (git_revision) to build in cygwin + if (i == 6) printw (" v2.0.1-10 Win32 \n"); #else if (i == 5) printw (" %s ", "zDEV BUILD"); if (i == 6) printw (" %s \n", GIT_TAG); diff --git a/src/rtl_sdr_fm.cpp b/src/rtl_sdr_fm.cpp index 5714400..7ecceda 100644 --- a/src/rtl_sdr_fm.cpp +++ b/src/rtl_sdr_fm.cpp @@ -1094,7 +1094,7 @@ void rtl_dev_tune(dsd_opts * opts, long int frequency) dongle.freq = opts->rtlsdr_center_freq = frequency; optimal_settings(dongle.freq, demod.rate_in); r = verbose_set_frequency(dongle.dev, dongle.freq); - dongle.mute = BUFFER_DUMP; //test this here -- seems to help with sample lag sending stale samples + // dongle.mute = BUFFER_DUMP; //test this here -- unsure if this does anything beneficial or anything at all, perceived 'lag' could be RMS related on NXDN48, DMR doesn't have the same symptoms. } //return RMS value (root means square) power level -- used as soft squelch inside of framesync