Commit Graph

13209 Commits

Author SHA1 Message Date
QMK Bot
6b3c2fa051 Merge remote-tracking branch 'origin/develop' into xap 2022-07-29 06:45:11 +00:00
QMK Bot
a7d0e01e5b Merge remote-tracking branch 'origin/master' into develop 2022-07-29 06:44:32 +00:00
James Young
5c90f7ae14
Wuque Promise87 WKL Refactor (#17828) 2022-07-28 23:43:54 -07:00
QMK Bot
587f750fce Merge remote-tracking branch 'origin/develop' into xap 2022-07-29 04:43:19 +00:00
QMK Bot
2d0443ec25 Merge remote-tracking branch 'origin/master' into develop 2022-07-29 04:42:45 +00:00
GG
b5452581da
[Keyboard] fix mistakes in promise87 config (#17830) 2022-07-28 21:41:42 -07:00
QMK Bot
7a706678d2 Merge remote-tracking branch 'origin/develop' into xap 2022-07-28 13:14:19 +00:00
QMK Bot
c2f68e3232 Merge remote-tracking branch 'origin/master' into develop 2022-07-28 13:13:39 +00:00
Ryan
920f983767
Move keyboard USB IDs and strings to data driven: H (#17821) 2022-07-28 14:12:40 +01:00
QMK Bot
09db67eeac Merge remote-tracking branch 'origin/develop' into xap 2022-07-28 00:57:44 +00:00
QMK Bot
476d709fa5 Merge remote-tracking branch 'origin/master' into develop 2022-07-28 00:57:13 +00:00
Less/Rikki
e7affd0541
feat: encoder map, OLED & encoder kb-level config (#17809) 2022-07-28 01:56:37 +01:00
QMK Bot
0d0a3a938b Merge remote-tracking branch 'origin/develop' into xap 2022-07-27 23:52:47 +00:00
QMK Bot
b029252e76 Merge remote-tracking branch 'origin/master' into develop 2022-07-27 23:52:09 +00:00
Arthur
1e745c48b6
[Keymap] Add artflag kyria layout (#17778)
* Initial firmware

* feedback

* updates

* update map
2022-07-27 16:51:13 -07:00
QMK Bot
63515f8515 Merge remote-tracking branch 'origin/develop' into xap 2022-07-27 21:45:14 +00:00
QMK Bot
7bb73306d6 Merge remote-tracking branch 'origin/master' into develop 2022-07-27 21:44:42 +00:00
Ryan
23f365b601
Move keyboard USB IDs and strings to data driven: F (#17816) 2022-07-27 22:44:05 +01:00
QMK Bot
08f1e8592f Merge remote-tracking branch 'origin/develop' into xap 2022-07-27 21:13:00 +00:00
QMK Bot
5055c9a74b Merge remote-tracking branch 'origin/master' into develop 2022-07-27 21:12:28 +00:00
Kevin Zhao
6731712cc1
Fix SKErgo Keymap (#17812) 2022-07-27 22:10:57 +01:00
QMK Bot
4a2610df8f Merge remote-tracking branch 'origin/develop' into xap 2022-07-27 19:20:32 +00:00
QMK Bot
ed5351d75e Merge remote-tracking branch 'origin/master' into develop 2022-07-27 19:19:51 +00:00
Ryan
4a0eb733ac
Move keyboard USB IDs and strings to data driven: G (#17818) 2022-07-27 20:19:09 +01:00
QMK Bot
800469c7b1 Merge remote-tracking branch 'origin/develop' into xap 2022-07-27 16:29:43 +00:00
QMK Bot
602fde61e2 Merge remote-tracking branch 'origin/master' into develop 2022-07-27 16:29:08 +00:00
turbololvo
c788857b6b
fix function layer to reflect cap labels (#17813)
These changes correctly reflect the keycap labels on the Vortex Race 3.
2022-07-27 17:27:39 +01:00
QMK Bot
a96e6b019d Merge remote-tracking branch 'origin/develop' into xap 2022-07-27 15:03:12 +00:00
QMK Bot
df15caf407 Merge remote-tracking branch 'origin/master' into develop 2022-07-27 15:02:29 +00:00
James Young
0f40e5d0dc
Wuque Promise87 ANSI Refactor (#17807) 2022-07-27 08:01:37 -07:00
QMK Bot
f6c5e68371 Merge remote-tracking branch 'origin/develop' into xap 2022-07-26 20:49:37 +00:00
QMK Bot
5df7cfdeb4 Merge remote-tracking branch 'origin/master' into develop 2022-07-26 20:48:59 +00:00
Danny
dc48b3fd04
[Keyboard] Fix typo with RGB LED positioning in Iris (#17805) 2022-07-26 13:48:07 -07:00
QMK Bot
695d620392 Merge remote-tracking branch 'origin/develop' into xap 2022-07-26 20:26:36 +00:00
QMK Bot
ff5848992c Merge remote-tracking branch 'origin/master' into develop 2022-07-26 20:25:59 +00:00
Less/Rikki
fc9654a1d0
feat: encoder map, OLED & encoder kb-level config (#17767) 2022-07-26 21:25:23 +01:00
QMK Bot
ee295d2bd8 Merge remote-tracking branch 'origin/develop' into xap 2022-07-26 19:51:55 +00:00
QMK Bot
53ca6338c7 Merge remote-tracking branch 'origin/master' into develop 2022-07-26 19:51:21 +00:00
Drashna Jaelre
5f36285fc5
[Keyboard] Add work louder micro (#17586)
* [Keyboard] Add work louder micro

* Update keyboards/work_louder/micro/readme.md

* Update readme

* Update kb config files

* Update to use encoder map

Co-authored-by: Tom Barnes <barnestom@me.com>
2022-07-26 20:50:45 +01:00
QMK Bot
ce9e5ef048 Merge remote-tracking branch 'origin/develop' into xap 2022-07-26 19:44:53 +00:00
QMK Bot
e0e1f0af92 Merge remote-tracking branch 'origin/master' into develop 2022-07-26 19:44:06 +00:00
Scott Bennett
9dbc0473ef
Dz65v2 Settings for SBennett13 (#17747)
* Start of dz65v2 map for sbennett13

* No wpm, disable some rgb, ~copyright~

* No more raindrops

* Remove more rgb modes and set default

* Almost orgot this crappy thing

* cannot define startup :(

* Layered esc is kc_grv

* Start of dz65v2 map for sbennett13

* No wpm, disable some rgb, ~copyright~

* No more raindrops

* Remove more rgb modes and set default

* Almost orgot this crappy thing

* cannot define startup :(

* Layered esc is kc_grv

* Add license to config and keymap
2022-07-26 20:43:26 +01:00
QMK Bot
734227951c Merge remote-tracking branch 'origin/develop' into xap 2022-07-26 19:16:23 +00:00
QMK Bot
2899e69ead Merge remote-tracking branch 'origin/master' into develop 2022-07-26 19:15:45 +00:00
Spaceman
d4bb5a9820
Add alternative Logos (#17787) 2022-07-26 20:15:08 +01:00
QMK Bot
545f7da5cd Merge remote-tracking branch 'origin/develop' into xap 2022-07-26 16:38:14 +00:00
QMK Bot
0534b878c3 Merge remote-tracking branch 'origin/master' into develop 2022-07-26 16:37:29 +00:00
Wilba
501276a8fd
Added WT65-D (#17724) 2022-07-26 17:36:30 +01:00
QMK Bot
834364ceb7 Merge remote-tracking branch 'origin/develop' into xap 2022-07-26 08:00:58 +00:00
QMK Bot
1cf68476cc Merge remote-tracking branch 'origin/master' into develop 2022-07-26 08:00:23 +00:00
Álvaro A. Volpato
b0b14cc440
[Keyboard] Acheron Athena support (#16818)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-07-26 00:59:38 -07:00
QMK Bot
2702e823c0 Merge remote-tracking branch 'origin/develop' into xap 2022-07-26 06:42:02 +00:00
Charly Delay
244450625a
bastardkb: fix info.json changes that got reverted during the last merge from master to develop (#17800)
* bastardkb: fix info.json changes that got reverted during the last merge from `master` to `develop`

* Remove board name from root folder `info.json`
2022-07-26 07:41:24 +01:00
QMK Bot
722c806043 Merge remote-tracking branch 'origin/develop' into xap 2022-07-26 06:27:35 +00:00
QMK Bot
9f5b71bada Merge remote-tracking branch 'origin/master' into develop 2022-07-26 06:27:00 +00:00
QMK Bot
7ae0ce6660 Merge remote-tracking branch 'origin/develop' into xap 2022-07-26 06:26:31 +00:00
Olly Hayes
77e48f5b7e
[Keymap] Add ollyhayes keymap (#16632) 2022-07-25 23:26:22 -07:00
QMK Bot
9825b66cac Merge remote-tracking branch 'origin/master' into develop 2022-07-26 06:26:00 +00:00
Leo Deng
ddae04bca1
[Keyboard] add DJam keyboard (#17430)
Co-authored-by: Joel Challis <git@zvecr.com>
2022-07-25 23:25:28 -07:00
QMK Bot
21a97ba809 Merge remote-tracking branch 'origin/develop' into xap 2022-07-26 05:37:43 +00:00
QMK Bot
2456044d5f Merge remote-tracking branch 'origin/master' into develop 2022-07-26 05:36:55 +00:00
shamit05
91d911eb1f
[Keyboard] Add Halokeys Elemental 75 (#17323)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-07-25 22:36:11 -07:00
QMK Bot
d461430574 Merge remote-tracking branch 'origin/develop' into xap 2022-07-26 05:32:22 +00:00
QMK Bot
9f976b89d8 Merge remote-tracking branch 'origin/master' into develop 2022-07-26 05:31:41 +00:00
Cipulot
ba1643af7d
[Keyboard] Add Kawayo Keyboard (#17454)
Co-authored-by: Joel Challis <git@zvecr.com>
2022-07-25 22:30:59 -07:00
QMK Bot
7cd18cbf5b Merge remote-tracking branch 'origin/develop' into xap 2022-07-26 05:25:18 +00:00
QMK Bot
11c9a5e3ac Merge remote-tracking branch 'origin/master' into develop 2022-07-26 05:24:46 +00:00
hornslyn
a33dc8ebb5
[Keyboard] Add Star75 support (#17421)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-07-25 22:24:04 -07:00
QMK Bot
873ebca8b2 Merge remote-tracking branch 'origin/develop' into xap 2022-07-26 05:23:22 +00:00
Albert Y
70d554420c
[Keyboard] Add RP2040 config defaults for ferris/sweep and cradio (#17557) 2022-07-25 22:22:42 -07:00
QMK Bot
1d78e87305 Merge remote-tracking branch 'origin/develop' into xap 2022-07-26 05:21:43 +00:00
QMK Bot
f004d93bad Merge remote-tracking branch 'origin/master' into develop 2022-07-26 05:21:11 +00:00
James Young
753ca0e13c
takashicompany miniZone: fix QMK Configurator implementation (#17801) 2022-07-25 22:20:36 -07:00
QMK Bot
b690ca7cdc Merge remote-tracking branch 'origin/develop' into xap 2022-07-26 05:03:07 +00:00
QMK Bot
4bd4210e97 Merge remote-tracking branch 'origin/master' into develop 2022-07-26 05:02:37 +00:00
Daniel O'Brien
3eb9f28c89
[Keyboard] Add missing mute button to sofle keymap (#17796) 2022-07-25 22:02:02 -07:00
QMK Bot
7022dfeb9c Merge remote-tracking branch 'origin/develop' into xap 2022-07-26 05:00:43 +00:00
QMK Bot
f0300fc763 Merge remote-tracking branch 'origin/master' into develop 2022-07-26 05:00:11 +00:00
Diogo Sergio
e6a7db2fd2
Update README.md for teensy lc onekey (#17797) 2022-07-25 21:59:37 -07:00
QMK Bot
71ed6f52c5 Merge remote-tracking branch 'origin/develop' into xap 2022-07-26 04:02:23 +00:00
QMK Bot
d556c4233e Merge remote-tracking branch 'origin/master' into develop 2022-07-26 04:01:41 +00:00
Ryan
5ed98df374
gboards/georgi: cleanup & fix (#17753) 2022-07-26 14:01:05 +10:00
QMK Bot
e03fb1dcd2 Merge remote-tracking branch 'origin/develop' into xap 2022-07-26 01:41:06 +00:00
Drashna Jaelre
928bbded6d
[Keyboard] Fix compilation issues for Charybdis/Dilemma (#17791)
* [Keyboard] Fix debug printing for Charybdis/Dilemma

* Fix compliation issue for dilemma
2022-07-26 02:40:14 +01:00
QMK Bot
d77946e324 Merge remote-tracking branch 'origin/develop' into xap 2022-07-26 00:54:05 +00:00
QMK Bot
77ed0feebe Merge remote-tracking branch 'origin/master' into develop 2022-07-26 00:53:04 +00:00
Ryan
674422eb13
Move keyboard USB IDs and strings to data driven: A (#17781) 2022-07-26 01:52:18 +01:00
QMK Bot
68c2b8800c Merge remote-tracking branch 'origin/develop' into xap 2022-07-25 23:05:20 +00:00
QMK Bot
1e651dbdb0 Merge remote-tracking branch 'origin/master' into develop 2022-07-25 23:04:48 +00:00
Ryan
a939293aca
Move keyboard USB IDs and strings to data driven: C (#17789) 2022-07-26 00:04:09 +01:00
QMK Bot
1f3f652d3c Merge remote-tracking branch 'origin/develop' into xap 2022-07-25 22:56:39 +00:00
QMK Bot
4baed8037d Merge remote-tracking branch 'origin/master' into develop 2022-07-25 22:56:05 +00:00
James Young
b6ac0ecf82
Runes Skjöldr Touch-Up (#17792)
* skjoldr.h: use ___ for KC_NO

* skjoldr.h: use K<row><column> notation

Matrix was previously defined using identifiers in the format of K<column><row>.

* skjoldr.h: add matrix diagram

* info.json: apply friendly formatting

- key legends as labels
- correct key sizes and positioning

* refactor keymaps

Refactors the `default` and `via` keymaps.

- use QMK-native keycode aliases
- grid-align keycodes for readability

* rename LAYOUT macro to LAYOUT_60_ansi_arrow

* enable Community Layout support

* info.json: correct maintainer value

Field is meant to reference the maintainer's GitHub username.
2022-07-25 23:55:26 +01:00
QMK Bot
0f304d6884 Merge remote-tracking branch 'origin/develop' into xap 2022-07-25 22:09:19 +00:00
QMK Bot
4837bc50c4 Merge remote-tracking branch 'origin/master' into develop 2022-07-25 22:08:08 +00:00
Drashna Jaelre
68cc6be564
[Keyboard] Fix Charue Sunsetter_r2 compilation issues (#17793) 2022-07-25 23:07:32 +01:00
QMK Bot
0bd3ff9881 Merge remote-tracking branch 'origin/develop' into xap 2022-07-25 17:16:46 +00:00
Drashna Jael're
99c48f1361
Merge remote-tracking branch 'origin/master' into develop 2022-07-25 10:15:47 -07:00
ILWrites
1df6322f10
Fixed spacebar position (#17784) 2022-07-25 17:21:09 +01:00
Ryan
50c2b151b2
Move keyboard USB IDs and strings to data driven: B (#17782) 2022-07-25 16:20:19 +01:00