GitHub/dsd-fme
1
0
Fork 0
mirror of https://github.com/lwvmobile/dsd-fme.git synced 2026-11-13 17:27:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Symbol Sample Edge; YSF/DMR Edge Tweak; RTL Tweak;

Browse Source
This commit is contained in:
lwvmobile
2023-11-26 07:22:21 -05:00
parent f98bad18b9
commit 20ca710523
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/dsd_symbol.c
View File

@@ -499,24 +499,25 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
if (state->rf_mod == 0)
{
// 0: C4FM modulation
if ((opts->frame_p25p1 == 1) && (i >= state->symbolCenter - 2) && (i <= state->symbolCenter + 2))
{
sum += sample;
count++;
}
//testing dmr may be slightly off compared to P25, particularly wav recording at narrower bandwidth?
else if ((opts->frame_dmr == 1) && (i >= state->symbolCenter - 1) && (i <= state->symbolCenter + 2))
{
sum += sample;
count++;
}
//anything else
else if ((i >= state->symbolCenter - 2) && (i <= state->symbolCenter + 2))
//EXPERIMENTAL: manipulate the left edge depending on sync type
//TODO: See if we can manipulate this a bit more based on AFC or similar type function
int l_edge = 2;
int r_edge = 2;
if (state->synctype == 30 || state->synctype == 31) l_edge = 1; //YSF (need to test with new recordings at BW:12000)
else if ((state->lastsynctype >= 10 && state->lastsynctype <= 13) || state->lastsynctype == 32 || state->lastsynctype == 33) l_edge = 1;
else l_edge = 2; //P25 and NXDN96 perform better, DMR doesn't seem to care too much, but may favor 1 and not 2
if ((i >= state->symbolCenter - l_edge) && (i <= state->symbolCenter + r_edge))
{
sum += sample;
count++;
}
//debug: show what was selected for the left edge
// fprintf (stderr, " L:%d", l_edge);
#ifdef TRACE_DSD
if (i == state->symbolCenter - 1) {
state->debug_sample_left_edge = state->debug_sample_index - 1;

2
src/rtl_sdr_fm.cpp
View File

@@ -1003,7 +1003,7 @@ void open_rtlsdr_stream(dsd_opts *opts)
//this needs to be initted first, then we set the parameters
dongle_init(&dongle);
//init with low pass if decoding P25 or EDACS/Provoice
if (opts->frame_p25p1 == 1 || opts->frame_provoice == 1)
if (opts->frame_p25p1 == 1 || opts->frame_p25p2 == 1 || opts->frame_provoice == 1)
demod_init_ro2(&demod);
else demod_init(&demod);
output_init(&output);