added DIVERSITY functions (toggle, change gain/phase) to MIDI functions

diff --git a/diversity_menu.c b/diversity_menu.c
index 6df029686d2e19123a999d2ce6da24818e3711d7..1b66296ab3b8688ff93199e1a12253bf255d0e9f 100644 (file)
--- a/diversity_menu.c
+++ b/diversity_menu.c
@@ -128,7 +128,7 @@ static void phase_fine_changed_cb(GtkWidget *widget, gpointer data) {
 }
 
 void update_diversity_gain(double increment) {
-  double g=div_gain+(increment/10);
+  double g=div_gain+(0.1*increment);
   if(g<-27.0) g=-27.0;
   if(g>27.0) g=27.0;
   div_gain=g;

diff --git a/ext.c b/ext.c
index 9543b783e611896c256e784346b95fd4921a10d8..34981e016dbce87ad79260998ad09c61a0aae227 100644 (file)
--- a/ext.c
+++ b/ext.c
@@ -574,6 +574,20 @@ int ext_diversity_update(void *data) {
   return 0;
 }
 
+int ext_diversity_change_gain(void *data) {
+  double *dp = (double *) data;
+  update_diversity_gain(*dp);
+  free(dp);
+  return 0;
+}
+
+int ext_diversity_change_phase(void *data) {
+  double *dp = (double *) data;
+  update_diversity_phase(*dp);
+  free(dp);
+  return 0;
+}
+
 #ifdef PURESIGNAL
 int ext_start_ps(void *data) {
   start_ps();

diff --git a/ext.h b/ext.h
index 6442dc5a857a693d1acf9a3dd9e8be488dc68317..810be49f0c0e5bb0d929afbd0b64f5949bd28c3c 100644 (file)
--- a/ext.h
+++ b/ext.h
@@ -104,6 +104,8 @@ int ext_set_compression(void *data);
 int ext_start_rx(void *data);
 int ext_start_tx(void *data);
 int ext_diversity_update(void *data);
+int ext_diversity_change_gain(void *data);
+int ext_diversity_change_phase(void *data);
 int ext_sat_update(void *data);
 int ext_set_rf_gain(void *data);
 int ext_set_duplex(void *data);

diff --git a/midi.h b/midi.h
index 999bc0fdcd89d9cbe3a5671486a1f94921fd00c9..3090b2349dad24e8ef028d0803dba49832b9ba97 100644 (file)
--- a/midi.h
+++ b/midi.h
@@ -62,6 +62,9 @@ enum MIDIaction {
   CWL,                 // CWL:                 Left paddle pressed (use with ONOFF)
   CWR,                 // CWR:                 Right paddle pressed (use with ONOFF)
   CWSPEED,             // CWSPEED:             Set speed of (iambic) CW keyer
+  DIV_GAIN,            // DIVGAIN:             change DIVERSITY gain
+  DIV_PHASE,           // DIVPHASE:            change DIVERSITY phase
+  DIV_TOGGLE,          // DIVTOGGLE:           DIVERSITY on/off
   MIDI_DUP,            // DUP:                 toggle duplex on/off
   FILTER_DOWN,         // FILTERDOWN:          cycle through filters downwards
   FILTER_UP,           // FILTERUP:            cycle through filters upwards

diff --git a/midi2.c b/midi2.c
index 29788e2839f937ecd5a21c9d3e297b70aadabc55..6385e5d7915fde64048343a249d2afb13bf07ad5 100644 (file)
--- a/midi2.c
+++ b/midi2.c
@@ -115,6 +115,9 @@ static struct {
        { CWL,                  "CWL"},
        { CWR,                  "CWR"},
        { CWSPEED,              "CWSPEED"},
+       { DIV_GAIN,             "DIVGAIN"},
+       { DIV_PHASE,            "DIVPHASE"},
+       { DIV_TOGGLE,           "DIVTOGGLE"},
        { MIDI_DUP,             "DUP"},
         { FILTER_DOWN,         "FILTERDOWN"},
         { FILTER_UP,           "FILTERUP"},

diff --git a/midi3.c b/midi3.c
index 56a1333ff31fd9a42305ba3d0008c0ed7ced60a6..d35b7c950e40046895de11fa8941698baaca473c 100644 (file)
--- a/midi3.c
+++ b/midi3.c
@@ -232,6 +232,54 @@ void DoTheMidi(enum MIDIaction action, enum MIDItype type, int val) {
 #endif
             g_idle_add(ext_vfo_update, NULL);
            break;
+       /////////////////////////////////////////////////////////// "DIVGAIN"
+       case DIV_GAIN:  // knob or wheel supported
+            switch (type) {
+              case MIDI_KNOB:
+               dnew = 10.0*(-25.0 + 0.5*val - div_gain);
+                break;
+              case MIDI_WHEEL:
+                dnew= val;
+                break;
+              default:
+                // do not change
+                // we should not come here anyway
+               dnew = 0.0;
+                break;
+            }
+           // dnew is the delta times 10
+           dp=malloc(sizeof(double));
+           *dp=dnew;
+            g_idle_add(ext_diversity_change_gain, dp);
+            break;
+        /////////////////////////////////////////////////////////// "DIVPHASE"
+        case DIV_PHASE:  // knob or wheel supported
+            switch (type) {
+              case MIDI_KNOB:
+                dnew = (-180.0 + 3.6*val - div_phase);
+                break;
+              case MIDI_WHEEL:
+                dnew= val;
+                break;
+              default:
+                // do not change
+                // we should not come here anyway
+                dnew = 0.0;
+                break;
+            }
+            // dnew is the delta
+            dp=malloc(sizeof(double));
+            *dp=dnew;
+            g_idle_add(ext_diversity_change_phase, dp);
+            break;
+        /////////////////////////////////////////////////////////// "DIVTOGGLE"
+        case DIV_TOGGLE:   // only key supported
+            if (type == MIDI_KEY) {
+                // enable/disable DIVERSITY
+                diversity_enabled = diversity_enabled ? 0 : 1;
+                g_idle_add(ext_vfo_update, NULL);
+            }
+            break;
        /////////////////////////////////////////////////////////// "DUP"
         case MIDI_DUP:
            if (can_transmit && !isTransmitting()) {