Joel Challis
9e24262161
Fix DD use within boardsource/microdox ( #18319 )
2022-09-09 21:21:48 +01:00
QMK Bot
8772d9b296
Merge remote-tracking branch 'origin/develop' into xap
2022-09-09 18:18:23 +00:00
QMK Bot
a18aab4c3c
Merge remote-tracking branch 'origin/master' into develop
2022-09-09 18:17:46 +00:00
ZhaoYou.Ge
9ad75dbf47
'soda/cherish' support apm32f072 ( #18316 )
2022-09-09 19:17:10 +01:00
QMK Bot
e1dd0ee428
Merge remote-tracking branch 'origin/develop' into xap
2022-09-09 12:42:29 +00:00
QMK Bot
2b30b3e168
Merge remote-tracking branch 'origin/master' into develop
2022-09-09 12:41:51 +00:00
Jacqueline Liang
88555d8e18
Add via support for 6key ( #18082 )
2022-09-09 13:41:18 +01:00
QMK Bot
e3727d117d
Merge remote-tracking branch 'origin/develop' into xap
2022-09-09 01:59:28 +00:00
QMK Bot
b6a79bec46
Merge remote-tracking branch 'origin/master' into develop
2022-09-09 01:58:52 +00:00
James Young
107ccc56b4
Hillside 46 & 52: remove dead space from QMK Configurator renderings ( #18315 )
...
* Hillside 46 info.json: fix syntax error
* Hillside 46 info.json: remove dead space
* Hillside 52 info.json: remove dead space
2022-09-09 02:57:46 +01:00
QMK Bot
9ca45211a7
Merge remote-tracking branch 'origin/develop' into xap
2022-09-07 21:53:36 +00:00
QMK Bot
3e0a22d532
Merge remote-tracking branch 'origin/master' into develop
2022-09-07 21:52:45 +00:00
Danny
7b4dc5a7e4
Add Iris Rev. 6b ( #18307 )
2022-09-07 17:52:11 -04:00
QMK Bot
405274123b
Merge remote-tracking branch 'origin/develop' into xap
2022-09-07 21:31:35 +00:00
QMK Bot
60d2108f23
Merge remote-tracking branch 'origin/master' into develop
2022-09-07 21:30:54 +00:00
James Young
ce90be0961
GeonWorks Frog Mini Hotswap Layout Rework ( #18305 )
...
* fmh.h: add matrix diagram
* info.json: apply friendly formatting
* physically arrange LAYOUT_all macro
Move position `K5D` (right half of Split Backspace) to the end of the top row.
* rename LAYOUT_all to LAYOUT_60_tsangan_hhkb
* add LAYOUT_60_ansi_tsangan
* add LAYOUT_60_hhkb
* add LAYOUT_60_ansi_wkl
* add LAYOUT_60_ansi_wkl_split_bs_rshift
* enable Community Layouts support
2022-09-07 14:30:17 -07:00
QMK Bot
7edecf913e
Merge remote-tracking branch 'origin/develop' into xap
2022-09-07 21:06:02 +00:00
QMK Bot
fd8875f82c
Merge remote-tracking branch 'origin/master' into develop
2022-09-07 21:05:23 +00:00
Danny
3f65d48539
Update Iris VIA configuration ( #18306 )
...
* Update RGB matrix max brightness
* Remove old VIA workaround code
* Fix default encoder rotations for encoder map
2022-09-07 22:04:46 +01:00
QMK Bot
455bf586c1
Merge remote-tracking branch 'origin/develop' into xap
2022-09-07 19:20:03 +00:00
QMK Bot
4bbac50277
Merge remote-tracking branch 'origin/master' into develop
2022-09-07 19:19:22 +00:00
QMK Bot
a12338aa10
Merge remote-tracking branch 'origin/develop' into xap
2022-09-07 19:19:09 +00:00
mechlovin
b0dc789a1b
[Keyboard] Wearhaus66 correct matrix ( #18284 )
2022-09-07 20:18:48 +01:00
QMK Bot
9ca91a7a98
Merge remote-tracking branch 'origin/master' into develop
2022-09-07 19:18:35 +00:00
David Luo
76910eece1
enable RGB matrix effects for drop ctrl ( #18291 )
2022-09-07 20:17:52 +01:00
QMK Bot
50faccc01e
Merge remote-tracking branch 'origin/develop' into xap
2022-09-07 18:53:44 +00:00
QMK Bot
cf8cdd1992
Merge remote-tracking branch 'origin/master' into develop
2022-09-07 18:53:04 +00:00
syntax-magic
6321cbaadd
[Keymap] removed else in numlock led if statement ( #18304 )
2022-09-07 19:52:32 +01:00
QMK Bot
65a28d78c5
Merge remote-tracking branch 'origin/develop' into xap
2022-09-07 16:16:12 +00:00
QMK Bot
54f6b61643
Merge remote-tracking branch 'origin/master' into develop
2022-09-07 16:15:38 +00:00
syntax-magic
8a0c0f72a5
added a new kprepublic/bm40hsrgb keymap called dan ( #18301 )
...
by syntax-magic
2022-09-07 17:14:46 +01:00
QMK Bot
1c0359da58
Merge remote-tracking branch 'origin/develop' into xap
2022-09-06 23:43:11 +00:00
Dasky
d30f0f71d0
Remove legacy define SERIAL_USE_MULTI_TRANSACTION ( #18299 )
2022-09-07 00:42:28 +01:00
QMK Bot
86b50872f0
Merge remote-tracking branch 'origin/develop' into xap
2022-09-06 23:36:25 +00:00
Dasky
c2b35b2327
Remove legacy define USE_SERIAL_PD2 ( #18298 )
2022-09-07 00:35:47 +01:00
QMK Bot
807fe7b7da
Merge remote-tracking branch 'origin/develop' into xap
2022-09-06 23:04:13 +00:00
Joshua Diamond
ff7470420a
Merge remote-tracking branch 'origin/master' into develop
2022-09-06 19:03:08 -04:00
Michael Stapelberg
f733307551
keymaps/stapelberg: keypad layer for multimedia keys, wake on escape ( #18295 )
...
This makes more keys function as printed on the actual keyboard :)
2022-09-06 23:13:12 +01:00
QMK Bot
478689a87d
Merge remote-tracking branch 'origin/develop' into xap
2022-09-06 21:43:23 +00:00
Joshua Diamond
a4d1d8b745
Resolve conflict merging master to develop ( #18297 )
...
* Discourage use of ENCODER_MAP at keyboard level (#18286 )
* Discourage use of ENCODER_MAP at keyboard level
* Update docs/feature_encoders.md
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
* Fungo rev1: fix QMK Configurator key sequence (#18293 )
* info.json: correct JSON syntax; friendly formatting
* info.json: fix key sequence
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2022-09-06 17:42:43 -04:00
QMK Bot
8d2009391a
Merge remote-tracking branch 'origin/develop' into xap
2022-09-06 17:47:09 +00:00
Dasky
dc4af81e0b
Remove legacy USE_SERIAL define ( #18292 )
...
* Remove legacy USE_SERIAL define
* tidy up missed comments
2022-09-06 18:46:34 +01:00
James Young
7160487ccd
Fungo rev1: fix QMK Configurator key sequence ( #18293 )
...
* info.json: correct JSON syntax; friendly formatting
* info.json: fix key sequence
2022-09-06 18:36:37 +01:00
QMK Bot
d05ba544ca
Merge remote-tracking branch 'origin/develop' into xap
2022-09-06 17:07:42 +00:00
Ryan
8833b28361
Remove UNICODE_KEY_OSX
and UC_OSX
( #18290 )
2022-09-06 18:07:08 +01:00
QMK Bot
a43d225fae
Merge remote-tracking branch 'origin/develop' into xap
2022-09-06 04:27:39 +00:00
QMK Bot
c6ab11bc45
Merge remote-tracking branch 'origin/master' into develop
2022-09-06 04:26:42 +00:00
James Young
712aa7b1cd
Mars 6.5 Layout Additions ( #18282 )
...
* info.json: apply friendly formatting
* add LAYOUT_65_ansi_blocker
* add LAYOUT_65_ansi_blocker_split_bs
* add LAYOUT_65_iso_blocker
* add LAYOUT_65_iso_blocker_split_bs
* enable Community Layouts support
* info.json: correct maintainer value
2022-09-06 05:26:11 +01:00
QMK Bot
552c15c969
Merge remote-tracking branch 'origin/develop' into xap
2022-09-05 13:15:38 +00:00
QMK Bot
f010af0c8e
Merge remote-tracking branch 'origin/master' into develop
2022-09-05 13:15:04 +00:00
James Young
5f1273fca6
EU ISOlation: fix QMK Configurator key sequence ( #18272 )
...
* eu_isolation.h: physically arrange layout macros
Whitespace only; no logic changes.
* info.json: apply friendly formatting
Add line breaks between physical rows.
* info.json: correct key sequence
2022-09-05 14:14:25 +01:00
QMK Bot
7ce93618e6
Merge remote-tracking branch 'origin/develop' into xap
2022-09-05 01:02:02 +00:00
QMK Bot
0ac18bfc84
Merge remote-tracking branch 'origin/master' into develop
2022-09-05 01:01:23 +00:00
AMing Lau
a36c95db60
Fix compilation error for GH60 satan HHKB 7u layout ( #18250 )
...
* Fix compilation error for GH60 satan HHKB 7u layout
* Update keyboards/gh60/satan/info.json
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2022-09-05 02:00:44 +01:00
QMK Bot
b2002d63b1
Merge remote-tracking branch 'origin/develop' into xap
2022-09-04 20:37:14 +00:00
Ryan
3e02b70d28
Rename keyboards with uppercase letters ( #18268 )
2022-09-04 21:36:33 +01:00
QMK Bot
a7661cac6c
Merge remote-tracking branch 'origin/develop' into xap
2022-09-03 21:45:04 +00:00
QMK Bot
a9f8111eac
Merge remote-tracking branch 'origin/master' into develop
2022-09-03 21:44:27 +00:00
James Young
288808526b
dyz60_hs Layout Additions ( #18261 )
...
* dyz60_hs: add matrix diagram
* add LAYOUT_60_ansi
* add LAYOUT_60_ansi_split_bs_rshift
* add LAYOUT_60_tsangan_hhkb
* add LAYOUT_60_iso
* add LAYOUT_60_iso_split_bs_rshift
* enable Community Layouts support
* readme.md: correct keyboard references
Replace `dyz60` with `dyz60_hs` as needed.
2022-09-03 22:43:52 +01:00
QMK Bot
87593b76bf
Merge remote-tracking branch 'origin/develop' into xap
2022-09-03 18:48:24 +00:00
QMK Bot
3a56e973ff
Merge remote-tracking branch 'origin/master' into develop
2022-09-03 18:47:52 +00:00
Ryan
3c09db41fe
Fix a couple of boards still using usb.device_ver
( #18258 )
2022-09-03 14:47:22 -04:00
QMK Bot
d4deb2fbc2
Merge remote-tracking branch 'origin/develop' into xap
2022-09-03 15:28:16 +00:00
QMK Bot
272b6f6ddb
Merge remote-tracking branch 'origin/master' into develop
2022-09-03 15:27:31 +00:00
Xelus22
489b287e1f
[Keyboard] RS60 Rev2 change to eeprom emulation ( #18201 )
...
by xelus
2022-09-03 16:27:00 +01:00
QMK Bot
622c08cde9
Merge remote-tracking branch 'origin/develop' into xap
2022-09-03 15:22:28 +00:00
QMK Bot
556fd909eb
Merge remote-tracking branch 'origin/master' into develop
2022-09-03 15:21:53 +00:00
Vino Rodrigues
0c76a3c7d0
[Keyboard] Add IDOBAO Abacus ID42 Keyboard ( #16923 )
...
by vinorodrigues
2022-09-03 16:21:00 +01:00
QMK Bot
3dc5e787f2
Merge remote-tracking branch 'origin/develop' into xap
2022-09-03 14:48:23 +00:00
QMK Bot
2c9c62b365
Merge remote-tracking branch 'origin/master' into develop
2022-09-03 14:47:51 +00:00
Tim Traversy
f27c70fffc
Add absolute key positions to microdox info.json ( #18238 )
2022-09-03 15:47:20 +01:00
QMK Bot
b5767c6632
Merge remote-tracking branch 'origin/develop' into xap
2022-09-03 05:52:07 +00:00
QMK Bot
fea65c9856
Merge remote-tracking branch 'origin/master' into develop
2022-09-03 05:51:26 +00:00
Joel Challis
5c0e87608f
Remove more RESET keycode references ( #18252 )
2022-09-03 06:50:44 +01:00
QMK Bot
ac46d4a756
Merge remote-tracking branch 'origin/develop' into xap
2022-09-02 19:38:58 +00:00
Ryan
09d668eb0e
Simplify extrakeys sending at the host driver level ( #18230 )
...
* Simplify extrakeys sending at the host driver level
* There are two arguments here
* Wrong syntax
* Adjust keyboards which use a custom host driver
2022-09-02 20:38:27 +01:00
QMK Bot
ba760447f7
Merge remote-tracking branch 'origin/develop' into xap
2022-09-02 16:11:17 +00:00
QMK Bot
0ceaaaae8e
Merge remote-tracking branch 'origin/master' into develop
2022-09-02 16:10:46 +00:00
Brian
5d932e2612
[Keymap] Fixing location of my Keymap for the Gentleman65 ( #18246 )
2022-09-02 09:10:05 -07:00
QMK Bot
fb2d62082c
Merge remote-tracking branch 'origin/develop' into xap
2022-09-02 03:55:44 +00:00
QMK Bot
4ad659f226
Merge remote-tracking branch 'origin/master' into develop
2022-09-02 03:55:05 +00:00
Yoichiro Tanaka
27671d8a43
[Keyboard] Add Lunakey Pico ( #18202 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-09-01 20:54:33 -07:00
QMK Bot
d440e9063c
Merge remote-tracking branch 'origin/develop' into xap
2022-09-02 03:49:31 +00:00
QMK Bot
fbfb04b253
Merge remote-tracking branch 'origin/master' into develop
2022-09-02 03:48:58 +00:00
Jannik Becker
8c793c1a43
[Keyboard] Add Shoc Keyboard ( #18143 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-09-01 20:48:24 -07:00
QMK Bot
64722d8dfa
Merge remote-tracking branch 'origin/develop' into xap
2022-09-01 23:33:53 +00:00
QMK Bot
98ed5b6cfa
Merge remote-tracking branch 'origin/master' into develop
2022-09-01 23:33:21 +00:00
jpuerto96
101d7b5337
[Keyboard] Add Ingrained Keyboard ( #15928 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Juan Puerto <jpuerto@psc.edu>
Co-authored-by: jpuerto-psc <68066250+jpuerto-psc@users.noreply.github.com>
2022-09-01 16:32:47 -07:00
QMK Bot
894e2ab781
Merge remote-tracking branch 'origin/develop' into xap
2022-08-31 20:06:45 +00:00
QMK Bot
b9effc94db
Merge remote-tracking branch 'origin/master' into develop
2022-08-31 20:06:14 +00:00
3araht
1ccd0c19da
Add giabalanai keyboard ( #10125 )
...
by 3araht
2022-08-31 21:05:43 +01:00
QMK Bot
bd3cecb5b6
Merge remote-tracking branch 'origin/develop' into xap
2022-08-31 19:31:49 +00:00
QMK Bot
55c0c920e9
Merge remote-tracking branch 'origin/master' into develop
2022-08-31 19:30:30 +00:00
Ryan Neff
d4c935d8fa
Added personal Iris Rev6a layout and Milk 2% layout ( #17600 )
...
by JellyTitan
2022-08-31 20:29:26 +01:00
QMK Bot
738c4dd9cc
Merge remote-tracking branch 'origin/develop' into xap
2022-08-31 17:20:47 +00:00
QMK Bot
64749d3adc
Merge remote-tracking branch 'origin/master' into develop
2022-08-31 17:20:16 +00:00
Benjamin Collet
6104b66014
Add bepo variant to massdrop/thekey keymaps ( #18129 )
...
by mrBen
2022-08-31 18:19:42 +01:00
QMK Bot
82f936af21
Merge remote-tracking branch 'origin/develop' into xap
2022-08-31 17:19:16 +00:00
QMK Bot
5af7982af1
Merge remote-tracking branch 'origin/master' into develop
2022-08-31 17:18:46 +00:00
3araht
786b5d310d
Bandominedoni encoder fix ( #18229 )
...
by 3araht
2022-08-31 18:17:54 +01:00