diff --git a/src/dsd_main.c b/src/dsd_main.c index b7d915e..5e381f3 100644 --- a/src/dsd_main.c +++ b/src/dsd_main.c @@ -90,10 +90,18 @@ void 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 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) { state->lcn_freq_roll = 0; //reset to zero diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c index db1a64c..f5b158f 100644 --- a/src/dsd_ncurses.c +++ b/src/dsd_ncurses.c @@ -445,8 +445,8 @@ void ncursesMenu (dsd_opts * opts, dsd_state * state) //zero out to fix call history 'scrolling' bug when changing decoding types state->nxdn_last_tg = 0; - state->nxdn_last_ran = 0; - state->nxdn_last_rid = 0; + state->nxdn_last_ran = -1; //0 + state->nxdn_last_rid = 0; //0 WINDOW *menu_win; WINDOW *test_win; @@ -2346,8 +2346,13 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state) 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 == 1) printw ("IDAS - Area: [%02d] ", rn); + #endif if (state->nxdn_location_site_code != 0) { printw ("Cat: [%s] ", state->nxdn_location_category); @@ -3533,8 +3538,8 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state) state->nxdn_location_sys_code = 0; sprintf (state->nxdn_location_category, "%s", " "); - state->nxdn_last_ran = 0; - state->nxdn_ran = 0; + state->nxdn_last_ran = -1; //0 + state->nxdn_ran = 0; //0 state->nxdn_rcn = 0; state->nxdn_base_freq = 0; diff --git a/src/nxdn_frame.c b/src/nxdn_frame.c index c65ee82..39ba92f 100644 --- a/src/nxdn_frame.c +++ b/src/nxdn_frame.c @@ -64,7 +64,7 @@ void nxdn_frame (dsd_opts * opts, dsd_state * state) uint8_t facch_bits_b[144]; uint8_t cac_bits[300]; 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 int nxdn_bit_buffer[364];