summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-193-724/+340
|\
| * Hineybush Ibis Layout Additions and Configurator Rendering Update (#17132)James Young2022-05-193-724/+340
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * info.json: apply friendly formatting * info.json: remove dead space from rendering * info.json: insert line breaks between physical rows in layout data * info.json: fix overlap in key rendering Fixes an issue where the ANSI Enter key renders on top of the ISO Hash/Tilde key, visually hiding the latter. * add LAYOUT_ansi_all macro with associated keymap Duplicates `LAYOUT_all`, but with the ISO Hash/Tilde and ISO Backslash keys removed. - ANSI Enter and 2.25u Left Shift - Backspace, Right Shift, Numpad Plus and Numpad Enter all split - 1.5 / 1 / 1.5 / 6.25 / 1.25 / 1.25 / 1.25 Bottom Row * add LAYOUT_iso_all macro with associated keymap Duplicates `LAYOUT_all`, but with the ANSI Backslash key removed. - ISO Enter and 1.25u Left Shift - Backspace, Right Shift, Numpad Plus and Numpad Enter all split - 1.5 / 1 / 1.5 / 6.25 / 1.25 / 1.25 / 1.25 Bottom Row
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-1812-563/+144
|\|
| * Update mtei's keymap (helix/rev2:five_rows, helix/pico:mtei, ↵Takeshi ISHII2022-05-1912-563/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | helix/rev3_5rows:five_rows) (#16966) * add users/mtei/key_blocks.h This change does not alter the binary of the build result. Moved common macro definitions in the following files to users/mtei/key_blocks.h. * keyboards/helix/rev2/keymaps/five_rows/keymap.c * keyboards/helix/rev3_5rows/keymaps/five_rows/keymap.c * remove INIT_HELIX_OLED() in helix:five_rows This change does not alter the binary of the build result. * update helix/pico/keymaps/mtei/keymap.c Changed helix/pico/keymaps/mtei/keymap.c to use users/mtei/key_blocks.h. This change does not alter the binary of the build result. * Remove old SSD1306OLED code from users/mtei/oled_display.c This change does not alter the binary of the build result. * add options ENABLE_COLEMAK, ENABLE_DVORAK and ENABLE_EUCALYN into five_rows/keymap.c * add users/mtei/{config.h,rules.mk,user_featues.mk,user_options.mk} * move layer_names[] from users/mtei/oled_display.c to keymaps/five_rows/keymap.c * Update keyboards/helix/pico/keymaps/mtei/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/helix/pico/keymaps/mtei/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/helix/pico/keymaps/mtei/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/helix/rev2/keymaps/five_rows/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/helix/rev2/keymaps/five_rows/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/helix/rev2/keymaps/five_rows/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/helix/rev3_5rows/keymaps/five_rows/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/helix/rev3_5rows/keymaps/five_rows/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/helix/rev3_5rows/keymaps/five_rows/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update users/mtei/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update users/mtei/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update users/mtei/cpp_map.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update users/mtei/cpp_map.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update users/mtei/debug_config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update users/mtei/debug_config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update users/mtei/layer_number_util.h Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-173-11/+16
|\|
| * Frooastside Walnut Community Layout Support (#17112)James Young2022-05-173-11/+16
| | | | | | | | | | | | | | | | | | | | | | * LAYOUT_iso: move Enter to home row This commit makes the layout macro compatible with QMK's `tkl_nofrow_iso` Community Layout. * rename LAYOUT_ansi to LAYOUT_tkl_nofrow_ansi * rename LAYOUT_iso to LAYOUT_tkl_nofrow_iso * enable Community Layout support
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-174-5/+51
|\|
| * Adding VIA support for bfo-9000 (#17116)John-Schreiber2022-05-172-0/+43
| |
| * fix non-working builds (#17123)Xelus222022-05-172-5/+8
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-173-3/+3
|\|
| * [Keyboard] Fixed Gas75 info.json and keymap for M64 RGB (#17081)HorrorTroll2022-05-163-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-171-10/+10
|\|
| * [Keyboard] lulu LED index correction (#17108)Albert Y2022-05-161-10/+10
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-172-14/+12
|\|
| * [Keyboard] Latinpad LED index correction (#17109)Albert Y2022-05-161-11/+9
| |
| * [Keyboard] mach3 LED index correction (#17110)Albert Y2022-05-161-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-1728-1/+973
|\|
| * [Keyboard] Add Iron165R2 PCB support (#16948)Álvaro A. Volpato2022-05-1627-0/+972
| |
| * [Keyboard] Fix too many elements in g_led_config for quark_lp (#17117)Drashna Jaelre2022-05-161-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-173-24/+14
|\|
| * [Keyboard] Fix compilation issues for Quark LP (#17009)Drashna Jaelre2022-05-163-24/+14
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-171-2/+149
|\|
| * DigiCarpice Configurator Rendering Fix (#17113)James Young2022-05-171-2/+149
| | | | | | | | | | * info.json: apply friendly formatting * info.json: rebuild layout data
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-161-1/+1
|\|
| * fix tiger80 matrix error (#17107)moyi46812022-05-161-1/+1
| |
* | Various fixes for g_led_config lint warnings (#17104)Joel Challis2022-05-167-12/+32
| |
* | RESET -> QK_BOOT default keymaps (#17037)Joel Challis2022-05-151886-2233/+2233
| |
* | Rename keymap_extras headers for consistency (#16939)Ryan2022-05-1598-104/+104
| |
* | [Feature] Add support for multiple switchs/solenoids to Haptic Feedback ↵Drashna Jaelre2022-05-153-0/+17
| | | | | | | | engine (#15657)
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-145-20/+1111
|\|
| * Eason Capsule65 Community Layout Support (#17090)James Young2022-05-145-20/+1111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * capsule65.h: modify matrix diagram Taken from the VIA layout data. * rename LAYOUT to LAYOUT_all * add LAYOUT_65_ansi macro * add LAYOUT_65_ansi_blocker macro * add LAYOUT_65_ansi_blocker_tsangan macro * add LAYOUT_65_ansi_split_bs macro * add LAYOUT_65_ansi_blocker_split_bs macro * add LAYOUT_65_ansi_blocker_tsangan_split_bs macro * add LAYOUT_65_iso macro * add LAYOUT_65_iso_split_bs macro * add LAYOUT_65_iso_blocker macro * add LAYOUT_65_iso_blocker_split_bs macro * add LAYOUT_65_iso_blocker_tsangan macro * add LAYOUT_65_iso_blocker_tsangan_split_bs macro * enable Community Layout support * info.json: update maintainer value This field is meant to reference the maintainer's GitHub username.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-145-11/+17
|\|
| * Axolstudio Foundation Gamma: Community Layout Support (#17080)James Young2022-05-145-11/+17
| | | | | | | | | | | | | | * LAYOUT_tkl_f13_ansi_tsangan support Renames `LAYOUT_ansi_tsangan` to `LAYOUT_tkl_f13_ansi_tsangan`. Also enables Community Layout support. * LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift support
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-143-0/+235
|\|
| * Avalanche: add QMK Configurator data (#17092)James Young2022-05-143-0/+235
| | | | | | | | | | | | | | * avalanche/v1: add info.json * avalanche/v2: add info.json * avalanche/v3: add info.json
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-141-7/+7
|\|
| * Clickety Split Leeloo: QMK Configurator Fixes (#17093)James Young2022-05-141-7/+7
| | | | | | | | | | | | | | | | | | | | | | * info.json: fix key sequence error * info.json: fix visual rendering Clarify the physical locations of the keys. * info.json: update maintainer field This field is meant to reference the maintainer's GitHub username.
* | [Core] Add Reboot keycode to core (#15990)Drashna Jaelre2022-05-141-0/+5
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-1413-5/+728
|\|
| * [Keyboard] Add M64 RGB (#17069)HorrorTroll2022-05-1313-5/+728
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-138-0/+799
|\|
| * [Keyboard] Add keyboard "Spreadwriter" (#17031)takashicompany2022-05-138-0/+799
| | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-131-6/+6
|\|
| * [Keyboard] Fixed info.json issue, some key got wrong pos for Gas75 (#17070)HorrorTroll2022-05-131-6/+6
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-138-1/+577
|\|
| * [Keymap] Contra - QWERTY US basic layout; MechWild Marcuio - EN update ↵Stephon Parker2022-05-128-1/+577
| | | | | | | | | | | | | | | | layout (#16787) Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Stephon Parker <stephonparker@Stephons-MacBook-Pro.local>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-133-31/+29
|\|
| * [Keyboard] H60 updates (#16999)Josh Hinnebusch2022-05-123-31/+29
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-131-1/+5
|\|
| * [Keyboard] Add caps and num indicators to Balance keyboard (#17075)Andrew Kannan2022-05-121-1/+5
| |