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

Merge pull request #248 from ilyacodes/afs 

EDACS: fix AFS 4:4:3 display
This commit is contained in:
lwvmobile 2024-04-06 19:52:36 -04:00 committed by GitHub
parent cee797017b 20989c31c8
commit 3483c736ba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/dsd_ncurses.c
View File

@ -3544,8 +3544,9 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
for (i = 1; i <= state->edacs_lcn_count; i++) for (i = 1; i <= state->edacs_lcn_count; i++)
{ {
// Compute 4:4:3 AFS for display purposes only // Compute 4:4:3 AFS for display purposes only
int a = (call_matrix[i][2] >> 7) & 0xF; int a = (call_matrix[i][2] >> 7) & 0xF;
int fs = call_matrix[i][2] & 0x7F; int f = (call_matrix[i][2] >> 3) & 0xF;
int s = call_matrix[i][2] & 0x7;
printw ("| - LCN [%02d][%010.06lf] MHz", i, (double)state->trunk_lcn_freq[i-1]/1000000); printw ("| - LCN [%02d][%010.06lf] MHz", i, (double)state->trunk_lcn_freq[i-1]/1000000);
//print Control Channel on LCN line with the current Control Channel //print Control Channel on LCN line with the current Control Channel
@ -3608,7 +3609,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
{ {
// Group call // Group call
if ((call_matrix[i][4] & EDACS_IS_GROUP) != 0) if ((call_matrix[i][4] & EDACS_IS_GROUP) != 0)
printw (" TGT [%6lld][%02d-%03d] SRC [%5lld]", call_matrix[i][2], a, fs, call_matrix[i][3] ); printw (" TGT [%6lld][%02d-%02d%01d] SRC [%5lld]", call_matrix[i][2], a, f, s, call_matrix[i][3] );
// I-Call // I-Call
else if ((call_matrix[i][4] & EDACS_IS_INDIVIDUAL) != 0) else if ((call_matrix[i][4] & EDACS_IS_INDIVIDUAL) != 0)
printw (" TGT [%6lld][ UNIT ] SRC [%5lld] I-Call", call_matrix[i][2], call_matrix[i][3] ); printw (" TGT [%6lld][ UNIT ] SRC [%5lld] I-Call", call_matrix[i][2], call_matrix[i][3] );
@ -3792,12 +3793,13 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
if ((call_matrix[j][4] & EDACS_IS_VOICE) != 0) if ((call_matrix[j][4] & EDACS_IS_VOICE) != 0)
{ {
// Compute 4:4:3 AFS for display purposes only // Compute 4:4:3 AFS for display purposes only
int a = (call_matrix[j][2] >> 7) & 0xF; int a = (call_matrix[j][2] >> 7) & 0xF;
int fs = call_matrix[j][2] & 0x7F; int f = (call_matrix[j][2] >> 3) & 0xF;
int s = call_matrix[j][2] & 0x7;
// Group call // Group call
if ((call_matrix[j][4] & EDACS_IS_GROUP) != 0) if ((call_matrix[j][4] & EDACS_IS_GROUP) != 0)
printw ("Target [%6lld][%02d-%03d] Source [%5lld]", call_matrix[j][2], a, fs, call_matrix[j][3]); printw ("Target [%6lld][%02d-%02d%01d] Source [%5lld]", call_matrix[j][2], a, f, s, call_matrix[j][3]);
// I-Call // I-Call
else if ((call_matrix[j][4] & EDACS_IS_INDIVIDUAL) != 0) else if ((call_matrix[j][4] & EDACS_IS_INDIVIDUAL) != 0)
printw ("Target [%6lld][ UNIT ] Source [%5lld] I-Call", call_matrix[j][2], call_matrix[j][3]); printw ("Target [%6lld][ UNIT ] Source [%5lld] I-Call", call_matrix[j][2], call_matrix[j][3]);

5
src/edacs-fme.c
View File

@ -349,7 +349,10 @@ 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 (state->ea_mode == 0) if (state->ea_mode == 0)
{ {
fprintf (stderr, " AFS [%03d] [%02d-%03d] LCN [%02d]", afs, afs >> 7, afs & 0x7F, lcn); int a = (afs >> 7) & 0xF;
int f = (afs >> 3) & 0xF;
int s = afs & 0x7;
fprintf (stderr, " AFS [%03d] [%02d-%02d%01d] LCN [%02d]", afs, a, f, s, lcn);
} }
else else
{ {