From d8e7c4c3aa841ebc607e97660e502b195c2de497 Mon Sep 17 00:00:00 2001 From: lwvmobile Date: Mon, 6 Mar 2023 03:07:23 -0500 Subject: [PATCH] Fix trunk_hangtime lf to f; Ncurses Fixes; --- src/dsd_main.c | 2 +- src/dsd_ncurses.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dsd_main.c b/src/dsd_main.c index 6d9b243..9abfa22 100644 --- a/src/dsd_main.c +++ b/src/dsd_main.c @@ -1383,7 +1383,7 @@ main (int argc, char **argv) case 't': //New letter assignment for Trunk Hangtime, flow down to allow temp numbers case '6': //hangtime in seconds, default is 1; sscanf (optarg, "%f", &opts.trunk_hangtime); //updated for float/decimal values - fprintf (stderr, "Trunking or Fast Scanner Hang Time set to: %.02lf sec\n", opts.trunk_hangtime); + fprintf (stderr, "Trunking or Fast Scanner Hang Time set to: %.02f sec\n", opts.trunk_hangtime); break; case 'q': //New letter assignment for Reverse Mute, flow down to allow temp numbers diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c index 1b1308a..74b4388 100644 --- a/src/dsd_ncurses.c +++ b/src/dsd_ncurses.c @@ -2169,7 +2169,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state) { printw ("| Fast Scan Mode Enabled "); if (state->lcn_freq_roll != 0) - printw (" - Frequency: [%.06lf] Mhz \n", (double)state->trunk_lcn_freq[state->lcn_freq_roll-1]/1000000); + printw (" - Frequency: [%.06lf] Mhz", (double)state->trunk_lcn_freq[state->lcn_freq_roll-1]/1000000); printw (" Speed: %.02lf sec \n", opts->trunk_hangtime); //not sure values less than 1 make a difference, may be system/environment dependent } @@ -3190,7 +3190,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state) //Lockout bug in EDACS prevents any group from tuning when using this, not sure why yet //WARNING! USE THESE WITH CAUTION! IF BREAKING ISSUES OBSERVED, THEN RESTART AND DON'T USE THEM!! - if (opts->frame_provoice != 1 && c == 49) //'1' key, lockout slot 1 or conventional tg from tuning/playback during session + if (state->lasttg != 0 && opts->frame_provoice != 1 && c == 49) //'1' key, lockout slot 1 or conventional tg from tuning/playback during session { state->group_array[state->group_tally].groupNumber = state->lasttg; sprintf (state->group_array[state->group_tally].groupMode, "%s", "B"); @@ -3206,7 +3206,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state) } - if (opts->frame_provoice != 1 && c == 50) //'2' key, lockout slot 2 tdma tgR from tuning/playback during session + if (state->lasttgR != 0 && opts->frame_provoice != 1 && c == 50) //'2' key, lockout slot 2 tdma tgR from tuning/playback during session { state->group_array[state->group_tally].groupNumber = state->lasttgR; sprintf (state->group_array[state->group_tally].groupMode, "%s", "B");