mirror of
				https://github.com/mfulz/qmk_firmware.git
				synced 2025-10-31 05:12:33 +01:00 
			
		
		
		
	Fixes midi functionality
This commit is contained in:
		
							parent
							
								
									4aa7d2e206
								
							
						
					
					
						commit
						8b94e26d7c
					
				
							
								
								
									
										2
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								Makefile
									
									
									
									
									
								
							| @ -181,7 +181,7 @@ endif | ||||
| 
 | ||||
| ifeq ($(strip $(MIDI_ENABLE)), yes) | ||||
|     OPT_DEFS += -DMIDI_ENABLE | ||||
| 	SRC += $(QUANTUM_DIR)/process_keycode/process_audio.c | ||||
| 	SRC += $(QUANTUM_DIR)/process_keycode/process_midi.c | ||||
| endif | ||||
| 
 | ||||
| ifeq ($(strip $(AUDIO_ENABLE)), yes) | ||||
|  | ||||
| @ -69,9 +69,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
| ) | ||||
| 
 | ||||
| /* ws2812 RGB LED */ | ||||
| #define RGB_DI_PIN D2 | ||||
| #define RGB_DI_PIN D4 | ||||
| #define RGBLIGHT_TIMER | ||||
| #define RGBLED_NUM 28     // Number of LEDs
 | ||||
| #define RGBLED_NUM 8     // Number of LEDs
 | ||||
| #define RGBLIGHT_HUE_STEP 10 | ||||
| #define RGBLIGHT_SAT_STEP 17 | ||||
| #define RGBLIGHT_VAL_STEP 17 | ||||
|  | ||||
| @ -11,7 +11,7 @@ CONSOLE_ENABLE = no         # Console for debug(+400) | ||||
| COMMAND_ENABLE = yes        # Commands for debug and configuration | ||||
| NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work | ||||
| BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality | ||||
| MIDI_ENABLE = no            # MIDI controls | ||||
| MIDI_ENABLE = yes            # MIDI controls | ||||
| AUDIO_ENABLE = yes           # Audio output on port C6 | ||||
| UNICODE_ENABLE = no         # Unicode | ||||
| BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID | ||||
|  | ||||
| @ -30,7 +30,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
| #include "quantum.h" | ||||
| 
 | ||||
| #ifdef MIDI_ENABLE | ||||
| 	#include "keymap_midi.h" | ||||
| 	#include "process_midi.h" | ||||
| #endif | ||||
| 
 | ||||
| extern keymap_config_t keymap_config; | ||||
|  | ||||
| @ -1,8 +1,8 @@ | ||||
| #include "process_midi.h" | ||||
| 
 | ||||
| bool midi_activated = false; | ||||
| uint8_t starting_note = 0x0C; | ||||
| int offset = 7; | ||||
| uint8_t midi_starting_note = 0x0C; | ||||
| int midi_offset = 7; | ||||
| 
 | ||||
| bool process_midi(uint16_t keycode, keyrecord_t *record) { | ||||
|     if (keycode == MI_ON && record->event.pressed) { | ||||
| @ -20,42 +20,42 @@ bool process_midi(uint16_t keycode, keyrecord_t *record) { | ||||
|     if (midi_activated) { | ||||
|       if (record->event.key.col == (MATRIX_COLS - 1) && record->event.key.row == (MATRIX_ROWS - 1)) { | ||||
|           if (record->event.pressed) { | ||||
|               starting_note++; // Change key
 | ||||
|               midi_starting_note++; // Change key
 | ||||
|               midi_send_cc(&midi_device, 0, 0x7B, 0); | ||||
|           } | ||||
|           return false; | ||||
|       } | ||||
|       if (record->event.key.col == (MATRIX_COLS - 2) && record->event.key.row == (MATRIX_ROWS - 1)) { | ||||
|           if (record->event.pressed) { | ||||
|               starting_note--; // Change key
 | ||||
|               midi_starting_note--; // Change key
 | ||||
|               midi_send_cc(&midi_device, 0, 0x7B, 0); | ||||
|           } | ||||
|           return false; | ||||
|       } | ||||
|       if (record->event.key.col == (MATRIX_COLS - 3) && record->event.key.row == (MATRIX_ROWS - 1) && record->event.pressed) { | ||||
|           offset++; // Change scale
 | ||||
|           midi_offset++; // Change scale
 | ||||
|           midi_send_cc(&midi_device, 0, 0x7B, 0); | ||||
|           return false; | ||||
|       } | ||||
|       if (record->event.key.col == (MATRIX_COLS - 4) && record->event.key.row == (MATRIX_ROWS - 1) && record->event.pressed) { | ||||
|           offset--; // Change scale
 | ||||
|           midi_offset--; // Change scale
 | ||||
|           midi_send_cc(&midi_device, 0, 0x7B, 0); | ||||
|           return false; | ||||
|       } | ||||
|       // basic
 | ||||
|       // uint8_t note = (starting_note + SCALE[record->event.key.col + offset])+12*(MATRIX_ROWS - record->event.key.row);
 | ||||
|       // uint8_t note = (midi_starting_note + SCALE[record->event.key.col + midi_offset])+12*(MATRIX_ROWS - record->event.key.row);
 | ||||
|       // advanced
 | ||||
|       // uint8_t note = (starting_note + record->event.key.col + offset)+12*(MATRIX_ROWS - record->event.key.row);
 | ||||
|       // uint8_t note = (midi_starting_note + record->event.key.col + midi_offset)+12*(MATRIX_ROWS - record->event.key.row);
 | ||||
|       // guitar
 | ||||
|       uint8_t note = (starting_note + record->event.key.col + offset)+5*(MATRIX_ROWS - record->event.key.row); | ||||
|       uint8_t note = (midi_starting_note + record->event.key.col + midi_offset)+5*(MATRIX_ROWS - record->event.key.row); | ||||
|       // violin
 | ||||
|       // uint8_t note = (starting_note + record->event.key.col + offset)+7*(MATRIX_ROWS - record->event.key.row);
 | ||||
|       // uint8_t note = (midi_starting_note + record->event.key.col + midi_offset)+7*(MATRIX_ROWS - record->event.key.row);
 | ||||
| 
 | ||||
|       if (record->event.pressed) { | ||||
|         // midi_send_noteon(&midi_device, record->event.key.row, starting_note + SCALE[record->event.key.col], 127);
 | ||||
|         // midi_send_noteon(&midi_device, record->event.key.row, midi_starting_note + SCALE[record->event.key.col], 127);
 | ||||
|         midi_send_noteon(&midi_device, 0, note, 127); | ||||
|       } else { | ||||
|         // midi_send_noteoff(&midi_device, record->event.key.row, starting_note + SCALE[record->event.key.col], 127);
 | ||||
|         // midi_send_noteoff(&midi_device, record->event.key.row, midi_starting_note + SCALE[record->event.key.col], 127);
 | ||||
|         midi_send_noteoff(&midi_device, 0, note, 127); | ||||
|       } | ||||
| 
 | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Jack Humbert
						Jack Humbert