mirror of
https://github.com/lwvmobile/dsd-fme.git
synced 2026-11-19 20:27:26 -05:00
M17 - Fix Cygwin M17 FrameSync Woes; (Initialize Synctest);
This commit is contained in:
@@ -184,10 +184,8 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
|
|||||||
char synctest[25];
|
char synctest[25];
|
||||||
char synctest12[13]; //dPMR
|
char synctest12[13]; //dPMR
|
||||||
char synctest10[11]; //NXDN FSW only
|
char synctest10[11]; //NXDN FSW only
|
||||||
char synctest18[19];
|
|
||||||
char synctest32[33];
|
char synctest32[33];
|
||||||
char synctest20[21]; //YSF
|
char synctest20[21]; //YSF
|
||||||
char synctest21[22]; //P25 S-OEMI (SACCH)
|
|
||||||
char synctest48[49]; //EDACS
|
char synctest48[49]; //EDACS
|
||||||
char synctest8[9]; //M17
|
char synctest8[9]; //M17
|
||||||
char synctest16[17]; //M17 Preamble
|
char synctest16[17]; //M17 Preamble
|
||||||
@@ -195,8 +193,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
|
|||||||
char *synctest_p;
|
char *synctest_p;
|
||||||
char synctest_buf[10240]; //what actually is assigned to this, can't find its use anywhere?
|
char synctest_buf[10240]; //what actually is assigned to this, can't find its use anywhere?
|
||||||
int lmin, lmax, lidx;
|
int lmin, lmax, lidx;
|
||||||
UNUSED2(synctest18, synctest21);
|
|
||||||
|
|
||||||
//assign t_max value based on decoding type expected (all non-auto decodes first)
|
//assign t_max value based on decoding type expected (all non-auto decodes first)
|
||||||
int t_max; //maximum values allowed for t will depend on decoding type - NXDN will be 10, others will be more
|
int t_max; //maximum values allowed for t will depend on decoding type - NXDN will be 10, others will be more
|
||||||
if (opts->frame_nxdn48 == 1 || opts->frame_nxdn96 == 1)
|
if (opts->frame_nxdn48 == 1 || opts->frame_nxdn96 == 1)
|
||||||
@@ -233,11 +230,13 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
|
|||||||
t = 0;
|
t = 0;
|
||||||
synctest10[10] = 0;
|
synctest10[10] = 0;
|
||||||
synctest[24] = 0;
|
synctest[24] = 0;
|
||||||
|
synctest8[8] = 0; //M17, wasn't initialized or terminated (source of much pain and frustration in Cygwin)
|
||||||
synctest12[12] = 0;
|
synctest12[12] = 0;
|
||||||
synctest18[18] = 0;
|
synctest16[16] = 0; //M17, wasn't initialized or terminated (source of much pain and frustration in Cygwin)
|
||||||
synctest48[48] = 0;
|
synctest48[48] = 0;
|
||||||
synctest32[32] = 0;
|
synctest32[32] = 0;
|
||||||
synctest20[20] = 0;
|
synctest20[20] = 0;
|
||||||
|
modulation[7] = 0; //not initialized or terminated (unsure if this would be an issue or not)
|
||||||
synctest_pos = 0;
|
synctest_pos = 0;
|
||||||
synctest_p = synctest_buf + 10;
|
synctest_p = synctest_buf + 10;
|
||||||
sync = 0;
|
sync = 0;
|
||||||
|
|||||||
@@ -107,11 +107,11 @@ void
|
|||||||
noCarrier (dsd_opts * opts, dsd_state * state)
|
noCarrier (dsd_opts * opts, dsd_state * state)
|
||||||
{
|
{
|
||||||
|
|
||||||
#ifdef AERO_BUILD
|
// #ifdef AERO_BUILD //NOTE: Blame seems to be synctest8 not being initialized (will continue to test)
|
||||||
//TODO: Investigate why getSymbol needs to be run first in this context...truly confused here
|
// //TODO: Investigate why getSymbol needs to be run first in this context...truly confused here
|
||||||
if(opts->frame_m17 == 1) //&& opts->audio_in_type == 5
|
// if(opts->frame_m17 == 1) //&& opts->audio_in_type == 5
|
||||||
for (int i = 0; i < 960; i++) getSymbol(opts, state, 1); //I think this is actually just framesync being a pain
|
// for (int i = 0; i < 960; i++) getSymbol(opts, state, 1); //I think this is actually just framesync being a pain
|
||||||
#endif
|
// #endif
|
||||||
|
|
||||||
if (opts->floating_point == 1)
|
if (opts->floating_point == 1)
|
||||||
{
|
{
|
||||||
@@ -1446,11 +1446,11 @@ if (opts->audio_out_type == 0)
|
|||||||
openPulseOutput(opts);
|
openPulseOutput(opts);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef AERO_BUILD
|
// #ifdef AERO_BUILD //NOTE: Blame seems to be synctest8 not being initialized (will continue to test)
|
||||||
//TODO: More Random Cygwin Related M17 Bugs to sort out
|
// //TODO: More Random Cygwin Related M17 Bugs to sort out
|
||||||
if(opts->frame_m17 == 1 && opts->audio_in_type != 0)
|
// if(opts->frame_m17 == 1)
|
||||||
for (int i = 0; i < 960; i++) getSymbol(opts, state, 1); //I think this is actually just framesync being a pain
|
// for (int i = 0; i < 960; i++) getSymbol(opts, state, 1); //I think this is actually just framesync being a pain
|
||||||
#endif
|
// #endif
|
||||||
|
|
||||||
while (!exitflag)
|
while (!exitflag)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user