Commit Graph

13833 Commits

Author SHA1 Message Date
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