summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Collapse)AuthorAgeFilesLines
...
* Remove use of __flash due to LTO issues (#15268)Joel Challis2021-11-2479-87/+87
|
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-243-130/+33
|\
| * Revert "handwired/split89 Layout Macro Refactor (#15210)" (#15284)James Young2021-11-233-130/+33
| | | | | | | | | | This reverts commit 26ae43219001dfe20aa525b6fb35f2aeb2b76617. Requested by jurassic73.
* | New Keyboard: TGR Jane CE (#14713)MechMerlin2021-11-2423-0/+330
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * move ce and v2ce into their own directories * update copyright notices * change LAYOUT macro names * remove community layout support for the original layouts * fix LAYOUT macro names * change info.json for the common layouts * fix tsangan LAYOUT * fix layout all * Update keyboards/tgr/jane/v2ce/keymaps/via/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/tgr/jane/v2ce/v2ce.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/tgr/jane/v2ce/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * remove unneeded file * one more time for good measure * Update keyboards/tgr/jane/v2ce/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/tgr/jane/v2ce/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-2310-72/+301
|\|
| * Portal 66 Layout Macro Refactor (#15255)James Young2021-11-2310-72/+301
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * soldered.h: use QMK 3-character notation * soldered.h: add matrix diagram * portal_66/soldered: rename LAYOUT_65_ansi_split_bs to LAYOUT_65_ansi_blocker_split_bs * portal_66/soldered: rename LAYOUT_65_ansi to LAYOUT_65_ansi_blocker * portal_66/soldered: rename LAYOUT_65_tsangan_split_bs to LAYOUT_65_ansi_blocker_tsangan_split_bs * portal_66/soldered: rename LAYOUT_65_iso to LAYOUT_65_iso_blocker * portal_66/soldered: add LAYOUT_65_iso_blocker_split_bs * portal_66/soldered: add LAYOUT_65_iso_blocker_tsangan_split_bs * portal_66/soldered: enable Community Layout support * hotswap.h: use QMK 3-character notation * hotswap.h: add matrix diagram * portal_66/hotswap: rename LAYOUT to LAYOUT_65_ansi_blocker * portal_66/hotswap: enable Community Layout support
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-234-150/+273
|\|
| * Pluckey: Fix QMK Configurator Implementation (#15254)James Young2021-11-234-150/+273
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rename LAYOUT to LAYOUT_all * pluckey.h: add matrix diagram * pluckey.h: use XXX for KC_NO * add LAYOUT_ergo macro with keymap `info.json` had layout data for this macro, but the macro was not present in the source code. * info.json: correct key sequence Fixes incorrect key assignments in QMK Configurator.
* | [Keyboard] Disable features on SplitKB boards to fit under size (#15262)Drashna Jaelre2021-11-222-2/+6
| |
* | [Keyboard] Disable console on Keebio foldkb and iris rev3 (#15260)Drashna Jaelre2021-11-233-4/+4
| |
* | [Keymap] Disable console on Sofle default keymap (#15261)Drashna Jaelre2021-11-221-1/+1
| |
* | [Keyboard] Enable LTO on viktus/sp_mini via keymap (#15263)Drashna Jaelre2021-11-221-1/+1
| |
* | Macros in JSON keymaps (#14374)Zach White2021-11-225-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * macros in json keymaps * add advanced macro support to json * add a note about escaping macro strings * add simple examples * format json * add support for language specific keymap extras * switch to dictionaries instead of inline text for macros * use SS_TAP on the innermost tap keycode * add the new macro format to the schema * document the macro limit * add the json keyword for syntax highlighting * fix format that vscode screwed up * Update feature_macros.md * add tests for macros * change ding to beep * add json support for SENDSTRING_BELL * update doc based on feedback from sigprof * document host_layout * remove unused var * improve carriage return handling * support tab characters as well * Update docs/feature_macros.md Co-authored-by: Nick Brassel <nick@tzarc.org> * escape backslash characters * format * flake8 * Update quantum/quantum_keycodes.h Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-215-40/+198
|\|
| * Ocean Wang Ergo: Fix QMK Configurator Implementation (#15249)James Young2021-11-215-40/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * info.json: apply friendly formatting * info.json: update labels; reposition keys * wang_ergo.h: use XXX for KC_NO * wang_ergo.h: add matrix diagram * rename LAYOUT to LAYOUT_all * move Backspace keycode to top row Moves the matrix argument/keycode for Backspace to its proper position at the end of the top row. * add LAYOUT_2x2u with keymap * info.json: update maintainer field Use the maintainer's GitHub username.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-215-517/+631
|\|
| * Mokey Ginkgo65 Layout Macro Refactor (#15233)James Young2021-11-215-517/+631
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rename LAYOUT to LAYOUT_65_ansi_blocker; enable Community Layout support * refactor default keymaps Updates grid alignment of keycodes, and adds a Function layer to the default keymap. * refactor LAYOUT_iso into LAYOUT_65_iso_blocker_split_bs Adds missing KC_NUBS position, and moves Enter keycode to home row (consistent with QMK Community Layout). * remove LAYOUT_split_left_shift With the changes to LAYOUT_65_iso_blocker_split_bs, LAYOUT_split_left_shift maps all the same positions, but in a different sequence, making it redundant. * refactor LAYOUT_7u_space to LAYOUT_65_iso_blocker_tsangan_split_bs Moves Enter keycode to home row. * remove LAYOUT_split_space_1 LAYOUT_split_space_1 differs from LAYOUT_split_space_2 only in the sizes of the split spacebars, and I like the layout rendering of LAYOUT_split_space_2 better. :) * refactor LAYOUT_split_space_2 into LAYOUT_all ANSI Enter, split Backspace, split Left Shift, and Split Spacebar. * add LAYOUT_65_ansi_blocker_split_bs * add LAYOUT_65_ansi_blocker_tsangan_split_bs * add LAYOUT_65_iso_blocker * ginkgo65.h: touch-up block diagrams * info.json: use maintainer's GitHub username * bugfix layout macros Position k1D wasn't being assigned on the ISO layouts or LAYOUT_all. * rules.mk: update Community Layout support
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-214-68/+84
|\|
| * MW65 RGB Layout Macro Refactor (#15246)James Young2021-11-214-68/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * mw65_rgb.h: use QMK 3-character notation for matrix identifiers * mw65_rgb.h: add matrix diagram * info.json: apply friendly formatting Update key labels for QMK CLI rendering. * move rotary encoder keycodes to top row * info.json: update maintainer field Use the maintainer's GitHub username.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-214-87/+108
|\|
| * MW75 Layout Macro Refactor (#15247)James Young2021-11-214-87/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * mw75.h: use QMK 3-character matrix identifiers * update stock keymaps Use QMK-native keycode aliases, and update grid alignment of keycodes. * mw75.h: add matrix diagram * info.json: apply friendly formatting * move rotary encoder keycodes to top row * info.json: update maintainer field Use the maintainer's GitHub username.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-204-0/+464
|\|
| * [Keymap] Initial simple keymap for ForeverAnApple (#14654)ForeverAnApple2021-11-194-0/+464
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-209-0/+455
|\|
| * [Keyboard] Added Jels88 (#15090)jels2021-11-199-0/+455
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@users.noreply.github.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-2030-553/+1215
|\|
| * Meletrix Zoom65 Refactor (#15222)James Young2021-11-1924-531/+813
| |
| * Minimon Index Tab touch-up (#15224)James Young2021-11-196-22/+402
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-203-31/+153
|\|
| * Undead60M touch-up (#15214)James Young2021-11-192-15/+85
| |
| * Lime rev1: fix Configurator implementation (#15213)James Young2021-11-191-16/+68
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-201-25/+29
|\|
| * [Keyboard] Fix xox70 via layout (#15220)Drashna Jaelre2021-11-191-25/+29
| |
* | Move tmk_core/common/<plat> (#13918)Joel Challis2021-11-198-8/+8
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-191-61/+53
|\|
| * Handwired Split65: Fix QMK Configurator Implementation (#15209)James Young2021-11-191-61/+53
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-199-0/+488
|\|
| * [Keyboard] Add xox70 (#15098)rhmokey2021-11-199-0/+488
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-191-0/+160
|\|
| * [Keymap] 3w6 helltm keymap (with ascii art) (#15146)HellTM2021-11-191-0/+160
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-191-14/+14
|\|
| * [Keymap] Sofle RGB - fixed switch and numpad layers (#15094)Andy2021-11-191-14/+14
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-199-0/+550
|\|
| * [Keyboard] Add Keebcats Denis PCB (#15154)Callum Hart2021-11-199-0/+550
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-1918-1/+588
|\|
| * [Keyboard] Add b87 keyboard (#15091)jels2021-11-1910-0/+382
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Add TKL-FF v2 (#15144)Ramon Imbao2021-11-198-1/+206
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-1910-8/+102
|\|
| * [Keyboard] Aozora update (#15201)Nick Abe2021-11-1910-8/+102
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2021-11-1949-156/+1858
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 14:54:12 +0000