~ruther/qmk_firmware

54abf60e — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
f5cecffa — Antoine R. Dumont 4 years ago
keymap/ardumont: Fix substitute keycode reset step (#12675)

It so happens that when releasing the control key prior to the main key (C-h, C-i, C-n,
...), the substituted keycode was continuously sent in a loop after that (even when
releasing said key). The workaround so far was to type any other key to stop the loop.

This commit fixes such behavior by resetting the substitution keycode sent when the ctrl
released situation conditional is detected (and that the substitution keycode was on).
5e86a11a — Jose Luis Adelantado Torres 4 years ago
[keymap] Added new `oled_status` keymap to `nullbitsco/nibble` keyboard (#12824)

* Added new oled_status keymap to nullbitsco/nibble keyboard

* rm: Removed font from src imports
303132fa — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
3099630a — Robert Verst 4 years ago
[Keymap] Feature/extend keymap (#12778)

* Add F13-F24

* Add nvim macros

* Add debug switch

* Switch mode every time, add debug print
7e7e6d1a — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
dee50c9c — T.Shinohara 4 years ago
[Keymap] fix key code. numpad to numkey (#12808)

* add keyboard new macro pad "Kuro"

* change main readme.md

* remove not used code from default/keymap.c

* Remove unnecessary code

* Supports info.json

* removed back slash and not used functions.

* update at product link. add japanese messages.

* Merge All

* [Shiro]Add MacKeymap

* Change key code. Numpad→Numkey
0ec6d6da — Jay Greco 4 years ago
Update oled_bongocat to match VIA keymap (#12875)

* Update to match VIA keymap

* Update with feedback from PR
b69fa51e — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
909d9c22 — Mike Tsao 4 years ago
Switch default layout to standard TKL; add custom (#12818)

4a15eb59 — Tyler Thrailkill 4 years ago
snowe keymap/userspace and Ocean Dream animation (#12477)

* Add snowe keymap/userspace & Ocean Dream animation

* Add snowe userspace with keymap wrappers and two animations
* Add crkbd keymap
* Add Ocean Dream animation, a cool full screen animation with:
* * twinkling stars
* * meteor showers
* * ocean waves
* * island with palm tree
* * moon with phases

* Disable Luna so travis build succeeds.

* Add more copyrights

* Add pragma once to keycode_aliases.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

Co-authored-by: Drashna Jaelre <drashna@live.com>
1ea01765 — Gigahawk 4 years ago
Allow settable SPI divisor for AW20216 driver, set default to 4 (#13309)

531f34d2 — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
6e1ed1c9 — David Hoelscher 4 years ago
Optional OLED splash screen  and fixed OLED i2c execution time saving (#12294)

* Made OLED splash screen optional to reduce memory and fixed OLED i2c execution time saving

* moved OLED address updates into their respective conditional checks
38d97918 — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
a913db63 — Albert Y 4 years ago
Fix zero condition of reactive runners that will suspend RGB animation (#12710)

* Avoid zero or overflow from user's rgb_matrix_config.speed

* Avoid zero tick for reactive splash.

* Avoid zero time for animation runner.

Co-authored-by: filterpaper <filterpaper@localhost>
c742d0bd — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
ced7e9a0 — Xelus22 4 years ago
[Keyboard][Bug] Makrosu VIA compile fix encoder and formatting (#13306)

* fix encoder and formatting

* remove redundant breaks

* Update keyboards/makrosu/keymaps/default/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/makrosu/keymaps/via/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

Co-authored-by: Drashna Jaelre <drashna@live.com>
Fix linker error when rgblight and RGB Matrix are both enabled (#13304)

973a006c — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
Next