diff options
author | James Young <18669334+noroadsleft@users.noreply.github.com> | 2020-11-28 12:02:18 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-28 12:02:18 -0800 |
commit | c66df1664497546f32662409778731143e45a552 (patch) | |
tree | da73a2d532a27685a31d932b3a44a707d4a3af81 /quantum/quantum_keycodes.h | |
parent | 15385d4113414d42bd062c60c9de5df797d3157f (diff) | |
download | qmk_firmware-c66df1664497546f32662409778731143e45a552.tar.gz qmk_firmware-c66df1664497546f32662409778731143e45a552.zip |
2020 November 28 Breaking Changes Update (#11053)
* Branch point for 2020 November 28 Breaking Change
* Remove matrix_col_t to allow MATRIX_ROWS > 32 (#10183)
* Add support for soft serial to ATmega32U2 (#10204)
* Change MIDI velocity implementation to allow direct control of velocity value (#9940)
* Add ability to build a subset of all keyboards based on platform.
* Actually use eeprom_driver_init().
* Make bootloader_jump weak for ChibiOS. (#10417)
* Joystick 16-bit support (#10439)
* Per-encoder resolutions (#10259)
* Share button state from mousekey to pointing_device (#10179)
* Add hotfix for chibios keyboards not wake (#10088)
* Add advanced/efficient RGB Matrix Indicators (#8564)
* Naming change.
* Support for STM32 GPIOF,G,H,I,J,K (#10206)
* Add milc as a dependency and remove the installed milc (#10563)
* ChibiOS upgrade: early init conversions (#10214)
* ChibiOS upgrade: configuration file migrator (#9952)
* Haptic and solenoid cleanup (#9700)
* XD75 cleanup (#10524)
* OLED display update interval support (#10388)
* Add definition based on currently-selected serial driver. (#10716)
* New feature: Retro Tapping per key (#10622)
* Allow for modification of output RGB values when using rgblight/rgb_matrix. (#10638)
* Add housekeeping task callbacks so that keyboards/keymaps are capable of executing code for each main loop iteration. (#10530)
* Rescale both ChibiOS and AVR backlighting.
* Reduce Helix keyboard build variation (#8669)
* Minor change to behavior allowing display updates to continue between task ticks (#10750)
* Some GPIO manipulations in matrix.c change to atomic. (#10491)
* qmk cformat (#10767)
* [Keyboard] Update the Speedo firmware for v3.0 (#10657)
* Maartenwut/Maarten namechange to evyd13/Evy (#10274)
* [quantum] combine repeated lines of code (#10837)
* Add step sequencer feature (#9703)
* aeboards/ext65 refactor (#10820)
* Refactor xelus/dawn60 for Rev2 later (#10584)
* add DEBUG_MATRIX_SCAN_RATE_ENABLE to common_features.mk (#10824)
* [Core] Added `add_oneshot_mods` & `del_oneshot_mods` (#10549)
* update chibios os usb for the otg driver (#8893)
* Remove HD44780 References, Part 4 (#10735)
* [Keyboard] Add Valor FRL TKL (+refactor) (#10512)
* Fix cursor position bug in oled_write_raw functions (#10800)
* Fixup version.h writing when using SKIP_VERSION=yes (#10972)
* Allow for certain code in the codebase assuming length of string. (#10974)
* Add AT90USB support for serial.c (#10706)
* Auto shift: support repeats and early registration (#9826)
* Rename ledmatrix.h to match .c file (#7949)
* Split RGB_MATRIX_ENABLE into _ENABLE and _DRIVER (#10231)
* Split LED_MATRIX_ENABLE into _ENABLE and _DRIVER (#10840)
* Merge point for 2020 Nov 28 Breaking Change
Diffstat (limited to 'quantum/quantum_keycodes.h')
-rw-r--r-- | quantum/quantum_keycodes.h | 38 |
1 files changed, 37 insertions, 1 deletions
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h index a0a7bc340..a2cc7b38d 100644 --- a/quantum/quantum_keycodes.h +++ b/quantum/quantum_keycodes.h | |||
@@ -16,6 +16,10 @@ | |||
16 | #ifndef QUANTUM_KEYCODES_H | 16 | #ifndef QUANTUM_KEYCODES_H |
17 | #define QUANTUM_KEYCODES_H | 17 | #define QUANTUM_KEYCODES_H |
18 | 18 | ||
19 | #if defined(SEQUENCER_ENABLE) | ||
20 | # include "sequencer.h" | ||
21 | #endif | ||
22 | |||
19 | #ifndef MIDI_ENABLE_STRICT | 23 | #ifndef MIDI_ENABLE_STRICT |
20 | # define MIDI_ENABLE_STRICT 0 | 24 | # define MIDI_ENABLE_STRICT 0 |
21 | #endif | 25 | #endif |
@@ -343,7 +347,8 @@ enum quantum_keycodes { | |||
343 | MI_TRNSU, // transpose up | 347 | MI_TRNSU, // transpose up |
344 | 348 | ||
345 | MIDI_VELOCITY_MIN, | 349 | MIDI_VELOCITY_MIN, |
346 | MI_VEL_1 = MIDI_VELOCITY_MIN, | 350 | MI_VEL_0 = MIDI_VELOCITY_MIN, |
351 | MI_VEL_1, | ||
347 | MI_VEL_2, | 352 | MI_VEL_2, |
348 | MI_VEL_3, | 353 | MI_VEL_3, |
349 | MI_VEL_4, | 354 | MI_VEL_4, |
@@ -549,6 +554,37 @@ enum quantum_keycodes { | |||
549 | JS_BUTTON31, | 554 | JS_BUTTON31, |
550 | JS_BUTTON_MAX = JS_BUTTON31, | 555 | JS_BUTTON_MAX = JS_BUTTON31, |
551 | 556 | ||
557 | #if defined(SEQUENCER_ENABLE) | ||
558 | SQ_ON, | ||
559 | SQ_OFF, | ||
560 | SQ_TOG, | ||
561 | |||
562 | SQ_TMPD, // Decrease tempo | ||
563 | SQ_TMPU, // Increase tempo | ||
564 | |||
565 | SEQUENCER_RESOLUTION_MIN, | ||
566 | SEQUENCER_RESOLUTION_MAX = SEQUENCER_RESOLUTION_MIN + SEQUENCER_RESOLUTIONS, | ||
567 | SQ_RESD, // Decrease resolution | ||
568 | SQ_RESU, // Increase resolution | ||
569 | |||
570 | SQ_SALL, // All steps on | ||
571 | SQ_SCLR, // All steps off | ||
572 | SEQUENCER_STEP_MIN, | ||
573 | SEQUENCER_STEP_MAX = SEQUENCER_STEP_MIN + SEQUENCER_STEPS, | ||
574 | |||
575 | SEQUENCER_TRACK_MIN, | ||
576 | SEQUENCER_TRACK_MAX = SEQUENCER_TRACK_MIN + SEQUENCER_TRACKS, | ||
577 | |||
578 | /** | ||
579 | * Helpers to assign a keycode to a step, a resolution, or a track. | ||
580 | * Falls back to NOOP if n is out of range. | ||
581 | */ | ||
582 | # define SQ_S(n) (n < SEQUENCER_STEPS ? SEQUENCER_STEP_MIN + n : XXXXXXX) | ||
583 | # define SQ_R(n) (n < SEQUENCER_RESOLUTIONS ? SEQUENCER_RESOLUTION_MIN + n : XXXXXXX) | ||
584 | # define SQ_T(n) (n < SEQUENCER_TRACKS ? SEQUENCER_TRACK_MIN + n : XXXXXXX) | ||
585 | |||
586 | #endif | ||
587 | |||
552 | // always leave at the end | 588 | // always leave at the end |
553 | SAFE_RANGE | 589 | SAFE_RANGE |
554 | }; | 590 | }; |