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

Tweaks to NXDN FSW Tests; #123

Browse Source
This commit is contained in:
lwvmobile
2023-05-05 18:32:06 -04:00
parent 3aa20f82b9
commit d2b27fdf25
3 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/dsd_frame_sync.c
View File

@@ -1276,7 +1276,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
}
}
#ifdef NXDNTESTSYNC //use experimental sync detection based on multiple factors
//NXDN FSW sync and handling - testing with more exact syncs and also inlv (state->max)
@@ -1289,9 +1289,8 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
//Also, landing on other signal types will probably also
//trigger this without squelch enabled
//moved carrier = 1 and last_cc_synctime to inside of nxdn_frame after
//a good lich parity and known lich value occurs -- still available on
//the 'stable' sync pattern though
//NOTE: This test seems to work better for NXDN48 than it does for NXDN96
else if ((opts->frame_nxdn96 == 1) || (opts->frame_nxdn48 == 1))
{
strncpy (synctest10, (synctest_p - 9), 10); //FSW only
@@ -1306,14 +1305,15 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
(strcmp (synctest19, "3131133313131331111") == 0 ) ||
(strcmp (synctest19, "3131133313331331111") == 0 ) )
{
state->carrier = 1;
state->offset = synctest_pos;
state->max = ((state->max) + lmax) / 2;
state->min = ((state->min) + lmin) / 2;
state->lastsynctype = 28;
if (opts->payload == 1) fprintf (stderr, "\n PANDF ");
if (opts->payload == 1) fprintf (stderr, " %s ", synctest19);
if (opts->payload == 1) fprintf (stderr, " maxlvl %d ", state->max / 164);
if (opts->payload == 1) fprintf (stderr, " minlvl %d ", state->min);
// if (opts->payload == 1) fprintf (stderr, "\n PANDF ");
// if (opts->payload == 1) fprintf (stderr, " %s ", synctest19);
// if (opts->payload == 1) fprintf (stderr, " maxlvl %d ", state->max / 164);
// if (opts->payload == 1) fprintf (stderr, " minlvl %d ", state->min);
if (state->max < 5000)
return (28);
}
@@ -1322,14 +1322,15 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
(strcmp (synctest19, "1313311133131331111") == 0 ) ||
(strcmp (synctest19, "1313311133331331111") == 0 ) )
{
state->carrier = 1;
state->offset = synctest_pos;
state->max = ((state->max) + lmax) / 2;
state->min = ((state->min) + lmin) / 2;
state->lastsynctype = 29;
if (opts->payload == 1) fprintf (stderr, "\n PANDF ");
if (opts->payload == 1) fprintf (stderr, " %s ", synctest19);
if (opts->payload == 1) fprintf (stderr, " maxlvl %d ", state->max / 164);
if (opts->payload == 1) fprintf (stderr, " minlvl %d ", state->min);
// if (opts->payload == 1) fprintf (stderr, "\n PANDF ");
// if (opts->payload == 1) fprintf (stderr, " %s ", synctest19);
// if (opts->payload == 1) fprintf (stderr, " maxlvl %d ", state->max / 164);
// if (opts->payload == 1) fprintf (stderr, " minlvl %d ", state->min);
if (state->max < 5000)
return (29);
}
@@ -1339,16 +1340,17 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
(strcmp (synctest10, "3131331111") == 0 ) ||
(strcmp (synctest10, "3331331111") == 0 ) )
{
state->carrier = 1;
state->offset = synctest_pos;
state->max = ((state->max) + lmax) / 2;
state->min = ((state->min) + lmin) / 2;
if (state->lastsynctype == 28)
{
if (opts->payload == 1) fprintf (stderr, "\n FSW ");
if (opts->payload == 1) fprintf (stderr, " %s ", synctest10);
if (opts->payload == 1) fprintf (stderr, " maxlvl %d ", state->max / 164); //see if we can get max to meet threshold first?
if (opts->payload == 1) fprintf (stderr, " minlvl %d ", state->min);
// if (opts->payload == 1) fprintf (stderr, "\n FSW ");
// if (opts->payload == 1) fprintf (stderr, " %s ", synctest10);
// if (opts->payload == 1) fprintf (stderr, " maxlvl %d ", state->max / 164); //see if we can get max to meet threshold first?
// if (opts->payload == 1) fprintf (stderr, " minlvl %d ", state->min);
if (state->max < 5000)
return (28);
}
@@ -1362,16 +1364,17 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
(strcmp (synctest10, "1313113333") == 0 ) ||
(strcmp (synctest10, "1113113333") == 0 ) )
{
state->carrier = 1;
state->offset = synctest_pos;
state->max = ((state->max) + lmax) / 2;
state->min = ((state->min) + lmin) / 2;
if (state->lastsynctype == 29)
{
if (opts->payload == 1) fprintf (stderr, "\n FSW ");
if (opts->payload == 1) fprintf (stderr, " %s ", synctest10);
if (opts->payload == 1) fprintf (stderr, " maxlvl %d ", state->max / 164);
if (opts->payload == 1) fprintf (stderr, " minlvl %d ", state->min);
// if (opts->payload == 1) fprintf (stderr, "\n FSW ");
// if (opts->payload == 1) fprintf (stderr, " %s ", synctest10);
// if (opts->payload == 1) fprintf (stderr, " maxlvl %d ", state->max / 164);
// if (opts->payload == 1) fprintf (stderr, " minlvl %d ", state->min);
if (state->max < 5000)
return (29);
}

2
src/dsd_main.c
View File

@@ -52,7 +52,7 @@ char * FM_banner[9] = {
" ██║ ██║ ╚═══██╗██║ ██║   ██╔══╝ ██║╚██╔╝██║██╔══╝ ",
" ██████╔╝██████╔╝██████╔╝   ██║ ██║ ╚═╝ ██║███████╗",
" ╚═════╝ ╚═════╝ ╚═════╝    ╚═╝ ╚═╝ ╚═╝╚══════╝",
" 'Aero' Edition v2.0.0-94-gd1e1572 Windows 32-bit "
" 'Aero' Edition v2.0.0-95-g8485be9 Windows 32-bit "
};
int comp (const void *a, const void *b)

4
src/dsd_ncurses.c
View File

@@ -2073,7 +2073,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.0-94-gd1e1572 Win32");
printw ("| Digital Speech Decoder: Florida Man Edition - Aero %s \n", "v2.0.0-95-g8485be9 Win32");
}
if (opts->ncurses_compact == 0)
{
@@ -2085,7 +2085,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
if (i == 2) printw (" 'q' to Quit ");
if (i == 4) printw (" MBElib %s", versionstr);
if (i == 5) printw (" %s ", "Aero Win32"); //printw (" %s \n", GIT_TAG);
if (i == 6) printw (" %s \n", "v2.0.0-94-gd1e1572"); //printw (" %s \n", GIT_TAG);
if (i == 6) printw (" %s \n", "v2.0.0-95-g8485be9"); //printw (" %s \n", GIT_TAG);
else printw ("\n");
}
attroff(COLOR_PAIR(6)); //6