diff --git a/src/dmr_csbk.c b/src/dmr_csbk.c index 5a81e1a..dfbc3db 100644 --- a/src/dmr_csbk.c +++ b/src/dmr_csbk.c @@ -1087,16 +1087,12 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8 sprintf (state->dmr_site_parms, "Free RPT - %d ", xpt_free); //assign to cc freq to follow during no sync - //current theory is that user should set channel 0 as the 'home repeater' frequency - //this can change if this is ever tested by anybody properly long int ccfreq = 0; //if using rigctl we can set an unknown or updated cc frequency - //by polling rigctl for the current frequency - if (opts->use_rigctl == 1 ) //&& state->p25_cc_freq == 0 //&& opts->p25_is_tuned == 0 + if (opts->use_rigctl == 1 ) { ccfreq = GetCurrentFreq (opts->rigctl_sockfd); - // if (ccfreq != 0) state->p25_cc_freq = ccfreq; if (ccfreq != 0) { state->p25_cc_freq = ccfreq; @@ -1105,7 +1101,7 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8 } //if using rtl input, we can ask for the current frequency tuned - if (opts->audio_in_type == 3 ) //&& state->p25_cc_freq == 0 //&& opts->p25_is_tuned == 0 + if (opts->audio_in_type == 3 ) { ccfreq = (long int)opts->rtlsdr_center_freq; if (ccfreq != 0) @@ -1116,13 +1112,6 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8 } - // if (state->trunk_chan_map[0] != 0) - // { - // state->p25_cc_freq = state->trunk_chan_map[0]; - // //set to always tuned - // opts->p25_is_tuned = 1; - // } - //Skip tuning calls if group calls are disabled if (opts->trunk_tune_group_calls == 0) goto SKIPXPT; @@ -1191,6 +1180,11 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8 //and if calls occur on the home repeater, it'll be too busy with those to go to the free repeater //DSD-FME doesn't have any sort of TG priority, so its first come first served, just block or allow + //Additional Notes: I've set XPT to set a CC frequency to whichever frequency its tuned to currently and getting + //this particular CSBK, if the status portion does work correctly, then it shouldn't matter which frequency it is on + //as long as this CSBK comes in and we can tune to other repeater lcns if they have activity and the frequency mapping + //is correct in the csv file, assuming the current frequency doesn't have voice activity + } //end 0x0A //XPT Site Information - Adj Site Info?? diff --git a/src/dmr_flco.c b/src/dmr_flco.c index c7d2b58..642f280 100644 --- a/src/dmr_flco.c +++ b/src/dmr_flco.c @@ -229,7 +229,7 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C fprintf (stderr, "Hytera XPT "); if (reserved == 1) fprintf (stderr, "Group "); //according to observation else fprintf (stderr, "Private "); //according to observation - fprintf (stderr, "Call Protect "); + fprintf (stderr, "Call Alert "); //sounds more reasonable than 'protect' fprintf (stderr, "%s", KYEL); fprintf (stderr, "F-Rpt %d", xpt_free); diff --git a/src/dsd_main.c b/src/dsd_main.c index 8783c1a..d3aa9e6 100644 --- a/src/dsd_main.c +++ b/src/dsd_main.c @@ -52,7 +52,7 @@ char * FM_banner[9] = { " ██║ ██║ ╚═══██╗██║ ██║   ██╔══╝ ██║╚██╔╝██║██╔══╝ ", " ██████╔╝██████╔╝██████╔╝   ██║ ██║ ╚═╝ ██║███████╗", " ╚═════╝ ╚═════╝ ╚═════╝    ╚═╝ ╚═╝ ╚═╝╚══════╝", - " 'Aero' Edition v2.0.0-62-g432495c Windows 32-bit RC5 " + " 'Aero' Edition v2.0.0-64-gbd94f83 Windows 32-bit RC5 " }; int comp (const void *a, const void *b) diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c index d2e104a..dd5fe84 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 - Aero %s \n", "v2.0.0-62-g432495c RC5"); + printw ("| Digital Speech Decoder: Florida Man Edition - Aero %s \n", "v2.0.0-64-gbd94f83 RC5"); } 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 ", "Aero RC5"); //printw (" %s \n", GIT_TAG); - if (i == 6) printw (" %s \n", "v2.0.0-62-g432495c"); //printw (" %s \n", GIT_TAG); + if (i == 6) printw (" %s \n", "v2.0.0-64-gbd94f83"); //printw (" %s \n", GIT_TAG); else printw ("\n"); } attroff(COLOR_PAIR(6)); //6