summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-0410-275/+1177
|\|
| * Melody96 refactor (#16455)Ryan2022-03-0410-275/+1177
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-041-1/+1
|\|
| * Update pr_checklist.md (#16484)jels2022-03-041-1/+1
| | | | | | Update readme.md template link from https://github.com/qmk/qmk_firmware/blob/master/data/templates/avr/readme.md to https://github.com/qmk/qmk_firmware/blob/master/data/templates/keyboard/readme.md
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-031-1/+1
|\|
| * Typo in squeezing_avr.md (#16506)jels2022-03-031-1/+1
| | | | | | Fixed typo in squeezing_avr docs.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-033-2/+9
|\|
| * Fix use of ISSI driver config before init (#16493)Joel Challis2022-03-033-2/+9
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-036-7/+9
|\|
| * Fix helix/rev2 not working properly when using split_common. (#16512)Takeshi ISHII2022-03-036-7/+9
| | | | | | | | | | | | | | | | | | | | | | When helix/rev2 was using split_common, it didn't work properly and I couldn't type on the right hand side. The cause is that the following code, added in 0.16.0 to `quantum/keyboard.c`, does not include `quantum/split_common/split_util.h` but instead includes `keyboards/helix/rev2/split_util.h`. Therefore, `split_pre_init()/split_post_init()` in `quantum/split_common/split_util.c` was not called. ```c #ifdef SPLIT_KEYBOARD # include "split_util.h" #endif ```
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-031-0/+4
|\|
| * [Bug] fix v-usb connection enumeration, ifdef workaround (#16511)Gompa2022-03-031-0/+4
| | | | | | Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-032-4/+6
|\|
| * Fix mistakes in the include path in `helix/rev2/local_features.mk`. (#16507)Takeshi ISHII2022-03-032-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | ```diff --- a/keyboards/helix/rev2/local_features.mk +++ b/keyboards/helix/rev2/local_features.mk @@ -6,7 +6,7 @@ # KEYBOARD_LOCAL_FEATURES_MK := --include $(strip $(HELIX_TOP_DIR)/pico/override_helix_options.mk) ## File ded icated to maintenance +-include $(strip $(HELIX_TOP_DIR)/rev2/override_helix_options.mk) ## File dedicated to maintenance ```
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-031-1/+1
|\|
| * fixed typo in docs/newbs_getting_started.md (#16501)Jake VanderVaate2022-03-031-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-0211-114/+124
|\|
| * Change 'helix/rev2:default' setting to use split_common (#16432)Takeshi ISHII2022-03-0211-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 developQMK Bot2022-03-014-8/+18
|\|
| * Revert "handwired/3dortho14u: refactor layout data (#16475)" (#16485)xiao2022-03-014-8/+18
| | | | | | This reverts commit 3ac769b6abe9b97a94033f376b28482d2d5f7b00.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-015-61/+69
|\|
| * atlas_65 Layout Macro Refactor (#16483)James Young2022-03-015-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 developQMK Bot2022-03-011-1/+0
|\|
| * Remove invalid keyboard_folder from gk6 (#16480)Joel Challis2022-03-011-1/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-011-2/+82
|\|
| * Ellora65: remove dead space from Configurator rendering (#16478)James Young2022-03-011-2/+82
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-018-8/+10
|\|
| * Move projectcain encoder logic to keyboard level (#16479)Joel Challis2022-03-018-8/+10
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-284-4/+9
|\|
| * Glacier: Community Layout support (#16474)James Young2022-02-284-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 developQMK Bot2022-02-284-18/+8
|\|
| * handwired/3dortho14u: refactor layout data (#16475)James Young2022-02-284-18/+8
| | | | | | Remove nonextant matrix positions from the layout data.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-281-4/+4
|\|
| * snatchpad: update layout data (#16476)James Young2022-02-281-4/+4
| | | | | | Fixes key overlaps in QMK Configurator.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-286-18/+47
|\|
| * CLI: Validate JSON keymap input (#16261)Erovia2022-02-286-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 developQMK Bot2022-02-274-27/+32
|\|
| * Fix issues with data driven split keyboards (#16457)Joel Challis2022-02-274-27/+32
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-271-1/+1
|\|
| * fix helix/rev2:edvorakjp build error (#16433)Takeshi ISHII2022-02-271-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 Challis2022-02-276-11/+24
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-271-1/+0
|\|
| * Revert CLI default for manufacturer (#16467)Joel Challis2022-02-271-1/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-272-2/+120
|\|
| * Wolf Sabre: fix Configurator layout data (#16465)James Young2022-02-272-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 developQMK Bot2022-02-271-7/+6
|\|
| * Wren: fix QMK Configurator key sequence (#16462)James Young2022-02-271-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 Kerkmann2022-02-261-1/+8
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-271-1/+1
|\|
| * [Docs] Anchor link correction in rgb matrix docs (#16460)Albert Y2022-02-261-1/+1
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 07:32:51 +0000