From 23263546b27c2c828fa07b3558247fc132f558a0 Mon Sep 17 00:00:00 2001 From: Ramakrishnan Muthukrishnan Date: Mon, 4 Sep 2023 18:20:08 +0530 Subject: [PATCH] fix a bunch of compiler warnings --- ant_menu.c | 19 --- configure.c | 2 - cw_menu.c | 2 - diversity_menu.c | 2 - dsp_menu.c | 2 - exit_menu.c | 24 --- fft_menu.c | 2 - filter_menu.c | 5 - meter.c | 12 -- nb_menu.c | 1 - new_discovery.c | 2 - new_menu.c | 48 ------ new_protocol.c | 21 +-- new_protocol_programmer.c | 3 - noise_menu.c | 2 - oc_menu.c | 2 - old_discovery.c | 2 - old_protocol.c | 22 +-- pa_menu.c | 2 - radio.c | 17 --- radio_menu.c | 12 -- receiver.c | 6 - rigctl.c | 23 +-- rigctl_menu.c | 12 -- rx_menu.c | 1 - rx_panadapter.c | 3 +- sliders.c | 19 --- toolbar.c | 297 -------------------------------------- transmitter.c | 8 +- tx_menu.c | 4 - update.c | 3 + vfo_menu.c | 3 - vox_menu.c | 8 +- xvtr_menu.c | 3 - 34 files changed, 22 insertions(+), 572 deletions(-) diff --git a/ant_menu.c b/ant_menu.c index fdd0700..e839ed4 100644 --- a/ant_menu.c +++ b/ant_menu.c @@ -31,11 +31,8 @@ #include "new_protocol.h" static GtkWidget *parent_window=NULL; -static GtkWidget *menu_b=NULL; static GtkWidget *dialog=NULL; static GtkWidget *grid=NULL; -static GtkWidget *adc0_antenna_combo_box; -static GtkWidget *dac0_antenna_combo_box; static void cleanup() { if(dialog!=NULL) { @@ -67,22 +64,6 @@ static void rx_ant_cb(GtkToggleButton *widget, gpointer data) { } } -static void adc0_antenna_cb(GtkComboBox *widget,gpointer data) { - ADC *adc=(ADC *)data; - adc->antenna=gtk_combo_box_get_active(widget); - if(radio->protocol==NEW_PROTOCOL) { - schedule_high_priority(); - } -} - -static void dac0_antenna_cb(GtkComboBox *widget,gpointer data) { - DAC *dac=(DAC *)data; - dac->antenna=gtk_combo_box_get_active(widget); - if(radio->protocol==NEW_PROTOCOL) { - schedule_high_priority(); - } -} - static void tx_ant_cb(GtkToggleButton *widget, gpointer data) { if(gtk_toggle_button_get_active(widget)) { int b=(GPOINTER_TO_UINT(data))>>4; diff --git a/configure.c b/configure.c index 11652bb..f03e041 100644 --- a/configure.c +++ b/configure.c @@ -38,8 +38,6 @@ #ifdef GPIO -static GtkWidget *dialog; - static GtkWidget *i2c_sw_text[16]; static void response_event(GtkWidget *dialog,gint id,gpointer user_data) { diff --git a/cw_menu.c b/cw_menu.c index 94effe7..d183b29 100644 --- a/cw_menu.c +++ b/cw_menu.c @@ -38,8 +38,6 @@ static GtkWidget *parent_window=NULL; -static GtkWidget *menu_b=NULL; - static GtkWidget *dialog=NULL; void cw_changed() { diff --git a/diversity_menu.c b/diversity_menu.c index 47ac76d..8df76c8 100644 --- a/diversity_menu.c +++ b/diversity_menu.c @@ -42,8 +42,6 @@ static GtkWidget *gain_fine_scale=NULL; static GtkWidget *phase_fine_scale=NULL; static GtkWidget *phase_coarse_scale=NULL; -static GtkWidget *level; - static double gain_coarse, gain_fine; static double phase_coarse, phase_fine; diff --git a/dsp_menu.c b/dsp_menu.c index 26112df..ef710d5 100644 --- a/dsp_menu.c +++ b/dsp_menu.c @@ -34,8 +34,6 @@ static GtkWidget *parent_window=NULL; -static GtkWidget *menu_b=NULL; - static GtkWidget *dialog=NULL; static void cleanup() { diff --git a/exit_menu.c b/exit_menu.c index 7546ea2..9beeb28 100644 --- a/exit_menu.c +++ b/exit_menu.c @@ -36,8 +36,6 @@ static GtkWidget *parent_window=NULL; -static GtkWidget *menu_b=NULL; - static GtkWidget *dialog=NULL; static void cleanup() { @@ -48,28 +46,6 @@ static void cleanup() { } } -static gboolean discovery_cb (GtkWidget *widget, GdkEventButton *event, gpointer data) { - cleanup(); -#ifdef GPIO - gpio_close(); -#endif - switch(protocol) { - case ORIGINAL_PROTOCOL: - old_protocol_stop(); - break; - case NEW_PROTOCOL: - new_protocol_stop(); - break; - } - radioSaveState(); - radio_stop(); - gtk_container_remove(GTK_CONTAINER(top_window), fixed); - gtk_widget_destroy(fixed); - gtk_container_add(GTK_CONTAINER(top_window), grid); - discovery(); - return TRUE; -} - static gboolean close_cb (GtkWidget *widget, GdkEventButton *event, gpointer data) { cleanup(); return TRUE; diff --git a/fft_menu.c b/fft_menu.c index 9f9c082..85e6f39 100644 --- a/fft_menu.c +++ b/fft_menu.c @@ -30,8 +30,6 @@ static GtkWidget *parent_window=NULL; -static GtkWidget *menu_b=NULL; - static GtkWidget *dialog=NULL; static void cleanup() { diff --git a/filter_menu.c b/filter_menu.c index a9beb2d..f4ffab0 100644 --- a/filter_menu.c +++ b/filter_menu.c @@ -157,11 +157,7 @@ void filter_menu(GtkWidget *parent) { g_signal_connect (close_b, "pressed", G_CALLBACK(close_cb), NULL); gtk_grid_attach(GTK_GRID(grid),close_b,0,0,1,1); - BAND *band=band_get_band(vfo[active_receiver->id].band); - BANDSTACK *bandstack=band->bandstack; - BANDSTACK_ENTRY *entry=&bandstack->entry[vfo[active_receiver->id].bandstack]; FILTER* band_filters=filters[vfo[active_receiver->id].mode]; - FILTER* band_filter=&band_filters[vfo[active_receiver->id].filter]; switch(vfo[active_receiver->id].mode) { case modeFMN: @@ -193,7 +189,6 @@ void filter_menu(GtkWidget *parent) { default: for(i=0;iid].filter) { set_button_text_color(b,"orange"); diff --git a/meter.c b/meter.c index 4858720..5784904 100644 --- a/meter.c +++ b/meter.c @@ -47,18 +47,6 @@ static double max_level=-200.0; static int max_count=0; static int max_reverse=0; -static void -meter_clear_surface (void) -{ - cairo_t *cr; - cr = cairo_create (meter_surface); - - cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); - cairo_fill (cr); - - cairo_destroy (cr); -} - static gboolean meter_configure_event_cb (GtkWidget *widget, GdkEventConfigure *event, diff --git a/nb_menu.c b/nb_menu.c index a8755d9..c7f6f99 100644 --- a/nb_menu.c +++ b/nb_menu.c @@ -32,7 +32,6 @@ #include static GtkWidget *parent_window = NULL; -static GtkWidget *menu_b = NULL; static GtkWidget *dialog = NULL; void nb_changed() { diff --git a/new_discovery.c b/new_discovery.c index 6039d34..1d860c9 100644 --- a/new_discovery.c +++ b/new_discovery.c @@ -40,11 +40,9 @@ static char interface_name[64]; static struct sockaddr_in interface_addr={0}; static struct sockaddr_in interface_netmask={0}; -static int interface_length; #define DISCOVERY_PORT 1024 static int discovery_socket; -static struct sockaddr_in discovery_addr; void new_discover(struct ifaddrs* iface); diff --git a/new_menu.c b/new_menu.c index e5c1aca..9ab9129 100644 --- a/new_menu.c +++ b/new_menu.c @@ -70,9 +70,6 @@ #include "midi_menu.h" #endif - -static GtkWidget *menu_b=NULL; - static GtkWidget *dialog=NULL; GtkWidget *sub_menu=NULL; @@ -269,11 +266,6 @@ void start_band() { } } -static gboolean band_cb (GtkWidget *widget, GdkEventButton *event, gpointer data) { - start_band(); - return TRUE; -} - void start_bandstack() { int old_menu=active_menu; cleanup(); @@ -283,11 +275,6 @@ void start_bandstack() { } } -static gboolean bandstack_cb (GtkWidget *widget, GdkEventButton *event, gpointer data) { - start_bandstack(); - return TRUE; -} - void start_mode() { int old_menu=active_menu; cleanup(); @@ -297,11 +284,6 @@ void start_mode() { } } -static gboolean mode_cb (GtkWidget *widget, GdkEventButton *event, gpointer data) { - start_mode(); - return TRUE; -} - void start_filter() { int old_menu=active_menu; cleanup(); @@ -311,11 +293,6 @@ void start_filter() { } } -static gboolean filter_cb (GtkWidget *widget, GdkEventButton *event, gpointer data) { - start_filter(); - return TRUE; -} - void start_noise() { int old_menu=active_menu; cleanup(); @@ -325,11 +302,6 @@ void start_noise() { } } -static gboolean noise_cb (GtkWidget *widget, GdkEventButton *event, gpointer data) { - start_noise(); - return TRUE; -} - void start_agc() { int old_menu=active_menu; cleanup(); @@ -339,11 +311,6 @@ void start_agc() { } } -static gboolean agc_cb (GtkWidget *widget, GdkEventButton *event, gpointer data) { - start_agc(); - return TRUE; -} - void start_vox() { cleanup(); vox_menu(top_window); @@ -383,21 +350,11 @@ void start_vfo(int vfo) { } } -static gboolean vfo_cb (GtkWidget *widget, GdkEventButton *event, gpointer data) { - start_vfo(active_receiver->id); - return TRUE; -} - void start_store() { cleanup(); store_menu(top_window); } -static gboolean store_cb (GtkWidget *widget, GdkEventButton *event, gpointer data) { - start_store(); - return TRUE; -} - void start_tx() { cleanup(); tx_menu(top_window); @@ -425,11 +382,6 @@ void start_test() { test_menu(top_window); } -static gboolean test_cb (GtkWidget *widget, GdkEventButton *event, gpointer data) { - start_test(); - return TRUE; -} - #ifdef CLIENT_SERVER void start_server() { cleanup(); diff --git a/new_protocol.c b/new_protocol.c index c7eed19..84a3842 100644 --- a/new_protocol.c +++ b/new_protocol.c @@ -121,27 +121,13 @@ static long rx_specific_sequence = 0; static long tx_specific_sequence = 0; static long ddc_sequence[7/*MAX_DDC*/]; -//static int buffer_size=BUFFER_SIZE; -//static int fft_size=4096; -static int dspRate=48000; -static int outputRate=48000; - -static int micSampleRate=48000; -static int micDspRate=48000; -static int micOutputRate=192000; static int micoutputsamples; // 48000 in, 192000 out -static double micinputbuffer[MAX_BUFFER_SIZE*2]; // 48000 -static double iqoutputbuffer[MAX_BUFFER_SIZE*4*2]; //192000 - static long tx_iq_sequence=0; static unsigned char iqbuffer[1444]; static int iqindex; static int spectrumWIDTH=800; -static int SPECTRUM_UPDATES_PER_SECOND=10; - -static float phase = 0.0F; static long response_sequence=0; static long highprio_rcvd_sequence=0; @@ -187,8 +173,6 @@ static GThread *iq_thread_id[7/*MAX_DDC*/]; static int outputsamples; #endif -static int leftaudiosample; -static int rightaudiosample; static long audiosequence; static unsigned char audiobuffer[260]; // was 1444 static int audioindex; @@ -1543,6 +1527,7 @@ static gpointer command_response_thread(gpointer data) { process_command_response(); free(command_response_buffer); } + return NULL; } static gpointer high_priority_thread(gpointer data) { @@ -1558,6 +1543,7 @@ g_print("high_priority_thread\n"); process_high_priority(); free(high_priority_buffer); } + return NULL; } static gpointer mic_line_thread(gpointer data) { @@ -1577,6 +1563,7 @@ g_print("mic_line_thread\n"); process_mic_data(mic_bytes_read); free(mic_line_buffer); } + return NULL; } static gpointer iq_thread(gpointer data) { @@ -1624,6 +1611,8 @@ static gpointer iq_thread(gpointer data) { } free(buffer); } + + return NULL; } static void process_iq_data(unsigned char *buffer, RECEIVER *rx) { diff --git a/new_protocol_programmer.c b/new_protocol_programmer.c index 31d4032..1b26519 100644 --- a/new_protocol_programmer.c +++ b/new_protocol_programmer.c @@ -52,9 +52,6 @@ static char* source; static long blocks; static pthread_t programmer_thread_id; -static pthread_t programmer_response_thread_id; - -static int running; void *programmer_thread(void *arg); void *programmer_response_thread(void *arg); diff --git a/noise_menu.c b/noise_menu.c index deafed7..7b1f93c 100644 --- a/noise_menu.c +++ b/noise_menu.c @@ -40,8 +40,6 @@ static GtkWidget *parent_window=NULL; static GtkWidget *dialog=NULL; -static GtkWidget *last_filter; - static void cleanup() { if(dialog!=NULL) { gtk_widget_destroy(dialog); diff --git a/oc_menu.c b/oc_menu.c index 5da076f..545315e 100644 --- a/oc_menu.c +++ b/oc_menu.c @@ -34,8 +34,6 @@ static GtkWidget *parent_window=NULL; -static GtkWidget *menu_b=NULL; - static GtkWidget *dialog=NULL; static void cleanup() { diff --git a/old_discovery.c b/old_discovery.c index cb12be0..0ab712b 100644 --- a/old_discovery.c +++ b/old_discovery.c @@ -41,11 +41,9 @@ static char interface_name[64]; static struct sockaddr_in interface_addr={0}; static struct sockaddr_in interface_netmask={0}; -static int interface_length; #define DISCOVERY_PORT 1024 static int discovery_socket; -static struct sockaddr_in discovery_addr; static GThread *discover_thread_id; static gpointer discover_receive_thread(gpointer data); diff --git a/old_protocol.c b/old_protocol.c index ede3788..ffef50d 100644 --- a/old_protocol.c +++ b/old_protocol.c @@ -154,11 +154,6 @@ static int proto_val; static int display_width; -static int speed; - -static int dsp_rate=48000; -static int output_rate=48000; - static int data_socket=-1; static int tcp_socket=-1; static struct sockaddr_in data_addr; @@ -167,18 +162,13 @@ static int output_buffer_size; static unsigned char control_in[5]={0x00,0x00,0x00,0x00,0x00}; -static double tuning_phase; -static double phase=0.0; - static int running; -static long ep4_sequence; static uint32_t last_seq_num=-0xffffffff; static int suppress_ozy_packet = 0; static int current_rx=0; -static int samples=0; static int mic_samples=0; static int mic_sample_divisor=1; @@ -186,13 +176,6 @@ static int local_ptt=0; static int dash=0; static int dot=0; -static double micinputbuffer[MAX_BUFFER_SIZE*2]; - -static int left_rx_sample; -static int right_rx_sample; -static int left_tx_sample; -static int right_tx_sample; - static unsigned char output_buffer[OZY_BUFFER_SIZE]; static int output_buffer_index=8; @@ -201,7 +184,6 @@ static int command=1; static GThread *receive_thread_id; static gpointer receive_thread(gpointer arg); static void process_ozy_input_buffer(unsigned char *buffer); -static void process_bandscope_buffer(char *buffer); void ozy_send_buffer(); static unsigned char metis_buffer[1032]; @@ -1165,7 +1147,6 @@ static int rx1channel; static int rx2channel; static void process_ozy_byte(int b) { - int i,j; float fsample; switch(state) { case SYNC_0: @@ -1643,8 +1624,7 @@ void ozy_send_buffer() { { BAND *band=band_get_current_band(); int power=0; - static int last_power=0; - // + // Some HPSDR apps for the RedPitaya generate CW inside the FPGA, but while // doing this, DriveLevel changes are processed by the server, but do not become effective. // If the CW paddle is hit, the new PTT state is sent to piHPSDR, then the TX drive diff --git a/pa_menu.c b/pa_menu.c index 43c3890..29df28f 100644 --- a/pa_menu.c +++ b/pa_menu.c @@ -30,8 +30,6 @@ static GtkWidget *parent_window=NULL; -static GtkWidget *menu_b=NULL; - static GtkWidget *dialog=NULL; static GtkWidget *grid2; diff --git a/radio.c b/radio.c index 26c9932..bb819d2 100644 --- a/radio.c +++ b/radio.c @@ -119,13 +119,9 @@ gint controller = NO_CONTROLLER; GtkWidget *fixed; static GtkWidget *vfo_panel; static GtkWidget *meter; -static GtkWidget *menu; static GtkWidget *zoompan; static GtkWidget *sliders; static GtkWidget *toolbar; -static GtkWidget *panadapter; -static GtkWidget *waterfall; -static GtkWidget *audio_waterfall; // RX and TX calibration long long calibration = 0LL; @@ -145,8 +141,6 @@ int echo = 0; int radio_sample_rate; gboolean iqswap; -static gint save_timer_id; - DISCOVERED *radio = NULL; #ifdef CLIENT_SERVER gboolean radio_is_remote = FALSE; @@ -330,8 +324,6 @@ int tx_filter_high = 2850; static int pre_tune_mode; static int pre_tune_cw_internal; -static int pre_tune_filter_low; -static int pre_tune_filter_high; int enable_tx_equalizer = 0; int tx_equalizer[4] = {0, 0, 0, 0}; @@ -470,11 +462,6 @@ void reconfigure_radio() { } } -static gboolean save_cb(gpointer data) { - radioSaveState(); - return TRUE; -} - static gboolean minimize_cb(GtkWidget *widget, GdkEventButton *event, gpointer data) { gtk_window_iconify(GTK_WINDOW(top_window)); @@ -588,7 +575,6 @@ static void create_visual() { #endif // g_print("Create transmitter\n"); if (can_transmit) { - double pk; if (duplex) { transmitter = create_transmitter(CHANNEL_TX, buffer_size, fft_size, updates_per_second, display_width / 4, @@ -735,13 +721,10 @@ static void create_visual() { void start_radio() { int i; - int y; // g_print("start_radio: selected radio=%p device=%d\n",radio,radio->device); gdk_window_set_cursor(gtk_widget_get_window(top_window), gdk_cursor_new(GDK_WATCH)); - int rc; - protocol = radio->protocol; device = radio->device; diff --git a/radio_menu.c b/radio_menu.c index 117bc97..929d563 100644 --- a/radio_menu.c +++ b/radio_menu.c @@ -47,13 +47,7 @@ #endif static GtkWidget *parent_window=NULL; -static GtkWidget *menu_b=NULL; static GtkWidget *dialog=NULL; -static GtkWidget *rx_gains[3]; -static GtkWidget *tx_gain; -static GtkWidget *tx_gains[2]; -static GtkWidget *sat_b; -static GtkWidget *rsat_b; static GtkWidget *receivers_1; static GtkWidget *receivers_2; @@ -91,12 +85,6 @@ static void vfo_divisor_value_changed_cb(GtkWidget *widget, gpointer data) { vfo_encoder_divisor=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); } -#ifdef GPIO -static void gpio_settle_value_changed_cb(GtkWidget *widget, gpointer data) { - settle_time=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); -} -#endif - /* static void toolbar_dialog_buttons_cb(GtkWidget *widget, gpointer data) { toolbar_dialog_buttons=toolbar_dialog_buttons==1?0:1; diff --git a/receiver.c b/receiver.c index 66490e1..790abc4 100644 --- a/receiver.c +++ b/receiver.c @@ -59,9 +59,6 @@ static gboolean has_moved = FALSE; static gboolean pressed = FALSE; static gboolean making_active = FALSE; -static int waterfall_samples = 0; -static int waterfall_resample = 6; - void receiver_weak_notify(gpointer data, GObject *obj) { RECEIVER *rx = (RECEIVER *)data; g_print("%s: id=%d obj=%p\n", __FUNCTION__, rx->id, obj); @@ -1641,9 +1638,6 @@ void full_rx_buffer(RECEIVER *rx) { g_mutex_unlock(&rx->mutex); } -static int rx_buffer_seen = 0; -static int tx_buffer_seen = 0; - void add_iq_samples(RECEIVER *rx, double i_sample, double q_sample) { rx->iq_input_buffer[rx->samples * 2] = i_sample; rx->iq_input_buffer[(rx->samples * 2) + 1] = q_sample; diff --git a/rigctl.c b/rigctl.c index 6024661..4edd8fc 100644 --- a/rigctl.c +++ b/rigctl.c @@ -70,9 +70,9 @@ int rigctl_enable = 0; // the port client will be connecting to // 2-26-17 K5JAE - Changed the defines to const ints to allow use via pointers. -static const int TelnetPortA = 19090; -static const int TelnetPortB = 19091; -static const int TelnetPortC = 19092; +//static const int TelnetPortA = 19090; +//static const int TelnetPortB = 19091; +//static const int TelnetPortC = 19092; #define RIGCTL_THROTTLE_NSEC 15000000L #define NSEC_PER_SEC 1000000000L @@ -116,11 +116,8 @@ static GThread *serial_server_thread_id = NULL; static gboolean serial_running = FALSE; static int server_socket = -1; -static int server_address_length; static struct sockaddr_in server_address; -static int rigctl_timer = 0; - typedef struct _client { int fd; socklen_t address_length; @@ -774,14 +771,9 @@ static gpointer rigctl_client(gpointer data) { g_mutex_unlock(&mutex_a->m); g_idle_add(ext_vfo_update, NULL); - int save_flag = 0; // Used to concatenate two cmd lines together - int semi_number = 0; int i; - char *work_ptr; - char work_buf[MAXDATASIZE]; int numbytes; char cmd_input[MAXDATASIZE]; - char cmd_save[80]; char *command = g_new(char, MAXDATASIZE); int command_index = 0; @@ -2180,7 +2172,7 @@ gboolean parse_extended_cmd(char *command, CLIENT *client) { // read meter value if (command[5] == ';') { int m = atoi(&command[4]); - sprintf(reply, "ZZRM%d%20d;", smeter, (int)receiver[0]->meter); + sprintf(reply, "ZZRM%d%20d;", m, (int)receiver[0]->meter); send_resp(client->fd, reply); } break; @@ -2760,7 +2752,6 @@ int parse_cmd(void *data) { char reply[80]; reply[0] = '\0'; gboolean implemented = TRUE; - gboolean errord = FALSE; switch (command[0]) { case '#': @@ -2773,7 +2764,7 @@ int parse_cmd(void *data) { } else { new_protocol_stop(); } - int rc = system("shutdown -h -P now"); + system("shutdown -h -P now"); _exit(0); } break; @@ -3039,7 +3030,7 @@ int parse_cmd(void *data) { } } else if (command[6] == ';') { int fw = atoi(&command[2]); - int val = filter->low = fw; + filter->low = fw; switch (vfo[active_receiver->id].mode) { case modeCWL: case modeCWU: @@ -3565,7 +3556,7 @@ int parse_cmd(void *data) { // set/read stallite mode status if (command[2] == ';') { sprintf(reply, "SA%d%d%d%d%d%d%dSAT? ;", - sat_mode == SAT_MODE | sat_mode == RSAT_MODE, 0, 0, 0, + sat_mode == SAT_MODE || sat_mode == RSAT_MODE, 0, 0, 0, sat_mode == SAT_MODE, sat_mode == RSAT_MODE, 0); send_resp(client->fd, reply); } else if (command[9] == ';') { diff --git a/rigctl_menu.c b/rigctl_menu.c index 47eadbb..2ee0750 100644 --- a/rigctl_menu.c +++ b/rigctl_menu.c @@ -39,7 +39,6 @@ int serial_parity = 0; // 0=none, 1=even, 2=odd gboolean rigctl_debug=FALSE; static GtkWidget *parent_window=NULL; -static GtkWidget *menu_b=NULL; static GtkWidget *dialog=NULL; static GtkWidget *serial_port_entry; @@ -65,11 +64,6 @@ static void rigctl_value_changed_cb(GtkWidget *widget, gpointer data) { rigctl_port_base = gtk_spin_button_get_value(GTK_SPIN_BUTTON(widget)); } -static void serial_value_changed_cb(GtkWidget *widget, gpointer data) { - sprintf(ser_port,"/dev/ttyACM%0d",(int) gtk_spin_button_get_value(GTK_SPIN_BUTTON(widget))); - fprintf(stderr,"RIGCTL_MENU: New Serial port=%s\n",ser_port); -} - static void rigctl_debug_cb(GtkWidget *widget, gpointer data) { rigctl_debug=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); g_print("---------- RIGCTL DEBUG %s ----------\n",rigctl_debug?"ON":"OFF"); @@ -102,12 +96,6 @@ static void baud_rate_cb(GtkWidget *widget, gpointer data) { fprintf(stderr,"RIGCTL_MENU: Baud rate changed: %d\n",serial_baud_rate); } -// Set Parity 0=None, 1=Even, 2=0dd -static void parity_cb(GtkWidget *widget, gpointer data) { - serial_parity = GPOINTER_TO_INT(data); - fprintf(stderr,"RITCTL_MENU: Serial Parity changed=%d\n", serial_parity); -} - void rigctl_menu(GtkWidget *parent) { parent_window=parent; diff --git a/rx_menu.c b/rx_menu.c index 581b1e7..3af4fac 100644 --- a/rx_menu.c +++ b/rx_menu.c @@ -35,7 +35,6 @@ #include "new_protocol.h" static GtkWidget *parent_window=NULL; -static GtkWidget *menu_b=NULL; static GtkWidget *dialog=NULL; static GtkWidget *local_audio_b=NULL; static GtkWidget *output=NULL; diff --git a/rx_panadapter.c b/rx_panadapter.c index eb7eb4f..d150c2c 100644 --- a/rx_panadapter.c +++ b/rx_panadapter.c @@ -56,7 +56,6 @@ static gfloat filter_right; static gfloat cw_frequency; static gint sequence_error_count=0; -static gint fexchange_error_count=0; /* Create a new surface of the appropriate size to store our scribbles */ static gboolean @@ -520,7 +519,7 @@ void rx_panadapter_update(RECEIVER *rx) { cairo_line_to(cr, (double)i, s2); } - cairo_pattern_t *gradient; + cairo_pattern_t *gradient = NULL; if(display_gradient) { gradient = cairo_pattern_create_linear(0.0, display_height, 0.0, 0.0); // calculate where S9 is diff --git a/sliders.c b/sliders.c index 6a64324..4c43fbb 100644 --- a/sliders.c +++ b/sliders.c @@ -86,18 +86,12 @@ static GtkWidget *drive_scale; static GtkWidget *squelch_label; static GtkWidget *squelch_scale; static GtkWidget *squelch_enable; -static GtkWidget *comp_label; static GtkWidget *comp_scale; -static GtkWidget *comp_enable; -static GtkWidget *dummy_label; static GtkWidget *filter_width_scale; static GtkWidget *filter_shift_scale; static GtkWidget *diversity_gain_scale; static GtkWidget *diversity_phase_scale; -static GdkRGBA white; -static GdkRGBA gray; - void sliders_update() { if(display_sliders) { if(can_transmit) { @@ -650,19 +644,6 @@ static void squelch_enable_cb(GtkWidget *widget, gpointer data) { #endif } -static void compressor_value_changed_cb(GtkWidget *widget, gpointer data) { - transmitter_set_compressor_level(transmitter,gtk_range_get_value(GTK_RANGE(widget))); - // This value is now also reflected in the VFO panel - g_idle_add(ext_vfo_update, NULL); - -} - -static void compressor_enable_cb(GtkWidget *widget, gpointer data) { - transmitter_set_compressor(transmitter,gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))); - // This value is now also reflected in the VFO panel - g_idle_add(ext_vfo_update, NULL); -} - void set_squelch() { g_print("%s\n",__FUNCTION__); setSquelch(active_receiver); diff --git a/toolbar.c b/toolbar.c index 1c7c787..82d81d6 100644 --- a/toolbar.c +++ b/toolbar.c @@ -68,40 +68,11 @@ static GtkWidget *sim_s5; static GtkWidget *sim_s6; static GtkWidget *sim_function; - -static GtkWidget *last_band; -static GtkWidget *last_bandstack; -static GtkWidget *last_mode; -static GtkWidget *last_filter; - static GdkRGBA white; static GdkRGBA gray; -static gint rit_plus_timer=-1; -static gint rit_minus_timer=-1; -static gint xit_plus_timer=-1; -static gint xit_minus_timer=-1; - SWITCH *toolbar_switches=switches_controller1[0]; -static gboolean rit_timer_cb(gpointer data) { - int i=GPOINTER_TO_INT(data); - vfo_rit(active_receiver->id,i); - return TRUE; -} - -static gboolean xit_timer_cb(gpointer data) { - int i=GPOINTER_TO_INT(data); - transmitter->xit+=(i*rit_increment); - if(transmitter->xit>10000) transmitter->xit=10000; - if(transmitter->xit<-10000) transmitter->xit=-10000; - if(protocol==NEW_PROTOCOL) { - schedule_high_priority(); - } - g_idle_add(ext_vfo_update,NULL); - return TRUE; -} - void update_toolbar_labels() { gtk_button_set_label(GTK_BUTTON(sim_mox),ActionTable[toolbar_switches[0].switch_function].button_str); gtk_button_set_label(GTK_BUTTON(sim_s1),ActionTable[toolbar_switches[1].switch_function].button_str); @@ -113,11 +84,6 @@ void update_toolbar_labels() { gtk_button_set_label(GTK_BUTTON(sim_function),ActionTable[toolbar_switches[7].switch_function].button_str); } -static void close_cb(GtkWidget *widget, gpointer data) { - gtk_widget_destroy(last_dialog); - last_dialog=NULL; -} - void band_cb(GtkWidget *widget, gpointer data) { start_band(); } @@ -161,269 +127,6 @@ void ctun_cb (GtkWidget *widget, gpointer data) { #endif } -static void atob_cb (GtkWidget *widget, gpointer data) { -#ifdef CLIENT_SERVER - if(radio_is_remote) { - send_vfo(client_socket,VFO_A_TO_B); - } else { -#endif - vfo_a_to_b(); -#ifdef CLIENT_SERVER - } -#endif -} - -static void btoa_cb (GtkWidget *widget, gpointer data) { -#ifdef CLIENT_SERVER - if(radio_is_remote) { - send_vfo(client_socket,VFO_B_TO_A); - } else { -#endif - vfo_b_to_a(); -#ifdef CLIENT_SERVER - } -#endif -} - -static void aswapb_cb (GtkWidget *widget, gpointer data) { -#ifdef CLIENT_SERVER - if(radio_is_remote) { - send_vfo(client_socket,VFO_A_SWAP_B); - } else { -#endif - vfo_a_swap_b(); -#ifdef CLIENT_SERVER - } -#endif -} - -static void split_cb (GtkWidget *widget, gpointer data) { -#ifdef CLIENT_SERVER - if(radio_is_remote) { - send_split(client_socket,split==1?0:1); - } else { -#endif - g_idle_add(ext_split_toggle,NULL); -#ifdef CLIENT_SERVER - } -#endif -} - -static void duplex_cb (GtkWidget *widget, gpointer data) { - if(can_transmit && !isTransmitting()) { -#ifdef CLIENT_SERVER - if(radio_is_remote) { - send_dup(client_socket,duplex==1?0:1); - } else { -#endif - duplex=(duplex==1)?0:1; - g_idle_add(ext_set_duplex,NULL); -#ifdef CLIENT_SERVER - } -#endif - } -} - -static void sat_cb (GtkWidget *widget, gpointer data) { - int temp; - if(can_transmit) { - if(sat_mode==SAT_MODE) { - temp=SAT_NONE; - } else { - temp=SAT_MODE; - } -#ifdef CLIENT_SERVER - if(radio_is_remote) { - send_sat(client_socket,temp); - } else { -#endif - sat_mode=temp; - g_idle_add(ext_vfo_update,NULL); -#ifdef CLIENT_SERVER - } -#endif - } -} - -static void rsat_cb (GtkWidget *widget, gpointer data) { - int temp; - if(can_transmit) { - if(sat_mode==RSAT_MODE) { - temp=SAT_NONE; - } else { - temp=RSAT_MODE; - } -#ifdef CLIENT_SERVER - if(radio_is_remote) { - send_sat(client_socket,temp); - } else { -#endif - sat_mode=temp; - g_idle_add(ext_vfo_update,NULL); -#ifdef CLIENT_SERVER - } -#endif - } -} - -static void rit_enable_cb(GtkWidget *widget, gpointer data) { -#ifdef CLIENT_SERVER - if(radio_is_remote) { - send_rit_update(client_socket,active_receiver->id); - } else { -#endif - vfo_rit_update(active_receiver->id); -#ifdef CLIENT_SERVER - } -#endif -} - -static void rit_cb(GtkWidget *widget, gpointer data) { - int i=GPOINTER_TO_INT(data); -#ifdef CLIENT_SERVER - if(radio_is_remote) { - send_rit(client_socket,active_receiver->id,i); - } else { -#endif - vfo_rit(active_receiver->id,i); - if(i<0) { - rit_minus_timer=g_timeout_add(200,rit_timer_cb,GINT_TO_POINTER(i)); - } else { - rit_plus_timer=g_timeout_add(200,rit_timer_cb,GINT_TO_POINTER(i)); - } -#ifdef CLIENT_SERVER - } -#endif -} - -static void rit_clear_cb(GtkWidget *widget, gpointer data) { -#ifdef CLIENT_SERVER - if(radio_is_remote) { - send_rit_clear(client_socket,active_receiver->id); - } else { -#endif - vfo_rit_clear(active_receiver->id); -#ifdef CLIENT_SERVER - } -#endif -} - -static void xit_enable_cb(GtkWidget *widget, gpointer data) { - if(can_transmit) { - transmitter->xit_enabled=transmitter->xit_enabled==1?0:1; - if(protocol==NEW_PROTOCOL) { - schedule_high_priority(); - } - g_idle_add(ext_vfo_update,NULL); - } -} - -static void xit_cb(GtkWidget *widget, gpointer data) { - if(can_transmit) { - int i=GPOINTER_TO_INT(data); - transmitter->xit+=i*rit_increment; - if(transmitter->xit>10000) transmitter->xit=10000; - if(transmitter->xit<-10000) transmitter->xit=-10000; - if(protocol==NEW_PROTOCOL) { - schedule_high_priority(); - } - g_idle_add(ext_vfo_update,NULL); - if(i<0) { - xit_minus_timer=g_timeout_add(200,xit_timer_cb,GINT_TO_POINTER(i)); - } else { - xit_plus_timer=g_timeout_add(200,xit_timer_cb,GINT_TO_POINTER(i)); - } - } -} - -static void xit_clear_cb(GtkWidget *widget, gpointer data) { - if(can_transmit) { - transmitter->xit=0; - g_idle_add(ext_vfo_update,NULL); - } -} - -static void freq_cb(GtkWidget *widget, gpointer data) { - start_vfo(active_receiver->id); -} - -static void mem_cb(GtkWidget *widget, gpointer data) { - start_store(); -} - -static void vox_cb(GtkWidget *widget, gpointer data) { - vox_enabled=vox_enabled==1?0:1; - g_idle_add(ext_vfo_update,NULL); -} - -static void stop() { - if(protocol==ORIGINAL_PROTOCOL) { - old_protocol_stop(); - } else { - new_protocol_stop(); - } -#ifdef GPIO - gpio_close(); -#endif -#ifdef WIRIINGPI - gpio_close(); -#endif -} - -static void yes_cb(GtkWidget *widget, gpointer data) { - stop(); - _exit(0); -} - -static void halt_cb(GtkWidget *widget, gpointer data) { - stop(); - int rc=system("shutdown -h -P now"); - _exit(0); -} - -static void exit_cb(GtkWidget *widget, gpointer data) { - - radioSaveState(); - - GtkWidget *dialog=gtk_dialog_new_with_buttons("Exit",GTK_WINDOW(parent_window),GTK_DIALOG_DESTROY_WITH_PARENT,NULL,NULL); - - GtkWidget *content=gtk_dialog_get_content_area(GTK_DIALOG(dialog)); - GtkWidget *grid=gtk_grid_new(); - - gtk_grid_set_column_homogeneous(GTK_GRID(grid),TRUE); - gtk_grid_set_row_homogeneous(GTK_GRID(grid),TRUE); - - GtkWidget *label=gtk_label_new("Exit?"); - //gtk_widget_override_font(label, pango_font_description_from_string("Arial 18")); - gtk_widget_show(label); - gtk_grid_attach(GTK_GRID(grid),label,1,0,1,1); - - GtkWidget *b_yes=gtk_button_new_with_label("Yes"); - //gtk_widget_override_font(b_yes, pango_font_description_from_string("Arial 18")); - gtk_widget_show(b_yes); - gtk_grid_attach(GTK_GRID(grid),b_yes,0,1,1,1); - g_signal_connect(b_yes,"pressed",G_CALLBACK(yes_cb),NULL); - - GtkWidget *b_halt=gtk_button_new_with_label("Halt System"); - //gtk_widget_override_font(b_halt, pango_font_description_from_string("Arial 18")); - gtk_widget_show(b_halt); - gtk_grid_attach(GTK_GRID(grid),b_halt,2,1,1,1); - g_signal_connect(b_halt,"pressed",G_CALLBACK(halt_cb),NULL); - - gtk_container_add(GTK_CONTAINER(content),grid); - GtkWidget *close_button=gtk_dialog_add_button(GTK_DIALOG(dialog),"Cancel",GTK_RESPONSE_OK); - //gtk_widget_override_font(close_button, pango_font_description_from_string("Arial 18")); - gtk_widget_show_all(dialog); - - g_signal_connect_swapped (dialog, - "response", - G_CALLBACK (gtk_widget_destroy), - dialog); - - gtk_dialog_run(GTK_DIALOG(dialog)); - -} - void lock_cb(GtkWidget *widget, gpointer data) { #ifdef CLIENT_SERVER if(radio_is_remote) { diff --git a/transmitter.c b/transmitter.c index 7520e75..50d5844 100644 --- a/transmitter.c +++ b/transmitter.c @@ -54,10 +54,6 @@ double getNextInternalSideToneSample(); #define min(x,y) (xmode and tune only *once* within this function, to assure that // the two "if (cwmode)" clauses give the same result. @@ -985,6 +980,9 @@ static void full_tx_buffer(TRANSMITTER *tx) { case NEW_PROTOCOL: gain=8388607.0; // 24 bit break; + default: + gain=32767.0; + break; } if (cwmode) { diff --git a/tx_menu.c b/tx_menu.c index 570e417..e628959 100644 --- a/tx_menu.c +++ b/tx_menu.c @@ -31,7 +31,6 @@ static GtkWidget *parent_window=NULL; static GtkWidget *dialog=NULL; -static GtkWidget *last_filter; static GtkWidget *input; static GtkWidget *micin_b=NULL; static GtkWidget *linein_b=NULL; @@ -39,9 +38,6 @@ static GtkWidget *micboost_b=NULL; static GtkWidget *tx_spin_low; static GtkWidget *tx_spin_high; -static GtkWidget *tune_label; -static GtkWidget *tune_scale; - static void cleanup() { if(dialog!=NULL) { gtk_widget_destroy(dialog); diff --git a/update.c b/update.c index 63acc33..8f1cc17 100644 --- a/update.c +++ b/update.c @@ -24,6 +24,9 @@ int check_update() { FILE* f=fopen("latest","r"); if(f) { char *c=fgets(new_version,sizeof(new_version),f); + if (c == NULL) { + return -1; + } fclose(f); } else { fprintf(stderr,"check_update: could not read latest version\n"); diff --git a/vfo_menu.c b/vfo_menu.c index d9ec9d5..2cc7832 100644 --- a/vfo_menu.c +++ b/vfo_menu.c @@ -210,8 +210,6 @@ static void lock_cb(GtkWidget *widget, gpointer data) { g_idle_add(ext_vfo_update,NULL); } -static GtkWidget *last_mode; - void vfo_menu(GtkWidget *parent,int vfo) { int i; @@ -256,7 +254,6 @@ void vfo_menu(GtkWidget *parent,int vfo) { gtk_misc_set_alignment (GTK_MISC (label), 1, .5); gtk_grid_attach(GTK_GRID(grid),label,0,1,3,1); - GtkWidget *step_rb=NULL; for (i=0; i<16; i++) { btn[i]=gtk_button_new_with_label(btn_labels[i]); set_button_text_color(btn[i],"black"); diff --git a/vox_menu.c b/vox_menu.c index 5bba3ee..d47160f 100644 --- a/vox_menu.c +++ b/vox_menu.c @@ -42,8 +42,8 @@ static GtkWidget *led; static GdkRGBA led_color={0.0,0.0,0.0,1.0}; static GdkRGBA white={1.0,1.0,1.0,1.0}; -static GdkRGBA red={1.0,0.0,0.0,1.0}; -static GdkRGBA green={0.0,1.0,0.1,1.0}; +// static GdkRGBA red={1.0,0.0,0.0,1.0}; +// static GdkRGBA green={0.0,1.0,0.1,1.0}; static GThread *level_thread_id; static int run_level=0; @@ -137,10 +137,6 @@ static void vox_value_changed_cb(GtkWidget *widget, gpointer data) { vox_threshold=gtk_range_get_value(GTK_RANGE(widget))/1000.0; } -static void vox_gain_value_changed_cb(GtkWidget *widget, gpointer data) { - vox_gain=gtk_range_get_value(GTK_RANGE(widget)); -} - static void vox_hang_value_changed_cb(GtkWidget *widget, gpointer data) { vox_hang=gtk_range_get_value(GTK_RANGE(widget)); } diff --git a/xvtr_menu.c b/xvtr_menu.c index a370b5a..b7c387c 100644 --- a/xvtr_menu.c +++ b/xvtr_menu.c @@ -32,15 +32,12 @@ #include "vfo.h" static GtkWidget *parent_window=NULL; -static GtkWidget *menu_b=NULL; static GtkWidget *dialog=NULL; static GtkWidget *title[BANDS+XVTRS]; static GtkWidget *min_frequency[BANDS+XVTRS]; static GtkWidget *max_frequency[BANDS+XVTRS]; static GtkWidget *lo_frequency[BANDS+XVTRS]; static GtkWidget *lo_error[BANDS+XVTRS]; -static GtkWidget *tx_lo_frequency[BANDS+XVTRS]; -static GtkWidget *tx_lo_error[BANDS+XVTRS]; static GtkWidget *disable_pa[BANDS+XVTRS]; static void save_xvtr () { -- 2.45.2