QMK Bot
3796d1b9a4
Merge remote-tracking branch 'origin/develop' into xap
2023-02-03 00:05:36 +00:00
Ryan
f20a05440e
Remove unused MATRIX_HAS_GHOST
from config.h ( #19726 )
2023-02-03 00:04:10 +00:00
QMK Bot
ae916160ac
Merge remote-tracking branch 'origin/develop' into xap
2023-02-02 21:36:01 +00:00
QMK Bot
8c0267c0eb
Merge remote-tracking branch 'origin/master' into develop
2023-02-02 21:34:50 +00:00
lalalademaxiya1
de6a6f963b
[Keyboard] Add Keychron V6 ( #19498 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-02-02 13:34:39 -08:00
lalalademaxiya1
10c3b9737f
[Keyboard] Add Keychron V10 ( #19504 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-02-02 13:34:18 -08:00
QMK Bot
007bcb2106
Merge remote-tracking branch 'origin/master' into develop
2023-02-02 21:34:07 +00:00
lalalademaxiya1
a76e70cfff
[Keyboard] Add rev_0131 for Keychron Q0 ( #19547 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-02-02 13:33:56 -08:00
QMK Bot
834eabe0e2
Merge remote-tracking branch 'origin/develop' into xap
2023-02-02 21:33:42 +00:00
TommyZ
d3b00d9594
[Keyboard] Add Quarkeys Z67 with solder and hotswap versions ( #19465 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-02-02 13:33:31 -08:00
QMK Bot
2889f62179
Merge remote-tracking branch 'origin/master' into develop
2023-02-02 21:33:06 +00:00
Andrew Kannan
3115cdf663
[Keyboard] Add Crin ( #18065 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2023-02-02 13:32:22 -08:00
QMK Bot
26ac875738
Merge remote-tracking branch 'origin/develop' into xap
2023-02-02 20:15:40 +00:00
QMK Bot
a6900dd5c5
Merge remote-tracking branch 'origin/master' into develop
2023-02-02 20:15:05 +00:00
Nick Brassel
eeadbd2176
Politely ask people not to submit issues to add support for unknown keyboards. ( #19737 )
2023-02-03 07:14:26 +11:00
QMK Bot
fc9021240c
Merge remote-tracking branch 'origin/develop' into xap
2023-02-02 18:24:11 +00:00
Pablo Martínez
d55b07696b
Add commit info to version.h
( #19542 )
...
* Initial commit
* Fix import order
* Fix deleted code instead of debug print line
* Format
* Update lib/python/qmk/cli/generate/version_h.py
Co-authored-by: Ryan <fauxpark@gmail.com>
* Renaming
* Update lib/python/qmk/cli/generate/version_h.py
Co-authored-by: Joel Challis <git@zvecr.com>
* Update lib/python/qmk/git.py
Co-authored-by: Joel Challis <git@zvecr.com>
---------
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2023-02-02 18:23:27 +00:00
QMK Bot
9a4df31091
Merge remote-tracking branch 'origin/develop' into xap
2023-02-02 18:19:03 +00:00
QMK Bot
53132ab9cf
Merge remote-tracking branch 'origin/master' into develop
2023-02-02 18:18:26 +00:00
ziptyze
f7e69639b5
adding pi60 ( #19431 )
...
* updates to 1up product line
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-02-02 18:17:10 +00:00
QMK Bot
d2d640a6c8
Merge remote-tracking branch 'origin/develop' into xap
2023-02-02 03:32:31 +00:00
jpe230
49c912f9b4
QP: Correct rotation and offset when using LVGL ( #19713 )
...
Co-authored-by: Nick Brassel <nick@tzarc.org>
Co-authored-by: Joel Challis <git@zvecr.com>
2023-02-02 14:31:54 +11:00
QMK Bot
e02243635b
Merge remote-tracking branch 'origin/develop' into xap
2023-02-01 18:56:33 +00:00
QMK Bot
7717630390
Merge remote-tracking branch 'origin/master' into develop
2023-02-01 18:55:53 +00:00
adiabatic
8dc66867e2
zweihander-macos: Update keys, add capslock ( #19730 )
...
* Update to current Scroll Lock/Power names
* Replace `'` with `⇪`
2023-02-01 18:55:12 +00:00
QMK Bot
915a73c694
Merge remote-tracking branch 'origin/develop' into xap
2023-02-01 17:27:53 +00:00
QMK Bot
1c772eb618
Merge remote-tracking branch 'origin/master' into develop
2023-02-01 17:27:17 +00:00
a_marmot
ca8b4b8e30
[Keyboard] Add modded Razer Orbweaver with RP2040 ( #19711 )
...
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
2023-02-01 10:26:37 -07:00
QMK Bot
f1d6de8605
Merge remote-tracking branch 'origin/develop' into xap
2023-02-01 14:14:49 +00:00
QMK Bot
0ee48d287a
Merge remote-tracking branch 'origin/master' into develop
2023-02-01 14:14:10 +00:00
Patryk
252b041b97
add Mecx Labs mp1 macropad ( #19064 )
...
* add mecxlabs mp1 macropad
Co-authored-by: Joel Challis <git@zvecr.com>
2023-02-01 14:13:18 +00:00
QMK Bot
1e5eb9cc0d
Merge remote-tracking branch 'origin/develop' into xap
2023-01-31 01:02:53 +00:00
Joel Challis
944b6107e2
Fix midi after recent refactoring ( #19723 )
2023-01-31 01:02:17 +00:00
QMK Bot
734da53066
Merge remote-tracking branch 'origin/develop' into xap
2023-01-30 20:46:17 +00:00
Ryan
b867522f8c
Clean up Force NKRO in config.h ( #19718 )
2023-01-30 20:45:41 +00:00
QMK Bot
46ce115e6f
Merge remote-tracking branch 'origin/develop' into xap
2023-01-30 20:40:50 +00:00
Joel Challis
d84a7351ea
Strip out more of config_common ( #19722 )
2023-01-30 20:40:12 +00:00
QMK Bot
1d1b1e621b
Merge remote-tracking branch 'origin/develop' into xap
2023-01-30 19:04:14 +00:00
Nick Brassel
f6dd8dea2e
Remove usages of config_common.h from config.h files. ( #19714 )
2023-01-31 06:03:30 +11:00
QMK Bot
c694bb7ec6
Merge remote-tracking branch 'origin/develop' into xap
2023-01-30 18:37:56 +00:00
Ryan
2d843088a2
Normalise Swap Hands keycodes ( #19720 )
2023-01-30 18:37:19 +00:00
QMK Bot
d3de57dbc9
Merge remote-tracking branch 'origin/develop' into xap
2023-01-30 08:49:09 +00:00
QMK Bot
cc9520b7a0
Merge remote-tracking branch 'origin/master' into develop
2023-01-30 08:48:34 +00:00
Nick Brassel
e296d67146
Accumulate version.h generator flags. ( #19716 )
2023-01-30 08:47:46 +00:00
QMK Bot
5c9b49c9ff
Merge remote-tracking branch 'origin/develop' into xap
2023-01-30 07:56:55 +00:00
fauxpark
ef6505ad75
Merge remote-tracking branch 'upstream/master' into develop
2023-01-30 18:55:36 +11:00
QMK Bot
f015282a05
Merge remote-tracking branch 'origin/develop' into xap
2023-01-30 07:48:24 +00:00
Ryan
242b80c63f
Move MIDI code out of tmk_core ( #19704 )
2023-01-30 18:47:50 +11:00
QMK Bot
4ad663af8d
Merge remote-tracking branch 'origin/develop' into xap
2023-01-30 04:11:14 +00:00
Joel Challis
968cc1fe7b
Relocate diode direction definitions ( #19715 )
2023-01-30 15:10:40 +11:00