Commit graph

20583 commits

Author SHA1 Message Date
Joel Challis
4f8cc32cf5
Extend 'qmk info' to handle keymap level overrides (#16702) 2022-03-21 11:57:41 +01:00
QMK Bot
6281446aee Merge remote-tracking branch 'origin/develop' into xap 2022-03-21 08:06:45 +00:00
QMK Bot
aea9005236 Merge remote-tracking branch 'origin/master' into develop 2022-03-21 08:06:10 +00:00
Takeshi ISHII
7eb6f86bc0
[Keyboard] add oled_task_kb() into keyboards/helix/rev2/rev2.c (#16697) 2022-03-21 01:05:38 -07:00
QMK Bot
0dba850d43 Merge remote-tracking branch 'origin/develop' into xap 2022-03-20 17:25:13 +00:00
QMK Bot
b19d7399ca Merge remote-tracking branch 'origin/master' into develop 2022-03-20 17:24:36 +00:00
Droxx
669ad3c805
Droxx keymap (#16607)
* add droxx kaymap

* add droxx keymap

* fixed config.h

* fixed rules.mk

* fixed rules.mk

* updated readme.md

* Update config.h

* Update keymap.c

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update config.h

* Update readme.md

* Update keymap.c
2022-03-20 17:24:09 +00:00
QMK Bot
9ad318efc6 Merge remote-tracking branch 'origin/develop' into xap 2022-03-20 17:06:57 +00:00
QMK Bot
9216dd3917 Merge remote-tracking branch 'origin/master' into develop 2022-03-20 17:06:27 +00:00
Alabahuy
1bc8793f83
Add Rart75 hotswap and support via (#16619)
* Add Keyboard Rart75 Hotswap version

* Update readme

* Update config and readme

* Update info.json

* update readme and keymaps
2022-03-20 17:05:56 +00:00
QMK Bot
c5e26a8040 Merge remote-tracking branch 'origin/develop' into xap 2022-03-20 17:03:48 +00:00
QMK Bot
4dae5ff37d Merge remote-tracking branch 'origin/master' into develop 2022-03-20 17:03:16 +00:00
Joshua Barber
6125f7bf4d
Add MutePad keyboard (Handwired) (#16590)
* Add MutePad keyboard

* Update info.json and readme

* Move mutepad to handwired folder

* Address PR comments
2022-03-20 17:02:46 +00:00
QMK Bot
9ed471fd33 Merge remote-tracking branch 'origin/develop' into xap 2022-03-20 04:20:44 +00:00
Ryan
cfe28937d5
MS Sculpt Mobile refactor (#16038) 2022-03-20 15:19:46 +11:00
zvecr
b365cbce15 Merge in keymap level to XAP info.json payload 2022-03-20 01:25:04 +00:00
QMK Bot
29f349b90b Merge remote-tracking branch 'origin/develop' into xap 2022-03-19 20:59:36 +00:00
QMK Bot
729d7c2b2e Merge remote-tracking branch 'origin/master' into develop 2022-03-19 20:59:03 +00:00
Ryan
2f095b8925
qmk.path.FileType: fix argument handling (#16693)
* qmk.path.FileType: pass in mode as first argument

* Better solution

* Grammar...
2022-03-19 20:58:30 +00:00
QMK Bot
ded6a379b2 Merge remote-tracking branch 'origin/develop' into xap 2022-03-19 17:42:45 +00:00
QMK Bot
223bc47658 Merge remote-tracking branch 'origin/master' into develop 2022-03-19 17:41:15 +00:00
Joel Challis
047ef3cd12
VUSB - Use correct endpoint poll for VIA (#16691) 2022-03-19 17:40:47 +00:00
QMK Bot
5df35467b4 Merge remote-tracking branch 'origin/develop' into xap 2022-03-19 16:38:46 +00:00
QMK Bot
5dcee0199e Merge remote-tracking branch 'origin/master' into develop 2022-03-19 16:38:09 +00:00
leviport
3502bbbd16
Fix typo in docs/ref_functions.md (#16690) 2022-03-19 16:37:35 +00:00
QMK Bot
8dfe1134cf Merge remote-tracking branch 'origin/develop' into xap 2022-03-19 11:53:39 +00:00
QMK Bot
32d6c122e9 Merge remote-tracking branch 'origin/master' into develop 2022-03-19 11:53:10 +00:00
Ryan
e354cbe782
device_ver -> device_version for some more boards (#16685) 2022-03-19 11:52:40 +00:00
QMK Bot
dd2c2bfa97 Merge remote-tracking branch 'origin/develop' into xap 2022-03-19 11:52:33 +00:00
QMK Bot
98e783cc3c
Format code according to conventions (#16686) 2022-03-19 11:52:03 +00:00
QMK Bot
3cb3d5b0c9 Merge remote-tracking branch 'origin/develop' into xap 2022-03-19 06:57:50 +00:00
Ryan
9ee2effe8e
HD44780 driver rework (#16370) 2022-03-19 17:57:22 +11:00
QMK Bot
b73f5d3da6 Merge remote-tracking branch 'origin/develop' into xap 2022-03-19 06:53:44 +00:00
QMK Bot
86b5c6b5c3 Merge remote-tracking branch 'origin/master' into develop 2022-03-19 06:53:09 +00:00
stanrc85
06b6729b16
[Keymap] Update some code and keyboard rules (#16680) 2022-03-18 23:52:33 -07:00
zvecr
70c9905cb6 clang 2022-03-18 21:43:01 +00:00
zvecr
a5204887a8 maybe vusb 2022-03-18 21:37:23 +00:00
zvecr
c27edf4e64 vusb prep 2022-03-18 20:23:28 +00:00
zvecr
aaf4fcbe5a Merge chibios support 2022-03-18 19:51:20 +00:00
QMK Bot
b73a0b14aa Merge remote-tracking branch 'origin/develop' into xap 2022-03-18 18:50:26 +00:00
QMK Bot
c39eeaa1c8 Merge remote-tracking branch 'origin/master' into develop 2022-03-18 18:49:56 +00:00
Drashna Jaelre
61c644f6d0
[Keyboard] Update Tractyl Manuform config files (#16684) 2022-03-18 11:49:22 -07:00
QMK Bot
aff373bab2 Merge remote-tracking branch 'origin/develop' into xap 2022-03-18 17:25:53 +00:00
QMK Bot
a900f9251a Merge remote-tracking branch 'origin/master' into develop 2022-03-18 17:25:20 +00:00
Florian
773242503c
annepro2: Add more LED functionalities to default-layer-indicators (#16676) 2022-03-18 17:24:43 +00:00
zvecr
4d4b013e5b Fixup after merge 2022-03-18 17:03:54 +00:00
zvecr
5bb6173cc7 Fixup after merge 2022-03-18 17:01:02 +00:00
zvecr
e5e1e54f39 Merge remote-tracking branch 'origin/develop' into xap 2022-03-18 16:57:34 +00:00
QMK Bot
3a08deb7fe Merge remote-tracking branch 'origin/master' into develop 2022-03-18 16:02:57 +00:00
Joel Challis
ed773ab73c
Relocate CLI git interactions (#16682) 2022-03-18 16:02:24 +00:00