From 776c7c2185747ee747cea7ac82eb59e7c9914fed Mon Sep 17 00:00:00 2001 From: Mikhail Diatchenko Date: Mon, 29 Nov 2021 09:05:06 +1300 Subject: [PATCH 1/3] Added missing MidiControlChangeNumber definitions --- src/midi_Defs.h | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/midi_Defs.h b/src/midi_Defs.h index ef74621c..87102ec2 100644 --- a/src/midi_Defs.h +++ b/src/midi_Defs.h @@ -164,8 +164,22 @@ enum MidiControlChangeNumber: uint8_t GeneralPurposeController2 = 17, GeneralPurposeController3 = 18, GeneralPurposeController4 = 19, - + // CC20 to CC31 undefined + BankSelectLSB = 32, + ModulationWheelLSB = 33, + BreathControllerLSB = 34, + // CC35 undefined + FootControllerLSB = 36, + PortamentoTimeLSB = 37, DataEntryLSB = 38, + ChannelVolumeLSB = 39, + BalanceLSB = 40, + // CC41 undefined + PortamentoTimeLSB = 42, + ExpressionControllerLSB = 43, + EffectControl1LSB = 44, + EffectControl2LSB = 45, + // CC46 to CC63 undefined // Switches ---------------------------------------------------------------- Sustain = 64, @@ -203,6 +217,7 @@ enum MidiControlChangeNumber: uint8_t NRPNMSB = 99, ///< Non-Registered Parameter Number (MSB) RPNLSB = 100, ///< Registered Parameter Number (LSB) RPNMSB = 101, ///< Registered Parameter Number (MSB) + // CC102 to CC119 undefined // Channel Mode messages --------------------------------------------------- AllSoundOff = 120, From 1508321bd076e1300efb52eee5473a9b192a1ba1 Mon Sep 17 00:00:00 2001 From: Mikhail Diatchenko Date: Mon, 29 Nov 2021 10:34:33 +1300 Subject: [PATCH 2/3] Fixed duplicate enum --- src/midi_Defs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/midi_Defs.h b/src/midi_Defs.h index 87102ec2..1da019d8 100644 --- a/src/midi_Defs.h +++ b/src/midi_Defs.h @@ -175,7 +175,7 @@ enum MidiControlChangeNumber: uint8_t ChannelVolumeLSB = 39, BalanceLSB = 40, // CC41 undefined - PortamentoTimeLSB = 42, + PanLSB = 42, ExpressionControllerLSB = 43, EffectControl1LSB = 44, EffectControl2LSB = 45, From 9edd85f20771bb54885bacdbd70a1c04ae9c24d4 Mon Sep 17 00:00:00 2001 From: Mikhail Diatchenko Date: Mon, 29 Nov 2021 22:15:01 +1300 Subject: [PATCH 3/3] Added keywords for new definitions --- keywords.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/keywords.txt b/keywords.txt index cfb39f4f..845d7987 100644 --- a/keywords.txt +++ b/keywords.txt @@ -146,7 +146,18 @@ GeneralPurposeController1 LITERAL1 GeneralPurposeController2 LITERAL1 GeneralPurposeController3 LITERAL1 GeneralPurposeController4 LITERAL1 +BankSelectLSB LITERAL1 +ModulationWheelLSB LITERAL1 +BreathControllerLSB LITERAL1 +FootControllerLSB LITERAL1 +PortamentoTimeLSB LITERAL1 DataEntryLSB LITERAL1 +ChannelVolumeLSB LITERAL1 +BalanceLSB LITERAL1 +PanLSB LITERAL1 +ExpressionControllerLSB LITERAL1 +EffectControl1LSB LITERAL1 +EffectControl2LSB LITERAL1 Sustain LITERAL1 Portamento LITERAL1 Sostenuto LITERAL1