Commit Graph

14303 Commits

Author SHA1 Message Date
QMK Bot
7dd99f2b22 Merge remote-tracking branch 'origin/master' into develop 2020-12-30 00:06:16 +00:00
Naoto Takai
8ee03f6a6b
Update Choco60 firmware to support new PCB (#11218)
* Update vendor and product info

* Add rev2 for Choco60

* Add keymap for VIA

* Add readme.md for rev1 and rev2

* Use list instead of new line

* Remove DESCRIPTION

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

* Update rev1/readme.md to specify rev1 directly.

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

* Remove some definitions

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

* Remove comments

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

Co-authored-by: Ryan <fauxpark@gmail.com>
2020-12-30 00:05:48 +00:00
QMK Bot
e29b9e32bb Merge remote-tracking branch 'origin/master' into develop 2020-12-30 00:03:43 +00:00
Jacqueline Liang
0c4663a802
Add 6key to keyboards/handwired (#11226)
* Add 6key to keyboards/handwired

* Add keyboards/handwired/6key folder
* Add 6key.c
* Add 6key.h
* Add config.h
* Add keymaps/default/keymap.c
* Add readme.md
* Add rules.mk

* Add info.json

* Apply suggestions from code review

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

* Make changes based on pr comments

* Apply formatting suggestions from code review

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

* Update keyboards/handwired/6key/rules.mk

Co-authored-by: jyliang2 <jyliang2@illinois.edu>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2020-12-30 00:03:35 +00:00
Brandon Claveria
5d0c0e7c12
add nodu keyboard (#11233)
* add nodu keyboard

* fix info.json

* limit via to 3 layers

Co-authored-by: Swiftrax <swiftrax@gmail.com>
2020-12-30 00:03:09 +00:00
QMK Bot
599043e7ff Merge remote-tracking branch 'origin/master' into develop 2020-12-29 23:44:18 +00:00
Andrew Kannan
bea897caf1
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>
2020-12-29 23:43:46 +00:00
QMK Bot
79265fc2c0 Merge remote-tracking branch 'origin/master' into develop 2020-12-29 23:24:24 +00:00
Nick Krichevsky
e85d904fe1
Add convenience method for setting Nibble's big LED RGB (#11257) 2020-12-29 23:23:50 +00:00
QMK Bot
871d99e659 Merge remote-tracking branch 'origin/master' into develop 2020-12-29 22:14:33 +00:00
Drashna Jaelre
12568fb5a9
[Bug] Fix RGB Matrix Indicators (#11308) 2020-12-29 22:14:03 +00:00
QMK Bot
25109f79f1 Merge remote-tracking branch 'origin/master' into develop 2020-12-29 22:13:29 +00:00
Joe Hu
824e1cd95d
Fix backlight for XD84 (#11309)
Like XD87, XD8 should have `#define BACKLIGHT_ON_STATE 0` too.
2020-12-29 22:12:58 +00:00
QMK Bot
9634c72d7e Merge remote-tracking branch 'origin/master' into develop 2020-12-29 21:45:35 +00:00
xyzz
2573ed8c6b
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
2020-12-29 21:45:04 +00:00
QMK Bot
8609fe8f46 Merge remote-tracking branch 'origin/master' into develop 2020-12-29 21:14:06 +00:00
Monksoffunk
25d9cdc88f
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>
2020-12-29 21:13:35 +00:00
QMK Bot
77185961dc Merge remote-tracking branch 'origin/master' into develop 2020-12-29 20:52:21 +00:00
Ryan
962b8d3814
Update keycode docs (#11343) 2020-12-30 07:51:36 +11:00
QMK Bot
7ee3eb50b0 Merge remote-tracking branch 'origin/master' into develop 2020-12-29 19:46:58 +00:00
Ryan
122cf3ad0f
Update Zadig docs with list of bootloader device names and IDs (#11337) 2020-12-29 19:46:15 +00:00
QMK Bot
525be128c9 Merge remote-tracking branch 'origin/master' into develop 2020-12-29 19:42:43 +00:00
Zach White
5edfdeff50
remove some old and unused code from Makefile (#11336) 2020-12-29 19:42:09 +00:00
QMK Bot
7b7763469b Merge remote-tracking branch 'origin/master' into develop 2020-12-29 19:35:24 +00:00
LongerHV
221d8fd866
[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
2020-12-29 11:34:48 -08:00
QMK Bot
9748b6b847 Merge remote-tracking branch 'origin/master' into develop 2020-12-29 16:33:06 +00:00
Chas
3300164065
Typo fix: Useful function -> Useful Functions (#11342)
Thanks!
2020-12-30 01:32:30 +09:00
QMK Bot
d1b9a7e1bd Merge remote-tracking branch 'origin/master' into develop 2020-12-29 04:06:42 +00:00
Zach White
55843480ff
Fix compile issues from the error page (#11314)
* fix abacus so it works with configurator

* create the keymap path if it doesn't exist

* bpiphany/unloved_bastard: remove the nested macros, move default keymap to json

* readd the unloved_bastard default keymap

* fix clueboard/card

* fixup handwired/2x5keypad

* fixup hub16

* matrix/noah: remove the broken matrix print code to fix compilation

* reinstate matrix_print with the right include

* Revert "create the keymap path if it doesn't exist"

This reverts commit af732776a539e8c6e2edf2e54f4d7f5ffa65b3a2.
2020-12-28 20:06:07 -08:00
QMK Bot
8ea2650ab2 Merge remote-tracking branch 'origin/master' into develop 2020-12-28 20:27:33 +00:00
David Doan
5fde2d730c
1x4p1 (#11186)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
2020-12-28 21:27:00 +01:00
QMK Bot
99d6349978 Merge remote-tracking branch 'origin/master' into develop 2020-12-27 17:37:04 +00:00
Ryan
1b7b72c0e9
Ensure single newline at EOF for core files (#11310) 2020-12-28 04:36:32 +11:00
QMK Bot
0c5be869ff Merge remote-tracking branch 'origin/master' into develop 2020-12-27 16:56:40 +00:00
Joel Challis
bbf0f65284
Simplify the visual flow of the getting started page (#11316)
* Add tabs to getting started page

* Review comments

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

* Align with current theme

* Update docs/newbs_getting_started.md

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

* Apply suggestions from code review

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

Co-authored-by: Ryan <fauxpark@gmail.com>
2020-12-27 16:56:10 +00:00
QMK Bot
0b37c0dfa0 Merge remote-tracking branch 'origin/master' into develop 2020-12-26 04:56:43 +00:00
Ryan
1d1d5da43f
Change include guards in tmk_core/ and drivers/ to pragma once (#11240) 2020-12-26 15:56:11 +11:00
QMK Bot
ffd7e44e5a Merge remote-tracking branch 'origin/master' into develop 2020-12-26 04:53:57 +00:00
Ryan
48f4768d33
Change include guards in quantum/ to pragma once (#11239) 2020-12-26 15:53:12 +11:00
QMK Bot
6c366ccf6a Merge remote-tracking branch 'origin/master' into develop 2020-12-25 23:00:57 +00:00
Drashna Jaelre
53eb7f0774
[Keyboard] Fix default keymaps for tunks/ergo33 (#11280)
* [Keyboard] Fix default keymap for tunks/ergo33

* Add prpro keymap too
2020-12-25 15:00:29 -08:00
QMK Bot
a4866b31d6 Merge remote-tracking branch 'origin/master' into develop 2020-12-25 17:38:46 +00:00
Takeshi ISHII
5544bf8524
[Keymap] update rules.mk and config.h of helix/rev2:five_rows (#11302)
* update keyboards/helix/rev2/keymaps/five_rows/rules.mk: oled selection, led animation selection

* add OLED_UPDATE_INTERVAL support into keyboards/helix/rev2/keymaps/five_rows/oled_display.c

Support for OLED_UPDATE_INTERVAL, even for older types of OLED tasks.

* Add 'HELIX=debug/no-debug' option into 'helix/rev2/keymaps/five_rows/rules.mk'
2020-12-26 02:38:07 +09:00
QMK Bot
f1a67c42a0 Merge remote-tracking branch 'origin/master' into develop 2020-12-25 14:45:00 +00:00
kiwikey
7ca4b61922
First commit of Kawii9 (#11201)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2020-12-26 01:44:32 +11:00
QMK Bot
c6aa9c4ad7 Merge remote-tracking branch 'origin/master' into develop 2020-12-25 14:42:41 +00:00
Jonathon Carstens
b7f640ca76
Adding new keyboard: Tenkey++ (tenkey_plusplus) (#11197)
Co-authored-by: Ryan <fauxpark@gmail.com>
2020-12-26 01:42:11 +11:00
QMK Bot
f83eefba37 Merge remote-tracking branch 'origin/master' into develop 2020-12-25 14:39:30 +00:00
Drashna Jaelre
436b5394bb
[Keyboard] Fix Dactyl Manuform with Trackball info.json (#11298) 2020-12-26 01:38:31 +11:00
George Mao
73dfc2b368
[Keyboard] Refactor Jacky's boards (Bear65 and S7 Elephant) (#10528) 2020-12-24 14:53:16 -08:00