From 7a05435ce3dd25432432ff12d328a432b8ff4bbe Mon Sep 17 00:00:00 2001 From: c vw Date: Mon, 13 Jan 2020 13:56:38 +0100 Subject: [PATCH] tx panadapter possibyl too high issue --- radio.c | 7 +++---- radio_menu.c | 2 +- toolbar.c | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/radio.c b/radio.c index 852b11d..e169379 100644 --- a/radio.c +++ b/radio.c @@ -859,22 +859,21 @@ void start_radio() { if(display_toolbar) { rx_height-=TOOLBAR_HEIGHT; } - int tx_height=rx_height; - rx_height=rx_height/RECEIVERS; + //int tx_height=rx_height; // // To be on the safe side, we create ALL receiver panels here // If upon startup, we only should display one panel, we do the switch below // for(i=0;ix=0; receiver[i]->y=y; gtk_fixed_put(GTK_FIXED(fixed),receiver[i]->panel,0,y); g_object_ref((gpointer)receiver[i]->panel); set_displaying(receiver[i],1); - y+=rx_height; + y+=rx_height/RECEIVERS; // Upon startup, if RIT or CTUN is active, tell WDSP. set_offset(receiver[i],vfo[i].offset); } diff --git a/radio_menu.c b/radio_menu.c index 1c73ce0..749065b 100644 --- a/radio_menu.c +++ b/radio_menu.c @@ -213,7 +213,7 @@ void setDuplex() { GtkWidget *content=gtk_dialog_get_content_area(GTK_DIALOG(transmitter->dialog)); gtk_container_remove(GTK_CONTAINER(content),transmitter->panel); gtk_widget_destroy(transmitter->dialog); - reconfigure_transmitter(transmitter,display_width,rx_height*receivers); + reconfigure_transmitter(transmitter,display_width,rx_height); } g_idle_add(ext_vfo_update, NULL); } diff --git a/toolbar.c b/toolbar.c index 409a094..4076e99 100644 --- a/toolbar.c +++ b/toolbar.c @@ -280,7 +280,7 @@ static void split_cb (GtkWidget *widget, gpointer data) { } static void duplex_cb (GtkWidget *widget, gpointer data) { - if(can_transmit) { + if(can_transmit && !isTransmitting()) { duplex=(duplex==1)?0:1; g_idle_add(ext_set_duplex,NULL); } -- 2.45.2