~ruther/qmk_firmware

bb2986c1 — Dasky 4 years ago
Fix compliation for ferris 0.2 bling (#13937)

* Fix include
7bec9430 — James Young 4 years ago
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
c0628c28 — Joel Challis 4 years ago
Remove backwards compatibility of debounce names (#13877)

* Remove backwards compatibility of debounce names

* Update docs

* Update keyboards/keymaps
7c691d82 — Joel Challis 4 years ago
Remove ONEHAND_ENABLE (#13920)

26ea0901 — Daniil Yastremskiy 4 years ago
Limit RGB max brightness on KPrepublic BM-series keyboards (#13132)

2617ac60 — Drashna Jaelre 4 years ago
Fixup rgb matrix config for KBD67 mkII boards (#13931)

23becac3 — Pierre Chevalier 4 years ago
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
5a59363e — Stick 4 years ago
[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
8d19f4f1 — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
8936d0ae — Edvard Sire 4 years ago
[Keymap] new keymap for nui_mini (#13924)

ed7f06bd — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
dbee9609 — Andre Brait 4 years ago
Make default keymap for GMMK Pro reflect stock (#13850)

9a1a35f6 — Pascal Pfeil 4 years ago
[Keymap] Add kbd67 mkiirgb keymap (#13884)

Co-authored-by: Spaceman <rionlion100@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
f3cede72 — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
be72a64c — Michele Ferri 4 years ago
[Keyboard] Add TouhouPad (#13915)

* Touhoupad rev 2

* cleanup for PR

* fixes after review
12681bac — Zach White 4 years ago
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c
e6c171bd — Zach White 4 years ago
Fix generate api (#13930)

* Add missing returncode to exit()

* fix the aozora/hotswap vendor id
5eb0e406 — Zach White 4 years ago
make json imports more robust (#13928)

79d5b279 — Chris 4 years ago
[Keymap] rootiest for planck/rev6/ (#13294)

* squashed commits to master

* Fix in case of missing user_song_list
Substitutes missing songs with safe versions
Also updated and added detail to keymap readme

* Adjust Readme to match qmk contrib conventions

* Update keyboards/planck/keymaps/rootiest/config.h

* Update keyboards/planck/keymaps/rootiest/keymap.c

* Update keyboards/planck/keymaps/rootiest/keymap.c

* Update keyboards/planck/keymaps/rootiest/keymap.c

* Update keyboards/planck/keymaps/rootiest/keymap.c

* Fixed license header to GPLv2+

* Fix Volume key delay
Use a static number instead of removed MEDIA_KEY_DELAY

* Use TAP_CODE_DELAY

* added license to config.h

* Clean up formatting
- Fixed markdown in readme
- Removed extra commented line from config.h

* Update keyboards/planck/keymaps/rootiest/config.h
59b5c884 — jfescobar18 4 years ago
[Keyboard] Undead 60M (#13735)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Next