2018-12-05 03:15:52 +01:00
|
|
|
#include QMK_KEYBOARD_H
|
|
|
|
|
#ifdef PROTOCOL_LUFA
|
|
|
|
|
#include "lufa.h"
|
|
|
|
|
#include "split_util.h"
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
extern keymap_config_t keymap_config;
|
|
|
|
|
|
|
|
|
|
#ifdef RGBLIGHT_ENABLE
|
|
|
|
|
//Following line allows macro to read current RGB settings
|
|
|
|
|
extern rgblight_config_t rgblight_config;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
// Each layer gets a name for readability, which is then used in the keymap matrix below.
|
|
|
|
|
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
|
|
|
|
|
// Layer names don't all need to be of the same length, obviously, and you can also skip them
|
|
|
|
|
// entirely and just use numbers.
|
|
|
|
|
enum layer_number {
|
|
|
|
|
_QWERTY = 0,
|
|
|
|
|
_COLEMAK,
|
|
|
|
|
_FN,
|
|
|
|
|
_ADJ
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
enum custom_keycodes {
|
|
|
|
|
QWERTY = SAFE_RANGE,
|
|
|
|
|
COLEMAK,
|
|
|
|
|
FN,
|
|
|
|
|
ADJ,
|
|
|
|
|
BACKLIT,
|
|
|
|
|
RGBRST
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
enum macro_keycodes {
|
|
|
|
|
KC_SAMPLEMACRO,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
// Define your non-alpha grouping in this define's LAYOUT, and all your BASE_LAYERS will share the same mod/macro columns
|
|
|
|
|
/* Base Layout
|
|
|
|
|
* ,------------------------------------------------. ,------------------------------------------------.
|
|
|
|
|
* | Esc | 1 | 2 | 3 | 4 | 5 | - | | = | 6 | 7 | 8 | 9 | 0 | Del |
|
|
|
|
|
* |------+------+------+------+------+------|------| |------|------+------+------+------+------+------|
|
|
|
|
|
* | Tab | | | | | | [ | | ] | | | | | | Enter|
|
|
|
|
|
* |------+------+------+------+------+------|------| |------|------+------+------+------+------+------|
|
|
|
|
|
* | Caps | | | | | | { | | } | | | | | | ' |
|
|
|
|
|
* |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
|
|
|
|
|
* |Shift | | | | | | ` | | \ | | | | | |Shift |
|
|
|
|
|
* |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
|
|
|
|
|
* | Left | Down | Ctrl | Alt | Gui | Bspc | FN | | ADJ | Space| Gui | Alt | Ctrl | Up |Right |
|
|
|
|
|
* |------+------+------+------+------+------+------| |------+------+------+------+------+------+------'
|
|
|
|
|
* | Bspc | FN | | ADJ | Space|
|
|
|
|
|
* `-------------' `-------------'
|
|
|
|
|
*/
|
|
|
|
|
#define BASE_LAYOUT( \
|
|
|
|
|
_00, _01, _02, _03, _04, _05, _06, _07, _08, _09, \
|
|
|
|
|
_10, _11, _12, _13, _14, _15, _16, _17, _18, _19, \
|
|
|
|
|
_20, _21, _22, _23, _24, _25, _26, _27, _28, _29 \
|
|
|
|
|
) \
|
|
|
|
|
LAYOUT( \
|
|
|
|
|
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MINS, KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, \
|
|
|
|
|
KC_TAB, _00, _01, _02, _03, _04, KC_LBRC, KC_RBRC, _05, _06, _07, _08, _09, KC_ENT, \
|
|
|
|
|
KC_CAPS, _10, _11, _12, _13, _14, KC_LCBR, KC_RCBR, _15, _16, _17, _18, _19, KC_QUOT, \
|
|
|
|
|
KC_LSFT, _20, _21, _22, _23, _24, KC_GRV, KC_BSLS, _25, _26, _27, _28, _29, KC_RSFT, \
|
|
|
|
|
KC_LEFT, KC_DOWN, KC_LCTRL, KC_LALT, KC_LGUI, KC_BSPC, FN, ADJ, KC_SPC, KC_RGUI, KC_RALT, KC_RCTRL, KC_UP, KC_RIGHT, \
|
2019-05-07 00:06:43 +02:00
|
|
|
KC_BSPC, FN, ADJ, KC_SPC \
|
2018-12-05 03:15:52 +01:00
|
|
|
)
|
|
|
|
|
|
|
|
|
|
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|
|
|
|
/* Qwerty
|
|
|
|
|
* ,------------------------------------------------. ,------------------------------------------------.
|
|
|
|
|
* | | | | | | | | | | | | | | | |
|
|
|
|
|
* |------+------+------+------+------+------|------| |------|------+------+------+------+------+------|
|
|
|
|
|
* | | Q | W | E | R | T | | | | Y | U | I | O | P | |
|
|
|
|
|
* |------+------+------+------+------+------|------| |------|------+------+------+------+------+------|
|
|
|
|
|
* | | A | S | D | F | G | | | | H | J | K | L | ; | |
|
|
|
|
|
* |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
|
|
|
|
|
* | | Z | X | C | V | B | | | | N | M | , | . | / | |
|
|
|
|
|
* |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
|
|
|
|
|
* | | | | | | | | | | | | | | | |
|
|
|
|
|
* `------+------+------+------+------+------+------| |------+------+------+------+------+------+------'
|
|
|
|
|
* | | | | | |
|
|
|
|
|
* `-------------' `-------------'
|
|
|
|
|
*/
|
|
|
|
|
[_QWERTY] = BASE_LAYOUT( \
|
|
|
|
|
KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \
|
|
|
|
|
KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, \
|
|
|
|
|
KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH \
|
|
|
|
|
),
|
|
|
|
|
|
|
|
|
|
/* Colemak
|
|
|
|
|
* ,------------------------------------------------. ,------------------------------------------------.
|
|
|
|
|
* | | | | | | | | | | | | | | | |
|
|
|
|
|
* |------+------+------+------+------+------|------| |------|------+------+------+------+------+------|
|
|
|
|
|
* | | Q | W | F | P | G | | | | J | L | U | Y | ; | |
|
|
|
|
|
* |------+------+------+------+------+------|------| |------|------+------+------+------+------+------|
|
|
|
|
|
* | | A | R | S | T | D | | | | H | N | E | I | O | |
|
|
|
|
|
* |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
|
|
|
|
|
* | | Z | X | C | V | B | | | | K | M | , | . | / | |
|
|
|
|
|
* |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
|
|
|
|
|
* | | | | | | | | | | | | | | | |
|
|
|
|
|
* `------+------+------+------+------+------+------| |------+------+------+------+------+------+------'
|
|
|
|
|
* | | | | | |
|
|
|
|
|
* `-------------' `--------=----'
|
|
|
|
|
*/
|
|
|
|
|
[_COLEMAK] = BASE_LAYOUT( \
|
|
|
|
|
KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, \
|
|
|
|
|
KC_A, KC_R, KC_S, KC_T, KC_G, KC_K, KC_N, KC_E, KC_I, KC_O, \
|
|
|
|
|
KC_Z, KC_X, KC_C, KC_D, KC_V, KC_M, KC_H, KC_COMM, KC_DOT, KC_SLSH \
|
|
|
|
|
),
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* FN
|
|
|
|
|
* ,------------------------------------------------. ,------------------------------------------------.
|
|
|
|
|
* | | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | |
|
|
|
|
|
* |------+------+------+------+------+------|------| |------|------+------+------+------+------+------|
|
|
|
|
|
* | | | | | | | | | | | PGDN | UP | PGUP | PRINT| HOME |
|
|
|
|
|
* |------+------+------+------+------+------|------| |------|------+------+------+------+------+------|
|
|
|
|
|
* | | | | | | | | | | | LEFT | DOWN | RIGHT|INSERT| END |
|
|
|
|
|
* |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
|
|
|
|
|
* |Shift | | | | | | | | | PLAY | MUTE | VOL- | VOL+ | LAST | NEXT |
|
|
|
|
|
* |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
|
|
|
|
|
* | | | | | Gui | | | | | | | | | | |
|
|
|
|
|
* `------+------+------+------+------+------+------| |------+------+------+------+------+------+------'
|
|
|
|
|
* | | | | | |
|
|
|
|
|
* `-------------' `-------------'
|
|
|
|
|
*/
|
|
|
|
|
[_FN] = LAYOUT( \
|
|
|
|
|
XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, \
|
|
|
|
|
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, KC_UP, KC_PGUP, KC_PSCR, KC_HOME, \
|
|
|
|
|
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS, KC_END, \
|
|
|
|
|
_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MPLY, KC_MUTE, KC_VOLD, KC_VOLU, KC_MRWD, KC_MFFD, \
|
|
|
|
|
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
|
2019-05-07 00:06:43 +02:00
|
|
|
XXXXXXX, _______, XXXXXXX, XXXXXXX \
|
2018-12-05 03:15:52 +01:00
|
|
|
),
|
|
|
|
|
|
|
|
|
|
/* ADJ
|
|
|
|
|
* ,------------------------------------------------. ,------------------------------------------------.
|
|
|
|
|
* |RESET | F1 | F2 | F3 | F4 | F5 | F6 | | | = | / | * | - | | |
|
|
|
|
|
* |------+------+------+------+------+------|------| |------|------+------+------+------+------+------|
|
|
|
|
|
* | | F7 | F8 | F9 | F10 | F11 | F12 | | | 7 | 8 | 9 | + | | |
|
|
|
|
|
* |------+------+------+------+------+------|------| |------|------+------+------+------+------+------|
|
|
|
|
|
* | | HUI | VAI | SAI | | |COLEMK| | | 4 | 5 | 6 | Enter| | |
|
|
|
|
|
* |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
|
|
|
|
|
* | | HUD | VAD | SAD | | |QWERTY| | | 1 | 2 | 3 | Space| | |
|
|
|
|
|
* |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
|
|
|
|
|
* | |RGBRST|RGBTOG|RGBMOD|RGBSMD| | | | | | 0 | . | Bspc | | |
|
|
|
|
|
* `------+------+------+------+------+------+------| |------+------+------+------+------+------+------'
|
|
|
|
|
* | | | | | |
|
|
|
|
|
* `-------------' `-------------'
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
[_ADJ] = LAYOUT( \
|
|
|
|
|
RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, XXXXXXX, KC_PEQL, KC_PSLS, KC_PAST, KC_PMNS, XXXXXXX, XXXXXXX, \
|
|
|
|
|
XXXXXXX, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, KC_P7, KC_P8, KC_P9, KC_PPLS, XXXXXXX, XXXXXXX, \
|
|
|
|
|
XXXXXXX, RGB_SAD, RGB_VAI, RGB_SAI, XXXXXXX, XXXXXXX, COLEMAK, XXXXXXX, KC_P4, KC_P5, KC_P6, KC_PENT, XXXXXXX, XXXXXXX, \
|
|
|
|
|
XXXXXXX, RGB_HUD, RGB_VAD, RGB_HUI, XXXXXXX, XXXXXXX, QWERTY, XXXXXXX, KC_P1, KC_P2, KC_P3, KC_SPC, XXXXXXX, XXXXXXX, \
|
|
|
|
|
XXXXXXX, RGBRST, RGB_TOG, RGB_MOD, RGB_RMOD, XXXXXXX, XXXXXXX, _______, XXXXXXX, KC_P0, KC_PDOT, KC_BSPC, XXXXXXX, XXXXXXX, \
|
2019-05-07 00:06:43 +02:00
|
|
|
XXXXXXX, XXXXXXX, _______, XXXXXXX \
|
2018-12-05 03:15:52 +01:00
|
|
|
)
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
// define variables for reactive RGB
|
|
|
|
|
bool TOG_STATUS = false;
|
|
|
|
|
int RGB_current_mode;
|
|
|
|
|
|
2019-05-07 00:06:43 +02:00
|
|
|
#ifdef ENCODER_ENABLE
|
2021 May 29 Breaking Changes Update (#13034)
* Add Per Key functionality for AutoShift (#11536)
* LED Matrix: Reactive effect buffers & advanced indicators (#12588)
* [Keyboard] kint36: switch to sym_eager_pk debouncing (#12626)
* [Keyboard] kint2pp: reduce input latency by ≈10ms (#12625)
* LED Matrix: Split (#12633)
* [CI] Format code according to conventions (#12650)
* feat: infinite timeout for leader key (#6580)
* feat: implement leader_no_timeout logic
* docs(leader_key): infinite leader timeout docs
* Format code according to conventions (#12680)
* Update ADC driver for STM32F1xx, STM32F3xx, STM32F4xx (#12403)
* Fix default ADC_RESOLUTION for ADCv3 (and ADCv4)
Recent ChibiOS update removed ADC_CFGR1_RES_10BIT from the ADCv3 headers
(that macro should not have been there, because ADCv3 has CFGR instead of
CFGR1). Fix the default value for ADC_RESOLUTION to use ADC_CFGR_RES_10BITS
if it is defined (that name is used for ADCv3 and ADCv4).
* Update ADC docs to match the actually used resolution
ADC driver for ChibiOS actually uses the 10-bit resolution by default
(probably to match AVR); fix the documentation accordingly. Also add
both ADC_CFGR_RES_10BITS and ADC_CFGR1_RES_10BIT constants (these names
differ according to the ADC implementation in the particular MCU).
* Fix pinToMux() for B12 and B13 on STM32F3xx
Testing on STM32F303CCT6 revealed that the ADC mux values for B12 and
B13 pins were wrong.
* Add support for all possible analog pins on STM32F1xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 on STM32F1xx
(they are the same at least for STM32F103x8 and larger F103 devices, and
also F102, F105, F107 families). Actually tested on STM32F103C8T6
(therefore pins C0...C5 were not tested).
Pins F6...F10, which are present on STM32F103x[C-G] in 144-pin packages,
cannot be supported at the moment, because those pins are connected only
to ADC3, but the ChibiOS ADC driver for STM32F1xx supports only ADC1.
* Add support for all possible analog pins on STM32F4xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 and optionally
F3...F10 (if STM32_ADC_USE_ADC3 is enabled). These mux values are
apparently the same for all F4xx devices, except some smaller devices may
not have ADC3.
Actually tested on STM32F401CCU6, STM32F401CEU6, STM32F411CEU6 (using
various WeAct “Blackpill” boards); only pins A0...A7, B0, B1 were tested.
Pins F3...F10 are inside `#if STM32_ADC_USE_ADC3` because some devices
which don't have ADC3 also don't have the GPIOF port, therefore the code
which refers to Fx pins does not compile.
* Fix STM32F3xx ADC mux table in documentation
The ADC driver documentation had some errors in the mux table for STM32F3xx.
Fix this table to match the datasheet and the actual code (mux settings for
B12 and B13 were also tested on a real STM32F303CCT6 chip).
* Add STM32F1xx ADC pins to the documentation
* Add STM32F4xx ADC pins to the documentation
* Add initial support for tinyuf2 bootloader (when hosted on F411 blackpill) (#12600)
* Add support for jumping to tinyuf2 bootloader. Adds blackpill UF2 example.
* Update flashing.md
* Update chconf.h
* Update config.h
* Update halconf.h
* Update mcuconf.h
* eeprom driver: Refactor where eeprom driver initialisation (and EEPROM emulation initialisation) occurs to make it non-target-specific. (#12671)
* Add support for MCU = STM32F446 (#12619)
* Add support for MCU = STM32F446
* Update platforms/chibios/GENERIC_STM32_F446XE/configs/config.h
* Restore mcuconf.h to the one used by RT-STM32F446RE-NUCLEO64
* stm32f446: update mcuconf.h and board.h for 16MHz operation, with USB enabled, and other peripherals disabled.
* Format code according to conventions (#12682)
* Format code according to conventions (#12687)
* Add STM32L433 and L443 support (#12063)
* initial L433 commit
* change to XC
* fix L433
* disable all peripherals
* update system and peripheral clocks
* 433 change
* use its own board files
* revert its own board files
* l433 specific change
* fix stm32l432xx define
* remove duplicate #define
* fix bootloader jump
* move to L443xx and add i2c2, spi2, usart3 to mcuconf.h
* move to L443
* move to L443
* fix sdmmc in mcuconf.h
* include STM32L443
* add L443
* Include L443 in compatible microcontrollers
* Include L443 in compatible microcontrollers
* Update config bootloader jump description
* Update ChibiOS define reasoning
* Update quantum/mcu_selection.mk
* fix git conflict
* Updated Function96 with V2 files and removed chconf.h and halconf.h (#12613)
* Fix bad PR merge for #6580. (#12721)
* Change RGB/LED Matrix to use a simple define for USB suspend (#12697)
* [CI] Format code according to conventions (#12731)
* Fixing transport's led/rgb matrix suspend state logic (#12770)
* [CI] Format code according to conventions (#12772)
* Fix comment parsing (#12750)
* Added OLED fade out support (#12086)
* fix some references to bin/qmk that slipped in (#12832)
* Resolve a number of warnings in `qmk generate-api` (#12833)
* New command: qmk console (#12828)
* stash poc
* stash
* tidy up implementation
* Tidy up slightly for review
* Tidy up slightly for review
* Bodge environment to make tests pass
* Refactor away from asyncio due to windows issues
* Filter devices
* align vid/pid printing
* Add hidapi to the installers
* start preparing for multiple hid_listeners
* udev rules for hid_listen
* refactor to move closer to end state
* very basic implementation of the threaded model
* refactor how vid/pid/index are supplied and parsed
* windows improvements
* read the report directly when usage page isn't available
* add per-device colors, the choice to show names or numbers, and refactor
* add timestamps
* Add support for showing bootloaders
* tweak the color for bootloaders
* Align bootloader disconnect with connect color
* add support for showing all bootloaders
* fix the pyusb check
* tweaks
* fix exception
* hide a stack trace behind -v
* add --no-bootloaders option
* add documentation for qmk console
* Apply suggestions from code review
* pyformat
* clean up and flesh out KNOWN_BOOTLOADERS
* Remove pointless SERIAL_LINK_ENABLE rules (#12846)
* Make Swap Hands use PROGMEM (#12284)
This converts the array that the Swap Hands feature uses to use PROGMEM,
and to read from that array, as such. Since this array never changes at
runtime, there is no reason to keep it in memory. Especially for AVR
boards, as memory is a precious resource.
* Fix another bin/qmk reference (#12856)
* [Keymap] Turn OLED off on suspend in soundmonster keymap (#10419)
* Fixup build errors on `develop` branch. (#12723)
* LED Matrix: Effects! (#12651)
* Fix syntax error when compiling for ARM (#12866)
* Remove KEYMAP and LAYOUT_kc (#12160)
* alias KEYMAP to LAYOUT
* remove KEYMAP and LAYOUT_kc
* Add setup, clone, and env to the list of commands we allow even with broken modules (#12868)
* Rename `point_t` -> `led_point_t` (#12864)
* [Keyboard] updated a vendor name / fixed minor keymap issues (#12881)
* Add missing LED Matrix suspend code to suspend.c (#12878)
* LED Matrix: Documentation (#12685)
* Deprecate `send_unicode_hex_string()` (#12602)
* Fix spelling mistake regarding LED Matrix in split_common. (#12888)
* [Keymap] Fix QWERTY/DVORAK status output for kzar keymap (#12895)
* Use milc.subcommand.config instead of qmk.cli.config (#12915)
* Use milc.subcommand.config instead
* pyformat
* remove the config test
* Add function to allow repeated blinking of one layer (#12237)
* Implement function rgblight_blink_layer_repeat to allow repeated blinking of one layer at a time
* Update doc
* Rework rgblight blinking according to requested change
* optimize storage
* Fixup housekeeping from being invoked twice per loop. (#12933)
* matrix: wait for row signal to go HIGH for every row (#12945)
I noticed this discrepancy (last row of the matrix treated differently than the
others) when optimizing the input latency of my keyboard controller, see also
https://michael.stapelberg.ch/posts/2021-05-08-keyboard-input-latency-qmk-kinesis/
Before this commit, when tuning the delays I noticed ghost key presses when
pressing the F2 key, which is on the last row of the keyboard matrix: the
dead_grave key, which is on the first row of the keyboard matrix, would be
incorrectly detected as pressed.
After this commit, all keyboard matrix rows are interpreted correctly.
I suspect that my setup is more susceptible to this nuance than others because I
use GPIO_INPUT_PIN_DELAY=0 and hence don’t have another delay that might mask
the problem.
* ensure we do not conflict with existing keymap aliases (#12976)
* Add support for up to 4 IS31FL3733 drivers (#12342)
* Convert Encoder callbacks to be boolean functions (#12805)
* [Keyboard] Fix Terrazzo build failure (#12977)
* Do not hard set config in CPTC files (#11864)
* [Keyboard] Corne - Remove legacy revision support (#12226)
* [Keymap] Update to Drashna keymap and user code (based on develop) (#12936)
* Add Full-duplex serial driver for ARM boards (#9842)
* Document LED_MATRIX_FRAMEBUFFER_EFFECTS (#12987)
* Backlight: add defines for default level and breathing state (#12560)
* Add dire message about LUFA mass storage bootloader (#13014)
* [Keyboard] Remove redundant legacy and common headers for crkbd (#13023)
Was causing compiler errors on some systems.
* Fix keyboards/keymaps for boolean encoder callback changes (#12985)
* `backlight.c`: include `eeprom.h` (#13024)
* Add changelog for 2021-05-29 Breaking Changes merge (#12939)
* Add ChangeLog for 2021-05-29 Breaking Changes Merge: initial version
* Add recent develop changes
* Sort recent develop changes
* Remove sections for ChibiOS changes per tzarc
No ChibiOS changes this round.
* Add and sort recent develop changes
* add notes about keyboard moves/deletions
* import changelog for PR 12172
Documents the change to BOOTMAGIC_ENABLE.
* update section headings
* re-sort changelog
* add additional note regarding Bootmagic changes
* remove changelog timestamp
* update dates in main Breaking Changes docs
* fix broken section anchors in previous changelogs
* add link to backlight/eeprom patch to changelog
* highlight some more changes
* link PRs from section headers
* Restore standard readme
* run: qmk cformat --core-only
2021-05-29 23:38:50 +02:00
|
|
|
bool encoder_update_user(uint8_t index, bool clockwise) {
|
2019-05-07 00:06:43 +02:00
|
|
|
if (index == 0) { /* First encoder */
|
|
|
|
|
if (clockwise) {
|
|
|
|
|
tap_code(KC_VOLU);
|
|
|
|
|
} else {
|
|
|
|
|
tap_code(KC_VOLD);
|
|
|
|
|
}
|
|
|
|
|
} else if (index == 1) { /* Second encoder*/
|
|
|
|
|
if (clockwise) {
|
|
|
|
|
tap_code(KC_VOLU);
|
|
|
|
|
} else {
|
|
|
|
|
tap_code(KC_VOLD);
|
|
|
|
|
}
|
|
|
|
|
}
|
2021 May 29 Breaking Changes Update (#13034)
* Add Per Key functionality for AutoShift (#11536)
* LED Matrix: Reactive effect buffers & advanced indicators (#12588)
* [Keyboard] kint36: switch to sym_eager_pk debouncing (#12626)
* [Keyboard] kint2pp: reduce input latency by ≈10ms (#12625)
* LED Matrix: Split (#12633)
* [CI] Format code according to conventions (#12650)
* feat: infinite timeout for leader key (#6580)
* feat: implement leader_no_timeout logic
* docs(leader_key): infinite leader timeout docs
* Format code according to conventions (#12680)
* Update ADC driver for STM32F1xx, STM32F3xx, STM32F4xx (#12403)
* Fix default ADC_RESOLUTION for ADCv3 (and ADCv4)
Recent ChibiOS update removed ADC_CFGR1_RES_10BIT from the ADCv3 headers
(that macro should not have been there, because ADCv3 has CFGR instead of
CFGR1). Fix the default value for ADC_RESOLUTION to use ADC_CFGR_RES_10BITS
if it is defined (that name is used for ADCv3 and ADCv4).
* Update ADC docs to match the actually used resolution
ADC driver for ChibiOS actually uses the 10-bit resolution by default
(probably to match AVR); fix the documentation accordingly. Also add
both ADC_CFGR_RES_10BITS and ADC_CFGR1_RES_10BIT constants (these names
differ according to the ADC implementation in the particular MCU).
* Fix pinToMux() for B12 and B13 on STM32F3xx
Testing on STM32F303CCT6 revealed that the ADC mux values for B12 and
B13 pins were wrong.
* Add support for all possible analog pins on STM32F1xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 on STM32F1xx
(they are the same at least for STM32F103x8 and larger F103 devices, and
also F102, F105, F107 families). Actually tested on STM32F103C8T6
(therefore pins C0...C5 were not tested).
Pins F6...F10, which are present on STM32F103x[C-G] in 144-pin packages,
cannot be supported at the moment, because those pins are connected only
to ADC3, but the ChibiOS ADC driver for STM32F1xx supports only ADC1.
* Add support for all possible analog pins on STM32F4xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 and optionally
F3...F10 (if STM32_ADC_USE_ADC3 is enabled). These mux values are
apparently the same for all F4xx devices, except some smaller devices may
not have ADC3.
Actually tested on STM32F401CCU6, STM32F401CEU6, STM32F411CEU6 (using
various WeAct “Blackpill” boards); only pins A0...A7, B0, B1 were tested.
Pins F3...F10 are inside `#if STM32_ADC_USE_ADC3` because some devices
which don't have ADC3 also don't have the GPIOF port, therefore the code
which refers to Fx pins does not compile.
* Fix STM32F3xx ADC mux table in documentation
The ADC driver documentation had some errors in the mux table for STM32F3xx.
Fix this table to match the datasheet and the actual code (mux settings for
B12 and B13 were also tested on a real STM32F303CCT6 chip).
* Add STM32F1xx ADC pins to the documentation
* Add STM32F4xx ADC pins to the documentation
* Add initial support for tinyuf2 bootloader (when hosted on F411 blackpill) (#12600)
* Add support for jumping to tinyuf2 bootloader. Adds blackpill UF2 example.
* Update flashing.md
* Update chconf.h
* Update config.h
* Update halconf.h
* Update mcuconf.h
* eeprom driver: Refactor where eeprom driver initialisation (and EEPROM emulation initialisation) occurs to make it non-target-specific. (#12671)
* Add support for MCU = STM32F446 (#12619)
* Add support for MCU = STM32F446
* Update platforms/chibios/GENERIC_STM32_F446XE/configs/config.h
* Restore mcuconf.h to the one used by RT-STM32F446RE-NUCLEO64
* stm32f446: update mcuconf.h and board.h for 16MHz operation, with USB enabled, and other peripherals disabled.
* Format code according to conventions (#12682)
* Format code according to conventions (#12687)
* Add STM32L433 and L443 support (#12063)
* initial L433 commit
* change to XC
* fix L433
* disable all peripherals
* update system and peripheral clocks
* 433 change
* use its own board files
* revert its own board files
* l433 specific change
* fix stm32l432xx define
* remove duplicate #define
* fix bootloader jump
* move to L443xx and add i2c2, spi2, usart3 to mcuconf.h
* move to L443
* move to L443
* fix sdmmc in mcuconf.h
* include STM32L443
* add L443
* Include L443 in compatible microcontrollers
* Include L443 in compatible microcontrollers
* Update config bootloader jump description
* Update ChibiOS define reasoning
* Update quantum/mcu_selection.mk
* fix git conflict
* Updated Function96 with V2 files and removed chconf.h and halconf.h (#12613)
* Fix bad PR merge for #6580. (#12721)
* Change RGB/LED Matrix to use a simple define for USB suspend (#12697)
* [CI] Format code according to conventions (#12731)
* Fixing transport's led/rgb matrix suspend state logic (#12770)
* [CI] Format code according to conventions (#12772)
* Fix comment parsing (#12750)
* Added OLED fade out support (#12086)
* fix some references to bin/qmk that slipped in (#12832)
* Resolve a number of warnings in `qmk generate-api` (#12833)
* New command: qmk console (#12828)
* stash poc
* stash
* tidy up implementation
* Tidy up slightly for review
* Tidy up slightly for review
* Bodge environment to make tests pass
* Refactor away from asyncio due to windows issues
* Filter devices
* align vid/pid printing
* Add hidapi to the installers
* start preparing for multiple hid_listeners
* udev rules for hid_listen
* refactor to move closer to end state
* very basic implementation of the threaded model
* refactor how vid/pid/index are supplied and parsed
* windows improvements
* read the report directly when usage page isn't available
* add per-device colors, the choice to show names or numbers, and refactor
* add timestamps
* Add support for showing bootloaders
* tweak the color for bootloaders
* Align bootloader disconnect with connect color
* add support for showing all bootloaders
* fix the pyusb check
* tweaks
* fix exception
* hide a stack trace behind -v
* add --no-bootloaders option
* add documentation for qmk console
* Apply suggestions from code review
* pyformat
* clean up and flesh out KNOWN_BOOTLOADERS
* Remove pointless SERIAL_LINK_ENABLE rules (#12846)
* Make Swap Hands use PROGMEM (#12284)
This converts the array that the Swap Hands feature uses to use PROGMEM,
and to read from that array, as such. Since this array never changes at
runtime, there is no reason to keep it in memory. Especially for AVR
boards, as memory is a precious resource.
* Fix another bin/qmk reference (#12856)
* [Keymap] Turn OLED off on suspend in soundmonster keymap (#10419)
* Fixup build errors on `develop` branch. (#12723)
* LED Matrix: Effects! (#12651)
* Fix syntax error when compiling for ARM (#12866)
* Remove KEYMAP and LAYOUT_kc (#12160)
* alias KEYMAP to LAYOUT
* remove KEYMAP and LAYOUT_kc
* Add setup, clone, and env to the list of commands we allow even with broken modules (#12868)
* Rename `point_t` -> `led_point_t` (#12864)
* [Keyboard] updated a vendor name / fixed minor keymap issues (#12881)
* Add missing LED Matrix suspend code to suspend.c (#12878)
* LED Matrix: Documentation (#12685)
* Deprecate `send_unicode_hex_string()` (#12602)
* Fix spelling mistake regarding LED Matrix in split_common. (#12888)
* [Keymap] Fix QWERTY/DVORAK status output for kzar keymap (#12895)
* Use milc.subcommand.config instead of qmk.cli.config (#12915)
* Use milc.subcommand.config instead
* pyformat
* remove the config test
* Add function to allow repeated blinking of one layer (#12237)
* Implement function rgblight_blink_layer_repeat to allow repeated blinking of one layer at a time
* Update doc
* Rework rgblight blinking according to requested change
* optimize storage
* Fixup housekeeping from being invoked twice per loop. (#12933)
* matrix: wait for row signal to go HIGH for every row (#12945)
I noticed this discrepancy (last row of the matrix treated differently than the
others) when optimizing the input latency of my keyboard controller, see also
https://michael.stapelberg.ch/posts/2021-05-08-keyboard-input-latency-qmk-kinesis/
Before this commit, when tuning the delays I noticed ghost key presses when
pressing the F2 key, which is on the last row of the keyboard matrix: the
dead_grave key, which is on the first row of the keyboard matrix, would be
incorrectly detected as pressed.
After this commit, all keyboard matrix rows are interpreted correctly.
I suspect that my setup is more susceptible to this nuance than others because I
use GPIO_INPUT_PIN_DELAY=0 and hence don’t have another delay that might mask
the problem.
* ensure we do not conflict with existing keymap aliases (#12976)
* Add support for up to 4 IS31FL3733 drivers (#12342)
* Convert Encoder callbacks to be boolean functions (#12805)
* [Keyboard] Fix Terrazzo build failure (#12977)
* Do not hard set config in CPTC files (#11864)
* [Keyboard] Corne - Remove legacy revision support (#12226)
* [Keymap] Update to Drashna keymap and user code (based on develop) (#12936)
* Add Full-duplex serial driver for ARM boards (#9842)
* Document LED_MATRIX_FRAMEBUFFER_EFFECTS (#12987)
* Backlight: add defines for default level and breathing state (#12560)
* Add dire message about LUFA mass storage bootloader (#13014)
* [Keyboard] Remove redundant legacy and common headers for crkbd (#13023)
Was causing compiler errors on some systems.
* Fix keyboards/keymaps for boolean encoder callback changes (#12985)
* `backlight.c`: include `eeprom.h` (#13024)
* Add changelog for 2021-05-29 Breaking Changes merge (#12939)
* Add ChangeLog for 2021-05-29 Breaking Changes Merge: initial version
* Add recent develop changes
* Sort recent develop changes
* Remove sections for ChibiOS changes per tzarc
No ChibiOS changes this round.
* Add and sort recent develop changes
* add notes about keyboard moves/deletions
* import changelog for PR 12172
Documents the change to BOOTMAGIC_ENABLE.
* update section headings
* re-sort changelog
* add additional note regarding Bootmagic changes
* remove changelog timestamp
* update dates in main Breaking Changes docs
* fix broken section anchors in previous changelogs
* add link to backlight/eeprom patch to changelog
* highlight some more changes
* link PRs from section headers
* Restore standard readme
* run: qmk cformat --core-only
2021-05-29 23:38:50 +02:00
|
|
|
return true;
|
2019-05-07 00:06:43 +02:00
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
2018-12-05 03:15:52 +01:00
|
|
|
// Setting ADJ layer RGB back to default
|
|
|
|
|
void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
|
|
|
|
|
if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
|
|
|
|
|
#ifdef RGBLIGHT_ENABLE
|
|
|
|
|
//rgblight_mode(RGB_current_mode);
|
|
|
|
|
#endif
|
|
|
|
|
layer_on(layer3);
|
|
|
|
|
} else {
|
|
|
|
|
layer_off(layer3);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
|
|
|
|
//uint8_t shifted = get_mods() & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT));
|
|
|
|
|
|
|
|
|
|
switch (keycode) {
|
|
|
|
|
case QWERTY:
|
|
|
|
|
if (record->event.pressed) {
|
|
|
|
|
set_single_persistent_default_layer(_QWERTY);
|
|
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
break;
|
|
|
|
|
case COLEMAK:
|
|
|
|
|
if(record->event.pressed) {
|
|
|
|
|
set_single_persistent_default_layer(_COLEMAK);
|
|
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
break;
|
|
|
|
|
case FN:
|
|
|
|
|
if (record->event.pressed) {
|
|
|
|
|
//not sure how to have keyboard check mode and set it to a variable, so my work around
|
|
|
|
|
//uses another variable that would be set to true after the first time a reactive key is pressed.
|
|
|
|
|
if (TOG_STATUS) { //TOG_STATUS checks is another reactive key currently pressed, only changes RGB mode if returns false
|
|
|
|
|
} else {
|
|
|
|
|
TOG_STATUS = !TOG_STATUS;
|
|
|
|
|
#ifdef RGBLIGHT_ENABLE
|
|
|
|
|
//rgblight_mode(15);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
layer_on(_FN);
|
|
|
|
|
} else {
|
|
|
|
|
#ifdef RGBLIGHT_ENABLE
|
|
|
|
|
//rgblight_mode(RGB_current_mode); // revert RGB to initial mode prior to RGB mode change
|
|
|
|
|
#endif
|
|
|
|
|
layer_off(_FN);
|
|
|
|
|
TOG_STATUS = false;
|
|
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
break;
|
|
|
|
|
case ADJ:
|
|
|
|
|
if (record->event.pressed) {
|
|
|
|
|
layer_on(_ADJ);
|
|
|
|
|
} else {
|
|
|
|
|
layer_off(_ADJ);
|
|
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
break;
|
|
|
|
|
//led operations - RGB mode change now updates the RGB_current_mode to allow the right RGB mode to be set after reactive keys are released
|
|
|
|
|
case RGBRST:
|
|
|
|
|
#ifdef RGBLIGHT_ENABLE
|
|
|
|
|
if (record->event.pressed) {
|
|
|
|
|
eeconfig_update_rgblight_default();
|
|
|
|
|
rgblight_enable();
|
|
|
|
|
RGB_current_mode = rgblight_config.mode;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void matrix_init_user(void) {
|
2019-04-16 05:32:57 +02:00
|
|
|
#ifdef RGBLIGHT_ENABLE
|
|
|
|
|
RGB_current_mode = rgblight_config.mode;
|
|
|
|
|
#endif
|
2018-12-05 03:15:52 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2019-04-16 05:32:57 +02:00
|
|
|
// OLED Driver Logic
|
|
|
|
|
#ifdef OLED_DRIVER_ENABLE
|
2018-12-05 03:15:52 +01:00
|
|
|
|
2019-04-17 01:36:55 +02:00
|
|
|
oled_rotation_t oled_init_user(oled_rotation_t rotation) {
|
2019-04-16 05:32:57 +02:00
|
|
|
if (!has_usb())
|
|
|
|
|
return OLED_ROTATION_180; // flip 180 for offhand
|
|
|
|
|
return rotation;
|
2018-12-05 03:15:52 +01:00
|
|
|
}
|
|
|
|
|
|
2019-04-16 05:32:57 +02:00
|
|
|
static void render_logo(void) {
|
|
|
|
|
static const char PROGMEM sol_logo[] = {
|
|
|
|
|
0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
|
|
|
|
|
0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
|
|
|
|
|
0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0};
|
|
|
|
|
|
|
|
|
|
oled_write_P(sol_logo, false);
|
2018-12-05 03:15:52 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//assign the right code to your layers for OLED display
|
|
|
|
|
#define L_BASE 0
|
|
|
|
|
#define L_FN (1<<_FN)
|
|
|
|
|
#define L_ADJ (1<<_ADJ)
|
2019-04-16 05:32:57 +02:00
|
|
|
#define L_ADJ_TRI (L_ADJ|L_FN)
|
2018-12-05 03:15:52 +01:00
|
|
|
|
2019-04-16 05:32:57 +02:00
|
|
|
static void render_status(void) {
|
2018-12-05 03:15:52 +01:00
|
|
|
// Render to mode icon
|
2019-04-16 05:32:57 +02:00
|
|
|
static const char PROGMEM mode_logo[4][4] = {
|
|
|
|
|
{0x95,0x96,0x0a,0},
|
|
|
|
|
{0xb5,0xb6,0x0a,0},
|
|
|
|
|
{0x97,0x98,0x0a,0},
|
|
|
|
|
{0xb7,0xb8,0x0a,0} };
|
|
|
|
|
|
|
|
|
|
if (keymap_config.swap_lalt_lgui != false) {
|
|
|
|
|
oled_write_P(mode_logo[0], false);
|
|
|
|
|
oled_write_P(mode_logo[1], false);
|
|
|
|
|
} else {
|
|
|
|
|
oled_write_P(mode_logo[2], false);
|
|
|
|
|
oled_write_P(mode_logo[3], false);
|
2018-12-05 03:15:52 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Define layers here, Have not worked out how to have text displayed for each layer. Copy down the number you see and add a case for it below
|
2019-04-16 05:32:57 +02:00
|
|
|
oled_write_P(PSTR("Layer: "), false);
|
|
|
|
|
switch (layer_state) {
|
|
|
|
|
case L_BASE:
|
|
|
|
|
oled_write_P(PSTR("Default\n"), false);
|
|
|
|
|
break;
|
|
|
|
|
case L_FN:
|
|
|
|
|
oled_write_P(PSTR("FN \n"), false);
|
|
|
|
|
break;
|
|
|
|
|
case L_ADJ:
|
|
|
|
|
case L_ADJ_TRI:
|
|
|
|
|
oled_write_P(PSTR("ADJ \n"), false);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
oled_write_P(PSTR("UNDEF \n"), false);
|
|
|
|
|
}
|
2018-12-05 03:15:52 +01:00
|
|
|
|
|
|
|
|
// Host Keyboard LED Status
|
2019-04-16 05:32:57 +02:00
|
|
|
uint8_t led_usb_state = host_keyboard_leds();
|
|
|
|
|
oled_write_P(led_usb_state & (1<<USB_LED_NUM_LOCK) ? PSTR("NUMLOCK ") : PSTR(" "), false);
|
|
|
|
|
oled_write_P(led_usb_state & (1<<USB_LED_CAPS_LOCK) ? PSTR("CAPS ") : PSTR(" "), false);
|
|
|
|
|
oled_write_P(led_usb_state & (1<<USB_LED_SCROLL_LOCK) ? PSTR("SCLK ") : PSTR(" "), false);
|
2018-12-05 03:15:52 +01:00
|
|
|
}
|
|
|
|
|
|
2019-04-16 05:32:57 +02:00
|
|
|
void oled_task_user(void) {
|
2019-05-07 00:06:43 +02:00
|
|
|
if (is_keyboard_master())
|
2019-04-16 05:32:57 +02:00
|
|
|
render_status();
|
|
|
|
|
else
|
|
|
|
|
render_logo();
|
2018-12-05 03:15:52 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif
|
