gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-02-24 15:50:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,313 Commits 65 Branches 1,625 Tags 886 MiB
b620124024
Commit Graph

12293 Commits

Author SHA1 Message Date
QMK Bot
349a42357d Merge remote-tracking branch 'origin/develop' into xap 2022-05-19 07:49:19 +00:00
QMK Bot
19e6e6d1de Merge remote-tracking branch 'origin/master' into develop 2022-05-19 07:48:36 +00:00
James Young
89e0fba75d
Hineybush Ibis Layout Additions and Configurator Rendering Update (#17132) 
* 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
 2022-05-19 00:48:01 -07:00
QMK Bot
817b2ffb8c Merge remote-tracking branch 'origin/develop' into xap 2022-05-18 17:34:31 +00:00
QMK Bot
3904a6afbe Merge remote-tracking branch 'origin/master' into develop 2022-05-18 17:33:52 +00:00
Takeshi ISHII
33d568e29b
Update mtei's keymap (helix/rev2:five_rows, helix/pico:mtei, 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>
 2022-05-19 02:33:17 +09:00
QMK Bot
5ef912ead7 Merge remote-tracking branch 'origin/develop' into xap 2022-05-17 16:14:08 +00:00
QMK Bot
6a11331a41 Merge remote-tracking branch 'origin/master' into develop 2022-05-17 16:13:31 +00:00
James Young
f736828fa8
Frooastside Walnut Community Layout Support (#17112) 
* 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
 2022-05-17 09:12:52 -07:00
QMK Bot
af5745832b Merge remote-tracking branch 'origin/develop' into xap 2022-05-17 12:02:08 +00:00
QMK Bot
cc8c539d00 Merge remote-tracking branch 'origin/master' into develop 2022-05-17 12:01:31 +00:00
John-Schreiber
6560903350
Adding VIA support for bfo-9000 (#17116) 2022-05-17 13:01:26 +01:00
Xelus22
654baebb2c
fix non-working builds (#17123) 2022-05-17 13:00:26 +01:00
QMK Bot
1138b51961 Merge remote-tracking branch 'origin/develop' into xap 2022-05-17 05:06:33 +00:00
QMK Bot
7541e75c3e Merge remote-tracking branch 'origin/master' into develop 2022-05-17 05:05:36 +00:00
HorrorTroll
e9e83b4da7
[Keyboard] Fixed Gas75 info.json and keymap for M64 RGB (#17081) 2022-05-16 22:05:05 -07:00
QMK Bot
da07c5e44a Merge remote-tracking branch 'origin/develop' into xap 2022-05-17 05:04:09 +00:00
QMK Bot
978e2fcd14 Merge remote-tracking branch 'origin/master' into develop 2022-05-17 05:03:38 +00:00
QMK Bot
778e7683f5 Merge remote-tracking branch 'origin/develop' into xap 2022-05-17 05:03:20 +00:00
Albert Y
b6ee006060
[Keyboard] lulu LED index correction (#17108) 2022-05-16 22:03:08 -07:00
QMK Bot
1a61f1f578 Merge remote-tracking branch 'origin/master' into develop 2022-05-17 05:02:48 +00:00
Albert Y
8b9cb030a7
[Keyboard] Latinpad LED index correction (#17109) 2022-05-16 22:02:35 -07:00
Albert Y
aa970e8560
[Keyboard] mach3 LED index correction (#17110) 2022-05-16 22:02:14 -07:00
QMK Bot
25efe0a376 Merge remote-tracking branch 'origin/develop' into xap 2022-05-17 04:46:49 +00:00
QMK Bot
68f466db87 Merge remote-tracking branch 'origin/master' into develop 2022-05-17 04:46:07 +00:00
Álvaro A. Volpato
467f3ae872
[Keyboard] Add Iron165R2 PCB support (#16948) 2022-05-16 21:45:56 -07:00
Drashna Jaelre
f22e8585a1
[Keyboard] Fix too many elements in g_led_config for quark_lp (#17117) 2022-05-16 21:45:11 -07:00
QMK Bot
74115d42f5 Merge remote-tracking branch 'origin/develop' into xap 2022-05-17 03:28:34 +00:00
QMK Bot
ac1173c3d4 Merge remote-tracking branch 'origin/master' into develop 2022-05-17 03:28:01 +00:00
Drashna Jaelre
4b7555117a
[Keyboard] Fix compilation issues for Quark LP (#17009) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2022-05-16 20:27:22 -07:00
QMK Bot
421a1d1ff3 Merge remote-tracking branch 'origin/develop' into xap 2022-05-17 01:46:08 +00:00
QMK Bot
6f499cfa12 Merge remote-tracking branch 'origin/master' into develop 2022-05-17 01:45:33 +00:00
James Young
bc2a6cf6ae
DigiCarpice Configurator Rendering Fix (#17113) 
* info.json: apply friendly formatting

* info.json: rebuild layout data
 2022-05-17 02:44:34 +01:00
QMK Bot
6e910f5250 Merge remote-tracking branch 'origin/develop' into xap 2022-05-16 11:48:02 +00:00
QMK Bot
d47c4ed4d0 Merge remote-tracking branch 'origin/master' into develop 2022-05-16 11:47:33 +00:00
moyi4681
6a94a9547d
fix tiger80 matrix error (#17107) 2022-05-16 12:46:37 +01:00
Nick Brassel
484ec12397 Merge remote-tracking branch 'upstream/develop' into xap 2022-05-16 09:51:49 +10:00
Joel Challis
85289e34ae
Various fixes for g_led_config lint warnings (#17104) 2022-05-16 09:40:56 +10:00
QMK Bot
1fee0ae414 Merge remote-tracking branch 'origin/develop' into xap 2022-05-15 19:26:56 +00:00
Joel Challis
b7771ec25b
RESET -> QK_BOOT default keymaps (#17037) 2022-05-15 20:26:27 +01:00
QMK Bot
89e0d40e3b Merge remote-tracking branch 'origin/develop' into xap 2022-05-15 11:27:31 +00:00
Ryan
4a8bd7b9a5
Rename keymap_extras headers for consistency (#16939) 2022-05-15 21:27:01 +10:00
QMK Bot
774d3ce428 Merge remote-tracking branch 'origin/develop' into xap 2022-05-15 11:25:08 +00:00
Drashna Jaelre
f090881aeb
[Feature] Add support for multiple switchs/solenoids to Haptic Feedback engine (#15657) 2022-05-15 21:24:35 +10:00
QMK Bot
14dfba2eef Merge remote-tracking branch 'origin/develop' into xap 2022-05-14 21:29:28 +00:00
QMK Bot
baa8d07fdb Merge remote-tracking branch 'origin/master' into develop 2022-05-14 21:29:01 +00:00
James Young
3a543d8990
Eason Capsule65 Community Layout Support (#17090) 
* 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.
 2022-05-14 22:28:29 +01:00
QMK Bot
f024fdb0bc Merge remote-tracking branch 'origin/develop' into xap 2022-05-14 21:25:41 +00:00
QMK Bot
710e8c0ccc Merge remote-tracking branch 'origin/master' into develop 2022-05-14 21:25:09 +00:00
James Young
90a43f9884
Axolstudio Foundation Gamma: Community Layout Support (#17080) 
* 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
 2022-05-14 22:23:58 +01:00
QMK Bot
d6773a133c Merge remote-tracking branch 'origin/develop' into xap 2022-05-14 21:23:43 +00:00
QMK Bot
c0f0f594d4 Merge remote-tracking branch 'origin/master' into develop 2022-05-14 21:23:13 +00:00
James Young
8c58af39af
Avalanche: add QMK Configurator data (#17092) 
* avalanche/v1: add info.json

* avalanche/v2: add info.json

* avalanche/v3: add info.json
 2022-05-14 22:22:39 +01:00
QMK Bot
6932cfa3a2 Merge remote-tracking branch 'origin/develop' into xap 2022-05-14 21:22:35 +00:00
QMK Bot
78a9e1708a Merge remote-tracking branch 'origin/master' into develop 2022-05-14 21:22:05 +00:00
James Young
24f378e6c3
Clickety Split Leeloo: QMK Configurator Fixes (#17093) 
* 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.
 2022-05-14 22:21:31 +01:00
QMK Bot
ad7d7a2ac7 Merge remote-tracking branch 'origin/develop' into xap 2022-05-14 03:36:21 +00:00
Drashna Jaelre
787a68948f
[Core] Add Reboot keycode to core (#15990) 2022-05-14 13:35:49 +10:00
QMK Bot
cf85b91a7f Merge remote-tracking branch 'origin/develop' into xap 2022-05-14 03:17:53 +00:00
QMK Bot
425c54cf8c Merge remote-tracking branch 'origin/master' into develop 2022-05-14 03:17:20 +00:00
HorrorTroll
8e2b8413b4
[Keyboard] Add M64 RGB (#17069) 2022-05-13 20:16:46 -07:00
QMK Bot
a70f8bec44 Merge remote-tracking branch 'origin/develop' into xap 2022-05-13 16:55:18 +00:00
QMK Bot
e0cdeab951 Merge remote-tracking branch 'origin/master' into develop 2022-05-13 16:54:39 +00:00
takashicompany
82828c3205
[Keyboard] Add keyboard "Spreadwriter" (#17031) 
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2022-05-13 09:53:43 -07:00
QMK Bot
6f1097225f Merge remote-tracking branch 'origin/develop' into xap 2022-05-13 16:36:10 +00:00
QMK Bot
158dc6829a Merge remote-tracking branch 'origin/master' into develop 2022-05-13 16:35:28 +00:00
HorrorTroll
3a80275fa1
[Keyboard] Fixed info.json issue, some key got wrong pos for Gas75 (#17070) 2022-05-13 09:34:47 -07:00
QMK Bot
476e64937f Merge remote-tracking branch 'origin/develop' into xap 2022-05-13 06:37:19 +00:00
QMK Bot
75a32de441 Merge remote-tracking branch 'origin/master' into develop 2022-05-13 06:36:47 +00:00
Stephon Parker
e5e7039368
[Keymap] Contra - QWERTY US basic layout; MechWild Marcuio - EN update 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>
 2022-05-12 23:36:12 -07:00
QMK Bot
d89203326b Merge remote-tracking branch 'origin/develop' into xap 2022-05-13 06:35:17 +00:00
QMK Bot
c4b2e9101d Merge remote-tracking branch 'origin/master' into develop 2022-05-13 06:34:42 +00:00
Josh Hinnebusch
ffe16386f0
[Keyboard] H60 updates (#16999) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2022-05-12 23:33:53 -07:00
QMK Bot
81b68fd7dc Merge remote-tracking branch 'origin/develop' into xap 2022-05-13 06:23:07 +00:00
QMK Bot
ff8c962d2e Merge remote-tracking branch 'origin/master' into develop 2022-05-13 06:22:36 +00:00
Andrew Kannan
fc3d3ef076
[Keyboard] Add caps and num indicators to Balance keyboard (#17075) 2022-05-12 23:22:03 -07:00
QMK Bot
4875711c7b Merge remote-tracking branch 'origin/develop' into xap 2022-05-12 18:25:30 +00:00
QMK Bot
6b39a38212 Merge remote-tracking branch 'origin/master' into develop 2022-05-12 18:24:53 +00:00
James Young
b26ba52bdd
[Keyboard] KBIC65 Refactor (#17066) 2022-05-12 11:24:40 -07:00
jack
59fa34a6fa
[Keyboard] Refactor mechwild/mokulua (#17068) 2022-05-12 11:24:03 -07:00
QMK Bot
236ac7cbd1 Merge remote-tracking branch 'origin/develop' into xap 2022-05-12 05:52:40 +00:00
QMK Bot
ec7801e2cb Merge remote-tracking branch 'origin/master' into develop 2022-05-12 05:52:09 +00:00
HorrorTroll
8a4ef2b3c4
[Keyboard] Move M63 RGB into maker folder (#17061) 2022-05-11 22:51:37 -07:00
QMK Bot
ea1046948d Merge remote-tracking branch 'origin/develop' into xap 2022-05-12 05:29:01 +00:00
QMK Bot
ff9aca781a Merge remote-tracking branch 'origin/master' into develop 2022-05-12 05:28:32 +00:00
jack
77aba32bc6
initial (#17067) 2022-05-12 06:27:58 +01:00
QMK Bot
cd0c15f887 Merge remote-tracking branch 'origin/develop' into xap 2022-05-12 04:50:49 +00:00
QMK Bot
56ca807f85 Merge remote-tracking branch 'origin/master' into develop 2022-05-12 04:49:18 +00:00
Kyle McCreery
d6e1de8c83
[Keyboard] Add Mokulua keyboard (#17055) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2022-05-11 21:49:11 -07:00
QMK Bot
6c4c64f147 Merge remote-tracking branch 'origin/develop' into xap 2022-05-12 04:49:10 +00:00
JX
4d1332b62c
[Keyboard] Cleanup zhou65 and add nz64 keyboard (#17032) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2022-05-11 21:48:47 -07:00
QMK Bot
a284b99876 Merge remote-tracking branch 'origin/master' into develop 2022-05-12 04:48:35 +00:00
HorrorTroll
ffa1b37634
[Keyboard] Add Black E6.5 keyboard (#16807) 2022-05-11 21:47:41 -07:00
QMK Bot
f7e436b91c Merge remote-tracking branch 'origin/develop' into xap 2022-05-12 00:10:20 +00:00
QMK Bot
b03daac76b Merge remote-tracking branch 'origin/master' into develop 2022-05-12 00:09:49 +00:00
Vino Rodrigues
7fd05afb10
[Keyboard] Revert "Fix id67 RGB Matrix (#16916)" - on IDOBAO ID67 kb (#16917) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2022-05-11 17:09:10 -07:00
QMK Bot
0be699dde6 Merge remote-tracking branch 'origin/develop' into xap 2022-05-11 23:55:48 +00:00
QMK Bot
12fe4c49de Merge remote-tracking branch 'origin/master' into develop 2022-05-11 23:55:09 +00:00
Vino Rodrigues
37417d531d
[Keyboard] remove handwired/reddot as per #14211 (#17033) 2022-05-11 16:54:27 -07:00
QMK Bot
bce04e6318 Merge remote-tracking branch 'origin/develop' into xap 2022-05-11 23:40:46 +00:00