From 600b9ac3735073674c716040c22809ffeedc237e Mon Sep 17 00:00:00 2001 From: Ramakrishnan Muthukrishnan Date: Fri, 14 Jan 2022 16:35:24 +0530 Subject: [PATCH] modify rigctl to accept values only from 0 to 60 (-12 to 48) --- rigctl.c | 9 ++------- sliders.c | 3 --- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/rigctl.c b/rigctl.c index 6ab71dc..72d45e1 100644 --- a/rigctl.c +++ b/rigctl.c @@ -3463,10 +3463,7 @@ int parse_cmd(void *data) { if (command[2] == ';') { double att = 0.0; if (have_rx_gain) { - att = adc[active_receiver->adc].attenuation_orig + 12.0; - printf("after stage 1: %f\n", att); - att = round(att * (99.0 / 60.0)); - printf("after stage 2: %f\n", att); + att = adc[active_receiver->adc].attenuation + 12.0; } else { att = adc[active_receiver->adc].attenuation; att = round((att * 99.0) / 31.0); @@ -3477,14 +3474,12 @@ int parse_cmd(void *data) { command[4] = '\0'; int attI = strtol(&command[2], NULL, 10); double att = 0.0; - printf("setting attn level [0..99]: %d\n", attI); if (have_rx_gain) { - att = ((attI * 60.0) / 99.0) - 12.0; + att = attI - 12.0; } else { att = (attI * 31.0) / 99.0; } - printf("setting attn val [-12..48]: %f\n", att); set_attenuation_value(att); } break; diff --git a/sliders.c b/sliders.c index f5d63ce..c117af3 100644 --- a/sliders.c +++ b/sliders.c @@ -153,8 +153,6 @@ static void attenuation_value_changed_cb(GtkWidget *widget, gpointer data) { void set_attenuation_value(double value) { g_print("%s\n",__FUNCTION__); - printf("last attn value: %d, setting it to: %f\n", adc[active_receiver->adc].attenuation, value); - adc[active_receiver->adc].attenuation_orig = value; adc[active_receiver->adc].attenuation = (int)value; set_attenuation(adc[active_receiver->adc].attenuation); if(display_sliders) { @@ -182,7 +180,6 @@ void set_attenuation_value(double value) { scale_dialog=gtk_dialog_new_with_buttons(title,GTK_WINDOW(top_window),GTK_DIALOG_DESTROY_WITH_PARENT,NULL,NULL); GtkWidget *content=gtk_dialog_get_content_area(GTK_DIALOG(scale_dialog)); if (have_rx_gain) { - printf("************** set attenuation scale [-12, 48] \n"); attenuation_scale=gtk_scale_new_with_range(GTK_ORIENTATION_HORIZONTAL,-12.0, 48.0, 1.00); } else { attenuation_scale=gtk_scale_new_with_range(GTK_ORIENTATION_HORIZONTAL,0.0, 31.0, 1.00); -- 2.45.2