mirror of
https://github.com/lwvmobile/dsd-fme.git
synced 2026-11-20 12:45:40 -05:00
NXDN - Zero TG/RID on TX_REL; Misc;
This commit is contained in:
@@ -2255,9 +2255,9 @@ main (int argc, char **argv)
|
|||||||
opts.frame_provoice = 0;
|
opts.frame_provoice = 0;
|
||||||
opts.frame_ysf = 0;
|
opts.frame_ysf = 0;
|
||||||
opts.frame_m17 = 0;
|
opts.frame_m17 = 0;
|
||||||
opts.mod_c4fm = 0;
|
opts.mod_c4fm = 1;
|
||||||
opts.mod_qpsk = 0;
|
opts.mod_qpsk = 0;
|
||||||
opts.mod_gfsk = 1;
|
opts.mod_gfsk = 0;
|
||||||
state.rf_mod = 0;
|
state.rf_mod = 0;
|
||||||
opts.pulse_digi_rate_out = 8000;
|
opts.pulse_digi_rate_out = 8000;
|
||||||
opts.pulse_digi_out_channels = 1;
|
opts.pulse_digi_out_channels = 1;
|
||||||
|
|||||||
@@ -1546,9 +1546,9 @@ void ncursesMenu (dsd_opts * opts, dsd_state * state)
|
|||||||
opts->frame_provoice = 0;
|
opts->frame_provoice = 0;
|
||||||
opts->frame_ysf = 0;
|
opts->frame_ysf = 0;
|
||||||
opts->frame_m17 = 0;
|
opts->frame_m17 = 0;
|
||||||
opts->mod_c4fm = 0;
|
opts->mod_c4fm = 1;
|
||||||
opts->mod_qpsk = 0;
|
opts->mod_qpsk = 0;
|
||||||
opts->mod_gfsk = 1;
|
opts->mod_gfsk = 0;
|
||||||
state->rf_mod = 0;
|
state->rf_mod = 0;
|
||||||
//opts->unmute_encrypted_p25 = 0;
|
//opts->unmute_encrypted_p25 = 0;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -386,7 +386,7 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
|
|||||||
{
|
{
|
||||||
//sample = dmr_filter(sample); //work on filter later
|
//sample = dmr_filter(sample); //work on filter later
|
||||||
}
|
}
|
||||||
else if (opts->frame_nxdn96 == 0) //disable NXDN96 filter, allow internal RTL or SDR++ Low Pass Filter instead
|
else
|
||||||
{
|
{
|
||||||
sample = dmr_filter(sample);
|
sample = dmr_filter(sample);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1269,6 +1269,13 @@ void NXDN_decode_VCALL(dsd_opts * opts, dsd_state * state, uint8_t * Message)
|
|||||||
state->nxdn_key = KeyID;
|
state->nxdn_key = KeyID;
|
||||||
state->nxdn_cipher_type = CipherType;
|
state->nxdn_cipher_type = CipherType;
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
state->nxdn_last_rid = 0;
|
||||||
|
state->nxdn_last_tg = 0;
|
||||||
|
sprintf (state->str50a, "%s", "");
|
||||||
|
memset (state->nxdn_alias_block_segment, 0, sizeof(state->nxdn_alias_block_segment));
|
||||||
|
}
|
||||||
|
|
||||||
//set enc bit here so we can tell playSynthesizedVoice whether or not to play enc traffic
|
//set enc bit here so we can tell playSynthesizedVoice whether or not to play enc traffic
|
||||||
if (state->nxdn_cipher_type != 0)
|
if (state->nxdn_cipher_type != 0)
|
||||||
|
|||||||
Reference in New Issue
Block a user