Small Corrections

diff --git a/midi3.c b/midi3.c
index d654dca08701e728afcd925f052e7d85b8f2a6ac..3fd2f94b9dc45c488393f992fa151c495e17db45 100644 (file)
--- a/midi3.c
+++ b/midi3.c
@@ -299,9 +299,11 @@ void DoTheMidi(enum MIDIaction action, enum MIDItype type, int val) {
            g_idle_add(ext_vfo_update, NULL);
            break;
        case PS:
+#ifdef PURESIGNAL
            // toggle PURESIGNAL
            new=!(transmitter->puresignal);
            g_idle_add(ext_tx_set_ps,(gpointer) (uintptr_t) new);
+#endif
            break;
        case SPLIT:
            // toggle split mode

diff --git a/new_protocol.h b/new_protocol.h
index 4a5bf5b592baf1eb5901f0e61cd0646ac956f1fe..d663c76c66e3b215138490e66c544c3a713429fc 100644 (file)
--- a/new_protocol.h
+++ b/new_protocol.h
@@ -73,6 +73,7 @@ extern int send_general;
 extern void schedule_high_priority();
 extern void schedule_general();
 extern void schedule_receive_specific();
+extern void schedule_transmit_specific();
 
 extern void new_protocol_init(int pixels);
 extern void new_protocol_stop();

diff --git a/ps_menu.c b/ps_menu.c
index 4e13f034cdc46047478b7ab4d541cb81c17f958d..7d554dc768bf43483045401d3f32896641cf8833 100644 (file)
--- a/ps_menu.c
+++ b/ps_menu.c
@@ -240,6 +240,9 @@ static int info_thread(gpointer arg) {
             if (transmitter->attenuation != new_att) {
               SetPSControl(transmitter->id, 1, 0, 0, 0);
              transmitter->attenuation=new_att;
+             if (protocol == NEW_PROTOCOL) {
+               schedule_transmit_specific();
+             }
               state=1;
            }
           }
@@ -267,12 +270,7 @@ static void ps_ant_cb(GtkWidget *widget, gpointer data) {
       case 0:  // AUTO (Internal), feedback goes to first ADC
       case 3:  // EXT1,            feedback goes to first ADC
       case 4:  // EXT2,            feedback goes to first ADC
-       receiver[PS_RX_FEEDBACK]->alex_antenna = (int) (uintptr_t) data;
-       receiver[PS_RX_FEEDBACK]->adc              = 0;
-       break;
-      case 99: // RX2,              feedback goes to second ADC
-       receiver[PS_RX_FEEDBACK]->alex_antenna = 0;
-       receiver[PS_RX_FEEDBACK]->adc              = 1;
+       receiver[PS_RX_FEEDBACK]->alex_antenna = val;
        break;
     }
   }
@@ -428,7 +426,7 @@ void ps_menu(GtkWidget *parent) {
 
   GtkWidget *ps_ant_auto=gtk_radio_button_new_with_label(NULL,"AUTO");
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ps_ant_auto), 
-    (receiver[PS_RX_FEEDBACK]->alex_antenna == 0) && (receiver[PS_RX_FEEDBACK]->adc == 0));
+    (receiver[PS_RX_FEEDBACK]->alex_antenna == 0) );
   gtk_widget_show(ps_ant_auto);
   gtk_grid_attach(GTK_GRID(grid), ps_ant_auto, col, row, 1, 1);
   g_signal_connect(ps_ant_auto,"toggled", G_CALLBACK(ps_ant_cb), (gpointer) (long) 0);
@@ -436,7 +434,7 @@ void ps_menu(GtkWidget *parent) {
 
   GtkWidget *ps_ant_ext1=gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(ps_ant_auto),"EXT1");
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ps_ant_ext1),
-    (receiver[PS_RX_FEEDBACK]->alex_antenna==3) && (receiver[PS_RX_FEEDBACK]->adc == 0));
+    (receiver[PS_RX_FEEDBACK]->alex_antenna==3) );
   gtk_widget_show(ps_ant_ext1);
   gtk_grid_attach(GTK_GRID(grid), ps_ant_ext1, col, row, 1, 1);
   g_signal_connect(ps_ant_ext1,"toggled", G_CALLBACK(ps_ant_cb), (gpointer) (long) 3);
@@ -444,21 +442,12 @@ void ps_menu(GtkWidget *parent) {
 
   GtkWidget *ps_ant_ext2=gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(ps_ant_auto),"EXT2");
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ps_ant_ext2),
-    (receiver[PS_RX_FEEDBACK]->alex_antenna==4) && (receiver[PS_RX_FEEDBACK]->adc == 0));
+    (receiver[PS_RX_FEEDBACK]->alex_antenna==4) );
   gtk_widget_show(ps_ant_ext2);
   gtk_grid_attach(GTK_GRID(grid), ps_ant_ext2, col, row, 1, 1);
   g_signal_connect(ps_ant_ext2,"toggled", G_CALLBACK(ps_ant_cb), (gpointer) (long) 4);
   col++;
 
-  if (n_adc > 1) {
-    // If there are two ADCs, we may choose to use the second ADC for PS_RX_FEEDBACK
-    GtkWidget *ps_ant_rx2=gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(ps_ant_auto),"RX2");
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ps_ant_rx2), receiver[PS_RX_FEEDBACK]->adc==1);
-    gtk_widget_show(ps_ant_rx2);
-    gtk_grid_attach(GTK_GRID(grid), ps_ant_rx2, col, row, 1, 1);
-    g_signal_connect(ps_ant_rx2,"toggled", G_CALLBACK(ps_ant_cb), (gpointer) (long) 99);
-  }
-
   row++;
 
   col=0;