~ruther/qmk_firmware: master

599043e7 — QMK Bot 4 years ago

Merge remote-tracking branch 'origin/master' into develop

bea897ca — Andrew Kannan 4 years ago

Tsukuyomi Keyboard (#10898)

* Add Tsukuyomi PCB

* Remove unncessary file

* Fix

* update config

* Tsukuyomi info.json

* Update readme

* add license header and add dfu suffix args

* Apply suggestions from code review

Co-authored-by: Joel Challis <git@zvecr.com>

* Update info.json

* Apply suggestions from code review

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

79265fc2 — QMK Bot 4 years ago

Merge remote-tracking branch 'origin/master' into develop

e85d904f — Nick Krichevsky 4 years ago

Add convenience method for setting Nibble's big LED RGB (#11257)

871d99e6 — QMK Bot 4 years ago

Merge remote-tracking branch 'origin/master' into develop

12568fb5 — Drashna Jaelre 4 years ago

[Bug] Fix RGB Matrix Indicators (#11308)

25109f79 — QMK Bot 4 years ago

Merge remote-tracking branch 'origin/master' into develop

824e1cd9 — Joe Hu 4 years ago

Fix backlight for XD84 (#11309)

Like XD87, XD8 should have `#define BACKLIGHT_ON_STATE 0` too.

9634c72d — QMK Bot 4 years ago

Merge remote-tracking branch 'origin/master' into develop

2573ed8c — xyzz 4 years ago

Remove MATRIX_IS_ON macro (#11330)

* Remove MATRIX_IS_ON macro

this macro is both incorrect and excessive given that macro_is_on()
exists

* Remove massdrop matrix.h

8609fe8f — QMK Bot 4 years ago

Merge remote-tracking branch 'origin/master' into develop

25d9cdc8 — Monksoffunk 4 years ago

Add ALETH42 keyboard (#10720)

* Add Aleth42 keyboard

* Fix Rotary Encoder Section

* Add VIA keymap

* Fix VIA keymap

remove RETRO_TAPPING define because of incompatiblity of rotary encoders with layer tapping.
change KC_ESC to KC_GESC

* Change TAPPING definitions

Comment TAPPING_TERM
Remove RETRO_TAPPING

* Add rev1

Add new rev1 directory
Move previous files to rev0

* Add define of ENCODER_RESOLUTION

* Change number of RGBLED

* Change USB descriptor param

Change VID, PID and product name

* Change default and via keymaps

* Remove upper keymap

* Add readme

* Change USB descriptor param

VID 0x04D8 PID 0xEAC8
Manufacturer 25KEYS
rev0 -> 0x0000 rev1 -> 0x0001
Remove define DESCRIPTION

* Fix info.json

Remove info,json under /rev0 /rev1
Add correct info.json at keyboard/aleth42/

* Change keymaps

* Remove unnecessary comments

* Change BOOTMAGIC option

* Change config options

* Fix readme files

* Change keymap readme files

* Change to use get_highest_layer

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

Co-authored-by: Ryan <fauxpark@gmail.com>

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

Co-authored-by: Ryan <fauxpark@gmail.com>

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

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/aleth42/keymaps/default/readme.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/aleth42/keymaps/default/readme.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/aleth42/keymaps/default/readme.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/aleth42/keymaps/via/readme.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/aleth42/keymaps/via/readme.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/aleth42/keymaps/via/readme.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Use tap_code16 function

* Remove empty config file

* Update keyboards/aleth42/keymaps/default/readme.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/aleth42/keymaps/default/readme.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/aleth42/keymaps/default/readme.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/aleth42/keymaps/default/readme.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/aleth42/keymaps/default/readme.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/aleth42/keymaps/via/readme.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/aleth42/keymaps/via/readme.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/aleth42/keymaps/via/readme.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/aleth42/keymaps/via/readme.md

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>

77185961 — QMK Bot 4 years ago

Merge remote-tracking branch 'origin/master' into develop

962b8d38 — Ryan 4 years ago

Update keycode docs (#11343)

7ee3eb50 — QMK Bot 4 years ago

Merge remote-tracking branch 'origin/master' into develop

122cf3ad — Ryan 4 years ago

Update Zadig docs with list of bootloader device names and IDs (#11337)

525be128 — QMK Bot 4 years ago

Merge remote-tracking branch 'origin/master' into develop

5edfdeff — Zach White 4 years ago

remove some old and unused code from Makefile (#11336)

7b776346 — QMK Bot 4 years ago

Merge remote-tracking branch 'origin/master' into develop

221d8fd8 — LongerHV 4 years ago

[CLI] Add stdin support for json2c command (#11289)

* Implement stdin for json2c command

* Refactor

* Handle json decode error

* Add stdin support for c2json cli command

* Refactor to prevent code duplication

* Change exit(1) to return False in c2json command

* Remove unused import