Manual merge with John's update (mainly removing debug output)

diff --git a/ext.c b/ext.c
index 135a88b9752ca7f4c4f426a11a40f6fd3daaa877..1ecd2167d712f744f1e6f516e206888d83e1dce9 100644 (file)
--- a/ext.c
+++ b/ext.c
@@ -115,7 +115,6 @@ int ext_set_frequency(void *data) {
   // via the menu prior to changing the frequency
   //
   SET_FREQUENCY *set_frequency=(SET_FREQUENCY *)data;
-g_print("ext_set_frequency: vfo=%d freq=%lld\n",set_frequency->vfo,set_frequency->frequency);
   vfo_set_frequency(set_frequency->vfo,set_frequency->frequency);
   free(data);
   return 0;
@@ -134,7 +133,7 @@ static int vfo_timeout_cb(void * data) {
 // such that they can be filtered out if they come at high rate
 //
 int ext_vfo_update(void *data) {
-  if (vfo_timeout ==0) {
+  if (vfo_timeout==0) {
     vfo_timeout=g_timeout_add(100, vfo_timeout_cb, NULL);
   }
   return 0;
@@ -185,7 +184,6 @@ int ext_noise_update(void *data) {
 }
 
 int ext_mox_update(void *data) {
-g_print("%s\n",__FUNCTION__);
   mox_update(GPOINTER_TO_INT(data));
   return 0;
 }
@@ -446,7 +444,6 @@ void band_plus(int id) {
 
 int ext_band_select(void *data) {
   int b=GPOINTER_TO_INT(data);
-  g_print("%s: %d\n",__FUNCTION__,b);
   vfo_band_changed(active_receiver->id,b);
   return 0;
 }
@@ -797,7 +794,6 @@ int ext_remote_command(void *data) {
       AGC_COMMAND *agc_command=(AGC_COMMAND *)data;
       RECEIVER *rx=receiver[agc_command->id];
       rx->agc=ntohs(agc_command->agc);
-g_print("AGC_COMMAND: set_agc id=%d agc=%d\n",rx->id,rx->agc);
       set_agc(rx,rx->agc);
       send_agc(client->socket,rx->id,rx->agc);
       g_idle_add(ext_vfo_update, NULL);
@@ -860,7 +856,6 @@ g_print("AGC_COMMAND: set_agc id=%d agc=%d\n",rx->id,rx->agc);
       BAND_COMMAND *band_command=(BAND_COMMAND *)data;
       RECEIVER *rx=receiver[band_command->id];
       short b=htons(band_command->band);
-g_print("BAND_COMMAND: id=%d band=%d\n",rx->id,b);
       vfo_band_changed(rx->id,b);
       send_vfo_data(client,VFO_A);
       send_vfo_data(client,VFO_B);
@@ -871,7 +866,6 @@ g_print("BAND_COMMAND: id=%d band=%d\n",rx->id,b);
       MODE_COMMAND *mode_command=(MODE_COMMAND *)data;
       RECEIVER *rx=receiver[mode_command->id];
       short m=htons(mode_command->mode);
-g_print("MODE_COMMAND: id=%d mode=%d\n",rx->id,m);
       vfo_mode_changed(m);
       send_vfo_data(client,VFO_A);
       send_vfo_data(client,VFO_B);
@@ -883,7 +877,6 @@ g_print("MODE_COMMAND: id=%d mode=%d\n",rx->id,m);
       FILTER_COMMAND *filter_command=(FILTER_COMMAND *)data;
       RECEIVER *rx=receiver[filter_command->id];
       short f=htons(filter_command->filter);
-g_print("FILTER_COMMAND: id=%d filter=%d\n",rx->id,f);
       vfo_filter_changed(f);
       send_vfo_data(client,VFO_A);
       send_vfo_data(client,VFO_B);
@@ -893,7 +886,6 @@ g_print("FILTER_COMMAND: id=%d filter=%d\n",rx->id,f);
     case CMD_RESP_SPLIT:
       {
       SPLIT_COMMAND *split_command=(SPLIT_COMMAND *)data;
-g_print("SPLIT_COMMAND: split=%d\n",split);
       if(can_transmit) {
         split=split_command->split;
         tx_set_mode(transmitter,get_tx_mode());
@@ -906,7 +898,6 @@ g_print("SPLIT_COMMAND: split=%d\n",split);
       {
       SAT_COMMAND *sat_command=(SAT_COMMAND *)data;
       sat_mode=sat_command->sat;
-g_print("SAT_COMMAND: sat_mode=%d\n",sat_mode);
       g_idle_add(ext_vfo_update, NULL);
       send_sat(client->socket,sat_mode);
       }
@@ -915,7 +906,6 @@ g_print("SAT_COMMAND: sat_mode=%d\n",sat_mode);
       {
       DUP_COMMAND *dup_command=(DUP_COMMAND *)data;
       duplex=dup_command->dup;
-g_print("DUP: duplex=%d\n",duplex);
       g_idle_add(ext_vfo_update, NULL);
       send_dup(client->socket,duplex);
       }
@@ -924,7 +914,6 @@ g_print("DUP: duplex=%d\n",duplex);
       {
       LOCK_COMMAND *lock_command=(LOCK_COMMAND *)data;
       locked=lock_command->lock;
-g_print("LOCK: locked=%d\n",locked);
       g_idle_add(ext_vfo_update, NULL);
       send_lock(client->socket,locked);
       }
@@ -932,7 +921,6 @@ g_print("LOCK: locked=%d\n",locked);
     case CMD_RESP_CTUN:
       {
       CTUN_COMMAND *ctun_command=(CTUN_COMMAND *)data;
-g_print("CTUN: vfo=%d ctun=%d\n",ctun_command->id,ctun_command->ctun);
       int v=ctun_command->id;
       vfo[v].ctun=ctun_command->ctun;
       if(!vfo[v].ctun) {
@@ -949,7 +937,6 @@ g_print("CTUN: vfo=%d ctun=%d\n",ctun_command->id,ctun_command->ctun);
       {
       FPS_COMMAND *fps_command=(FPS_COMMAND *)data;
       int rx=fps_command->id;
-g_print("FPS: rx=%d fps=%d\n",rx,fps_command->fps);
       receiver[rx]->fps=fps_command->fps;
       calculate_display_average(receiver[rx]);
       set_displaying(receiver[rx],1);
@@ -960,7 +947,6 @@ g_print("FPS: rx=%d fps=%d\n",rx,fps_command->fps);
       {
       RX_SELECT_COMMAND *rx_select_command=(RX_SELECT_COMMAND *)data;
       int rx=rx_select_command->id;
-g_print("RX_SELECT: rx=%d\n",rx);
       receiver_set_active(receiver[rx]);
       send_rx_select(client->socket,rx);
       }
@@ -969,7 +955,6 @@ g_print("RX_SELECT: rx=%d\n",rx);
       {
       VFO_COMMAND *vfo_command=(VFO_COMMAND *)data;
       int action=vfo_command->id;
-g_print("VFO: action=%d\n",action);
       switch(action) {
         case VFO_A_TO_B:
           vfo_a_to_b();
@@ -989,7 +974,6 @@ g_print("VFO: action=%d\n",action);
       {
       RIT_UPDATE_COMMAND *rit_update_command=(RIT_UPDATE_COMMAND *)data;
       int rx=rit_update_command->id;
-g_print("RIT_UPDATE: rx=%d\n",rx);
       vfo_rit_update(rx);
       send_vfo_data(client,rx);
       }
@@ -998,7 +982,6 @@ g_print("RIT_UPDATE: rx=%d\n",rx);
       {
       RIT_CLEAR_COMMAND *rit_clear_command=(RIT_CLEAR_COMMAND *)data;
       int rx=rit_clear_command->id;
-g_print("RIT_CLEAR: rx=%d\n",rx);
       vfo_rit_clear(rx);
       send_vfo_data(client,rx);
       }
@@ -1008,7 +991,6 @@ g_print("RIT_CLEAR: rx=%d\n",rx);
       RIT_COMMAND *rit_command=(RIT_COMMAND *)data;
       int rx=rit_command->id;
       short rit=ntohs(rit_command->rit);
-g_print("RIT: rx=%d rit=%d\n",rx,(int)rit);
       vfo_rit(rx,(int)rit);
       send_vfo_data(client,rx);
       }
@@ -1016,7 +998,6 @@ g_print("RIT: rx=%d rit=%d\n",rx,(int)rit);
     case CMD_RESP_XIT_UPDATE:
       {
       XIT_UPDATE_COMMAND *xit_update_command=(XIT_UPDATE_COMMAND *)data;
-g_print("XIT_UPDATE\n");
       send_vfo_data(client,VFO_A);
       send_vfo_data(client,VFO_B);
       }
@@ -1024,7 +1005,6 @@ g_print("XIT_UPDATE\n");
     case CMD_RESP_XIT_CLEAR:
       {
       XIT_CLEAR_COMMAND *xit_clear_command=(XIT_CLEAR_COMMAND *)data;
-g_print("XIT_CLEAR\n");
       send_vfo_data(client,VFO_A);
       send_vfo_data(client,VFO_B);
       }
@@ -1033,7 +1013,6 @@ g_print("XIT_CLEAR\n");
       {
       XIT_COMMAND *xit_command=(XIT_COMMAND *)data;
       short xit=ntohs(xit_command->xit);
-g_print("XIT_CLEAR: xit=%d\n",xit);
       send_vfo_data(client,VFO_A);
       send_vfo_data(client,VFO_B);
       }
@@ -1043,7 +1022,6 @@ g_print("XIT_CLEAR: xit=%d\n",xit);
       SAMPLE_RATE_COMMAND *sample_rate_command=(SAMPLE_RATE_COMMAND *)data;
       int rx=(int)sample_rate_command->id;
       long long rate=ntohll(sample_rate_command->sample_rate);
-g_print("SAMPLE_RATE: rx=%d rate=%d\n",rx,(int)rate);
       if(rx==-1) {
         radio_change_sample_rate((int)rate);
         send_sample_rate(client->socket,-1,radio_sample_rate);
@@ -1057,7 +1035,6 @@ g_print("SAMPLE_RATE: rx=%d rate=%d\n",rx,(int)rate);
       {
       RECEIVERS_COMMAND *receivers_command=(RECEIVERS_COMMAND *)data;
       int r=receivers_command->receivers;
-g_print("RECEIVERS: receivers=%d\n",r);
       radio_change_receivers(r);
       send_receivers(client->socket,receivers);
       }
@@ -1066,7 +1043,6 @@ g_print("RECEIVERS: receivers=%d\n",r);
       {
       RIT_INCREMENT_COMMAND *rit_increment_command=(RIT_INCREMENT_COMMAND *)data;
       short increment=ntohs(rit_increment_command->increment);
-g_print("RIT_INCREMENT: increment=%d\n",increment);
       rit_increment=(int)increment;
       send_rit_increment(client->socket,rit_increment);
       }
@@ -1074,7 +1050,6 @@ g_print("RIT_INCREMENT: increment=%d\n",increment);
     case CMD_RESP_FILTER_BOARD:
       {
       FILTER_BOARD_COMMAND *filter_board_command=(FILTER_BOARD_COMMAND *)data;
-g_print("FILTER_BOARD: board=%d\n",(int)filter_board_command->filter_board);
       filter_board=(int)filter_board_command->filter_board;
       load_filters();
       send_filter_board(client->socket,filter_board);
@@ -1083,7 +1058,6 @@ g_print("FILTER_BOARD: board=%d\n",(int)filter_board_command->filter_board);
     case CMD_RESP_SWAP_IQ:
       {
       SWAP_IQ_COMMAND *swap_iq_command=(SWAP_IQ_COMMAND *)data;
-g_print("SWAP_IQ: board=%d\n",(int)swap_iq_command->iqswap);
       iqswap=(int)swap_iq_command->iqswap;
       send_swap_iq(client->socket,iqswap);
       }
@@ -1091,7 +1065,6 @@ g_print("SWAP_IQ: board=%d\n",(int)swap_iq_command->iqswap);
     case CMD_RESP_REGION:
       {
       REGION_COMMAND *region_command=(REGION_COMMAND *)data;
-g_print("REGION: region=%d\n",(int)region_command->region);
       iqswap=(int)region_command->region;
       send_region(client->socket,region);
       }
@@ -1160,14 +1133,12 @@ int ext_pan_set(void *data) {
 
 int ext_remote_set_zoom(void *data) {
   int zoom=GPOINTER_TO_INT(data);
-g_print("ext_remote_set_zoom: %d\n",zoom);
   remote_set_zoom(active_receiver->id,(double)zoom);
   return 0;
 }
 
 int ext_remote_set_pan(void *data) {
   int pan=GPOINTER_TO_INT(data);
-g_print("ext_remote_set_pan: %d\n",pan);
   remote_set_pan(active_receiver->id,(double)pan);
   return 0;
 }

diff --git a/i2c.c b/i2c.c
index 62da7caca70a2f736d5183fa5be77c5977db789c..403ba0d814075b7770c9e5e10ed762b41dd1be26 100644 (file)
--- a/i2c.c
+++ b/i2c.c
@@ -78,27 +78,6 @@ static void frequencyStep(int pos) {
   vfo_step(pos);
 }
 
-static uint64_t epochMilli;
-
-static void initialiseEpoch() {
-  struct timespec ts ;
-
-  clock_gettime (CLOCK_MONOTONIC_RAW, &ts) ;
-  epochMilli = (uint64_t)ts.tv_sec * (uint64_t)1000    + (uint64_t)(ts.tv_nsec / 1000000L) ;
-}
-
-static uint32_t millis () {
-  uint64_t now ;
-  struct  timespec ts ;
-  clock_gettime (CLOCK_MONOTONIC_RAW, &ts) ;
-  now  = (uint64_t)ts.tv_sec * (uint64_t)1000 + (uint64_t)(ts.tv_nsec / 1000000L) ;
-  return (uint32_t)(now - epochMilli) ;
-}
-
-static uint32_t debounce_time=50; // 50ms
-static uint32_t t;
-static uint32_t debounce=0;
-
 void i2c_interrupt() {
   unsigned int flags;
   unsigned int ints;
@@ -111,7 +90,6 @@ void i2c_interrupt() {
   // Perhaps we should determine the lock status and simply return if it is locked.
   //
   g_mutex_lock(&i2c_mutex);
-  t=millis();
   for (;;) {
     flags=read_word_data(0x0E);      // indicates which switch caused the interrupt
                                      // More than one bit may be set if two input lines
@@ -119,16 +97,17 @@ void i2c_interrupt() {
     if (flags == 0) break;           // "forever" loop is left if no interrups pending
     ints=read_word_data(0x10);       // input lines at time of interrupt
                                      // only those bits set in "flags" are meaningful!
+//g_print("%s: flags=%04X ints=%04X\n",__FUNCTION__,flags,ints);
     if(t<debounce) break;
     for(i=0; i<16 && flags; i++) {   // leave loop if no bits left in flags.
         if(i2c_sw[i] & flags) {
           // The input line associated with switch #i has triggered an interrupt
+//g_print("%s: switches=%p sw=%d action=%d\n",__FUNCTION__,switches,i,switches[i].switch_function);
           flags &= ~i2c_sw[i];       // clear *this* bit in flags
           schedule_action(switches[i].switch_function, (ints & i2c_sw[i]) ? PRESSED : RELEASED, 0);
        }
       }
   }
-  debounce=t+debounce_time;
   g_mutex_unlock(&i2c_mutex);
 }
 
@@ -192,7 +171,6 @@ void i2c_init() {
     flags=read_word_data(0x0E);
     if(flags) {
       ints=read_word_data(0x10);
-      fprintf(stderr,"flush interrupt: flags=%04X ints=%04X\n",flags,ints);
       count++;
       if(count==10) {
         return;
@@ -200,7 +178,5 @@ void i2c_init() {
     }
   } while(flags!=0);
 
-  initialiseEpoch();
-  
 }
 #endif

diff --git a/vfo.c b/vfo.c
index 90bdea5a8a9cd76985e10e14ace02cddc243cb0e..67dcf87e822dd9b9e964353246743913db6a3d8d 100644 (file)
--- a/vfo.c
+++ b/vfo.c
@@ -281,7 +281,6 @@ void vfo_restore_state() {
   char *value;
 
   for(i=0;i<MAX_VFOS;i++) {
-g_print("vfo_restore_state: %d\n",i);
 
     vfo[i].band=band20;
     vfo[i].bandstack=0;
@@ -301,7 +300,6 @@ g_print("vfo_restore_state: %d\n",i);
     vfo[i].rit=0;
     vfo[i].ctun=0;
 
-g_print("vfo_restore_state: band=%d frequency=%lld\n",vfo[i].band,vfo[i].frequency);
 
     sprintf(name,"vfo.%d.band",i);
     value=getProperty(name);
@@ -387,7 +385,6 @@ void vfo_apply_mode_settings(int id) {
 void vfo_band_changed(int id,int b) {
   BANDSTACK *bandstack;
 
-  //fprintf(stderr,"%s: %d\n",__FUNCTION__,b);
 #ifdef CLIENT_SERVER
   if(radio_is_remote) {
     send_band(client_socket,id,b);
@@ -1391,7 +1388,7 @@ void vfo_update() {
         cairo_destroy (cr);
         gtk_widget_queue_draw (vfo_panel);
     } else {
-fprintf(stderr,"vfo_update: no surface!\n");
+fprintf(stderr,"%s: no surface!\n",__FUNCTION__);
     }
 }
 
@@ -1406,8 +1403,6 @@ vfo_press_event_cb (GtkWidget *widget,
 
 GtkWidget* vfo_init(int width,int height,GtkWidget *parent) {
 
-fprintf(stderr,"vfo_init: width=%d height=%d\n", width, height);
-
   parent_window=parent;
   my_width=width;
   my_height=height;