diff --git a/src/dsd_main.c b/src/dsd_main.c index ecd4fe6..5ae0376 100644 --- a/src/dsd_main.c +++ b/src/dsd_main.c @@ -52,7 +52,7 @@ char * FM_banner[9] = { " ██║ ██║ ╚═══██╗██║ ██║   ██╔══╝ ██║╚██╔╝██║██╔══╝ ", " ██████╔╝██████╔╝██████╔╝   ██║ ██║ ╚═╝ ██║███████╗", " ╚═════╝ ╚═════╝ ╚═════╝    ╚═╝ ╚═╝ ╚═╝╚══════╝", - " 'Lite' Edition v2.0.0-54-gd86b370 Windows 32-bit RC4c" + " 'Lite' Edition v2.0.0-55-gc1ed3fe Windows 32-bit RC4c" }; int comp (const void *a, const void *b) diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c index 577c312..412b917 100644 --- a/src/dsd_ncurses.c +++ b/src/dsd_ncurses.c @@ -2061,7 +2061,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state) if (opts->ncurses_compact == 1) { printw ("------------------------------------------------------------------------------\n"); - printw ("| Digital Speech Decoder: Florida Man Edition - Win32 %s \n", "v2.0.0-52-gda41dcd RC4c"); + printw ("| Digital Speech Decoder: Florida Man Edition - Win32 %s \n", "v2.0.0-55-gc1ed3fe RC4c"); } if (opts->ncurses_compact == 0) { @@ -2073,7 +2073,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state) if (i == 2) printw (" 'q' to Quit "); if (i == 4) printw (" MBElib %s", versionstr); if (i == 5) printw (" %s ", "Win32 RC4c"); //printw (" %s \n", GIT_TAG); - if (i == 6) printw (" %s \n", "v2.0.0-54-gd86b370"); //printw (" %s \n", GIT_TAG); + if (i == 6) printw (" %s \n", "v2.0.0-55-gc1ed3fe"); //printw (" %s \n", GIT_TAG); else printw ("\n"); } attroff(COLOR_PAIR(6)); //6 diff --git a/src/p25p2_vpdu.c b/src/p25p2_vpdu.c index d84ca1f..b05b678 100644 --- a/src/p25p2_vpdu.c +++ b/src/p25p2_vpdu.c @@ -1108,17 +1108,20 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon state->p25_chan_spac[iden] = ((MAC[4+len_a] & 0x3) << 8) | MAC[5+len_a]; state->p25_base_freq[iden] = (MAC[6+len_a] << 24) | (MAC[7+len_a] << 16) | (MAC[8+len_a] << 8) | (MAC[9+len_a] << 0); - //I don't think this is a surefire way, but may be good enough? - if (state->p25_chan_spac[iden] == 0x64) //tdma - { - state->p25_chan_type[iden] = 4; // - state->p25_chan_tdma[iden] = 1; // - } - else //fdma - { - state->p25_chan_type[iden] = 1; // - state->p25_chan_tdma[iden] = 0; // - } + //this is causing more issues -- need a different way to check on this + // if (state->p25_chan_spac[iden] == 0x64) //tdma + // { + // state->p25_chan_type[iden] = 4; // + // state->p25_chan_tdma[iden] = 1; // + // } + // else //fdma + // { + // state->p25_chan_type[iden] = 1; // + // state->p25_chan_tdma[iden] = 0; // + // } + + state->p25_chan_type[iden] = 1; //set as old values for now + state->p25_chan_tdma[iden] = 0; //set as old values for now fprintf (stderr, "\n Identifier Update UHF/VHF\n"); fprintf (stderr, " Channel Identifier [%01X] BW [%01X] Transmit Offset [%04X]\n Channel Spacing [%03X] Base Frequency [%08lX] [%09ld]",