From 83ac8feab7226ed4a751615866c311a59c8c6391 Mon Sep 17 00:00:00 2001 From: ilyacodes Date: Sat, 16 Mar 2024 08:01:56 -0400 Subject: [PATCH] Respect user preference for tuning to group calls --- src/edacs-fme.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/edacs-fme.c b/src/edacs-fme.c index 8329d37..66ff573 100644 --- a/src/edacs-fme.c +++ b/src/edacs-fme.c @@ -645,7 +645,7 @@ void edacs(dsd_opts * opts, dsd_state * state) fprintf (stderr, "%s", KNRM); //this is working now with the new import setup - if (opts->p25_trunk == 1 && (strcmp(mode, "DE") != 0) && (strcmp(mode, "B") != 0) ) //DE is digital encrypted, B is block + if (opts->trunk_tune_group_calls == 1 && opts->p25_trunk == 1 && (strcmp(mode, "DE") != 0) && (strcmp(mode, "B") != 0) ) //DE is digital encrypted, B is block { if (lcn < 26 && state->trunk_lcn_freq[lcn-1] != 0) //don't tune if zero (not loaded or otherwise) { @@ -661,7 +661,7 @@ void edacs(dsd_opts * opts, dsd_state * state) if (opts->use_rigctl == 1) { if (opts->setmod_bw != 0 ) SetModulation(opts->rigctl_sockfd, opts->setmod_bw); - SetFreq(opts->rigctl_sockfd, state->trunk_lcn_freq[lcn-1]); //minus one because the lcn index starts at zero + SetFreq(opts->rigctl_sockfd, state->trunk_lcn_freq[lcn-1]); //minus one because the lcn index starts at zero state->edacs_tuned_lcn = lcn; opts->p25_is_tuned = 1; //debug testing (since I don't have EDACS standard w/ Analog nearby) @@ -804,7 +804,7 @@ void edacs(dsd_opts * opts, dsd_state * state) //this is working now with the new import setup - if (opts->p25_trunk == 1 && (strcmp(mode, "DE") != 0) && (strcmp(mode, "B") != 0) ) //DE is digital encrypted, B is block + if (opts->trunk_tune_group_calls == 1 && opts->p25_trunk == 1 && (strcmp(mode, "DE") != 0) && (strcmp(mode, "B") != 0) ) //DE is digital encrypted, B is block { if (lcn < 26 && state->trunk_lcn_freq[lcn-1] != 0) //don't tune if zero (not loaded or otherwise) {