renamed RIT_CLEAR to MIDI_RIT_CLEAR (conflict with gpio.h)

diff --git a/midi.h b/midi.h
index 7d3b335baefe5f213286ff4f3117d397c8c10e77..ce8898196d375542f788470fc3471b73745c3429 100644 (file)
--- a/midi.h
+++ b/midi.h
@@ -75,7 +75,7 @@ enum MIDIaction {
   MIDI_PS,             // PURESIGNAL:          toggle PURESIGNAL on/off
   MIDI_RF_GAIN,                // RFGAIN:              receiver RF gain
   TX_DRIVE,            // RFPOWER:             adjust TX RF output power
-  RIT_CLEAR,           // RITCLEAR:            clear RIT and XIT value
+  MIDI_RIT_CLEAR,      // RITCLEAR:            clear RIT and XIT value
   RIT_STEP,            // RITSTEP:             cycle through RIT/XIT step size values
   RIT_TOGGLE,                  // RITTOGGLE:           toggle RIT on/off
   RIT_VAL,             // RITVAL:              change RIT value

diff --git a/midi2.c b/midi2.c
index 9bcebaf61a9fa1da35c9093c53831ad3c4b14b4b..d60d3fcb0c468490b84a44e7e8a7adea8e81448a 100644 (file)
--- a/midi2.c
+++ b/midi2.c
@@ -125,7 +125,7 @@ static struct {
        { MIDI_PS,              "PURESIGNAL"},
        { MIDI_RF_GAIN,         "RFGAIN"},
         { TX_DRIVE,            "RFPOWER"},
-       { RIT_CLEAR,            "RITCLEAR"},
+       { MIDI_RIT_CLEAR,       "RITCLEAR"},
        { RIT_STEP,             "RITSTEP"},
         { RIT_TOGGLE,          "RITTOGGLE"},
         { RIT_VAL,             "RITVAL"},

diff --git a/midi3.c b/midi3.c
index 950305f303ec9c35666de5974412c4195ac854cf..e071a326cdda9bbe980ab6bc8e3b9939938bd34f 100644 (file)
--- a/midi3.c
+++ b/midi3.c
@@ -460,7 +460,7 @@ void DoTheMidi(enum MIDIaction action, enum MIDItype type, int val) {
            g_idle_add(ext_set_drive, (gpointer) dp);
            break;
        /////////////////////////////////////////////////////////// "RITCLEAR"
-       case RIT_CLEAR:   // only key supported
+       case MIDI_RIT_CLEAR:      // only key supported
            if (type == MIDI_KEY) {
              // clear RIT value
              vfo[active_receiver->id].rit = new;