Merge remote-tracking branch 'origin/master' into develop
adding my keymap "vayashiko" (#13049)
* adding my keymap
* changed some bugs
* removed include keymap.h
Merge remote-tracking branch 'origin/master' into develop
Ristretto - Update bootloader (#13933)
* updated bootloader for 32u4 mcu
Should be atmel-dfu instead of caterina as the mcu is integrated instead of on a pro-micro/elite-c
Fix compliation for ferris 0.2 bling (#13937)
* Fix include
Merge remote-tracking branch 'upstream/master' into develop
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
Remove backwards compatibility of debounce names (#13877)
* Remove backwards compatibility of debounce names
* Update docs
* Update keyboards/keymaps
Remove ONEHAND_ENABLE (#13920)
Limit RGB max brightness on KPrepublic BM-series keyboards (#13132)
Fixup rgb matrix config for KBD67 mkII boards (#13931)
Support all the 0.2 Ferris variants (#12653)
* Support all the 0.2 Ferris variants
For the Compact, the High and the Mini, create a new directory so each
keyboard may have the correct USB descriptor and a readme with more
specific information about it.
For the Bling, also add support for the underglow functionality.
Change the "MANUFACTURER" string to "Cuddly Keyboards Ltd.", the
name of the company I incorporated to sell keyboards, and change the
default descriptor from "Ferris the keeb" to "Ferris 0.2" which is more
descriptive.
I didn't update the 0.1 variants as I don't intend to sell these kits
with "Cuddly Keyboards". The firmware is mostly there to support
existing users.
Update the "hardware availability" to point to my new website:
cuddlykeyboards.com.
* Add RGB mode toggle to my keymap and to the default keymap
* Improve wording in the readme
[User] changes to nstickney's keymaps (#11456)
0) Built a Bastyl, gave away the ErgoDoxEZ
1) UNICODEMAP
2) Iris left is now Elite-C
3) New QMK flashing instructions
Merge remote-tracking branch 'origin/master' into develop
[Keymap] new keymap for nui_mini (#13924)
Merge remote-tracking branch 'origin/master' into develop
Make default keymap for GMMK Pro reflect stock (#13850)
Merge remote-tracking branch 'origin/master' into develop
[Keyboard] Add TouhouPad (#13915)
* Touhoupad rev 2
* cleanup for PR
* fixes after review
Merge remote-tracking branch 'origin/master' into develop
Conflicts:
keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c