Fixed Lock button on E1

diff --git a/gpio.c b/gpio.c
index 2dfa86f3a3889b65b1db6842bb9f5334b7b1116b..9586924252ebc08022d45d3294f6cb761e3e5654 100644 (file)
--- a/gpio.c
+++ b/gpio.c
@@ -51,11 +51,10 @@ int ENABLE_E1_ENCODER=1;
 int ENABLE_E1_PULLUP=0;
 int E1_ENCODER_A=20;
 int E1_ENCODER_B=26;
-#ifdef sx1509
+#ifndef sx1509
 int E1_FUNCTION=25;
 #else
 int E1_FUNCTION=2; //RRK, was 25 now taken by waveshare LCD TS, disable i2c
-int LOCK_BUTTON=2; //temporarily in flux upstream
 #endif
 int ENABLE_E2_ENCODER=1;
 int ENABLE_E2_PULLUP=0;
@@ -87,7 +86,7 @@ int ENABLE_MOX_BUTTON=1;
 int MOX_BUTTON=27;
 int ENABLE_FUNCTION_BUTTON=1;
 int FUNCTION_BUTTON=22;
-int ENABLE_LOCK_BUTTON=1;
+int ENABLE_E1_BUTTON=1;
 int ENABLE_CW_BUTTONS=1;
 // make sure to disable UART0 for next 2 gpios
 int CWL_BUTTON=9;
@@ -478,11 +477,11 @@ void gpio_restore_state() {
   if(value) ENABLE_MOX_BUTTON=atoi(value);
   value=getProperty("MOX_BUTTON");
   if(value) MOX_BUTTON=atoi(value);
-  value=getProperty("ENABLE_LOCK_BUTTON");
-  if(value) ENABLE_LOCK_BUTTON=atoi(value);
+  value=getProperty("ENABLE_E1_BUTTON");
+  if(value) ENABLE_E1_BUTTON=atoi(value);
 #ifndef sx1509
-  value=getProperty("LOCK_BUTTON");
-  if(value) LOCK_BUTTON=atoi(value);
+  value=getProperty("E1_FUNCTION");
+  if(value) E1_FUNCTION=atoi(value);
 #endif
   value=getProperty("ENABLE_CW_BUTTONS");
   if(value) ENABLE_CW_BUTTONS=atoi(value);
@@ -565,11 +564,11 @@ void gpio_save_state() {
   setProperty("ENABLE_MOX_BUTTON",value);
   sprintf(value,"%d",MOX_BUTTON);
   setProperty("MOX_BUTTON",value);
-  sprintf(value,"%d",ENABLE_LOCK_BUTTON);
-  setProperty("ENABLE_LOCK_BUTTON",value);
+  sprintf(value,"%d",ENABLE_E1_BUTTON);
+  setProperty("ENABLE_E1_BUTTON",value);
 #ifndef sx1509
-  sprintf(value,"%d",LOCK_BUTTON);
-  setProperty("LOCK_BUTTON",value);
+  sprintf(value,"%d",E1_FUNCTION);
+  setProperty("E1_FUNCTION",value);
 #endif
   sprintf(value,"%d",ENABLE_CW_BUTTONS);
   setProperty("ENABLE_CW_BUTTONS",value);
@@ -724,8 +723,8 @@ fprintf(stderr,"encoder_init\n");
   }
 
 #ifndef sx1509
-  if(ENABLE_LOCK_BUTTON) {
-    setup_button(LOCK_BUTTON, lockAlert);
+  if(ENABLE_E1_BUTTON) {
+    setup_button(E1_FUNCTION, lockAlert);
   }
 #endif
 

diff --git a/toolbar.c b/toolbar.c
index d758a1c9246717514ec39c97b4c750c9a3378f47..4409e3a6feed5a5be651b6ad2e378a1b8be14e09 100644 (file)
--- a/toolbar.c
+++ b/toolbar.c
@@ -85,6 +85,13 @@ static void set_button_text_color(GtkWidget *widget,char *color) {
 void update_toolbar_labels() {
   if(toolbar_dialog_buttons) {
       if(function) {
+        gtk_button_set_label(GTK_BUTTON(sim_mox),"Tune");
+        gtk_button_set_label(GTK_BUTTON(sim_s1),"RIT+");
+        gtk_button_set_label(GTK_BUTTON(sim_s2),"RIT-");
+        gtk_button_set_label(GTK_BUTTON(sim_s3),"CTUN");
+        gtk_button_set_label(GTK_BUTTON(sim_s4),"");
+        gtk_button_set_label(GTK_BUTTON(sim_s5),"");
+        gtk_button_set_label(GTK_BUTTON(sim_s6),"Lock");
       } else {
         gtk_button_set_label(GTK_BUTTON(sim_mox),"Mox");
         gtk_button_set_label(GTK_BUTTON(sim_s1),"Band");
@@ -94,16 +101,6 @@ void update_toolbar_labels() {
         gtk_button_set_label(GTK_BUTTON(sim_s5),"Noise");
         gtk_button_set_label(GTK_BUTTON(sim_s6),"AGC");
       }
-      if(function) {
-        gtk_button_set_label(GTK_BUTTON(sim_mox),"Tune");
-        gtk_button_set_label(GTK_BUTTON(sim_s1),"RIT+");
-        gtk_button_set_label(GTK_BUTTON(sim_s2),"RIT-");
-        gtk_button_set_label(GTK_BUTTON(sim_s3),"CTUN");
-        gtk_button_set_label(GTK_BUTTON(sim_s4),"Filter");
-        gtk_button_set_label(GTK_BUTTON(sim_s5),"Noise");
-        gtk_button_set_label(GTK_BUTTON(sim_s6),"AGC");
-      } else {
-      }
   } else {
     if(function) {
       gtk_button_set_label(GTK_BUTTON(sim_s1),"Band v");
@@ -1175,7 +1172,10 @@ void sim_s4_cb(GtkWidget *widget, gpointer data) {
   BANDSTACK_ENTRY *entry;
 
   if(toolbar_dialog_buttons) {
-    filter_cb(widget,data);
+    if(function) {
+    } else {
+      filter_cb(widget,data);
+    }
   } else {
     band=band_get_current_band();
     entry=bandstack_entry_get_current();
@@ -1201,29 +1201,12 @@ void sim_s4_cb(GtkWidget *widget, gpointer data) {
 
 }
 
-void sim_s6_cb(GtkWidget *widget, gpointer data) {
+void sim_s5_cb(GtkWidget *widget, gpointer data) {
   if(toolbar_dialog_buttons) {
-    agc_cb(widget,data);
-  } else {
     if(function) {
-      agc--;
-      if(agc<0) {
-        agc=3;
-      }
     } else {
-      agc++;
-      if(agc>=4) {
-        agc=0;
-      }
+      noise_cb(widget,data);
     }
-    SetRXAAGCMode(CHANNEL_RX0, agc);
-    vfo_update(NULL);
-  }
-}
-
-void sim_s5_cb(GtkWidget *widget, gpointer data) {
-  if(toolbar_dialog_buttons) {
-    noise_cb(widget,data);
   } else {
     if(function) {
       if(nr) {
@@ -1264,6 +1247,30 @@ void sim_s5_cb(GtkWidget *widget, gpointer data) {
   }
 }
 
+void sim_s6_cb(GtkWidget *widget, gpointer data) {
+  if(toolbar_dialog_buttons) {
+    if(function) {
+      lock_cb(widget,data);
+    } else {
+      agc_cb(widget,data);
+    }
+  } else {
+    if(function) {
+      agc--;
+      if(agc<0) {
+        agc=3;
+      }
+    } else {
+      agc++;
+      if(agc>=4) {
+        agc=0;
+      }
+    }
+    SetRXAAGCMode(CHANNEL_RX0, agc);
+    vfo_update(NULL);
+  }
+}
+
 void sim_mox_cb(GtkWidget *widget, gpointer data) {
   if(function) {
     tune_cb((GtkWidget *)NULL, (gpointer)NULL);