ua1zbe
/
dsd-fme_18_05_2023
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NXDN Frame Sync Tests and Cmake Option #123

This commit is contained in:
lwvmobile 2023-05-05 06:14:56 -04:00
parent 815fbb026f
commit 95e74c8e28
4 changed files with 170 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -19,6 +19,20 @@ if (COLORS)
add_definitions(-DPRETTY_COLORS)
endif ()
#use cmake option -DNXDN=ON to enable new NXDN Sync Pattern Testing
option(NXDN
"Build with new NXDN Sync Pattern Testing Enabled" OFF)
if (NXDN)
add_definitions(-DNXDNTESTSYNC)
endif ()
#use cmake option -DLZ=ON to enable LimaZulu Requested NXDN Tweaks
option(LZ
"Build with new LimaZulu Requested NXDN Tweaks Enabled" OFF)
if (NXDN)
add_definitions(-DLIMAZULUTWEAKS)
endif ()
include(git_revision)
git_describe(GIT_TAG)

128
src/dsd_frame_sync.c
View File

@ -1276,7 +1276,113 @@ 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)
//Theory is that pure noise is always much louder than an organized signal
//The state->max inlvl will hinge on the user setting an appropriate gain level
//so, this may not entirely be ideal, loud system may still not decode properly
//currently set to invlv 5000 or ~31% or less audio in level when dividing by 164
//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
else if ((opts->frame_nxdn96 == 1) || (opts->frame_nxdn48 == 1))
{
strncpy (synctest10, (synctest_p - 9), 10); //FSW only
strncpy (synctest19, (synctest_p - 18), 19); //Preamble + FSW
//Using Hard Coded Sync Strings with variations for the areas where the symbol
//error will occur due to the demodulation issues internally
//Preamble plus FSW, proceed right away
if ( (strcmp (synctest19, "3131133313131331131") == 0 ) ||
(strcmp (synctest19, "3131133313331331131") == 0 ) ||
(strcmp (synctest19, "3131133313131331111") == 0 ) ||
(strcmp (synctest19, "3131133313331331111") == 0 ) )
{
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 (state->max < 5000)
return (28);
}
else if ( (strcmp (synctest19, "1313311133131331131") == 0 ) ||
(strcmp (synctest19, "1313311133331331131") == 0 ) ||
(strcmp (synctest19, "1313311133131331111") == 0 ) ||
(strcmp (synctest19, "1313311133331331111") == 0 ) )
{
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 (state->max < 5000)
return (29);
}
else if ( (strcmp (synctest10, "3131331131") == 0 ) ||
(strcmp (synctest10, "3331331131") == 0 ) ||
(strcmp (synctest10, "3131331111") == 0 ) ||
(strcmp (synctest10, "3331331111") == 0 ) )
{
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 (state->max < 5000)
return (28);
}
if (state->max < 5000)
state->lastsynctype = 28;
}
else if ( (strcmp (synctest10, "1313113313") == 0 ) ||
(strcmp (synctest10, "1113113313") == 0 ) ||
(strcmp (synctest10, "1313113333") == 0 ) ||
(strcmp (synctest10, "1113113333") == 0 ) )
{
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 (state->max < 5000)
return (29);
}
if (state->max < 5000)
state->lastsynctype = 29;
}
}
#else //use current 'more stable' NXDN Sync pattern detection
//NXDN FSW sync and handling - moved to very bottom of sync stack for falsing sanity
else if ((opts->frame_nxdn96 == 1) || (opts->frame_nxdn48 == 1))
{
@ -1286,30 +1392,33 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
//Preamble plus FSW, proceed right away
if ( (strncmperr (synctest19, NXDN_PANDFSW, 19, 1) == 0) )
{
state->carrier = 1;
// state->carrier = 1;
state->offset = synctest_pos;
state->max = ((state->max) + lmax) / 2;
state->min = ((state->min) + lmin) / 2;
state->lastsynctype = 28;
state->last_cc_sync_time = time(NULL);
//if (opts->payload == 1) fprintf (stderr, "PANDF ");
// if (opts->payload == 1) fprintf (stderr, "PANDF ");
// fprintf (stderr, " %s ", synctest19);
return (28);
}
else if ( (strncmperr (synctest19, INV_NXDN_PANDFSW, 19, 1) == 0) )
{
state->carrier = 1;
// state->carrier = 1;
state->offset = synctest_pos;
state->max = ((state->max) + lmax) / 2;
state->min = ((state->min) + lmin) / 2;
state->lastsynctype = 29;
state->last_cc_sync_time = time(NULL);
//if (opts->payload == 1) fprintf (stderr, "PANDF ");
// if (opts->payload == 1) fprintf (stderr, "PANDF ");
// fprintf (stderr, " %s ", synctest19);
return (29);
}
else if ( (strncmperr (synctest10, NXDN_FSW, 10, 1) == 0) )
{
state->carrier = 1;
// state->carrier = 1;
state->offset = synctest_pos;
state->max = ((state->max) + lmax) / 2;
state->min = ((state->min) + lmin) / 2;
@ -1317,7 +1426,8 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
if (state->lastsynctype == 28)
{
state->last_cc_sync_time = time(NULL);
//if (opts->payload == 1) fprintf (stderr, "FSW ");
// if (opts->payload == 1) fprintf (stderr, "FSW ");
// fprintf (stderr, " %s ", synctest10);
return (28);
}
state->lastsynctype = 28; //need two consecutive patterns to continue
@ -1326,7 +1436,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
else if ( (strncmperr (synctest10, INV_NXDN_FSW, 10, 1) == 0) )
{
state->carrier = 1;
// state->carrier = 1;
state->offset = synctest_pos;
state->max = ((state->max) + lmax) / 2;
state->min = ((state->min) + lmin) / 2;
@ -1334,7 +1444,8 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
if (state->lastsynctype == 29)
{
state->last_cc_sync_time = time(NULL);
//if (opts->payload == 1) fprintf (stderr, "FSW ");
// if (opts->payload == 1) fprintf (stderr, "FSW ");
// fprintf (stderr, " %s ", synctest10);
return (29);
}
state->lastsynctype = 29; //need two consecutive patterns to continue
@ -1342,6 +1453,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
}
}
#endif //NXDN Sync Type Selection
} // t >= 10
if (exitflag == 1)

31
src/nxdn_element.c
View File

@ -1114,6 +1114,37 @@ void NXDN_decode_VCALL(dsd_opts * opts, dsd_state * state, uint8_t * Message)
if (state->rkey_array[KeyID] != 0) state->R = state->rkey_array[KeyID];
else if (state->rkey_array[DestinationID] != 0) state->R = state->rkey_array[DestinationID];
#ifdef LIMAZULUTWEAKS
//LimaZulu specific tweak, load keys from frequency value, if avalable -- untested
long int freq = 0;
uint8_t hash_bits[24];
memset (hash_bits, 0, sizeof(hash_bits));
uint16_t limazulu = 0;
//if not available, then poll rigctl if its available
if (opts->use_rigctl == 1)
freq = GetCurrentFreq (opts->rigctl_sockfd);
//if using rtl input, we can ask for the current frequency tuned
else if (opts->audio_in_type == 3)
freq = (long int)opts->rtlsdr_center_freq;
//since a frequency value will be larger than the 16-bit max, we need to hash it first
//the hash has to be run the same way as the import, so at a 24-bit depth, which hopefully
//will not lead to any duplicate key loads due to multiple CRC16 collisions on a larger value?
for (int i = 0; i < 24; i++)
hash_bits[i] = ((freq << i) & 0x800000) >> 23; //load into array for CRC16
if (freq) limazulu = ComputeCrcCCITT16d (hash_bits, 24);
limazulu = limazulu & 0xFFFF; //make sure no larger than 16-bits
if (state->rkey_array[limazulu] != 0)
state->R = state->rkey_array[limazulu];
#endif //end LIMAZULUTWEAKS
//Don't zero key if no keyloader
if (CipherType != 0x1 && state->keyloader == 1) state->R = 0;

5
src/nxdn_frame.c
View File

@ -97,6 +97,7 @@ void nxdn_frame (dsd_opts * opts, dsd_state * state)
lich = lich >> 1;
if (lich_parity_received != lich_parity_computed)
{
if (opts->payload == 1) fprintf(stderr, " Lich Parity Error %02X\n", lich);
state->lastsynctype = -1; //set to -1 so we don't jump back here too quickly
goto END;
}
@ -237,6 +238,10 @@ void nxdn_frame (dsd_opts * opts, dsd_state * state)
break;
} // end of switch(lich)
//enable these after good lich parity and known lich value
state->carrier = 1;
state->last_cc_sync_time = time(NULL);
//printframesync after determining we have a good lich and it has something in it
if (idas)
{