Restart old protocol when changing the number of used HPSDR receivers.

diff --git a/diversity_menu.c b/diversity_menu.c
index b42822d5c8886ac669958aa849ada3b5441d76d2..eaa41bdfca0b5db22ae8cde2ce37f96cc9218af0 100644 (file)
--- a/diversity_menu.c
+++ b/diversity_menu.c
@@ -61,7 +61,18 @@ static gboolean delete_event(GtkWidget *widget, GdkEvent *event, gpointer user_d
 }
 
 static void diversity_cb(GtkWidget *widget, gpointer data) {
+  //
+  // If we have only one receiver, then changing diversity
+  // changes the number of HPSR receivers so we restart the
+  // original protocol
+  //
+  if (protocol == ORIGINAL_PROTOCOL && receivers == 1) {
+    old_protocol_stop();
+  }
   diversity_enabled=diversity_enabled==1?0:1;
+  if (protocol == ORIGINAL_PROTOCOL && receivers == 1) {
+    old_protocol_run();
+  }
   if (protocol == NEW_PROTOCOL) {
     schedule_high_priority();
     schedule_receive_specific();

diff --git a/ps_menu.c b/ps_menu.c
index e26ee5bd90be7eb93500abab36f0f8301164480d..21682dbe6435af47ce35d2f627b564f027bc74e4 100644 (file)
--- a/ps_menu.c
+++ b/ps_menu.c
@@ -28,6 +28,7 @@
 #include "toolbar.h"
 #include "transmitter.h"
 #include "new_protocol.h"
+#include "old_protocol.h"
 #include "vfo.h"
 #include "ext.h"
 
@@ -286,7 +287,17 @@ static void ps_ant_cb(GtkWidget *widget, gpointer data) {
 }
 
 static void enable_cb(GtkWidget *widget, gpointer data) {
+  //
+  // Enabling/Disabling changes the number of required
+  // of HPSR receivers so we restart the original protocol
+  //
+  if (protocol == ORIGINAL_PROTOCOL) {
+    old_protocol_stop();
+  }
   g_idle_add(ext_tx_set_ps,GINT_TO_POINTER(gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))));
+  if (protocol == ORIGINAL_PROTOCOL) {
+    old_protocol_run();
+  }
 }
 
 static void auto_cb(GtkWidget *widget, gpointer data) {

diff --git a/radio.c b/radio.c
index 35050db485562024a98ef0b14eb39ecc0a75b8f7..66e3c585b7bfb1394657ed0710b75cae14c03e7c 100644 (file)
--- a/radio.c
+++ b/radio.c
@@ -1070,6 +1070,13 @@ void radio_change_receivers(int r) {
   // number of receivers has not changed.
   if (receivers == r) return;
   fprintf(stderr,"radio_change_receivers: from %d to %d\n",receivers,r);
+  //
+  // When changing the number of receivers, restart the
+  // old protocol
+  //
+  if (protocol == ORIGINAL_PROTOCOL) {
+    old_protocol_stop();
+  }
   switch(r) {
     case 1:
        set_displaying(receiver[1],0);
@@ -1087,6 +1094,9 @@ void radio_change_receivers(int r) {
   if(protocol==NEW_PROTOCOL) {
     schedule_high_priority();
   }
+  if (protocol == ORIGINAL_PROTOCOL) {
+    old_protocol_run();
+  }
 }
 
 void radio_change_sample_rate(int rate) {