Simplified NoteValues

Need need for extra index (that is the same as the noteName anyway)
This commit is contained in:
lathoub 2020-03-22 23:29:13 +01:00
parent 050e9c9160
commit 9a644aca25
2 changed files with 140 additions and 131 deletions

View File

@ -10,7 +10,7 @@ MIDI_CREATE_DEFAULT_INSTANCE();
void handleNoteOn(byte inChannel, byte inNote, byte inVelocity) void handleNoteOn(byte inChannel, byte inNote, byte inVelocity)
{ {
Serial.print("Note On: "); Serial.print("Note On: ");
Serial.println(MIDI_NAMESPACE::NoteValues[inNote].strptr); Serial.println(MIDI_NAMESPACE::NoteValues[inNote]);
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------

View File

@ -244,11 +244,20 @@ https://www.midi.org/request-sysex-id
*/ */
enum ShortManufacturerId : uint8_t enum ShortManufacturerId : uint8_t
{ {
// USA
SequentialCircuits = 0x01, SequentialCircuits = 0x01,
BigBriarIDP = 0x02, BigBriarIDP = 0x02,
OctavePlateau = 0x03, OctavePlateau = 0x03,
MoogMusic = 0x04, MoogMusic = 0x04,
// ... // Europe
Passac = 0x20,
// Japan
Kawai = 0x40,
//...
// Universal
NonCommercial = 0x7d,
NonRealTime = 0x7e,
RealTime = 0x7f,
}; };
enum LongManufacturerId : uint16_t enum LongManufacturerId : uint16_t
@ -281,135 +290,135 @@ static const valueString<uint16_t, const char*> ManuLongValues[] = {
{ CrimsonTechnologyInc, "Crimson Technology Inc" }, { CrimsonTechnologyInc, "Crimson Technology Inc" },
}; };
static const valueString<uint8_t, const char*> NoteValues[] = { static const char* NoteValues[] = {
{ 0, "C-1" }, "C-1" ,
{ 1, "C#-1" }, "C#-1",
{ 2, "D-1" }, "D-1" ,
{ 3, "D#-1" }, "D#-1",
{ 4, "E-1" }, "E-1" ,
{ 5, "F-1" }, "F-1" ,
{ 6, "F#-1" }, "F#-1",
{ 7, "G-1" }, "G-1" ,
{ 8, "G#-1" }, "G#-1",
{ 9, "A-1" }, "A-1" ,
{ 10, "A#-1" }, "A#-1",
{ 11, "B-1" }, "B-1" ,
{ 12, "C0" }, "C0" ,
{ 13, "C#0" }, "C#0" ,
{ 14, "D0" }, "D0" ,
{ 15, "D#0" }, "D#0" ,
{ 16, "E0" }, "E0" ,
{ 17, "F0" }, "F0" ,
{ 18, "F#0" }, "F#0" ,
{ 19, "G0" }, "G0" ,
{ 20, "G#0" }, "G#0" ,
{ 21, "A0" }, "A0" ,
{ 22, "A#0" }, "A#0" ,
{ 23, "B0" }, "B0" ,
{ 24, "C1" }, "C1" ,
{ 25, "C#1" }, "C#1" ,
{ 26, "D1" }, "D1" ,
{ 27, "D#1" }, "D#1" ,
{ 28, "E1" }, "E1" ,
{ 29, "F1" }, "F1" ,
{ 30, "F#1" }, "F#1" ,
{ 31, "G1" }, "G1" ,
{ 32, "G#1" }, "G#1" ,
{ 33, "A1" }, "A1" ,
{ 34, "A#1" }, "A#1" ,
{ 35, "B1" }, "B1" ,
{ 36, "C2" }, "C2" ,
{ 37, "C#2" }, "C#2" ,
{ 38, "D2" }, "D2" ,
{ 39, "D#2" }, "D#2" ,
{ 40, "E2" }, "E2" ,
{ 41, "F2" }, "F2" ,
{ 42, "F#2" }, "F#2" ,
{ 43, "G2" }, "G2" ,
{ 44, "G#2" }, "G#2" ,
{ 45, "A2" }, "A2" ,
{ 46, "A#2" }, "A#2" ,
{ 47, "B2" }, "B2" ,
{ 48, "C3" }, "C3" ,
{ 49, "C#3" }, "C#3" ,
{ 50, "D3" }, "D3" ,
{ 51, "D#3" }, "D#3" ,
{ 52, "E3" }, "E3" ,
{ 53, "F3" }, "F3" ,
{ 54, "F#3" }, "F#3" ,
{ 55, "G3" }, "G3" ,
{ 56, "G#3" }, "G#3" ,
{ 57, "A3" }, "A3" ,
{ 58, "A#3" }, "A#3" ,
{ 59, "B3" }, "B3" ,
{ 60, "C4" }, "C4" ,
{ 61, "C#4" }, "C#4" ,
{ 62, "D4" }, "D4" ,
{ 63, "D#4" }, "D#4" ,
{ 64, "E4" }, "E4" ,
{ 65, "F4" }, "F4" ,
{ 66, "F#4" }, "F#4" ,
{ 67, "G4" }, "G4" ,
{ 68, "G#4" }, "G#4" ,
{ 69, "A4" }, "A4" ,
{ 70, "A#4" }, "A#4" ,
{ 71, "B4" }, "B4" ,
{ 72, "C5" }, "C5" ,
{ 73, "C#5" }, "C#5" ,
{ 74, "D5" }, "D5" ,
{ 75, "D#5" }, "D#5" ,
{ 76, "E5" }, "E5" ,
{ 77, "F5" }, "F5" ,
{ 78, "F#5" }, "F#5" ,
{ 79, "G5" }, "G5" ,
{ 80, "G#5" }, "G#5" ,
{ 81, "A5" }, "A5" ,
{ 82, "A#5" }, "A#5" ,
{ 83, "B5" }, "B5" ,
{ 84, "C6" }, "C6" ,
{ 85, "C#6" }, "C#6" ,
{ 86, "D6" }, "D6" ,
{ 87, "D#6" }, "D#6" ,
{ 88, "E6" }, "E6" ,
{ 89, "F6" }, "F6" ,
{ 90, "F#6" }, "F#6" ,
{ 91, "G6" }, "G6" ,
{ 92, "G#6" }, "G#6" ,
{ 93, "A6" }, "A6" ,
{ 94, "A#6" }, "A#6" ,
{ 95, "B6" }, "B6" ,
{ 96, "C7" }, "C7" ,
{ 97, "C#7" }, "C#7" ,
{ 98, "D7" }, "D7" ,
{ 99, "D#7" }, "D#7" ,
{ 100, "E7" }, "E7" ,
{ 101, "F7" }, "F7" ,
{ 102, "F#7" }, "F#7" ,
{ 103, "G7" }, "G7" ,
{ 104, "G#7" }, "G#7" ,
{ 105, "A7" }, "A7" ,
{ 106, "A#7" }, "A#7" ,
{ 107, "B7" }, "B7" ,
{ 108, "C8" }, "C8" ,
{ 109, "C#8" }, "C#8" ,
{ 110, "D8" }, "D8" ,
{ 111, "D#8" }, "D#8" ,
{ 112, "E8" }, "E8" ,
{ 113, "F8" }, "F8" ,
{ 114, "F#8" }, "F#8" ,
{ 115, "G8" }, "G8" ,
{ 116, "G#8" }, "G#8" ,
{ 117, "A8" }, "A8" ,
{ 118, "A#8" }, "A#8" ,
{ 119, "B8" }, "B8" ,
{ 120, "C9" }, "C9" ,
{ 121, "C#9" }, "C#9" ,
{ 122, "D9" }, "D9" ,
{ 123, "D#9" }, "D#9" ,
{ 124, "E9" }, "E9" ,
{ 125, "F9" }, "F9" ,
{ 126, "F#9" }, "F#9" ,
{ 127, "G9" }, "G9" ,
}; };
END_MIDI_NAMESPACE END_MIDI_NAMESPACE