summaryrefslogtreecommitdiffstats
path: root/keyboards/keebio/iris/keymaps/nstickney
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into developJames Young2021-08-094-174/+64
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes merge conflicts in: - keyboards/bm40hsrgb/config.h - Conflict from PR 13132: - RGB_DISABLE_WHEN_USB_SUSPENDED signature updated in develop branch, unmodified in master branch - updated file with changes from master branch - keyboards/keebio/iris/keymaps/nstickney/keymap.c - Conflict from PR 11456: - layer_state_set_user() updated in develop branch, removed in master branch - updated file with changes from master branch
| * [User] changes to nstickney's keymaps (#11456)Stick2021-08-094-173/+43
| | | | | | | | | | | | 0) Built a Bastyl, gave away the ErgoDoxEZ 1) UNICODEMAP 2) Iris left is now Elite-C 3) New QMK flashing instructions
* | [Bug] Develop - Change uint32_t to layer_state_t (#13596)Xelus222021-07-191-12/+12
|/ | | | | * fix sat75 * update uint32_t to layer_state
* [Keymap] update @nstickney's keymaps (#6076)Stick2019-06-064-92/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | * [Keymap] iris@nstickney: improve RGB init Perfecting the rgb backlight initialization with a delay for each color; also start and stop the animation at the "default layer" color. * [Keymap] iris,ergodox@nstickney fix FN on SYMB The function key was not operational on the SYMB and SYSH layers due to other keycodes being mapped over MO() on those layers. The offending keycodes have been moved to other keys. * [Keymap] add @nstickney's userspace Pulled common code out to a userspace directory for my iris and ergodox keymaps. * [Keymap] iris@nstickney add image to README Added an image from keyboard-layout-editor.com to meet the README standard. * iris@nstickney hue values now `uint8_t` (#6050)
* [Keymap] nstickney's layout for iris (#5045)Stick2019-02-254-0/+255