ncurses tweak take 2

ncurses tweak take 2
This commit is contained in:
lwvmobile 2022-04-08 20:38:32 -04:00 committed by GitHub
parent 4ad5a8f9dd
commit 2c842f5115
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions

View File

@ -446,7 +446,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
//attron(COLOR_PAIR(3));
printw ("| DCC: [%2i] FID: [%02X] SOP: [%02X] ", dcc, state->dmr_fid, state->dmr_so);
//if(state->payload_mi == 0 && state->dmr_so & 0x40)
if(state->payload_mi == 0 && state->dmr_so == 0x40)
if(state->payload_mi == 0 && (state->dmr_so & 0xCF) == 0x40) //4F or CF mask?
{
attron(COLOR_PAIR(5));
printw ("**BP** ");
@ -455,7 +455,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
attron(COLOR_PAIR(3));
}
//if(state->payload_keyid > 0 && state->dmr_so & 0x40)
if(state->payload_keyid > 0 && state->dmr_so == 0x40)
if(state->payload_keyid > 0 && (state->dmr_so & 0xCF) == 0x40)
{
attron(COLOR_PAIR(5));
printw (" ALG: [0x%02X] KEY [0x%02X] MI [0x%08X]", state->payload_algid, state->payload_keyid, state->payload_mi);
@ -464,7 +464,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
attron(COLOR_PAIR(3));
}
//if(state->K > 0 && state->payload_keyid == 0 && state->dmr_so & 0x40)
if(state->K > 0 && state->dmr_so == 0x40)
if(state->K > 0 && (state->dmr_so & 0xCF) == 0x40)
{
attron(COLOR_PAIR(5));
printw ("BPK [%3lld]", state->K);