mirror of
https://github.com/lwvmobile/dsd-fme.git
synced 2026-11-21 13:15:40 -05:00
Lima Zulu Tweaks III; #123
This commit is contained in:
@@ -90,10 +90,18 @@ void
|
|||||||
noCarrier (dsd_opts * opts, dsd_state * state)
|
noCarrier (dsd_opts * opts, dsd_state * state)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
//only do it here on the tweaks
|
||||||
|
#ifdef LIMAZULUTWEAKS
|
||||||
|
state->nxdn_last_ran = -1;
|
||||||
|
#endif
|
||||||
|
|
||||||
//experimental conventional frequency scanner mode
|
//experimental conventional frequency scanner mode
|
||||||
if (opts->scanner_mode == 1 && ( (time(NULL) - state->last_cc_sync_time) > opts->trunk_hangtime))
|
if (opts->scanner_mode == 1 && ( (time(NULL) - state->last_cc_sync_time) > opts->trunk_hangtime))
|
||||||
{
|
{
|
||||||
|
|
||||||
|
//always do this one -- makes sense during scanning
|
||||||
|
state->nxdn_last_ran = -1;
|
||||||
|
|
||||||
if (state->lcn_freq_roll >= state->lcn_freq_count)
|
if (state->lcn_freq_roll >= state->lcn_freq_count)
|
||||||
{
|
{
|
||||||
state->lcn_freq_roll = 0; //reset to zero
|
state->lcn_freq_roll = 0; //reset to zero
|
||||||
|
|||||||
@@ -445,8 +445,8 @@ void ncursesMenu (dsd_opts * opts, dsd_state * state)
|
|||||||
|
|
||||||
//zero out to fix call history 'scrolling' bug when changing decoding types
|
//zero out to fix call history 'scrolling' bug when changing decoding types
|
||||||
state->nxdn_last_tg = 0;
|
state->nxdn_last_tg = 0;
|
||||||
state->nxdn_last_ran = 0;
|
state->nxdn_last_ran = -1; //0
|
||||||
state->nxdn_last_rid = 0;
|
state->nxdn_last_rid = 0; //0
|
||||||
|
|
||||||
WINDOW *menu_win;
|
WINDOW *menu_win;
|
||||||
WINDOW *test_win;
|
WINDOW *test_win;
|
||||||
@@ -2346,8 +2346,13 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
|
|||||||
|
|
||||||
|
|
||||||
printw ("| ");
|
printw ("| ");
|
||||||
|
#ifdef LIMAZULUTWEAKS
|
||||||
|
if (idas == 0) printw ("NXDN - RAN: [%02d] ", state->nxdn_last_ran);
|
||||||
|
if (idas == 1) printw ("IDAS - Area: [%02d] ", state->nxdn_last_ran);
|
||||||
|
#else
|
||||||
if (idas == 0) printw ("NXDN - RAN: [%02d] ", rn);
|
if (idas == 0) printw ("NXDN - RAN: [%02d] ", rn);
|
||||||
if (idas == 1) printw ("IDAS - Area: [%02d] ", rn);
|
if (idas == 1) printw ("IDAS - Area: [%02d] ", rn);
|
||||||
|
#endif
|
||||||
if (state->nxdn_location_site_code != 0)
|
if (state->nxdn_location_site_code != 0)
|
||||||
{
|
{
|
||||||
printw ("Cat: [%s] ", state->nxdn_location_category);
|
printw ("Cat: [%s] ", state->nxdn_location_category);
|
||||||
@@ -3533,8 +3538,8 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
|
|||||||
state->nxdn_location_sys_code = 0;
|
state->nxdn_location_sys_code = 0;
|
||||||
sprintf (state->nxdn_location_category, "%s", " ");
|
sprintf (state->nxdn_location_category, "%s", " ");
|
||||||
|
|
||||||
state->nxdn_last_ran = 0;
|
state->nxdn_last_ran = -1; //0
|
||||||
state->nxdn_ran = 0;
|
state->nxdn_ran = 0; //0
|
||||||
|
|
||||||
state->nxdn_rcn = 0;
|
state->nxdn_rcn = 0;
|
||||||
state->nxdn_base_freq = 0;
|
state->nxdn_base_freq = 0;
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ void nxdn_frame (dsd_opts * opts, dsd_state * state)
|
|||||||
uint8_t facch_bits_b[144];
|
uint8_t facch_bits_b[144];
|
||||||
uint8_t cac_bits[300];
|
uint8_t cac_bits[300];
|
||||||
uint8_t facch2_bits[348]; //facch2 or udch, same amount of bits
|
uint8_t facch2_bits[348]; //facch2 or udch, same amount of bits
|
||||||
uint8_t facch3_bits[288]; //facch3 or udch2, same amoount of bits
|
uint8_t facch3_bits[288]; //facch3 or udch2, same amount of bits
|
||||||
|
|
||||||
//nxdn bit buffer, for easy assignment handling
|
//nxdn bit buffer, for easy assignment handling
|
||||||
int nxdn_bit_buffer[364];
|
int nxdn_bit_buffer[364];
|
||||||
|
|||||||
Reference in New Issue
Block a user