QMK Bot
994a2542af
Merge remote-tracking branch 'origin/master' into develop
2022-08-09 18:21:11 +00:00
QMK Bot
badd575bd7
Merge remote-tracking branch 'origin/develop' into xap
2022-08-09 18:20:41 +00:00
mechlovin
94b3efe92e
change Adelais En Ciel rev. 3 from STM32F303 to APM32F103 MCU ( #16964 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-08-09 11:20:36 -07:00
QMK Bot
525049990c
Merge remote-tracking branch 'origin/master' into develop
2022-08-09 18:20:08 +00:00
mincedshon
336c4904b5
[Keyboard] add ecila keyboard ( #17596 )
2022-08-09 11:19:15 -07:00
zvecr
3fe1a931d7
Fix up OOB behaviour for get/set keycodes
2022-08-09 19:10:49 +01:00
zvecr
507d65eb1b
Strip more from embedded info.json
2022-08-09 19:10:49 +01:00
QMK Bot
0d5e0b05b9
Merge remote-tracking branch 'origin/develop' into xap
2022-08-09 17:41:40 +00:00
QMK Bot
25913ef518
Merge remote-tracking branch 'origin/master' into develop
2022-08-09 17:41:07 +00:00
yiancar
5de655023e
[Keyboard] Add NK20 ( #17907 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: yiancar <yiancar@gmail.com>
2022-08-09 10:40:32 -07:00
QMK Bot
181ee37dd1
Merge remote-tracking branch 'origin/develop' into xap
2022-08-09 06:42:26 +00:00
QMK Bot
6e1c2b20e5
Merge remote-tracking branch 'origin/master' into develop
2022-08-09 06:41:55 +00:00
Salicylic-acid3
923cd63f3e
[Keyboard] (7skb)Change number of LEDs and Enable Mouse Keys ( #17954 )
2022-08-08 23:41:10 -07:00
QMK Bot
881d5c9580
Merge remote-tracking branch 'origin/develop' into xap
2022-08-08 18:07:06 +00:00
QMK Bot
1d33baac8f
Merge remote-tracking branch 'origin/master' into develop
2022-08-08 18:06:29 +00:00
Joel Challis
0002b1cc20
Also disable line ending conversion for merge workflows ( #17953 )
2022-08-08 19:05:41 +01:00
QMK Bot
a3b06fd87c
Format code according to conventions ( #17951 )
2022-08-08 17:33:25 +01:00
QMK Bot
a14cd0fba5
Merge remote-tracking branch 'origin/master' into develop
2022-08-08 16:31:00 +00:00
Joel Challis
bccf933bc9
Force no git line ending conversion on format workflow ( #16176 )
2022-08-08 17:30:26 +01:00
QMK Bot
22cb4e520a
Merge remote-tracking branch 'origin/master' into develop
2022-08-08 09:46:27 +00:00
Vertex-kb
9a3c30f2c7
[Keyboard] Add Vertex AngleR2 keyboard ( #16764 )
...
* Add files via upload
* Delete Vertex/AngleR2 directory
* Add files via upload
* Delete keyboards/Vertex/AngleR2 directory
* Add files via upload
* Add files via upload
* Add files via upload
* Update keyboards/vertex/angler2/angler2.h
* Update keyboards/vertex/angler2/info.json
* Update keyboards/vertex/angler2/keymaps/default/keymap.c
* Update keyboards/vertex/angler2/keymaps/via/keymap.c
* Update keyboards/vertex/angler2/keymaps/via/keymap.c
* Update keyboards/vertex/angler2/keymaps/via/keymap.c
* Update keyboards/vertex/angler2/keymaps/default/keymap.c
* Update keyboards/vertex/angler2/keymaps/via/keymap.c
2022-08-08 02:45:36 -07:00
QMK Bot
c6dab0a3df
Merge remote-tracking branch 'origin/develop' into xap
2022-08-08 02:14:00 +00:00
Joel Challis
764c542bef
Remove tmk_core 'serial' code ( #17866 )
2022-08-08 03:13:16 +01:00
QMK Bot
f22e5e955a
Merge remote-tracking branch 'origin/develop' into xap
2022-08-07 21:11:57 +00:00
QMK Bot
972f9a612c
Merge remote-tracking branch 'origin/master' into develop
2022-08-07 21:11:17 +00:00
Arturo Avila
d27a6bd629
[Keyboard] Add Shisaku keyboard ( #17572 )
2022-08-07 14:10:32 -07:00
QMK Bot
0d6e799e4b
Merge remote-tracking branch 'origin/develop' into xap
2022-08-07 21:08:25 +00:00
QMK Bot
b214768e09
Merge remote-tracking branch 'origin/master' into develop
2022-08-07 21:07:55 +00:00
yeimialberth
ca04babf3f
[Keymap] qwerty and dvorak keyboard setup ( #16592 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-08-07 14:07:25 -07:00
QMK Bot
c1617a0951
Merge remote-tracking branch 'origin/develop' into xap
2022-08-07 19:41:25 +00:00
QMK Bot
6a1a398627
Merge remote-tracking branch 'origin/master' into develop
2022-08-07 19:40:49 +00:00
csc027
4267f0e0d4
csc027/keymap-updates ( #17881 )
...
* Reverted to most usable configuration for RDP usage.
* Added some HSV color definitions without the value portion to allow using the existing value.
* Switched to using HSV and HS color definitions.
* Added media keys to the convenience layer.
* Updated make rules to enable media keys.
* Cleaned up planck make rules.
2022-08-07 20:40:16 +01:00
QMK Bot
4eb1edce0d
Merge remote-tracking branch 'origin/develop' into xap
2022-08-07 19:34:13 +00:00
QMK Bot
67461a0a47
Merge remote-tracking branch 'origin/master' into develop
2022-08-07 19:33:39 +00:00
Takeshi ISHII
5ecd745514
fix comment space code in quantum/matrix_common.c ( #17942 )
2022-08-07 20:32:59 +01:00
QMK Bot
d2694da64d
Merge remote-tracking branch 'origin/develop' into xap
2022-08-07 13:02:16 +00:00
QMK Bot
6e7678c415
Merge remote-tracking branch 'origin/master' into develop
2022-08-07 13:01:43 +00:00
XScorpion2
034e266998
Rgbkb/keeb fixes ( #17932 )
...
* Disable console by default for better bios & reboot behavior
* Remove custom matrix
* Disable console by default for better bios & reboot behavior
* PR feedback
2022-08-07 14:01:10 +01:00
QMK Bot
fad4c6cf4c
Merge remote-tracking branch 'origin/develop' into xap
2022-08-07 12:58:16 +00:00
QMK Bot
9087e6ee28
Merge remote-tracking branch 'origin/master' into develop
2022-08-07 12:57:41 +00:00
Joel Challis
a6ea760c94
rgbkb/zen - Resolve CONVERT_TO_PROTON_C warnings ( #17619 )
2022-08-07 13:57:12 +01:00
QMK Bot
61443ae853
Merge remote-tracking branch 'origin/develop' into xap
2022-08-07 09:34:47 +00:00
QMK Bot
e8ff0d6ced
Merge remote-tracking branch 'origin/master' into develop
2022-08-07 09:34:18 +00:00
medoix
b9269bf689
[Keyboard] Dumbpad v1x_oled ( #17058 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-08-07 02:33:36 -07:00
QMK Bot
ec076fc3a7
Merge remote-tracking branch 'origin/develop' into xap
2022-08-07 09:31:32 +00:00
QMK Bot
4f3bf762f1
Merge remote-tracking branch 'origin/master' into develop
2022-08-07 09:30:52 +00:00
QMK Bot
8f000dfab9
Merge remote-tracking branch 'origin/develop' into xap
2022-08-07 09:30:19 +00:00
DUILCHOI
964ce931e2
[Keyboard] add fave104 ( #17909 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-08-07 02:30:18 -07:00
QMK Bot
5599f26667
Merge remote-tracking branch 'origin/master' into develop
2022-08-07 09:29:42 +00:00
yiancar
82a72fe815
[Keyboard] Add P01 ( #17921 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: yiancar <yiancar@gmail.com>
2022-08-07 02:28:46 -07:00
