summaryrefslogtreecommitdiff
path: root/keyboards
AgeCommit message (Collapse)Author
2021-04-07Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-07Update info.json to correctly. (#12507)Kosuke Adachi
2021-04-07Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-07Add info.json for CK60i (#12318)Ryan
2021-04-06Fix up builds that are now too big for `develop` branch. (#12495)Nick Brassel
2021-04-04Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-04Disarray ProductID change (#12440)SneakboxKB
Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: mujimanic <64090325+mujimanic@users.noreply.github.com> Co-authored-by: Zach White <skullydazed@gmail.com>
2021-04-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-04[Keymap] cleanup keyboards/helix/{rev2|rev3_5rows}/keymaps/five_rows (#12259)Takeshi ISHII
* cleanup keyboards/helix/{rev2|rev3_5rows}/keymaps/five_rows * Made the layout data easier to read. * helix/rev2/keymaps/five_rows/keymap.c * helix/rev3_5rows/keymaps/five_rows/keymap.c * The following two were made the same. * keymaps/five_rows/config.h * keymaps/five_rows/oled_display.c The binary of the compilation result has not changed. * update keyboards/helix/rev2/keymaps/five_rows/rules.mk KEYBOARD_LOCAL_FEATURES_MK was moved to the end. * add '#define DISABLE_SYNC_TIMER' into helix/rev3_5rows/keymaps/five_rows/config.h The sync timer features worsen the matrix scan rate of the Helix keyboard. I'm not sure if it makes sense to have sync timer features enabled on the Helix keyboard. So in my keymap I disable this.
2021-04-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-03Added Epoch80 (#12307)kb-elmo
2021-04-03Merge remote-tracking branch 'upstream/master' into developfauxpark
2021-04-03[CI] Format code according to conventions (#12468)github-actions[bot]
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-04-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-02kingly_keys/ave: move RGBLight config to keyboard level (#12457)James Young
QMK Configurator's API can't use the RGBLight configurator when it's defined at keymap level.
2021-04-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-02keymaps: fix kinesis default keymap progrm/reset keycode (#12429)Michael Stapelberg
The right-most top-most key on the Kinesis Advantage keyboard is labeled “Progrm” and was meant to enter the Teensy bootloader as per the comment. However, the keycode was set to KC_1, which just produces a “1”. It should be RESET instead. This commit fixes KC_1 to RESET in all files where the fix is needed. The other files have already been fixed independently.
2021-04-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-02[Keymap] Remove kc keymap from khord chocopad keymap (#12409)Dylan Khor
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-02[Keyboard] Add GON NerD TKL VIA keymap (#12309)kaylanm
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-02[Keyboard] Add pkb65 keyboard (#12230)MCKeebs
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-02[Keyboard] KBD67 Hotswap VIA Support (#12351)MechMerlin
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-02[Keyboard] Added wilba.tech WT70-JB (#12347)Wilba
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-02[Keyboard] Added RAMA WORKS KARA (#12346)Wilba
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-02[Keyboard] Update sixkeyboard VID/PID (#12345)jrdsgl
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-02[Keymap] remove kc layout from levinson jyh keymap (#12301)Jason Yamada-Hanff
Co-authored-by: Jason Yamada-Hanff <jyamada-hanff@chromologic.com>
2021-04-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-02[Keyboard] Added VIA support to dmqdesign/spin (#12300)adamkraus6
Co-authored-by: Kraus, Adam <adam.kraus@mines.sdsmt.edu>
2021-04-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-02[Keyboard] Add FoldKB (#12255)Danny
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-02[Keyboard] Add Lumberjack keyboard (#12124)Paul James
2021-04-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-02[Keymap] for Ibm m122 (#11704)dsanchezseco
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-02[Keyboard] Add CherryB Studio Keyboards (#11475)Duong Anh
Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2021-04-01Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-31change BM68 RGB USB Device descriptor device name (#12418)peepeetee
* change styling USB Device descriptor device name to reflect stylistic choices of the developer
2021-03-31Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-01Remove leftover old implementations of the lily58 split code. (#12442)Nick Brassel
2021-03-31add kinesis/kint36 (#10171)Michael Stapelberg
This moves the config_common.h into the files that include ../config.h, so that the kint36/config.h does not include it (which would cause compilation errors).
2021-03-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-28Added the 64_ansi (GK64) layout to DZ60 (#12378)kb-elmo
* add gk64 layout * Apply suggestions from code review