Fix merge problem

diff --git a/gpio.c b/gpio.c
index f38d86f4e953170bd4e903160f47ecebd55fb8cb..139c647b5a924d38d86b4458b1ec8e183ac20d59 100644 (file)
--- a/gpio.c
+++ b/gpio.c
@@ -778,11 +778,7 @@ void gpio_save_state() {
     }
   }
 
-<<<<<<< HEAD
   if(controller==CONTROLLER2_V1 || controller==CONTROLLER2_V2) {
-=======
-  if(controller!=CONTROLLER1) {
->>>>>>> 98419181d3881fcaa1986ff14175d74cb9e1bccf
     for(int i=0;i<MAX_SWITCHES;i++) {
       sprintf(name,"switches[%d].switch_enabled",i);
       sprintf(value,"%d",switches[i].switch_enabled);
@@ -823,11 +819,7 @@ void gpio_restore_actions() {
       if(value) switches_controller1[f][i].switch_function=atoi(value);
     }
   }
-<<<<<<< HEAD
   if(controller==CONTROLLER2_V1 || controller==CONTROLLER2_V2) {
-=======
-  if(controller!=CONTROLLER1) {
->>>>>>> 98419181d3881fcaa1986ff14175d74cb9e1bccf
     for(int i=0;i<MAX_SWITCHES;i++) {
       sprintf(name,"switches[%d].switch_function",i);
       value=getProperty(name);
@@ -860,11 +852,7 @@ void gpio_save_actions() {
       setProperty(name,value);
     }
   }
-<<<<<<< HEAD
   if(controller==CONTROLLER2_V1 || controller==CONTROLLER2_V2) {
-=======
-  if(controller!=CONTROLLER1) {
->>>>>>> 98419181d3881fcaa1986ff14175d74cb9e1bccf
     for(int i=0;i<MAX_SWITCHES;i++) {
       sprintf(name,"switches[%d].switch_function",i);
       sprintf(value,"%d",switches[i].switch_function);

diff --git a/i2c.c b/i2c.c
index 084be2f69ae7a6a11c5420657c73788b84ae7335..78fc43b9e9db29b6945bfc0cc66de563693dced2 100644 (file)
--- a/i2c.c
+++ b/i2c.c
@@ -97,149 +97,6 @@ g_print("%s: switches=%p sw=%d action=%d\n",__FUNCTION__,switches,i,switches[i].
           a->action=switches[i].switch_function;
           a->state=PRESSED;
           g_idle_add(switch_action,a);
-
-/*
-          switch(switches[i].switch_function) {
-            case TUNE:
-              if(can_transmit) {
-                int tune=getTune();
-                if(tune==0) tune=1; else tune=0;
-                  g_idle_add(ext_tune_update,GINT_TO_POINTER(tune));
-              }
-              break;
-            case MOX:
-              if(can_transmit) {
-                int mox=getMox();
-                if(mox==0) mox=1; else mox=0;
-                g_idle_add(ext_mox_update,GINT_TO_POINTER(mox));
-              }
-              break;
-            case PS:
-#ifdef PURESIGNAL
-              if(can_transmit) g_idle_add(ext_ps_update,NULL);
-#endif
-              break;
-            case TWO_TONE:
-              if(can_transmit) g_idle_add(ext_two_tone,NULL);
-              break;
-            case NR:
-              g_idle_add(ext_nr_update,NULL);
-              break;
-            case NB:
-              g_idle_add(ext_nb_update,NULL);
-              break;
-            case SNB:
-              g_idle_add(ext_snb_update,NULL);
-              break;
-            case RIT:
-              g_idle_add(ext_rit_update,NULL);
-              break;
-            case RIT_CLEAR:
-              g_idle_add(ext_rit_clear,NULL);
-              break;
-            case XIT:
-              if(can_transmit) g_idle_add(ext_xit_update,NULL);
-              break;
-            case XIT_CLEAR:
-              if(can_transmit) g_idle_add(ext_xit_clear,NULL);
-              break;
-            case BAND_PLUS:
-              g_idle_add(ext_band_plus,NULL);
-              break;
-            case BAND_MINUS:
-              g_idle_add(ext_band_minus,NULL);
-              break;
-            case BANDSTACK_PLUS:
-              g_idle_add(ext_bandstack_plus,NULL);
-              break;
-            case BANDSTACK_MINUS:
-              g_idle_add(ext_bandstack_minus,NULL);
-              break;
-            case MODE_PLUS:
-              g_idle_add(ext_mode_plus,NULL);
-              break;
-            case MODE_MINUS:
-              g_idle_add(ext_mode_minus,NULL);
-              break;
-            case FILTER_PLUS:
-              g_idle_add(ext_filter_plus,NULL);
-              break;
-            case FILTER_MINUS:
-              g_idle_add(ext_filter_minus,NULL);
-              break;
-            case A_TO_B:
-              g_idle_add(ext_vfo_a_to_b,NULL);
-              break;
-            case B_TO_A:
-              g_idle_add(ext_vfo_b_to_a,NULL);
-              break;
-            case A_SWAP_B:
-              g_idle_add(ext_vfo_a_swap_b,NULL);
-              break;
-            case LOCK:
-              g_idle_add(ext_lock_update,NULL);
-              break;
-            case CTUN:
-              g_idle_add(ext_ctun_update,NULL);
-              break;
-            case AGC:
-              g_idle_add(ext_agc_update,NULL);
-              break;
-            case SPLIT:
-              if(can_transmit) g_idle_add(ext_split_toggle,NULL);
-              break;
-            case DIVERSITY:
-              g_idle_add(ext_diversity_update,GINT_TO_POINTER(0));
-              break;
-            case SAT:
-              if(can_transmit) g_idle_add(ext_sat_update,NULL);
-              break;
-            case MENU_BAND:
-              g_idle_add(ext_band_update,NULL);
-              break;
-            case MENU_BANDSTACK:
-              g_idle_add(ext_bandstack_update,NULL);
-              break;
-            case MENU_MODE:
-              g_idle_add(ext_mode_update,NULL);
-              break;
-            case MENU_FILTER:
-              g_idle_add(ext_filter_update,NULL);
-              break;
-            case MENU_FREQUENCY:
-              g_idle_add(ext_frequency_update,NULL);
-              break;
-            case MENU_MEMORY:
-              g_idle_add(ext_memory_update,NULL);
-              break;
-            case MENU_DIVERSITY:
-              g_idle_add(ext_diversity_update,GINT_TO_POINTER(1));
-              break;
-            case MENU_PS:
-#ifdef PURESIGNAL
-              g_idle_add(ext_start_ps,NULL);
-#endif
-              break;
-            case FUNCTION:
-              g_idle_add(ext_function_update,NULL);
-              break;
-            case MUTE:
-              g_idle_add(ext_mute_update,NULL);
-              break;
-            case PAN_MINUS:
-              g_idle_add(ext_pan_update,GINT_TO_POINTER(-100));
-              break;
-            case PAN_PLUS:
-              g_idle_add(ext_pan_update,GINT_TO_POINTER(100));
-              break;
-            case ZOOM_MINUS:
-              g_idle_add(ext_zoom_update,GINT_TO_POINTER(-1));
-              break;
-            case ZOOM_PLUS:
-              g_idle_add(ext_zoom_update,GINT_TO_POINTER(1));
-              break;
-          }
-*/
         }
       }
     }