GitHub/dsd-fme
1
0
Fork 0
mirror of https://github.com/lwvmobile/dsd-fme.git synced 2026-11-15 02:07:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

NXDN Tweaks to clear stale key values on keyload;

Browse Source
This commit is contained in:
lwvmobile
2023-04-29 17:02:55 -04:00
parent 91181f9e93
commit 00e0f00974
5 changed files with 20 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/dsd_main.c
View File

@@ -52,7 +52,7 @@ char * FM_banner[9] = {
" ██║ ██║ ╚═══██╗██║ ██║   ██╔══╝ ██║╚██╔╝██║██╔══╝ ",
" ██████╔╝██████╔╝██████╔╝   ██║ ██║ ╚═╝ ██║███████╗",
" ╚═════╝ ╚═════╝ ╚═════╝    ╚═╝ ╚═╝ ╚═╝╚══════╝",
" 'Aero' Edition v2.0.0-84-gacd2b0b Windows 32-bit "
" 'Aero' Edition v2.0.0-86-gfef36e3 Windows 32-bit "
};
int comp (const void *a, const void *b)
@@ -77,36 +77,6 @@ void
noCarrier (dsd_opts * opts, dsd_state * state)
{
// // experimental conventional frequency scanner mode
// if (opts->scanner_mode == 1)
// {
// if (state->lcn_freq_roll > state->lcn_freq_count) //with >= we were cutting one short
// {
// state->lcn_freq_roll = 0; //reset to zero
// }
// //check that we have a non zero value first, then tune next frequency
// if (state->trunk_lcn_freq[state->lcn_freq_roll] != 0)
// {
// //rigctl
// if (opts->use_rigctl == 1)
// {
// if (opts->setmod_bw != 0 ) SetModulation(opts->rigctl_sockfd, opts->setmod_bw);
// SetFreq(opts->rigctl_sockfd, state->trunk_lcn_freq[state->lcn_freq_roll]);
// }
// //rtludp
// if (opts->audio_in_type == 3)
// {
// rtl_udp_tune (opts, state, state->trunk_lcn_freq[state->lcn_freq_roll]);
// }
// if (state->lastsynctype != -1) fprintf (stderr, "Resume Scanning Mode\n");
// }
// state->lcn_freq_roll++;
// }
// //end experimental conventional frequency scanner mode
//experimental conventional frequency scanner mode
if (opts->scanner_mode == 1 && ( (time(NULL) - state->last_cc_sync_time) > opts->trunk_hangtime))
{
@@ -360,6 +330,18 @@ noCarrier (dsd_opts * opts, dsd_state * state)
memset (state->nxdn_alias_block_segment, 0, sizeof(state->nxdn_alias_block_segment));
sprintf (state->nxdn_call_type, "%s", "");
//unload keys when using keylaoder
if (state->keyloader == 1)
{
state->R = 0; //NXDN
state->K = 0; //BP
state->K1 = 0; //tera 10 char BP
state->H = 0; //shim for above
}
//forcing key application will re-enable this at the time of voice tx
state->nxdn_cipher_type = 0;
//dmr overaching manufacturer in use for a particular system or radio
// state->dmr_mfid = -1;