mirror of
https://github.com/lwvmobile/dsd-fme.git
synced 2026-11-21 05:05:38 -05:00
EDACS - Misc Tweaks;
This commit is contained in:
@@ -3437,7 +3437,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
|
|||||||
{
|
{
|
||||||
attron (COLOR_PAIR(3));
|
attron (COLOR_PAIR(3));
|
||||||
if (state->ea_mode == 1) printw (" TG [%5lld] SRC [%8lld]", call_matrix[i][2], call_matrix[i][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++)
|
for (int k = 0; k < state->group_tally; k++)
|
||||||
{
|
{
|
||||||
if (state->group_array[k].groupNumber == call_matrix[i][2] && call_matrix[i][2] != 0)
|
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));
|
attron (COLOR_PAIR(2));
|
||||||
if (state->ea_mode == 1) printw (" TG [%5lld] SRC [%8lld]", call_matrix[i][2], call_matrix[i][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++)
|
for (int k = 0; k < state->group_tally; k++)
|
||||||
{
|
{
|
||||||
if (state->group_array[k].groupNumber == call_matrix[i][2] && call_matrix[i][2] != 0)
|
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 a = (call_matrix[j][3] >> 7) & 0xF;
|
||||||
int fs = call_matrix[j][3] & 0x7F;
|
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
|
//test
|
||||||
for (int k = 0; k < state->group_tally; k++)
|
for (int k = 0; k < state->group_tally; k++)
|
||||||
|
|||||||
@@ -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);
|
fprintf (stderr, " Analog RMS: %04ld SQL: %ld", rms, sql);
|
||||||
if (afs != 0)
|
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
|
//debug, view hit counter
|
||||||
// fprintf (stderr, " CNT: %d; ", count);
|
// fprintf (stderr, " CNT: %d; ", count);
|
||||||
@@ -618,7 +618,7 @@ void edacs(dsd_opts * opts, dsd_state * state)
|
|||||||
UNUSED(status);
|
UNUSED(status);
|
||||||
if (afs > 0) state->lastsrc = afs;
|
if (afs > 0) state->lastsrc = afs;
|
||||||
fprintf (stderr, "%s", KGRN);
|
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
|
char mode[8]; //allow, block, digital enc
|
||||||
sprintf (mode, "%s", "");
|
sprintf (mode, "%s", "");
|
||||||
@@ -671,7 +671,7 @@ void edacs(dsd_opts * opts, dsd_state * state)
|
|||||||
//openwav file and do per call right here
|
//openwav file and do per call right here
|
||||||
if (opts->dmr_stereo_wav == 1 && (opts->use_rigctl == 1 || opts->audio_in_type == 3))
|
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 == 0xEF) openWavOutFile (opts, state); //digital
|
||||||
if (command == 0xEE) openWavOutFile48k (opts, state); //analog at 48k
|
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
|
} //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:
|
ENDPV:
|
||||||
|
|||||||
Reference in New Issue
Block a user