Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-02 | 11 | -114/+124 |
|\ | |||||
| * | Change 'helix/rev2:default' setting to use split_common (#16432) | Takeshi ISHII | 2022-03-02 | 11 | -114/+124 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add licenses message to helix/rev2 files * Minimize the processing of helix/rev2/local_features.mk * Changed helix/rev2 default setting to use split_common * fix helix/rev2:edvorakjp build error * Remove unnecessary '#include' from keymap.c * helix keymaps Workaround for build errors. five_rows_jis, fraanrosi, froggy, froggy_106, yshrsmz * Revert "fix helix/rev2:edvorakjp build error" This reverts commit 731dbbe15155b3efe2ff9f5ad61c7d0cf529e837. Separated into a single PR #16433. * Revert "Changed helix/rev2 default setting to use split_common" This reverts commit e76dbd7762e06e0781ee004213878b1a5029fa98. * add 'SPLIT_*_STATE_ENABLE' into helix/rev2/config.h * Revert "helix keymaps Workaround for build errors. five_rows_jis, fraanrosi, froggy, froggy_106, yshrsmz" This reverts commit 9b316c1c6a532f908f2ac430233089797ce7c794. * change helix:default to use split_common * change helix:five_rows to use split_common * add comment into helix/rev2/rules.mk * change helix:led_test to use split_common | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-01 | 4 | -8/+18 |
|\| | |||||
| * | Revert "handwired/3dortho14u: refactor layout data (#16475)" (#16485) | xiao | 2022-03-01 | 4 | -8/+18 |
| | | | | | | This reverts commit 3ac769b6abe9b97a94033f376b28482d2d5f7b00. | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-01 | 5 | -61/+69 |
|\| | |||||
| * | atlas_65 Layout Macro Refactor (#16483) | James Young | 2022-03-01 | 5 | -61/+69 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * atlas_65.h: add matrix diagram * atlas_65.h: apply linting - convert tabs to spaces - four-space indent - align backslashes in layout macro * atlas_65.h: adjust layout macro alignment Visually separates each side. White-space-only change. * physically arrange layout macro Move the matrix position identifiers in the layout macro to resemble the assembled keyboard's layout. - move `k46` (right side B) to the fourth (Shift) row - move each of `k1E`, `k2E` and `k3E` (right side navigation keys) up one row - update keymaps to match * update maintainer data Update the maintainer data in `info.json` and `readme.md`. | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-01 | 1 | -1/+0 |
|\| | |||||
| * | Remove invalid keyboard_folder from gk6 (#16480) | Joel Challis | 2022-03-01 | 1 | -1/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-01 | 1 | -2/+82 |
|\| | |||||
| * | Ellora65: remove dead space from Configurator rendering (#16478) | James Young | 2022-03-01 | 1 | -2/+82 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-01 | 8 | -8/+10 |
|\| | |||||
| * | Move projectcain encoder logic to keyboard level (#16479) | Joel Challis | 2022-03-01 | 8 | -8/+10 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-02-28 | 4 | -4/+9 |
|\| | |||||
| * | Glacier: Community Layout support (#16474) | James Young | 2022-02-28 | 4 | -4/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Glacier: Community Layout support Enables the Glacier to use QMK's `tkl_f13_ansi_tsangan` community layout. - rename `LAYOUT` to `LAYOUT_tkl_f13_ansi_tsangan` - add `LAYOUTS` rule to `rules.mk` * info.json: correct maintainer value Use the maintainer's GitHub username. | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-02-28 | 4 | -18/+8 |
|\| | |||||
| * | handwired/3dortho14u: refactor layout data (#16475) | James Young | 2022-02-28 | 4 | -18/+8 |
| | | | | | | Remove nonextant matrix positions from the layout data. | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-02-28 | 1 | -4/+4 |
|\| | |||||
| * | snatchpad: update layout data (#16476) | James Young | 2022-02-28 | 1 | -4/+4 |
| | | | | | | Fixes key overlaps in QMK Configurator. | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-02-28 | 6 | -18/+47 |
|\| | |||||
| * | CLI: Validate JSON keymap input (#16261) | Erovia | 2022-02-28 | 6 | -18/+47 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix schema validator It should use the passed schema. * Add required attributes to keymap schema * Rework subcommands to validate the JSON keymaps The 'compile', 'flash' and 'json2c' subcommands were reworked to add JSON keymap validation so error is reported for non-JSON and non-compliant-JSON inputs. * Fix required fields in keymap schema * Add tests * Fix compiling keymaps directly from keymap directory * Schema should not require version for now. | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-02-27 | 4 | -27/+32 |
|\| | |||||
| * | Fix issues with data driven split keyboards (#16457) | Joel Challis | 2022-02-27 | 4 | -27/+32 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-02-27 | 1 | -1/+1 |
|\| | |||||
| * | fix helix/rev2:edvorakjp build error (#16433) | Takeshi ISHII | 2022-02-27 | 1 | -1/+1 |
| | | | | | | | | | | 'helix/rev2/keymaps/edvorakjp' was no longer buildable due to changes made by #14864. The reason is that the prototype of `oled_task_user()` was changed in keymaps/edvorakjp/oled.c, but keymaps/edvorakjp/oled.h was not changed. Therefore, I modified the prototype in keymaps/edvorakjp/oled.h. | ||||
* | | Rework generate-api CLI command to use .build directory (#16441) | Joel Challis | 2022-02-27 | 6 | -11/+24 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-02-27 | 1 | -1/+0 |
|\| | |||||
| * | Revert CLI default for manufacturer (#16467) | Joel Challis | 2022-02-27 | 1 | -1/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-02-27 | 2 | -2/+120 |
|\| | |||||
| * | Wolf Sabre: fix Configurator layout data (#16465) | James Young | 2022-02-27 | 2 | -2/+120 |
| | | | | | | | | | | | | | | | | | | * apply friendly formatting to info.json * rebuild Configurator layout data KLE Rotation leads to incorrect layout data when converted to `info.json` format. * add matrix diagram to sabre.h | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-02-27 | 1 | -7/+6 |
|\| | |||||
| * | Wren: fix QMK Configurator key sequence (#16462) | James Young | 2022-02-27 | 1 | -7/+6 |
| | | | | | | | | | | * Wren: fix QMK Configurator key sequence * info.json: update maintainer field | ||||
* | | [Core] Squeeze AVR some more with `-mrelax` and `-mcall-prologues` (#16269) | Stefan Kerkmann | 2022-02-26 | 1 | -1/+8 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-02-27 | 1 | -1/+1 |
|\| | |||||
| * | [Docs] Anchor link correction in rgb matrix docs (#16460) | Albert Y | 2022-02-26 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-02-27 | 1 | -10/+4 |
|\| | |||||
| * | [Keymap] stanrc85 userspace rules cleanup (#16447) | stanrc85 | 2022-02-26 | 1 | -10/+4 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-02-27 | 2 | -0/+4 |
|\| | |||||
| * | Link WS2812 driver page from rgb feature docs (#16366) | Dasky | 2022-02-27 | 2 | -0/+4 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-02-27 | 7 | -0/+272 |
|\| | |||||
| * | [Keyboard] add YMDK YMD21 v2 (#16442) | James Young | 2022-02-26 | 7 | -0/+272 |
| | | | | | | | | | | * [Keyboard] add YMDK YMD21 v2 * remove trailing whitespace from default keymap | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-02-27 | 1 | -4/+30 |
|\| | |||||
| * | [Docs] Add commands to flashing docs (#16456) | Ryan | 2022-02-26 | 1 | -4/+30 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-02-27 | 12 | -0/+392 |
|\| | |||||
| * | [Handwired] Support for Adafruit lemon keypad (#16395) | Dari | 2022-02-26 | 12 | -0/+392 |
| | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: zvecr <git@zvecr.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-02-27 | 8 | -0/+281 |
|\| | |||||
| * | [Keyboard] ada1800mini (#16386) | peepeetee | 2022-02-26 | 8 | -0/+281 |
| | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-02-26 | 55 | -94/+9 |
|\| | |||||
| * | Remove 1k USB_POLLING_INTERVAL_MS config from keyboards and default-ish ↵ | Joel Challis | 2022-02-26 | 55 | -94/+9 |
| | | | | | | | | | | | | | | keymaps (#16448) * Remove 1k USB_POLLING_INTERVAL_MS config from keyboard level * Remove 1k USB_POLLING_INTERVAL_MS config from default|via keymaps | ||||
* | | Start develop for 2022q2 | zvecr | 2022-02-26 | 1 | -0/+4 |
|/ | |||||
* | Merge remote-tracking branch 'origin/develop' | zvecr | 2022-02-25 | 4166 | -26911/+32069 |
|\ |