ua1zbe
/
dsd-fme
mirror of https://github.com/lwvmobile/dsd-fme.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DMR Con+ Output Tweaks; Complier Warning Fix;

This commit is contained in:
lwvmobile 2024-04-09 21:39:13 -04:00
parent 3fbff95b2b
commit de91defc20
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/dmr_csbk.c
View File

@ -1677,7 +1677,13 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8
sprintf(state->dmr_branding_sub, "Con+ "); sprintf(state->dmr_branding_sub, "Con+ ");
//add active channel string for display //add active channel string for display
sprintf (state->active_channel[tslot], "Active VCh: %d TG: %d; ", lcn, grpAddr); if (opt == 2)
sprintf (state->active_channel[tslot], "Active Group Ch: %d TG: %d; ", lcn, grpAddr);
else if (opt == 3)
sprintf (state->active_channel[tslot], "Active Private Ch: %d TG: %d; ", lcn, grpAddr);
else //generic channel of unknown type
sprintf (state->active_channel[tslot], "Active OPT %02X Ch: %d TG: %d; ", opt, lcn, grpAddr);
state->last_active_time = time(NULL); state->last_active_time = time(NULL);
//Skip tuning group calls if group calls are disabled //Skip tuning group calls if group calls are disabled
@ -1796,7 +1802,7 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8
if (opts->trunk_tune_data_calls == 0) goto SKIPCOND; if (opts->trunk_tune_data_calls == 0) goto SKIPCOND;
//add active channel string for display //add active channel string for display
sprintf (state->active_channel[tslot], "Active DCh: %d TG: %d; ", lcn, dtarget); sprintf (state->active_channel[tslot], "Active Data Ch: %d TG: %d; ", lcn, dtarget);
state->last_active_time = time(NULL); state->last_active_time = time(NULL);
//NOTE: Only set CC Frequency from SLC since it will tell us //NOTE: Only set CC Frequency from SLC since it will tell us

2
src/dsd_ncurses.c
View File

@ -2495,7 +2495,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
if (opts->use_lpf == 1) printw ("F: |LP|"); else printw ("F: | |"); if (opts->use_lpf == 1) printw ("F: |LP|"); else printw ("F: | |");
if (opts->use_hpf == 1) printw ("HP|"); else printw (" |"); if (opts->use_hpf == 1) printw ("HP|"); else printw (" |");
if (opts->use_pbf == 1) printw ("PB|"); else printw (" |"); if (opts->use_pbf == 1) printw ("PB|"); else printw (" |");
if (opts->audio_in_type != 3 && state->m17_vox == 1) printw ( " SQL: %04d : %04d;", opts->rtl_rms, opts->rtl_squelch_level); if (opts->audio_in_type != 3 && state->m17_vox == 1) printw ( " SQL: %04ld : %04d;", opts->rtl_rms, opts->rtl_squelch_level);
printw ("\n"); printw ("\n");
} }