From 9a5077482b50037d1f25fecc28ae7642ce15c26e Mon Sep 17 00:00:00 2001 From: c vw Date: Sun, 10 Nov 2019 12:33:33 +0100 Subject: [PATCH] renamed RIT_CLEAR to MIDI_RIT_CLEAR (conflict with gpio.h) --- midi.h | 2 +- midi2.c | 2 +- midi3.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/midi.h b/midi.h index 7d3b335..ce88981 100644 --- 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 9bcebaf..d60d3fc 100644 --- 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 950305f..e071a32 100644 --- 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; -- 2.45.2