Commit Graph

26512 Commits

Author SHA1 Message Date
QMK Bot
61bac5bc03 Merge remote-tracking branch 'origin/develop' into xap 2023-03-21 09:16:51 +00:00
Nick Brassel
a518e1e5d8
Sync activity timestamps between sides. (#20192)
Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
2023-03-21 10:16:11 +01:00
QMK Bot
89e5152b5c Merge remote-tracking branch 'origin/develop' into xap 2023-03-21 08:25:58 +00:00
Albert Y
0e1e543836
Increase verbosity of make command (#20172) 2023-03-21 01:25:08 -07:00
QMK Bot
9202c67f2e Merge remote-tracking branch 'origin/develop' into xap 2023-03-21 08:18:42 +00:00
QMK Bot
0dad14dc81 Merge remote-tracking branch 'origin/master' into develop 2023-03-21 08:18:04 +00:00
mechlovin
650a0b8ad4
[Keyboard] Olly Orion: Disable SWD and JTAG (#20169)
Co-authored-by: Joel Challis <git@zvecr.com>
2023-03-21 01:17:24 -07:00
QMK Bot
63ee67eda3 Merge remote-tracking branch 'origin/develop' into xap 2023-03-21 08:13:54 +00:00
QMK Bot
280153b8f9 Merge remote-tracking branch 'origin/master' into develop 2023-03-21 08:13:16 +00:00
blindassassin111
0f07fcc8d4
[Keyboard] OSAv2 (#20166) 2023-03-21 01:12:21 -07:00
QMK Bot
db74628fa0 Merge remote-tracking branch 'origin/develop' into xap 2023-03-21 06:46:15 +00:00
QMK Bot
1f49203209 Merge remote-tracking branch 'origin/master' into develop 2023-03-21 06:45:37 +00:00
hulahermit
b6a636d954
[Keyboard] Add pteropus keyboard (#20147)
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Chi-Han Yang <chyang@enrichtx.com>
2023-03-20 23:44:56 -07:00
QMK Bot
949839cced Merge remote-tracking branch 'origin/develop' into xap 2023-03-21 06:21:48 +00:00
QMK Bot
4cec7ebfab Merge remote-tracking branch 'origin/master' into develop 2023-03-21 06:21:09 +00:00
Andrew Kannan
44cd8a2f88
[Keyboard] Add CannonKeys Bakeneko60 ISO Hotswap PCB (#20130) 2023-03-20 23:20:30 -07:00
QMK Bot
d6fecdc0b1 Merge remote-tracking branch 'origin/develop' into xap 2023-03-21 05:31:54 +00:00
QMK Bot
9331d89f3d Merge remote-tracking branch 'origin/master' into develop 2023-03-21 05:30:59 +00:00
Tobias Minn
f55d2cd6b6
[Keyboard] Add Kuro65 keyboard (#20122)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
2023-03-20 22:30:21 -07:00
QMK Bot
c29917c22b Merge remote-tracking branch 'origin/develop' into xap 2023-03-21 05:30:18 +00:00
QMK Bot
069f842399 Merge remote-tracking branch 'origin/master' into develop 2023-03-21 05:29:35 +00:00
Sid Quinsaat
63af5cd50e
[Keymap] for sharkby7e (#20121)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-03-20 22:28:54 -07:00
QMK Bot
a89973ece2 Merge remote-tracking branch 'origin/develop' into xap 2023-03-21 05:14:26 +00:00
Vino Rodrigues
bb53e9d539
[Keyboard] Consolidate Binepad BN009 R1 and R2 (#20113) 2023-03-20 22:13:44 -07:00
QMK Bot
63b968acda Merge remote-tracking branch 'origin/develop' into xap 2023-03-21 03:15:18 +00:00
QMK Bot
dff7b3688f Merge remote-tracking branch 'origin/master' into develop 2023-03-21 03:14:36 +00:00
Agent Blu, 006
8bb7d24fba
[Keyboard] Add Blu vimclutch (#20060)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-03-20 20:13:27 -07:00
QMK Bot
466df11fe9 Merge remote-tracking branch 'origin/develop' into xap 2023-03-20 03:14:30 +00:00
Nick Brassel
cd94ba031c
Quantum Painter QoL enhancements -- auto-poweroff, auto-flush, buffer sizing (#20013) 2023-03-20 14:13:53 +11:00
QMK Bot
5c78e6fc9e Merge remote-tracking branch 'origin/develop' into xap 2023-03-19 23:20:40 +00:00
QMK Bot
dfec6ac471 Merge remote-tracking branch 'origin/master' into develop 2023-03-19 23:20:04 +00:00
Laneware
50b12ece13
Update lpad info.json (#20184)
Update incorrect row and col pins, now confirmed working via manual build in QMK MSYS
2023-03-19 23:19:28 +00:00
QMK Bot
07142ffaa2 Merge remote-tracking branch 'origin/develop' into xap 2023-03-19 21:12:44 +00:00
Ryan
65a80f411f
Clean up APA102 config and add DD mapping (#20159) 2023-03-20 08:12:19 +11:00
Ryan
3c144fac5e
Clean up usage of QMK_KEYBOARD_H (#20167) 2023-03-20 08:12:05 +11:00
QMK Bot
53bd2136f7 Merge remote-tracking branch 'origin/develop' into xap 2023-03-19 20:33:58 +00:00
Nick Brassel
9d302f9b7f
Fixup CI build for F103C6 onekey. (#20188) 2023-03-19 20:33:21 +00:00
QMK Bot
cc887123d2 Merge remote-tracking branch 'origin/develop' into xap 2023-03-18 21:20:27 +00:00
Joel Challis
50cb8a3bf5
Remove bootloader logic from mcu_selection.mk (#20150)
* Remove bootloader logic from mcu_selection.mk

* Move MCU/BOOTLOADER to info.json
2023-03-18 21:19:26 +00:00
QMK Bot
c64c69f335 Merge remote-tracking branch 'origin/develop' into xap 2023-03-18 18:17:00 +00:00
QMK Bot
2c19e5d1c3 Merge remote-tracking branch 'origin/master' into develop 2023-03-18 18:16:18 +00:00
QMK Bot
c5b0e3a6a3
Format code according to conventions (#20175) 2023-03-18 18:15:26 +00:00
QMK Bot
324bf4b90d Merge remote-tracking branch 'origin/develop' into xap 2023-03-18 17:40:45 +00:00
QMK Bot
1690d72906 Merge remote-tracking branch 'origin/master' into develop 2023-03-18 17:39:02 +00:00
jack
a1a5dd6ddd
Fixup kbdfans/tiger80 RGB animations (#20164) 2023-03-18 11:38:24 -06:00
QMK Bot
f1e352548a Merge remote-tracking branch 'origin/develop' into xap 2023-03-18 17:36:16 +00:00
QMK Bot
8a553954f9 Merge remote-tracking branch 'origin/master' into develop 2023-03-18 17:33:59 +00:00
QMK Bot
a09ab2f16a Merge remote-tracking branch 'origin/develop' into xap 2023-03-18 17:33:53 +00:00
Laneware
da52450152
Add Support for LPAD (#19852)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-03-18 11:33:20 -06:00
QMK Bot
aace32c80f Merge remote-tracking branch 'origin/master' into develop 2023-03-18 17:33:12 +00:00