GitHub/dsd-fme
1
0
Fork 0
mirror of https://github.com/lwvmobile/dsd-fme.git synced 2026-11-12 16:57:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

NXDN -- Fix ENC LO; Tweaks/Misc; #121

Browse Source
This commit is contained in:
lwvmobile
2023-10-30 10:58:52 -04:00
parent fb1abfbd26
commit 584ca9e17a
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/dsd_main.c
View File

@@ -2249,16 +2249,16 @@ main (int argc, char **argv)
opts.frame_provoice = 0;
opts.frame_ysf = 0;
opts.frame_m17 = 0;
opts.mod_c4fm = 1;
opts.mod_c4fm = 0;
opts.mod_qpsk = 0;
opts.mod_gfsk = 0;
opts.mod_gfsk = 1;
state.rf_mod = 0;
opts.pulse_digi_rate_out = 8000;
opts.pulse_digi_out_channels = 1;
opts.dmr_stereo = 0;
opts.dmr_mono = 0;
state.dmr_stereo = 0;
// opts.setmod_bw = 7000; //causing issues
// opts.setmod_bw = 12000; //causing issues
sprintf (opts.output_name, "NXDN96");
fprintf (stderr,"Decoding only NXDN 9600 baud frames.\n");
}

4
src/dsd_ncurses.c
View File

@@ -1542,9 +1542,9 @@ void ncursesMenu (dsd_opts * opts, dsd_state * state)
opts->frame_provoice = 0;
opts->frame_ysf = 0;
opts->frame_m17 = 0;
opts->mod_c4fm = 1;
opts->mod_c4fm = 0;
opts->mod_qpsk = 0;
opts->mod_gfsk = 0;
opts->mod_gfsk = 1;
state->rf_mod = 0;
//opts->unmute_encrypted_p25 = 0;
}

12
src/nxdn_element.c
View File

@@ -505,11 +505,15 @@ void NXDN_decode_VCALL_ASSGN(dsd_opts * opts, dsd_state * state, uint8_t * Messa
}
}
//use DUP to display any other rolling active channels while on a call (from the dup message)
int dup = 0;
if (MessageType == 0x5) dup = 1;
//assign active call to string (might place inside of tune decision to get multiple ones?)
if (state->nxdn_rcn == 0)
sprintf (state->active_channel[0], "Active Ch: %d TG: %d; ", Channel, DestinationID);
sprintf (state->active_channel[dup], "Active Ch: %d TG: %d SRC: %d; ", Channel, DestinationID, SourceUnitID);
if (state->nxdn_rcn == 1)
sprintf (state->active_channel[0], "Active Ch: %d TG: %d; ", OFN, DestinationID);
sprintf (state->active_channel[dup], "Active Ch: %d TG: %d SRC: %d; ", OFN, DestinationID, SourceUnitID);
state->last_active_time = time(NULL);
@@ -1231,8 +1235,8 @@ void NXDN_decode_VCALL(dsd_opts * opts, dsd_state * state, uint8_t * Message)
state->dmr_encL = 0;
}
//experimental TG LO/B if ENC trunked following disabled //NXDN -- LO Trunked Enc Calls WIP; #121
if (opts->p25_trunk == 1 && opts->trunk_tune_enc_calls == 0 && MessageType == 0x1)
//TG ENC LO/B if ENC trunked following disabled #121 -- was locking out everything
if (opts->p25_trunk == 1 && opts->trunk_tune_enc_calls == 0 && MessageType == 0x1 && state->dmr_encL == 1)
{
int i, lo = 0;
uint16_t t = 0; char gm[8]; char gn[50];