QMK Bot
0a7b90831e
Merge remote-tracking branch 'origin/develop' into xap
2022-07-11 12:56:38 +00:00
QMK Bot
5925ea3478
Merge remote-tracking branch 'origin/master' into develop
2022-07-11 12:55:42 +00:00
Naphtaline
c8f969a3ce
[Keyboard] kbdfans kbd67 rev 2 : add new LAYOUT_65_iso_split_bs ( #16922 )
...
* [Layout/Keymap] kbdfans kbd67 rev2 : add new LAYOUT_65_iso_split_bs and naphaline keymap as a working example
* Update keyboards/kbdfans/kbd67/rev2/keymaps/naphtaline/keymap.c
I do trust the reviewer, here goes the change :)
Co-authored-by: Ryan <fauxpark@gmail.com>
* Remove QMK custom keycodes 1/2
Co-authored-by: Nick Brassel <nick@tzarc.org>
* Remove QMK custom keycodes 2/2
Co-authored-by: Nick Brassel <nick@tzarc.org>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2022-07-11 05:55:01 -07:00
QMK Bot
68476f0e60
Merge remote-tracking branch 'origin/develop' into xap
2022-07-11 12:52:44 +00:00
QMK Bot
5e750cf039
Merge remote-tracking branch 'origin/master' into develop
2022-07-11 12:52:03 +00:00
James Young
2dab029bcf
Peej Rosaline Refactor ( #17564 )
2022-07-11 05:51:29 -07:00
QMK Bot
c0f8ed3c6c
Merge remote-tracking branch 'origin/develop' into xap
2022-07-11 12:11:19 +00:00
Aidan Smith
7a73f9a6b3
[Keyboard] Add Fine!40 PCB Support ( #17426 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-07-11 05:10:47 -07:00
QMK Bot
fd8c86b195
Merge remote-tracking branch 'origin/develop' into xap
2022-07-11 11:31:54 +00:00
QMK Bot
5e347f42a6
Merge remote-tracking branch 'origin/master' into develop
2022-07-11 11:31:19 +00:00
Joel Challis
5389f088b1
splitkb/kyria - Resolve CONVERT_TO_PROTON_C warnings ( #17617 )
2022-07-11 04:30:45 -07:00
QMK Bot
e154a218f0
Merge remote-tracking branch 'origin/develop' into xap
2022-07-11 11:24:25 +00:00
QMK Bot
2e567150ea
Merge remote-tracking branch 'origin/master' into develop
2022-07-11 11:23:48 +00:00
GG
16b837b35b
[Keyboard] Add Promise87 ( #17525 )
2022-07-11 04:23:13 -07:00
QMK Bot
05feb44b58
Merge remote-tracking branch 'origin/develop' into xap
2022-07-10 22:46:04 +00:00
QMK Bot
0bee7cbebe
Merge remote-tracking branch 'origin/master' into develop
2022-07-10 22:45:26 +00:00
Joel Challis
a5eeee4ded
Fix infinite recursion in checkerboards/quark_plus ( #17616 )
2022-07-10 23:44:56 +01:00
QMK Bot
3795cae7c2
Merge remote-tracking branch 'origin/develop' into xap
2022-07-09 17:28:11 +00:00
QMK Bot
a15e44cfb3
Merge remote-tracking branch 'origin/master' into develop
2022-07-09 17:27:37 +00:00
Joel Challis
2106acc24a
merge/um80 - Fix WPM issues in configurator builds ( #17608 )
2022-07-09 18:26:48 +01:00
QMK Bot
4d6336ccab
Merge remote-tracking branch 'origin/develop' into xap
2022-07-08 22:33:36 +00:00
jpe230
13b2b93fb0
Add Adafruit Macropad ( #17512 )
2022-07-08 23:33:03 +01:00
QMK Bot
a65f6d33f7
Merge remote-tracking branch 'origin/develop' into xap
2022-07-07 12:44:02 +00:00
QMK Bot
b0c3d61c17
Merge remote-tracking branch 'origin/master' into develop
2022-07-07 12:43:20 +00:00
Bartosz Nowak
e724801d33
[Keyboard] Clean up dactyl manuform unused files ( #15890 )
2022-07-07 05:42:28 -07:00
QMK Bot
6cbcce37e0
Merge remote-tracking branch 'origin/develop' into xap
2022-07-07 12:14:51 +00:00
Stefan Kerkmann
643f6367a1
[Fix] Patches after printf library update ( #17584 )
...
* Add missing '(' to print_bin_reverse32 declaration
* Fix insufficient character buffers on satisfaction75
* Remove \0 character in format string and use corrected offset math
instead on rocketboard 16
* Replace snprintf_ with snprintf for djinn
* Explicitly ignore format checks for tracktyl manuform that uses %b
specifier
* Print properly escaped version string in command.c, as PRODUCT or
other defines can contain constructs like 'Vendor keyboard 66%' which
will be interpreted as a format specifier
2022-07-07 14:14:09 +02:00
QMK Bot
71208ccb09
Merge remote-tracking branch 'origin/develop' into xap
2022-07-07 05:45:40 +00:00
QMK Bot
8f086faf8a
Merge remote-tracking branch 'origin/master' into develop
2022-07-07 05:44:58 +00:00
Zykrah
0d30565bb7
Fix/waka60 audio ( #17561 )
2022-07-06 22:44:21 -07:00
QMK Bot
218f67fa57
Merge remote-tracking branch 'origin/develop' into xap
2022-07-03 21:26:16 +00:00
QMK Bot
e68205db1b
Merge remote-tracking branch 'origin/master' into develop
2022-07-03 21:25:42 +00:00
James Young
9a157a3a99
KP Republic BM60HSRGB_EC QMK Configurator and readme touch-up ( #17541 )
2022-07-03 14:25:29 -07:00
QMK Bot
1d8a0b75fe
Merge remote-tracking branch 'origin/develop' into xap
2022-07-03 18:09:02 +00:00
QMK Bot
63474e2c17
Merge remote-tracking branch 'origin/master' into develop
2022-07-03 18:08:32 +00:00
李董睿煊
168a631720
Add support for MacroCat Keyboard ( #17480 )
2022-07-03 19:07:31 +01:00
QMK Bot
b23f9ed0af
Merge remote-tracking branch 'origin/develop' into xap
2022-07-03 04:13:01 +00:00
QMK Bot
7d89dfe2dc
Merge remote-tracking branch 'origin/master' into develop
2022-07-03 04:12:32 +00:00
QMK Bot
8842fb9345
Merge remote-tracking branch 'origin/develop' into xap
2022-07-03 04:12:30 +00:00
James Young
d87d537b50
Remove dead space from Pierce QMK Configurator layout data ( #17551 )
2022-07-03 14:12:01 +10:00
QMK Bot
6154c184a8
Merge remote-tracking branch 'origin/master' into develop
2022-07-03 04:11:21 +00:00
jack
665feccca1
Fixup bounce/75 ( #17548 )
2022-07-03 14:10:51 +10:00
QMK Bot
84ffb77b8f
Merge remote-tracking branch 'origin/develop' into xap
2022-07-03 02:56:48 +00:00
QMK Bot
e8c46fab96
Merge remote-tracking branch 'origin/master' into develop
2022-07-03 02:56:16 +00:00
Drashna Jaelre
1c43410e26
[Keymap] Updates to drashna Keymaps and Userspace ( #17543 )
2022-07-02 19:55:46 -07:00
QMK Bot
4fafb916bf
Merge remote-tracking branch 'origin/develop' into xap
2022-07-02 23:55:15 +00:00
QMK Bot
03909b8a3f
Merge remote-tracking branch 'origin/master' into develop
2022-07-02 23:54:45 +00:00
duoshock
a3119385a4
Add keyboard 'UM-80' ( #17035 )
2022-07-03 00:54:15 +01:00
QMK Bot
b7333ba99a
Merge remote-tracking branch 'origin/develop' into xap
2022-07-02 23:44:01 +00:00
QMK Bot
2d5047a79c
Merge remote-tracking branch 'origin/master' into develop
2022-07-02 23:43:38 +00:00
jack
c5215d4a06
initial ( #17545 )
2022-07-03 00:43:29 +01:00
moyi4681
4ba5102a50
add bounce keyboard ( #17030 )
2022-07-03 00:43:07 +01:00
QMK Bot
564fa77863
Merge remote-tracking branch 'origin/develop' into xap
2022-07-02 23:39:12 +00:00
QMK Bot
c8a78b1f04
Merge remote-tracking branch 'origin/master' into develop
2022-07-02 23:38:39 +00:00
TW59420
f2d4424bb7
Add alicekk support ( #17027 )
2022-07-03 00:38:02 +01:00
QMK Bot
ec644bd932
Merge remote-tracking branch 'origin/develop' into xap
2022-07-02 23:16:03 +00:00
QMK Bot
ce29cb0f10
Merge remote-tracking branch 'origin/master' into develop
2022-07-02 23:15:32 +00:00
br
fbf3cbcd5c
Added PLOOPY_DRAGSCROLL_H_INVERT ( #17453 )
2022-07-03 00:13:45 +01:00
QMK Bot
d8d8f51848
Merge remote-tracking branch 'origin/develop' into xap
2022-07-02 23:13:38 +00:00
QMK Bot
4d243e94fa
Merge remote-tracking branch 'origin/master' into develop
2022-07-02 23:12:20 +00:00
QMK Bot
d152bc43e2
Merge remote-tracking branch 'origin/develop' into xap
2022-07-02 23:12:12 +00:00
yiancar
6a0814bb04
Update NK1 RGB animation defines ( #17486 )
2022-07-03 00:11:48 +01:00
QMK Bot
4b7c01c84b
Merge remote-tracking branch 'origin/master' into develop
2022-07-02 23:11:36 +00:00
Ralph Bacolod
3ed4a7086e
Update readme.md ( #17489 )
...
Fixed link to http://mkweb.bcgsc.ca/carpalx/?popular_alternatives
2022-07-03 00:10:30 +01:00
QMK Bot
a467771af9
Merge remote-tracking branch 'origin/develop' into xap
2022-07-02 22:19:46 +00:00
QMK Bot
8744d57578
Merge remote-tracking branch 'origin/master' into develop
2022-07-02 22:19:13 +00:00
QMK Bot
7506a5a183
Merge remote-tracking branch 'origin/develop' into xap
2022-07-02 22:19:12 +00:00
Andrew Kannan
43e33ba232
Add Gentoo Hotswap PCB to QMK ( #17528 )
2022-07-02 23:18:43 +01:00
QMK Bot
5f11d7b554
Merge remote-tracking branch 'origin/master' into develop
2022-07-02 22:18:33 +00:00
Andrew Kannan
2011aec06f
Add Gentoo Solderable PCB to QMK ( #17527 )
2022-07-02 23:17:53 +01:00
QMK Bot
b87d48dac7
Merge remote-tracking branch 'origin/develop' into xap
2022-07-02 19:10:23 +00:00
QMK Bot
a41c5d8023
Merge remote-tracking branch 'origin/master' into develop
2022-07-02 19:09:55 +00:00
Ciutadellla
4804b73540
Update info.json ( #17530 )
...
Change to correct keyboard name from reviung31 to reviung41
2022-07-02 20:09:21 +01:00
QMK Bot
47c263cf8d
Merge remote-tracking branch 'origin/develop' into xap
2022-07-02 18:10:37 +00:00
QMK Bot
6c7d549e31
Merge remote-tracking branch 'origin/master' into develop
2022-07-02 18:10:05 +00:00
Evelien Dekkers
40d295abf6
[Keyboard] Add nt-650 ( #17471 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-07-02 11:09:26 -07:00
QMK Bot
436417ec7c
Merge remote-tracking branch 'origin/develop' into xap
2022-07-02 17:52:05 +00:00
QMK Bot
efd41fe9df
Merge remote-tracking branch 'origin/master' into develop
2022-07-02 17:51:26 +00:00
James Young
18a1cbce75
Mikeneko 65 QMK Configurator touch-up and Community Layout Support ( #17542 )
...
* info.json: apply friendly formatting
* info.json: remove dead space from Configurator rendering
* rename LAYOUT_all to LAYOUT_65_ansi_blocker
* rules.mk: enable Community Layout support
2022-07-02 18:50:54 +01:00
QMK Bot
13af51006a
Merge remote-tracking branch 'origin/develop' into xap
2022-07-02 14:33:12 +00:00
QMK Bot
36de989e6f
Merge remote-tracking branch 'origin/master' into develop
2022-07-02 14:32:39 +00:00
James Young
9b8ae05796
Correct QMK Configurator layout data for Kin80 ( #17526 )
2022-07-03 00:32:09 +10:00
QMK Bot
559ec50325
Merge remote-tracking branch 'origin/develop' into xap
2022-07-02 14:24:13 +00:00
QMK Bot
b56edb5f11
Merge remote-tracking branch 'origin/master' into develop
2022-07-02 14:23:42 +00:00
Nick Brassel
b9a6126518
Revert "[Keyboard]KPrepublic bm80v2 Keyboard ISO support " ( #17537 )
2022-07-03 00:23:21 +10:00
Nick Brassel
1b9491f8f3
Fixup builds for TzCI ( #17538 )
2022-07-03 00:23:08 +10:00
QMK Bot
17ce7bb67f
Merge remote-tracking branch 'origin/develop' into xap
2022-07-02 14:17:28 +00:00
Nick Brassel
ea14a93718
Merge remote-tracking branch 'upstream/master' into develop
2022-07-03 00:16:33 +10:00
QMK Bot
063a5b8e7c
Merge remote-tracking branch 'origin/develop' into xap
2022-07-02 14:14:17 +00:00
Ryan
ac5e6b6a3b
Tentative Teensy 3.5 support ( #14420 )
...
* Tentative Teensy 3.5 support
* Set firmware format to .hex for ARM Teensys
* Got to "device descriptor failed" by comparing with Teensy 3.6 code
* Drop down to 96MHz...
* Bump back up to 120MHz
2022-07-03 00:12:45 +10:00
QMK Bot
25544107aa
Merge remote-tracking branch 'origin/develop' into xap
2022-07-02 14:12:03 +00:00
bruun-baer
5108d53169
Add a workman-miryoku hybrid keymap for the ferris sweep keyboard ( #17511 )
2022-07-03 00:11:53 +10:00
gourdo1
97dfdcb2bd
[keymap] Update gourdo1 keymap for Q2 changes ( #17398 )
2022-07-03 00:11:26 +10:00
QMK Bot
11299b337b
Merge remote-tracking branch 'origin/master' into develop
2022-07-02 14:10:26 +00:00
QMK Bot
7bcd48f995
Merge remote-tracking branch 'origin/develop' into xap
2022-07-02 14:09:55 +00:00
HorrorTroll
d694488e2e
Added new keyboard KB16-01 ( #17418 )
2022-07-03 00:08:38 +10:00
QMK Bot
f083eb1a37
Merge remote-tracking branch 'origin/master' into develop
2022-07-02 14:07:53 +00:00
QMK Bot
62e0f026ad
Merge remote-tracking branch 'origin/develop' into xap
2022-07-02 14:07:10 +00:00
IFo Hancroft
1cffe5b6ce
My ErgoDox Keymap (finally perfected, I think) ( #17208 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-07-03 00:06:23 +10:00
QMK Bot
61eca0c972
Merge remote-tracking branch 'origin/master' into develop
2022-07-02 14:06:19 +00:00