QMK Bot
d9b045a6fe
Merge remote-tracking branch 'origin/develop' into xap
2022-05-21 22:55:10 +00:00
QMK Bot
ac1c5f8dfe
Merge remote-tracking branch 'origin/master' into develop
2022-05-21 22:54:42 +00:00
-k
a1fb86b17a
Add massdrop/alt:charlesrocket keymap ( #17173 )
2022-05-21 15:54:09 -07:00
QMK Bot
89ddecb2de
Merge remote-tracking branch 'origin/develop' into xap
2022-05-21 16:37:53 +00:00
QMK Bot
f5b3f12544
Merge remote-tracking branch 'origin/master' into develop
2022-05-21 16:37:24 +00:00
Diego Palacios
e6071b891a
Added Cantor keyboard ( #16552 )
2022-05-21 17:36:54 +01:00
QMK Bot
4a71fcc98b
Merge remote-tracking branch 'origin/develop' into xap
2022-05-20 17:23:52 +00:00
QMK Bot
afdf1c23dc
Merge remote-tracking branch 'origin/master' into develop
2022-05-20 17:23:16 +00:00
James Young
0103f7877a
PJB Eros Community Layout Support ( #17158 )
2022-05-20 10:23:03 -07:00
James Young
a9c8a88e43
Ryan Skidmore rskeys100 Community Layout Support ( #17159 )
2022-05-20 10:22:42 -07:00
QMK Bot
6567aecb58
Merge remote-tracking branch 'origin/develop' into xap
2022-05-20 17:14:15 +00:00
QMK Bot
bb7572b42f
Merge remote-tracking branch 'origin/master' into develop
2022-05-20 17:13:33 +00:00
James Young
caa5dcc672
Dailycraft Sandbox Configurator Data ( #17169 )
2022-05-20 10:12:58 -07:00
QMK Bot
badad5c65f
Merge remote-tracking branch 'origin/develop' into xap
2022-05-20 16:13:17 +00:00
QMK Bot
5ac861efa5
Merge remote-tracking branch 'origin/master' into develop
2022-05-20 16:12:15 +00:00
Albert Y
799a7f98ce
[Keyboard] yeti LED index correction ( #17138 )
2022-05-20 09:10:31 -07:00
Kyle McCreery
c60c19e8d5
[Keyboard] Add eeprom IC-less rev for MechWild OBE and Waka60 ( #17126 )
2022-05-20 09:10:05 -07:00
QMK Bot
c8ee7abd7f
Merge remote-tracking branch 'origin/develop' into xap
2022-05-20 16:09:47 +00:00
QMK Bot
90f3e139e6
Merge remote-tracking branch 'origin/master' into develop
2022-05-20 16:09:40 +00:00
Albert Y
713ce7b276
[Keyboard] rskeys100 LED index correction ( #17139 )
2022-05-20 09:09:19 -07:00
QMK Bot
f155db37d4
Merge remote-tracking branch 'origin/master' into develop
2022-05-20 16:09:04 +00:00
AnthonyNguyen168
e1759cd638
[Keyboard] Update Layouts for MB-65S and MB-65H ( #17160 )
2022-05-20 09:08:33 -07:00
QMK Bot
b6c9366ce0
Merge remote-tracking branch 'origin/develop' into xap
2022-05-20 05:51:43 +00:00
QMK Bot
92548bb3e7
[CI] Format code according to conventions ( #17164 )
2022-05-20 15:51:11 +10:00
QMK Bot
becf0307d7
[CI] Format code according to conventions ( #17165 )
2022-05-20 15:50:48 +10:00
QMK Bot
5ad3150c14
Merge remote-tracking branch 'origin/develop' into xap
2022-05-20 05:45:16 +00:00
QMK Bot
1557455f7f
Merge remote-tracking branch 'origin/master' into develop
2022-05-20 05:44:45 +00:00
Albert Y
90612fce92
[Keyboard] 0xc_pad LED index correction ( #17120 )
2022-05-19 22:44:28 -07:00
Albert Y
5591489747
[Keyboard] launch_1 LED index correction ( #17118 )
2022-05-19 22:44:08 -07:00
QMK Bot
e243f47a6d
Merge remote-tracking branch 'origin/develop' into xap
2022-05-20 05:39:19 +00:00
QMK Bot
0dbaa7e057
Merge remote-tracking branch 'origin/master' into develop
2022-05-20 05:38:49 +00:00
aadriance
94d89dfe82
[Keyboard] Add Eu isolation Keyboard ( #17102 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: TuckTuckFloof <stnashmore@gmail.com>
2022-05-19 22:38:15 -07:00
QMK Bot
b666febc72
Merge remote-tracking branch 'origin/develop' into xap
2022-05-20 05:29:44 +00:00
QMK Bot
8b33ca9fe2
Merge remote-tracking branch 'origin/master' into develop
2022-05-20 05:29:11 +00:00
anubhav dhiman
c7e114e0bb
[Keyboard] add rad keyboard ( #17088 )
...
Co-authored-by: zvecr <git@zvecr.com>
2022-05-19 22:28:41 -07:00
QMK Bot
eb53b08cb4
Merge remote-tracking branch 'origin/develop' into xap
2022-05-20 04:39:20 +00:00
QMK Bot
a97ed8a1fd
Merge remote-tracking branch 'origin/master' into develop
2022-05-20 04:38:48 +00:00
takashicompany
38073c3d44
[Keyboard] Add miniZone keyboard ( #16644 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-05-19 21:38:00 -07:00
QMK Bot
1e8c96cea3
Merge remote-tracking branch 'origin/develop' into xap
2022-05-20 00:47:56 +00:00
GloriousThrall
83fa6fe916
Move GMMK Pro to allow for multiple revisions ( #16423 )
...
* Added GMMK PRO Rev2 WBG7 MCU compatibility. Added GMMK 2 WBG7 MCU compatibility.
* GMMK PRO MCU Updates only (removed other kbs)
* fix problems
* Optimize the code.
* Update form develop branch
* Update
* Updater from qmk/develop
* Update
* Update config.h
* Update config.h
* Remove gmmk pro rev2
* move moults31/keymap.c
* Update
* tidy up
Co-authored-by: Joy <chang.li@westberrytech.com>
Co-authored-by: zvecr <git@zvecr.com>
2022-05-20 01:47:22 +01:00
QMK Bot
4e87e4b074
Merge remote-tracking branch 'origin/develop' into xap
2022-05-19 20:27:07 +00:00
QMK Bot
36c8462f0a
Merge remote-tracking branch 'origin/master' into develop
2022-05-19 20:26:30 +00:00
James Young
c4c67f2eb2
KBDfans Tiger80 Community Layout Support and Keymap Touch-Up ( #17149 )
...
* info.json: apply friendly formatting
* rename LAYOUT_all to LAYOUT_tkl_f13_ansi_tsangan
* enable Community Layout support
* refactor keymaps to use grid alignment
2022-05-19 13:25:56 -07:00
QMK Bot
7cac1ee2d1
Merge remote-tracking branch 'origin/develop' into xap
2022-05-19 17:56:24 +00:00
QMK Bot
b4d65aac7f
Merge remote-tracking branch 'origin/master' into develop
2022-05-19 17:55:45 +00:00
James Young
394f147897
KBDfans Phase One Layout Macro Additions and Configurator Data ( #17148 )
...
* phaseone.h: add matrix diagram
* add QMK Configurator data
* add LAYOUT_65_ansi_blocker_split_bs macro
* add LAYOUT_65_ansi_wkl_split_bs macro
* add LAYOUT_65_iso_blocker macro
* add LAYOUT_65_iso_blocker_split_bs macro
* add LAYOUT_65_iso_wkl macro
* add LAYOUT_65_iso_wkl_split_bs macro
* rename LAYOUT_65_ansi_wkl to LAYOUT_65_ansi_blocker_tsangan_wkl
Differentiates the layout supported here from QMK's `65_ansi_blocker_tsangan` Community Layout, which is equivalent to this but with a 1u GUI key between Left Ctrl and Left Alt.
* rename new layout macros for codebase consistency
- `LAYOUT_65_ansi_wkl_split_bs` -> `LAYOUT_65_ansi_blocker_tsangan_wkl_split_bs`
- `LAYOUT_65_iso_wkl` -> `LAYOUT_65_iso_blocker_tsangan_wkl`
- `LAYOUT_65_iso_wkl_split_bs` -> `LAYOUT_65_iso_blocker_tsangan_wkl_split_bs`
* add reference keymaps
Add keymaps which demonstrate the layout macro implementations.
2022-05-19 10:54:57 -07:00
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