Commit graph

27905 commits

Author SHA1 Message Date
QMK Bot
9536b86a09 Merge remote-tracking branch 'origin/master' into develop 2024-07-04 19:50:25 +00:00
Ryan Neff
4ced8d9371
Fixes duplicate pid/vid for sofle_choc (#24030) 2024-07-04 13:49:55 -06:00
QMK Bot
9adac59c29 Merge remote-tracking branch 'origin/master' into develop 2024-07-04 02:42:11 +00:00
Cipulot
1c6cdb8d74
[Keyboard] Addition of EC 60X (#24028)
* Addition of EC 60X

* Update keyboards/cipulot/ec_60x/keymaps/via/keymap.c

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/cipulot/ec_60x/keymaps/default/keymap.c

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/cipulot/ec_60x/keyboard.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/cipulot/ec_60x/keyboard.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/cipulot/ec_60x/keyboard.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/cipulot/ec_60x/keyboard.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Revert "Update keyboards/cipulot/ec_60x/keyboard.json"

This reverts commit 5f49ef63cdcc4ff99d8056b243d255fd9b30420c.

* Revert "Update keyboards/cipulot/ec_60x/keyboard.json"

This reverts commit 5fb9706acd7bcd40f60edfe2d8c46bffc460ee5e.

* revert of what was done with the layouts

* Update keyboards/cipulot/ec_60x/mcuconf.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

---------

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2024-07-03 20:42:07 -06:00
chalex
c663f5e9f3
[Keyboard] Add chlx lfn merro (#24026)
* add previous working files to new branch

* update config files. tested via version

* update per qmk PR requested changes - 1. rename info.json -> keyboard.json, move config.h -> keyamps/via/config.h, remove rules.mk

* update photo link for pcb

* remove redundant community keymaps

* Update keyboards/chlx/lfn_merro60/keymaps/default/keymap.c

correct keycode for iso keys

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* switch image url to source from imgur instead of github

---------

Co-authored-by: chalex <alejandrelee+magbogbro@gmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2024-07-03 20:40:24 -06:00
QMK Bot
32ec677d8d Merge remote-tracking branch 'origin/master' into develop 2024-07-04 02:39:15 +00:00
Guanzhong Chen
977918982d
monsgeek/m5: make numlock and capslock LEDs work (#24027) 2024-07-03 20:38:38 -06:00
Will Hedges
26c114a2b4
[keyboard] added bear_face/v3 (#24032)
* added keyboard.json, default, default_iso, and keymap READMEs
2024-07-03 20:38:03 -06:00
QMK Bot
17c6744c82 Merge remote-tracking branch 'origin/master' into develop 2024-07-04 02:34:47 +00:00
James Gzowski
c2f7974c8e
[Keyboard] Add Ashwing66 (#24031)
* Create hello.txt

* Add files via upload

* Create keymap.c

* Ashwing66

* Update readme.md

* Update keymap.c

* Ashwing66 addition

* Ashwing66 addition

* Changes as per request

* Changes as per request

* Changes as per request, Updated repo, fixed filenames

* 02-Jul-11:04:08
2024-07-03 20:34:17 -06:00
Drashna Jaelre
bdca9318f9
Change suspend condition check order on ChibiOS (#24020) 2024-07-04 12:13:00 +10:00
DavidSannier
e07f752a57
[build_test] set CONSOLE_ENABLE=yes if DEBUG > 0 (#23097) 2024-07-04 00:15:44 +01:00
QMK Bot
eed2a74be9 Merge remote-tracking branch 'origin/master' into develop 2024-07-03 12:01:26 +00:00
Nick Brassel
bc8ac86422
Minimum python version listing. (#23989) 2024-07-03 22:00:53 +10:00
QMK Bot
ce9edc94e5 Merge remote-tracking branch 'origin/master' into develop 2024-07-03 10:32:19 +00:00
Ryan
33adb8cba0
vertex/arc60h: add additional layouts (#24023) 2024-07-03 20:31:49 +10:00
QMK Bot
a400c332d2 Merge remote-tracking branch 'origin/master' into develop 2024-07-03 08:46:37 +00:00
kopibeng
e754c9f2b4
Update keymap for KLC x TGR Lena (#23688) 2024-07-03 01:38:57 -07:00
Ryan
f8596b40a4
Normalise mouse keycodes (#23975) 2024-07-03 18:35:54 +10:00
Ryan
bc0c69570b
Rename encoder pins defines (#24003) 2024-07-03 17:18:27 +10:00
QMK Bot
8471dcc563 Merge remote-tracking branch 'origin/master' into develop 2024-07-02 21:35:55 +00:00
Cipulot
869b7d9ae6
Fix index EC Dolice (#24033)
* Update keyboard.json

Fixed wrong index in keyboard.json

* Small touch layout
2024-07-02 15:35:26 -06:00
Nick Brassel
7bc3eef8cc
SPI flash API cleanup, add async erase capability. (#23894) 2024-07-02 10:16:41 +10:00
QMK Bot
641a1ce568 Merge remote-tracking branch 'origin/master' into develop 2024-06-30 02:40:18 +00:00
Joel Challis
3ffe8d917a
Fix 'qmk new-keyboard' processing of development_board (#23996) 2024-06-30 03:39:49 +01:00
QMK Bot
e8e5d11ed8 Merge remote-tracking branch 'origin/master' into develop 2024-06-30 01:58:04 +00:00
Danylo Kondratiev
12379dc1eb
Fix ploopy Adept/Madromys link (#24018) 2024-06-30 02:57:35 +01:00
Joel Challis
0947299864
Remove custom keycodes from nullbitsco/snap (#24017) 2024-06-29 14:25:24 +01:00
QMK Bot
bd5da148ec Merge remote-tracking branch 'origin/master' into develop 2024-06-29 10:57:00 +00:00
Ryan
d6bfbdb6b1
horrortroll/handwired_k552: fix RGB Matrix LED config (#24014) 2024-06-29 20:56:29 +10:00
QMK Bot
3e4159bc55 Merge remote-tracking branch 'origin/master' into develop 2024-06-29 09:27:40 +00:00
Ryan
cc0b2f9814
jels/boaty: adjust layout name (#24013) 2024-06-29 10:20:11 +01:00
Ryan
5624804c68
h0oni/deskpad and hotduck: adjust layout names (#24004) 2024-06-29 10:19:51 +01:00
Joel Challis
38f72c5d2b
Relocate xelus/pachi/rgb/rev2 VIA logic (#24016) 2024-06-29 10:17:47 +01:00
Joel Challis
07253bfe4a
Relocate work_louder VIA logic (#24011) 2024-06-29 09:33:20 +01:00
QMK Bot
62f81cfcc3 Merge remote-tracking branch 'origin/master' into develop 2024-06-29 06:55:21 +00:00
Ryan
2bde8ce206
ez_maker: adjust layout names (#24015) 2024-06-29 07:54:52 +01:00
QMK Bot
b94f70d642 Merge remote-tracking branch 'origin/master' into develop 2024-06-29 06:00:35 +00:00
Ryan
086e8e938e
tzarc/djinn: adjust layout name (#24012) 2024-06-29 16:00:05 +10:00
Ryan
af8fe44e0f
atreus: misc cleanups (#24010) 2024-06-29 05:50:08 +01:00
Joel Challis
7bc53b8baa
Relocate m256ws VIA logic (#24009) 2024-06-29 04:20:08 +01:00
Joel Challis
9ca1f35333
Relocate winry315 VIA logic (#24008) 2024-06-29 04:16:52 +01:00
QMK Bot
2998d20a00 Merge remote-tracking branch 'origin/master' into develop 2024-06-29 03:08:12 +00:00
Ryan
cd374b1500
clueboard/card: Swap layout and alias (#24007) 2024-06-29 04:07:42 +01:00
Joel Challis
be7728ae58
Relocate m256wh VIA logic (#24006) 2024-06-29 03:36:28 +01:00
QMK Bot
ffd9062190 Merge remote-tracking branch 'origin/master' into develop 2024-06-27 17:39:02 +00:00
Danny
9d02ac37f7
Add Nyquist Rev. 5 (#23971)
* Add Nyquist Rev. 5

* Remove unused keymap
2024-06-27 13:37:41 -04:00
Dasky
a7aa58cc81
Change ADNS9800 and PMW33XX SROM uploads to opt in. (#24001)
Make SROM upload optional
2024-06-27 05:10:13 +01:00
QMK Bot
276ecd4693 Merge remote-tracking branch 'origin/master' into develop 2024-06-27 03:56:17 +00:00
David Hoelscher
603586800c
[Keyboard] Add Elysian (#23949)
* adding Elysian

* corrections from zvecr
2024-06-26 21:56:16 -06:00