From 43df9c3ff52afebccec8e89a3c4bbddf64ff287d Mon Sep 17 00:00:00 2001 From: lwvmobile Date: Tue, 2 Apr 2024 10:04:02 -0400 Subject: [PATCH] Set RTL Sample Multiplier Default to 2X; --- examples/Example_Usage.md | 2 +- src/dsd_main.c | 4 ++-- src/nxdn_deperm.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/Example_Usage.md b/examples/Example_Usage.md index c59fd76..1c6d84a 100644 --- a/examples/Example_Usage.md +++ b/examples/Example_Usage.md @@ -86,7 +86,7 @@ RTL-SDR options: ppm RTL-SDR PPM Error (default = 0) bw RTL-SDR Bandwidth kHz (default = 12)(8, 12, 16, 24) sq RTL-SDR Squelch Level vs RMS Value (Optional) - vol RTL-SDR Sample 'Volume' Multiplier (default = 1)(1,2,3) + vol RTL-SDR Sample 'Volume' Multiplier (default = 2)(1,2,3) Example: dsd-fme -fs -i rtl -C cap_plus_channel.csv -T Example: dsd-fme -fp -i rtl:0:851.375M:22:-2:24:0:2 diff --git a/src/dsd_main.c b/src/dsd_main.c index 8b2c29c..69b440a 100644 --- a/src/dsd_main.c +++ b/src/dsd_main.c @@ -643,7 +643,7 @@ initOpts (dsd_opts * opts) opts->rtl_dev_index = 0; //choose which device we want by index number opts->rtl_gain_value = 0; //mid value, 0 - AGC - 0 to 49 acceptable values opts->rtl_squelch_level = 100; //100 by default, but only affects NXDN and dPMR during framesync test, compared to RMS value - opts->rtl_volume_multiplier = 1; //sample multiplier; This multiplies the sample value to produce a higher 'inlvl' (probably best left unused) + opts->rtl_volume_multiplier = 2; //sample multiplier; This multiplies the sample value to produce a higher 'inlvl' for the demodulator opts->rtl_udp_port = 0; //set UDP port for RTL remote -- 0 by default, will be making this optional for some external/legacy use cases (edacs-fm, etc) opts->rtl_bandwidth = 12; //default is 12, reverted back to normal on this (no inherent benefit) opts->rtlsdr_ppm_error = 0; //initialize ppm with 0 value; @@ -1316,7 +1316,7 @@ usage () printf (" bw RTL-SDR Bandwidth kHz (default = 12)(4, 6, 8, 12, 16, 24) \n"); printf (" sq RTL-SDR Squelch Level vs RMS Value (Optional)\n"); // printf (" udp RTL-SDR Legacy UDP Remote Port (Optional -- External Use Only)\n"); //NOTE: This is still available as an option in the ncurses menu - printf (" vol RTL-SDR Sample 'Volume' Multiplier (default = 1)(1,2,3)\n"); + printf (" vol RTL-SDR Sample 'Volume' Multiplier (default = 2)(1,2,3)\n"); printf (" Example: dsd-fme -fs -i rtl -C cap_plus_channel.csv -T\n"); printf (" Example: dsd-fme -fp -i rtl:0:851.375M:22:-2:24:0:2\n"); printf ("\n"); diff --git a/src/nxdn_deperm.c b/src/nxdn_deperm.c index a2cb97c..304da1e 100644 --- a/src/nxdn_deperm.c +++ b/src/nxdn_deperm.c @@ -723,7 +723,7 @@ void nxdn_deperm_cac(dsd_opts * opts, dsd_state * state, uint8_t bits[300]) else cac_fail = 0; //reset some parameters if CAC continues to fail - if (cac_fail >= 5) + if (cac_fail > 10) { //simple reset state->synctype = 0;