summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-061-2/+2
|\
| * merge/uma - Resolve configurator issues (#16551)Joel Challis2022-03-061-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-061-0/+1
|\|
| * Change helix:five_rows keymap to use QMK standerd oled driver (#16539)Takeshi ISHII2022-03-061-0/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-051-25/+69
|\|
| * `qmk info`: nicer rendering of ISO enter (#16466)Ryan2022-03-051-25/+69
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-051-2/+2
|\|
| * Update info.json (#16540)Joel Challis2022-03-061-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-055-18/+15
|\|
| * Some docs improvements (#15845)kiilerix2022-03-055-18/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * docs: clarify in "Keymap Overview" what LAYOUT is and isn't It is not strictly necessary to use LAYOUT macros in keyboard.c, but it is a convenient abstraction of hardware internals, allowing focus on the physical keyboard layout. From the C source point of view LAYOUT is macro with a parameter list, which expands to a array of rows that each is an array with a keyboard scancode for each column. A macro parameter list is not an array, and even less a single array. Perhaps no big deal, but also no reason to give incorrect hints. * docs: update "Understanding QMK's Code" to current code structure introduced in 96e2b13d1de This part of the documentation was no longer correct. I tried updating it, mainly copy editing and using github links to latest release. This is not trying to fix all problems, but just trying to fix some problems while reusing much of the old phrases and structure. * Update docs to use "qmk format-python"
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-053-45/+114
|\|
| * support more leds (#15840)yulei2022-03-053-45/+114
| |
* | Map data driven `DESCRIPTION` as string literal (#16523)Ryan2022-03-056-6/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-0433-60/+657
|\|
| * [Keyboard] BDE Rev2 (#15877)Kyle McCreery2022-03-0433-60/+657
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-042-1/+28
|\|
| * More validation of declared LAYOUT macro names (#16520)Joel Challis2022-03-042-1/+28
| |
* | Change data driven "str" type to represent a quoted string literal (#16516)Ryan2022-03-046-10/+24
| | | | | | | | | | * Change data driven "str" type to represent a quoted string literal * Update docs
* | Remove `send_unicode_hex_string()` (#16518)Ryan2022-03-044-56/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-041-13/+12
|\|
| * Bug report template: require `qmk doctor` output (#16517)Ryan2022-03-031-13/+12
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-045-6/+4
|\|
| * analog.[ch]: remove unnecessary includes (#16471)Ryan2022-03-045-6/+4
| |
* | 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
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 22:26:41 +0000