From c1705b893484ded027099a38a9e04cdbc532282d Mon Sep 17 00:00:00 2001 From: c vw Date: Wed, 13 May 2020 16:04:43 +0200 Subject: [PATCH] reviewed conditions for "immediate antenna switching" --- ant_menu.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/ant_menu.c b/ant_menu.c index 9713995..07bbd49 100644 --- a/ant_menu.c +++ b/ant_menu.c @@ -28,6 +28,7 @@ #include "ant_menu.h" #include "band.h" #include "radio.h" +#include "vfo.h" #include "new_protocol.h" #ifdef SOAPYSDR #include "soapy_protocol.h" @@ -65,7 +66,10 @@ static void rx_ant_cb(GtkToggleButton *widget, gpointer data) { int ant=(GPOINTER_TO_UINT(data))&0xF; BAND *band=band_get_band(b); band->alexRxAntenna=ant; - if(active_receiver->id==0) { + // + // Immediate switching if the VFO controlling the active receiver is on band b + // + if(vfo[active_receiver->id].band == b) { set_alex_rx_antenna(ant); } } @@ -101,7 +105,10 @@ static void tx_ant_cb(GtkToggleButton *widget, gpointer data) { int ant=(GPOINTER_TO_UINT(data))&0xF; BAND *band=band_get_band(b); band->alexTxAntenna=ant; - if(active_receiver->id==0) { + // + // Switch immediately if the VFO controlling the TX is on that band + // + if (vfo[get_tx_vfo()].band == b) { set_alex_tx_antenna(ant); } } -- 2.45.2