Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-07 | 9 | -292/+0 |
|\ | |||||
| * | [Keyboard] Delete duplicate pandora directory (#16496) | Koobaczech | 2022-03-06 | 9 | -292/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-07 | 5 | -38/+38 |
|\| | |||||
| * | [Keyboard] Tidy Up pearlboards (#16497) | Koobaczech | 2022-03-06 | 5 | -38/+38 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-07 | 3 | -10/+30 |
|\| | |||||
| * | [Keyboard] Atlantis ak81_ve encoder behaviour enhancement & fixes (#16503) | fOmey | 2022-03-06 | 3 | -10/+30 |
| | | |||||
* | | [Keyboard] Update Wakizashi 40 config and readme (#16505) | xiao | 2022-03-06 | 2 | -10/+12 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-07 | 4 | -0/+84 |
|\| | |||||
| * | [Keyboard] Sick68 VIA keymap (#16508) | xiao | 2022-03-06 | 4 | -0/+84 |
| | | | | | | Co-authored-by: xia0 <xiao@morgan.net.au> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-07 | 18 | -0/+732 |
|\| | |||||
| * | [Keyboard] add qk65 files by qwertykeys studio (#16491) | owlab-git | 2022-03-06 | 18 | -0/+732 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-07 | 19 | -61/+438 |
|\| | |||||
| * | [Keymap] Drashna Mouse keys and oled updates (#16556) | Drashna Jaelre | 2022-03-06 | 19 | -61/+438 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-07 | 1 | -1/+1 |
|\| | |||||
| * | Format code according to conventions (#16554) | QMK Bot | 2022-03-06 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-07 | 9 | -0/+408 |
|\| | |||||
| * | [Keyboard] Add support for Typ65+ (#16399) | kopibeng | 2022-03-06 | 9 | -0/+408 |
| | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-07 | 9 | -0/+383 |
|\| | |||||
| * | [Keyboard] Add Kyuu Hotswap (#16360) | Felix Jen | 2022-03-06 | 9 | -0/+383 |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-07 | 11 | -0/+430 |
|\| | |||||
| * | [Keyboard] Add Lain keyboard (#16345) | Takuya Urakawa | 2022-03-06 | 11 | -0/+430 |
| | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-07 | 2 | -0/+71 |
|\| | |||||
| * | [Keyboard] fourier via keymap (#16335) | Andrew Garver | 2022-03-06 | 2 | -0/+71 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-07 | 17 | -0/+674 |
|\| | |||||
| * | [Keyboard] add support for Quark_Plus (#16324) | npspears | 2022-03-06 | 17 | -0/+674 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-07 | 2 | -21/+118 |
|\| | |||||
| * | [Keymap] Change helix:five_rows_jis keymap to use split_common (#16538) | Takeshi ISHII | 2022-03-06 | 2 | -21/+118 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-07 | 1 | -0/+1 |
|\| | |||||
| * | [Keymap] Change helix:fraanrosi keymap to use split_common (#16533) | Takeshi ISHII | 2022-03-06 | 1 | -0/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-06 | 1 | -2/+2 |
|\| | |||||
| * | merge/uma - Resolve configurator issues (#16551) | Joel Challis | 2022-03-06 | 1 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-06 | 1 | -0/+1 |
|\| | |||||
| * | Change helix:five_rows keymap to use QMK standerd oled driver (#16539) | Takeshi ISHII | 2022-03-06 | 1 | -0/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-05 | 3 | -45/+114 |
|\| | |||||
| * | support more leds (#15840) | yulei | 2022-03-05 | 3 | -45/+114 |
| | | |||||
* | | Map data driven `DESCRIPTION` as string literal (#16523) | Ryan | 2022-03-05 | 4 | -4/+0 |
|/ | |||||
* | [Keyboard] BDE Rev2 (#15877) | Kyle McCreery | 2022-03-04 | 33 | -60/+657 |
| | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | Melody96 refactor (#16455) | Ryan | 2022-03-04 | 10 | -275/+1177 |
| | |||||
* | Fix helix/rev2 not working properly when using split_common. (#16512) | Takeshi ISHII | 2022-03-03 | 6 | -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 ``` | ||||
* | Fix mistakes in the include path in `helix/rev2/local_features.mk`. (#16507) | Takeshi ISHII | 2022-03-03 | 2 | -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 ``` | ||||
* | 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 | ||||
* | Revert "handwired/3dortho14u: refactor layout data (#16475)" (#16485) | xiao | 2022-03-01 | 4 | -8/+18 |
| | | | This reverts commit 3ac769b6abe9b97a94033f376b28482d2d5f7b00. | ||||
* | 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`. | ||||
* | Remove invalid keyboard_folder from gk6 (#16480) | Joel Challis | 2022-03-01 | 1 | -1/+0 |
| | |||||
* | Ellora65: remove dead space from Configurator rendering (#16478) | James Young | 2022-03-01 | 1 | -2/+82 |
| | |||||
* | Move projectcain encoder logic to keyboard level (#16479) | Joel Challis | 2022-03-01 | 8 | -8/+10 |
| | |||||
* | 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. | ||||
* | handwired/3dortho14u: refactor layout data (#16475) | James Young | 2022-02-28 | 4 | -18/+8 |
| | | | Remove nonextant matrix positions from the layout data. | ||||
* | snatchpad: update layout data (#16476) | James Young | 2022-02-28 | 1 | -4/+4 |
| | | | Fixes key overlaps in QMK Configurator. | ||||
* | 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. |