From eee0384167b965c60120e1222bc24c0b40cadac4 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 11 Jul 2023 17:07:24 +1000 Subject: process_keycode: remove direct `quantum.h` includes (#21486) --- quantum/midi/qmk_midi.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'quantum/midi') diff --git a/quantum/midi/qmk_midi.c b/quantum/midi/qmk_midi.c index f6a5d92281..688259784c 100644 --- a/quantum/midi/qmk_midi.c +++ b/quantum/midi/qmk_midi.c @@ -5,6 +5,10 @@ #include "usb_descriptor.h" #include "process_midi.h" +#ifdef AUDIO_ENABLE +# include "audio.h" +#endif + /******************************************************************************* * MIDI ******************************************************************************/ -- cgit v1.2.3 From da2d2f947d5c30aebea17f414fb22ad50fe5410b Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 16 Jul 2023 23:42:56 +1000 Subject: quantum: remove direct `quantum.h` includes (#21507) --- quantum/midi/qmk_midi.c | 1 + 1 file changed, 1 insertion(+) (limited to 'quantum/midi') diff --git a/quantum/midi/qmk_midi.c b/quantum/midi/qmk_midi.c index 688259784c..43ebd72937 100644 --- a/quantum/midi/qmk_midi.c +++ b/quantum/midi/qmk_midi.c @@ -7,6 +7,7 @@ #ifdef AUDIO_ENABLE # include "audio.h" +# include #endif /******************************************************************************* -- cgit v1.2.3 From 96789a7cb01b6ac3b6cf46a8dec650ac19c823c0 Mon Sep 17 00:00:00 2001 From: Nebuleon <2391500+Nebuleon@users.noreply.github.com> Date: Thu, 27 Jul 2023 19:14:34 -0400 Subject: Unify MIDI note calculation with the audio feature's algorithm (#21588) --- quantum/midi/qmk_midi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'quantum/midi') diff --git a/quantum/midi/qmk_midi.c b/quantum/midi/qmk_midi.c index 43ebd72937..6b8831fb58 100644 --- a/quantum/midi/qmk_midi.c +++ b/quantum/midi/qmk_midi.c @@ -108,10 +108,10 @@ static void fallthrough_callback(MidiDevice* device, uint16_t cnt, uint8_t byte0 if (cnt == 3) { switch (byte0 & 0xF0) { case MIDI_NOTEON: - play_note(((double)261.6) * pow(2.0, -4.0) * pow(2.0, (byte1 & 0x7F) / 12.0), (byte2 & 0x7F) / 8); + play_note(440.0f * powf(2.0f, ((byte1 & 0x7F) - 57) / 12.0f), (byte2 & 0x7F) / 8); break; case MIDI_NOTEOFF: - stop_note(((double)261.6) * pow(2.0, -4.0) * pow(2.0, (byte1 & 0x7F) / 12.0)); + stop_note(440.0f * powf(2.0f, ((byte1 & 0x7F) - 57) / 12.0f)); break; } } -- cgit v1.2.3