77b7fa437f
Merge remote-tracking branch 'origin/develop' into xap
2022-07-26 07:28:15 +00:00
5d898a3d34
[Docs] Updates to Pointing Device Docs ( #17777 )
2022-07-26 00:27:34 -07:00
2702e823c0
Merge remote-tracking branch 'origin/develop' into xap
2022-07-26 06:42:02 +00:00
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
722c806043
Merge remote-tracking branch 'origin/develop' into xap
2022-07-26 06:27:35 +00:00
9f5b71bada
Merge remote-tracking branch 'origin/master' into develop
2022-07-26 06:27:00 +00:00
7ae0ce6660
Merge remote-tracking branch 'origin/develop' into xap
2022-07-26 06:26:31 +00:00
77e48f5b7e
[Keymap] Add ollyhayes keymap ( #16632 )
2022-07-25 23:26:22 -07:00
9825b66cac
Merge remote-tracking branch 'origin/master' into develop
2022-07-26 06:26:00 +00:00
ddae04bca1
[Keyboard] add DJam keyboard ( #17430 )
...
Co-authored-by: Joel Challis <git@zvecr.com >
2022-07-25 23:25:28 -07:00
0a220ed6e7
Merge remote-tracking branch 'origin/develop' into xap
2022-07-26 06:20:10 +00:00
1de6811ebe
Cirque circular scroll: Support POINTING_DEVICE_COMBINED ( #17654 )
2022-07-25 23:19:33 -07:00
21a97ba809
Merge remote-tracking branch 'origin/develop' into xap
2022-07-26 05:37:43 +00:00
2456044d5f
Merge remote-tracking branch 'origin/master' into develop
2022-07-26 05:36:55 +00:00
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
d461430574
Merge remote-tracking branch 'origin/develop' into xap
2022-07-26 05:32:22 +00:00
9f976b89d8
Merge remote-tracking branch 'origin/master' into develop
2022-07-26 05:31:41 +00:00
ba1643af7d
[Keyboard] Add Kawayo Keyboard ( #17454 )
...
Co-authored-by: Joel Challis <git@zvecr.com >
2022-07-25 22:30:59 -07:00
7cd18cbf5b
Merge remote-tracking branch 'origin/develop' into xap
2022-07-26 05:25:18 +00:00
11c9a5e3ac
Merge remote-tracking branch 'origin/master' into develop
2022-07-26 05:24:46 +00:00
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
873ebca8b2
Merge remote-tracking branch 'origin/develop' into xap
2022-07-26 05:23:22 +00:00
70d554420c
[Keyboard] Add RP2040 config defaults for ferris/sweep and cradio ( #17557 )
2022-07-25 22:22:42 -07:00
1d78e87305
Merge remote-tracking branch 'origin/develop' into xap
2022-07-26 05:21:43 +00:00
f004d93bad
Merge remote-tracking branch 'origin/master' into develop
2022-07-26 05:21:11 +00:00
753ca0e13c
takashicompany miniZone: fix QMK Configurator implementation ( #17801 )
2022-07-25 22:20:36 -07:00
b690ca7cdc
Merge remote-tracking branch 'origin/develop' into xap
2022-07-26 05:03:07 +00:00
4bd4210e97
Merge remote-tracking branch 'origin/master' into develop
2022-07-26 05:02:37 +00:00
3eb9f28c89
[Keyboard] Add missing mute button to sofle keymap ( #17796 )
2022-07-25 22:02:02 -07:00
7022dfeb9c
Merge remote-tracking branch 'origin/develop' into xap
2022-07-26 05:00:43 +00:00
f0300fc763
Merge remote-tracking branch 'origin/master' into develop
2022-07-26 05:00:11 +00:00
e6a7db2fd2
Update README.md for teensy lc onekey ( #17797 )
2022-07-25 21:59:37 -07:00
71ed6f52c5
Merge remote-tracking branch 'origin/develop' into xap
2022-07-26 04:02:23 +00:00
d556c4233e
Merge remote-tracking branch 'origin/master' into develop
2022-07-26 04:01:41 +00:00
5ed98df374
gboards/georgi: cleanup & fix ( #17753 )
2022-07-26 14:01:05 +10:00
e03fb1dcd2
Merge remote-tracking branch 'origin/develop' into xap
2022-07-26 01:41:06 +00:00
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
d77946e324
Merge remote-tracking branch 'origin/develop' into xap
2022-07-26 00:54:05 +00:00
77ed0feebe
Merge remote-tracking branch 'origin/master' into develop
2022-07-26 00:53:04 +00:00
674422eb13
Move keyboard USB IDs and strings to data driven: A ( #17781 )
2022-07-26 01:52:18 +01:00
68c2b8800c
Merge remote-tracking branch 'origin/develop' into xap
2022-07-25 23:05:20 +00:00
1e651dbdb0
Merge remote-tracking branch 'origin/master' into develop
2022-07-25 23:04:48 +00:00
a939293aca
Move keyboard USB IDs and strings to data driven: C ( #17789 )
2022-07-26 00:04:09 +01:00
1f3f652d3c
Merge remote-tracking branch 'origin/develop' into xap
2022-07-25 22:56:39 +00:00
4baed8037d
Merge remote-tracking branch 'origin/master' into develop
2022-07-25 22:56:05 +00:00
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
0f304d6884
Merge remote-tracking branch 'origin/develop' into xap
2022-07-25 22:09:19 +00:00
4837bc50c4
Merge remote-tracking branch 'origin/master' into develop
2022-07-25 22:08:08 +00:00
8d6a1d1e41
Merge remote-tracking branch 'origin/develop' into xap
2022-07-25 22:07:47 +00:00
68cc6be564
[Keyboard] Fix Charue Sunsetter_r2 compilation issues ( #17793 )
2022-07-25 23:07:32 +01:00
QMK Bot
Drashna Jaelre
Charly Delay
Olly Hayes
Leo Deng
Daniel Kao
shamit05
Cipulot
hornslyn
Albert Y
James Young
Daniel O'Brien
Diogo Sergio
Ryan