Experimental -- Fast Scanner Feature;

This commit is contained in:
lwvmobile
2023-03-01 17:56:07 -05:00
parent 5b51adfc95
commit 477ca97830
3 changed files with 71 additions and 11 deletions

View File

@@ -2158,6 +2158,12 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
printw ("| Reverse Mute - Muting Unencrypted Voice\n");
}
if (opts->aggressive_framesync == 0) printw ("| Selective CRC ERR Bypass Enabled (RAS) \n");
if (state->M == 1) printw ("| Forcing Key Priority -- Key: %lld \n", state->R);
if (opts->scanner_mode == 1)
{
printw ("| Fast Scan Mode Enabled ");
printw (" - Frequency: [%.06lf] Mhz \n", (double)state->trunk_lcn_freq[state->lcn_freq_roll]/1000000);
}
printw ("------------------------------------------------------------------------------\n");
attroff(COLOR_PAIR(4));
@@ -2247,7 +2253,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
}
printw ("| ");
printw ("NXDN - RAN: [%2d] ", rn);
printw ("NXDN - RAN: [%02d] ", rn);
if (state->nxdn_location_site_code != 0)
{
printw ("Cat [%s] ", state->nxdn_location_category);
@@ -2257,8 +2263,8 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
printw ("\n");
printw ("| ");
printw ("TGT: [%4d] ", tgn);
printw ("SRC: [%4d] ", src);
printw ("TGT: [%05d] ", tgn);
printw ("SRC: [%05d] ", src);
if (state->nxdn_alias_block_segment[0][0] > 0)
{
printw ("ALIAS: [");
@@ -2296,7 +2302,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
}
if (state->nxdn_cipher_type == 0x2 && state->carrier == 1)
{
printw ("IV: [%016llX]", state->payload_miN);
printw ("IV: [%016llX] ", state->payload_miN);
attron(COLOR_PAIR(2));
printw ("DES-OFB ");
attroff(COLOR_PAIR(2));
@@ -2304,7 +2310,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
}
if (state->nxdn_cipher_type == 0x3 && state->carrier == 1)
{
printw ("IV: [%016llX]", state->payload_miN);
printw ("IV: [%016llX] ", state->payload_miN);
attron(COLOR_PAIR(2));
printw ("AES-256 ");
attroff(COLOR_PAIR(2));
@@ -2901,9 +2907,9 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
printw ("| %s ", SyncTypes[call_matrix[9-j][0]]);
if (lls == 28 || lls == 29)
{
printw ("RAN [%2lld] ", call_matrix[9-j][1]);
printw ("TG [%4lld] ", call_matrix[9-j][4]);
printw ("RID [%4lld] ", call_matrix[9-j][2]);
printw ("RAN [%02lld] ", call_matrix[9-j][1]);
printw ("TG [%05lld] ", call_matrix[9-j][4]);
printw ("RID [%05lld] ", call_matrix[9-j][2]);
}
//dPMR
if (lls == 20 || lls == 21 || lls == 22 || lls == 23 ||lls == 24 || lls == 25 || lls == 26 || lls == 27)
@@ -2980,10 +2986,18 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
else opts->ncurses_compact = 1;
}
if (c == 116) //'t' key, toggle trunking
if (c == 116) //'t' key, toggle trunking mode
{
if (opts->p25_trunk == 1) opts->p25_trunk = 0;
else opts->p25_trunk = 1;
opts->scanner_mode = 0; //turn off scanner mode
}
if (c == 121) //'y' key, toggle scanner mode
{
if (opts->scanner_mode == 1) opts->scanner_mode = 0;
else opts->scanner_mode = 1;
opts->p25_trunk = 0; //turn off trunking mode
}
if (c == 97) //'a' key, toggle call alert beep