Commit Graph

22634 Commits

Author SHA1 Message Date
QMK Bot
536511a32a Merge remote-tracking branch 'origin/master' into develop 2022-07-22 14:58:18 +00:00
mechlovin
8de0427fec
[Kay60] Change LED pin state and correct keycode. (#17746) 2022-07-22 15:57:03 +01:00
QMK Bot
852a69dd4d Merge remote-tracking branch 'origin/develop' into xap 2022-07-22 13:24:10 +00:00
QMK Bot
0e81d63b64 Merge remote-tracking branch 'origin/master' into develop 2022-07-22 13:23:36 +00:00
Aidan Gauland
de10784799
Fix compilation error in Ploopy Nano maddie keymap (#17733) 2022-07-22 14:22:56 +01:00
QMK Bot
62d5372824 Merge remote-tracking branch 'origin/develop' into xap 2022-07-22 03:43:43 +00:00
QMK Bot
f1671ec720 Merge remote-tracking branch 'origin/master' into develop 2022-07-22 03:43:08 +00:00
Sắn
b9c7d4c48d
[Keyboard] Add Krush65 Hotswap (#16692)
* Add Krush65 Hotswap

* Led fix

* small fix

* a

* B

* move ec action to VIA keymaps

* Update keyboards/sawnsprojects/krush/krush65/hotswap/readme.md

* Update keyboards/sawnsprojects/krush/krush65/hotswap/rules.mk

* Update readme.md

* Update readme.md

* Update readme.md

* Update keyboards/sawnsprojects/krush/krush65/hotswap/readme.md

* Update keyboards/sawnsprojects/krush/krush65/hotswap/rules.mk

* Update keyboards/sawnsprojects/krush/krush65/hotswap/info.json

* Update keyboards/sawnsprojects/krush/krush65/hotswap/readme.md

* Update keyboards/sawnsprojects/krush/krush65/hotswap/readme.md

* Update keyboards/sawnsprojects/krush/krush65/hotswap/info.json

* Update keyboards/sawnsprojects/krush/krush65/hotswap/hotswap.h
2022-07-21 20:42:29 -07:00
QMK Bot
6a20e8a8d1 Merge remote-tracking branch 'origin/develop' into xap 2022-07-21 20:25:37 +00:00
QMK Bot
d681eac0ad Merge remote-tracking branch 'origin/master' into develop 2022-07-21 20:24:51 +00:00
Joel Challis
5a0e47db5e
Add reviewer/labels to dependabot PRs (#17743) 2022-07-21 21:24:07 +01:00
QMK Bot
07c431e190 Merge remote-tracking branch 'origin/develop' into xap 2022-07-21 19:55:36 +00:00
QMK Bot
bfed88dba2 Merge remote-tracking branch 'origin/master' into develop 2022-07-21 19:55:00 +00:00
dependabot[bot]
4ca99af8f5
Bump JamesIves/github-pages-deploy-action from 4.3.4 to 4.4.0 (#17742) 2022-07-21 20:54:27 +01:00
QMK Bot
e40a5999bf Merge remote-tracking branch 'origin/develop' into xap 2022-07-21 17:17:24 +00:00
Drashna Jaelre
5f32690cba
Move Pointing Device Initialization (#17740)
Move Pointing Device Initialization to after Split Post Initialization

If both pointing device and split is enabled, the pointing device init needs to be called after the split post init, otherwise the connection (serial/etc) isn't initialized yet, and any commands that need to send data over (such as calling the set cpi command) never get sent over.
2022-07-21 10:16:44 -07:00
QMK Bot
4cc24bc05b Merge remote-tracking branch 'origin/develop' into xap 2022-07-21 13:45:37 +00:00
jpe230
5c90732622
Adafruit Macropad: Add VIA keymap, fix default km (#17735) 2022-07-21 14:44:12 +01:00
QMK Bot
a377c20907 Merge remote-tracking branch 'origin/develop' into xap 2022-07-21 12:46:12 +00:00
QMK Bot
6081a8091d Merge remote-tracking branch 'origin/master' into develop 2022-07-21 12:45:28 +00:00
jonavin
7f0581cd35
Jonavin mercutio - reduce mem footprint (#17498)
* Reduce mem footprint - remove sprintf

* remove stdio reference and use get_u8_str

Co-authored-by: Jonavin <=>
2022-07-21 13:44:51 +01:00
QMK Bot
bb1bed38e7 Merge remote-tracking branch 'origin/develop' into xap 2022-07-20 23:54:28 +00:00
Albert Y
d510e80b89
Add Blok 2040 conversion (#17603) 2022-07-21 00:54:05 +01:00
Wilba
4efe6330c4
VIA Encoder Map Support (#17734) 2022-07-21 09:53:42 +10:00
QMK Bot
dbc77677d6 Merge remote-tracking branch 'origin/develop' into xap 2022-07-20 23:21:07 +00:00
QMK Bot
493d422406 Merge remote-tracking branch 'origin/master' into develop 2022-07-20 23:20:34 +00:00
mechlovin
a6d70de96a
[Keyboardo] Update PID for mechlovin zed60 (#17728) 2022-07-20 16:19:51 -07:00
QMK Bot
2552b00adc Merge remote-tracking branch 'origin/develop' into xap 2022-07-20 22:00:02 +00:00
mknj
9a31bbb3fa
fix syntax error (#17732) 2022-07-20 22:59:18 +01:00
QMK Bot
146d312cce Merge remote-tracking branch 'origin/develop' into xap 2022-07-20 17:25:15 +00:00
Albert Y
05f30f0787
Use Pro Micro pinout for SDA/SCL (#17595) 2022-07-20 18:24:34 +01:00
QMK Bot
54414d5474 Merge remote-tracking branch 'origin/develop' into xap 2022-07-20 17:00:52 +00:00
QMK Bot
ab45e3b993 Merge remote-tracking branch 'origin/master' into develop 2022-07-20 17:00:18 +00:00
takashicompany
62e3f8b885
Add miniZone Keymap (#17552) 2022-07-20 17:59:40 +01:00
QMK Bot
d83e5bf9dd Merge remote-tracking branch 'origin/develop' into xap 2022-07-20 16:44:24 +00:00
Ben Fiedler
1db5272154
docs: fix default value of USB_SUSPEND_WAKEUP_DELAY (#17501)
Documents the change made in #12081
2022-07-20 17:43:41 +01:00
QMK Bot
1ed3b63f1a Merge remote-tracking branch 'origin/develop' into xap 2022-07-20 16:33:00 +00:00
Drashna Jaelre
ee17ffadea
Move Pointing Device code to a subdirectory (#17684) 2022-07-20 17:32:00 +01:00
QMK Bot
cca59adc56 Merge remote-tracking branch 'origin/develop' into xap 2022-07-20 15:03:32 +00:00
QMK Bot
adfa36fee4 Merge remote-tracking branch 'origin/master' into develop 2022-07-20 15:02:35 +00:00
Felix Jen
55f16167e4
Added Windz Sinanju to QMK (#17566) 2022-07-20 16:01:35 +01:00
QMK Bot
ece9f8c7f3 Merge remote-tracking branch 'origin/develop' into xap 2022-07-20 00:57:03 +00:00
QMK Bot
fa44f2b21e Merge remote-tracking branch 'origin/master' into develop 2022-07-20 00:56:25 +00:00
Michal
00c8e24c6a
[Keymap] Michal Keymap for Sofle rev1 (#17610) 2022-07-19 17:55:48 -07:00
QMK Bot
45298a8c26 Merge remote-tracking branch 'origin/develop' into xap 2022-07-20 00:47:05 +00:00
Drashna Jaelre
12eb6444c6
Add support for PAW3204 Optical Sensor (#17669)
Co-authored-by: gompa <gompa@h-bomb.nl>
Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
2022-07-19 17:46:22 -07:00
QMK Bot
3537b632b9 Merge remote-tracking branch 'origin/develop' into xap 2022-07-19 23:25:25 +00:00
QMK Bot
6992efb229 Merge remote-tracking branch 'origin/master' into develop 2022-07-19 23:24:53 +00:00
Duccio
a7893f207d
Add rgb underglow support and change vendor_id (#17719) 2022-07-20 00:24:10 +01:00
QMK Bot
154f13cd83 Merge remote-tracking branch 'origin/develop' into xap 2022-07-19 15:44:44 +00:00