Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-20 | 17 | -18/+34 |
|\ | |||||
| * | Six Pack and ortho_ layout updates (#13587) | Suschman | 2021-07-19 | 17 | -18/+34 |
| | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Suschman <suschman@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-20 | 2 | -0/+0 |
|\| | |||||
| * | Knobgoblin: rename ortho keymap to default (#13592) | James Young | 2021-07-19 | 2 | -0/+0 |
| | | | | | | Keyboard did not previously have a `default` keymap. | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-20 | 1 | -0/+118 |
|\| | |||||
| * | converter/periboard_512: add Configurator layout data (#13600) | James Young | 2021-07-19 | 1 | -0/+118 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-20 | 5 | -26/+187 |
|\| | |||||
| * | fluxlab zplit: keymap restructuring (#13599) | James Young | 2021-07-19 | 5 | -26/+187 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-20 | 1 | -1/+1 |
|\| | |||||
| * | [Keyboard][Bug] Constellation Rev2 (#13595) | Xelus22 | 2021-07-19 | 1 | -1/+1 |
| | | |||||
* | | [Bug] Develop - Change uint32_t to layer_state_t (#13596) | Xelus22 | 2021-07-19 | 105 | -433/+433 |
| | | | | | | | | | | * fix sat75 * update uint32_t to layer_state | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-18 | 2 | -0/+0 |
|\| | |||||
| * | LazyDesigners Bolt: move via keymap to keymaps directory (#13581) | James Young | 2021-07-17 | 2 | -0/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-17 | 2 | -18/+608 |
|\| | |||||
| * | Discipline layout macro/Configurator fixes (#13574) | James Young | 2021-07-17 | 2 | -18/+608 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * use human-friendly formatting in info.json * move layout macro aliases to info.json * correct and complete layout data Corrects the layout data for a few layouts, adds the missing data, and renames some of the layout macros. - rename LAYOUT_wkl_ansi_2_right_mods to LAYOUT_65_ansi_wkl - rename LAYOUT_wkl_ansi_3_right_mods to LAYOUT_65_ansi_lwkl - rename LAYOUT_wkl_iso_2_right_mods to LAYOUT_65_iso_wkl - rename LAYOUT_wkl_iso_3_right_mods to LAYOUT_65_iso_lwkl | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-17 | 6 | -208/+620 |
|\| | |||||
| * | ACR60 Refactor (#13575) | James Young | 2021-07-17 | 6 | -208/+620 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * modernize acr60.h - use #pragma once include guard - add license header - use four-space indent - use QMK three-character notation for layout macro arguments * human-friendly format info.json * remove `key_count` keys from info.json * rename LAYOUT_2_shifts to LAYOUT_all * move LAYOUT_all to top * use QMK three-character notation in info.json * refactor default keymap - add license header - remove third layer (does nothing) - replace Shift-Escape keycode with KC_GESC - use LAYOUT_all macro instead of LAYOUT * modernize readme.md - update header - convert metadata section to list - add flashing and bootloader jump instructions - update Docs links * use #pragma once include guard in config.h * update LED Indicator API * add license headers | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-17 | 1 | -0/+432 |
|\| | |||||
| * | Cutie Club Giant Macro Pad: add info.json (#13576) | James Young | 2021-07-17 | 1 | -0/+432 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-17 | 4 | -8/+12 |
|\| | |||||
| * | Xelus Akis Configurator Fixes (#13577) | James Young | 2021-07-17 | 4 | -8/+12 |
| | | | | | | | | | | | | | | | | | | * correct layout macro references The keyboard's header file and info.json referenced different layout macro names. * correct layout data Insert an object for the Non-US Backslash key, which was previously missing. | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-16 | 1 | -0/+12 |
|\| | |||||
| * | Limit RGB brightness for crkbd when not defined (#13568) | Dasky | 2021-07-16 | 1 | -0/+12 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-16 | 2 | -0/+49 |
|\| | |||||
| * | adding tw40 via support (#13032) | lukeski14 | 2021-07-17 | 2 | -0/+49 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-16 | 25 | -22/+1134 |
|\| | |||||
| * | [Keyboard] Neito + my DZ60 keymap tweaks (#11773) | Oliver Granlund | 2021-07-16 | 25 | -22/+1134 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' into develop | Nick Brassel | 2021-07-16 | 1 | -0/+8 |
|\| | |||||
| * | Set some default configurations for GMMK Pro (#13219) | Andre Brait | 2021-07-16 | 1 | -0/+9 |
| | | | | | | | | | | * Set some default configurations for GMMK Pro * Remove FORCE_NKRO to avoid issues with KVMs | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-15 | 2 | -56/+59 |
|\| | |||||
| * | [Keyboard] correct the info.json for qmk configurator and add two empty ↵ | bomb | 2021-07-15 | 2 | -56/+59 |
| | | | | | | | | layers for via (#13552) | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-15 | 18 | -0/+1440 |
|\| | |||||
| * | [keyboard] Clueboard 2x1800 2021 Support (#13220) | Zach White | 2021-07-14 | 18 | -0/+1440 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2x1800 2021 * add support for writing a whole frame at a time * improvements * wip * fix scrolling * small tweak * add a buffer that's larger than the display * add the start of a font * working upper and lower case letters * add qmk animation * integrate the message sign into the qmk task system * add encoder defaults * add MAX7219_LED_CUSTOM to config.h * tweaks * remove unneeded keymaps * add a keymap showing how to control the signboard * cleanup * cleanup * add a way to disable the startup test * make it easier to define options at the keymap level * Fix define names Co-authored-by: Greg Cochard <gcochard@users.noreply.github.com> * Apply suggestions from gcochard Co-authored-by: Greg Cochard <gcochard@users.noreply.github.com> * feedback from noroads * format info.json Co-authored-by: Greg Cochard <gcochard@users.noreply.github.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-14 | 13 | -1/+764 |
|\| | |||||
| * | [Keyboard] Add Serratus PCB (#13281) | mechlovin | 2021-07-14 | 13 | -1/+764 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-14 | 9 | -0/+370 |
|\| | |||||
| * | [Keyboard] Tidying up my projects and subprojects (#13289) | Koobaczech | 2021-07-14 | 9 | -0/+370 |
| | | | | | | | | | | Co-authored-by: Erovia <Erovia@users.noreply.github.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ethan Madden <maddene@madden.ninja> | ||||
* | | Migrate more `fn_actions` stuff (#13502) | Ryan | 2021-07-15 | 9 | -352/+206 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-14 | 2 | -3/+3 |
|\| | |||||
| * | Fix some RGB Matrix-enabled keymaps referring to RGBLight mode (#13509) | Ryan | 2021-07-15 | 2 | -3/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | Zach White | 2021-07-14 | 166 | -1452/+10344 |
|\| | | | | | | | | | Resolved Conflicts: keyboards/checkerboards/nop60/info.json | ||||
| * | correct data info.json (#13544) | mechlovin | 2021-07-14 | 2 | -2/+2 |
| | | | | | | rouge87 and rogue87 | ||||
| * | [Keyboard] Add MelGeek MJ6xy which is a 60% keyboard that support mul… ↵ | bomb | 2021-07-14 | 59 | -0/+6118 |
| | | | | | | | | | | (#13494) Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
| * | Traveller handwired layout macro refactor (#13539) | James Young | 2021-07-13 | 3 | -126/+129 |
| | | |||||
| * | Lucid Phantom soldered: layout macro touch-up (#13540) | James Young | 2021-07-13 | 3 | -31/+30 |
| | | |||||
| * | RGB Matrix support for Scylla (#13415) | Albert Y | 2021-07-13 | 3 | -3/+68 |
| | | | | | | Co-authored-by: filterpaper <filterpaper@localhost> | ||||
| * | Refactor Drop boards to custom matrix lite (#13468) | Joel Challis | 2021-07-13 | 4 | -286/+74 |
| | | |||||
| * | [Keyboard] Add ianklug grooveboard (#13536) | Ian Klug | 2021-07-13 | 11 | -0/+337 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
| * | [Keyboard} Add ISO support for the GMMK Pro (#13532) | Anton | 2021-07-13 | 3 | -0/+197 |
| | | | | | | | | | | | | | | | | | | | | * Added iso layer support for the GMMK Pro iso version * Adjusted the mapping * aligning with best practises * aligning with comments from PR * Added iso layout to info.json | ||||
| * | Ortho 5x14 handwired info.json correction (#13538) | James Young | 2021-07-13 | 2 | -2/+2 |
| | | | | | | | | | | | | | | * ortho5x14 handwired: correct info.json data Last key was incorrectly positioned. * fix readme typo |