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

EDACS - Misc Tweaks;

This commit is contained in:
lwvmobile 2023-11-17 17:26:43 -05:00
parent e6da485117
commit fc6b35c7f5
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dsd_ncurses.c
View File

@ -3437,7 +3437,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
{
attron (COLOR_PAIR(3));
if (state->ea_mode == 1) printw (" TG [%5lld] SRC [%8lld]", call_matrix[i][2], call_matrix[i][3] );
else printw (" AFS [%lld][%02d-%03d]", call_matrix[i][3], a, fs );
else printw (" AFS [%03lld][%02d-%03d]", call_matrix[i][3], a, fs );
for (int k = 0; k < state->group_tally; k++)
{
if (state->group_array[k].groupNumber == call_matrix[i][2] && call_matrix[i][2] != 0)
@ -3460,7 +3460,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
{
attron (COLOR_PAIR(2));
if (state->ea_mode == 1) printw (" TG [%5lld] SRC [%8lld]", call_matrix[i][2], call_matrix[i][3] );
else printw (" AFS [%lld][%02d-%03d]", call_matrix[i][3], a, fs );
else printw (" AFS [%03lld][%02d-%03d]", call_matrix[i][3], a, fs );
for (int k = 0; k < state->group_tally; k++)
{
if (state->group_array[k].groupNumber == call_matrix[i][2] && call_matrix[i][2] != 0)
@ -3590,7 +3590,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
{
int a = (call_matrix[j][3] >> 7) & 0xF;
int fs = call_matrix[j][3] & 0x7F;
printw (" AFS [%lld][%02d-%03d]", call_matrix[j][3], a, fs );
printw (" AFS [%03lld][%02d-%03d]", call_matrix[j][3], a, fs );
}
//test
for (int k = 0; k < state->group_tally; k++)

9
src/edacs-fme.c
View File

@ -226,7 +226,7 @@ void edacs_analog(dsd_opts * opts, dsd_state * state, int afs, unsigned char lcn
fprintf (stderr, " Analog RMS: %04ld SQL: %ld", rms, sql);
if (afs != 0)
fprintf (stderr, " AFS [%d] [%02d-%03d] LCN [%02d]", afs, afs >> 7, afs & 0x7F, lcn);
fprintf (stderr, " AFS [%03d] [%02d-%03d] LCN [%02d]", afs, afs >> 7, afs & 0x7F, lcn);
//debug, view hit counter
// fprintf (stderr, " CNT: %d; ", count);
@ -618,7 +618,7 @@ void edacs(dsd_opts * opts, dsd_state * state)
UNUSED(status);
if (afs > 0) state->lastsrc = afs;
fprintf (stderr, "%s", KGRN);
fprintf (stderr, " AFS [%d] [%02d-%03d] LCN [%02d]", afs, a, fs, lcn);
fprintf (stderr, " AFS [%03d] [%02d-%03d] LCN [%02d]", afs, a, fs, lcn);
char mode[8]; //allow, block, digital enc
sprintf (mode, "%s", "");
@ -671,7 +671,7 @@ void edacs(dsd_opts * opts, dsd_state * state)
//openwav file and do per call right here
if (opts->dmr_stereo_wav == 1 && (opts->use_rigctl == 1 || opts->audio_in_type == 3))
{
sprintf (opts->wav_out_file, "./WAV/%s %s EDACS Site %lld AFS %02d-%03d - %d.wav", getDateE(), getTimeE(), state->edacs_site_id, a, fs, afs);
sprintf (opts->wav_out_file, "./WAV/%s %s EDACS Site %lld AFS %02d-%03d - %03d.wav", getDateE(), getTimeE(), state->edacs_site_id, a, fs, afs);
if (command == 0xEF) openWavOutFile (opts, state); //digital
if (command == 0xEE) openWavOutFile48k (opts, state); //analog at 48k
}
@ -716,6 +716,9 @@ void edacs(dsd_opts * opts, dsd_state * state)
} //end Standard or Networked
//supply user warning to use -9 switch if decoding doesn't start shortly
else fprintf (stderr, " Net/EA Auto Detect; Use -9 CLI Switch For Standard;");
}
ENDPV: