Commit graph

20413 commits

Author SHA1 Message Date
QMK Bot
d5b6b82361 Merge remote-tracking branch 'origin/develop' into xap 2022-03-16 03:15:37 +00:00
QMK Bot
d802e1c805 Merge remote-tracking branch 'origin/master' into develop 2022-03-16 03:15:02 +00:00
QMK Bot
1bb00c1609 Merge remote-tracking branch 'origin/develop' into xap 2022-03-16 03:14:32 +00:00
Yakbats
a867cfc26d
Update the AL1 Vender ID (#16660)
* Add via to AL1

* Updated number of rows and columns, and applied suggestions from code review

* Update Vender ID

Change the Vender ID for Triangle Lab to comply with the via PR checklist.
2022-03-16 03:14:31 +00:00
QMK Bot
db6d432d6a Merge remote-tracking branch 'origin/master' into develop 2022-03-16 03:13:51 +00:00
AnthonyNguyen168
fded67f1a9
[MB-65S] Change layout to follow change request from OEM (#16663) 2022-03-16 03:13:14 +00:00
zvecr
52d3b9dcc5 fix up for pytest 2022-03-16 00:10:40 +00:00
QMK Bot
cddcd8d735 Merge remote-tracking branch 'origin/develop' into xap 2022-03-16 00:07:59 +00:00
QMK Bot
b2e870e4a2 Merge remote-tracking branch 'origin/master' into develop 2022-03-16 00:07:19 +00:00
an_achronism
f6f4d85aa5
yugo_m enhancement: include all available key positions (#16216)
* yugo_m enhancement to include all available key positions in matrix
2022-03-15 17:06:27 -07:00
zvecr
7e8f0d49ea Temp bodge for unit tests? 2022-03-15 23:57:59 +00:00
QMK Bot
7183516a2b Merge remote-tracking branch 'origin/develop' into xap 2022-03-15 23:28:59 +00:00
QMK Bot
919df5934b Merge remote-tracking branch 'origin/master' into develop 2022-03-15 23:28:31 +00:00
Joel Challis
8bffc61959
Ensure dependent CI workflows run (#16662) 2022-03-15 23:27:55 +00:00
QMK Bot
d37ed07c47 Merge remote-tracking branch 'origin/master' into develop 2022-03-15 22:58:50 +00:00
Moritz
77aafd8056
[Keyboard] Add Dolice keyboard (#16186) 2022-03-15 15:58:16 -07:00
QMK Bot
8e1f505ab2 Merge remote-tracking branch 'origin/master' into develop 2022-03-15 22:49:10 +00:00
Tom Konidas
a808c29726
[Keymap] Planck Keymap: tomkonidas (#15869) 2022-03-15 15:48:13 -07:00
zvecr
2b4724bd83 Convert info_json_gz.h generation to CLI 2022-03-15 17:59:12 +00:00
QMK Bot
5f817a1d7f Merge remote-tracking branch 'origin/master' into develop 2022-03-15 13:57:46 +00:00
Ryan
764dc18a81
Remove NO_ACTION_MACRO and NO_ACTION_FUNCTION from keyboard config.h (#16655) 2022-03-15 13:56:58 +00:00
zvecr
b96b862ef9 Merge remote-tracking branch 'origin/develop' into xap 2022-03-15 13:27:35 +00:00
QMK Bot
872b521e4f Merge remote-tracking branch 'origin/master' into develop 2022-03-15 12:50:04 +00:00
Joel Challis
46e85ded47
Add merge workflow for XAP branch (#16652)
* Add merge workflow for XAP branch

* uncomment
2022-03-15 12:49:23 +00:00
QMK Bot
3315894269 Merge remote-tracking branch 'origin/master' into develop 2022-03-15 09:35:53 +00:00
jack
e9bf95e0f2
[Keyboard] Fix westm/westm68 compliation errors (#16657) 2022-03-15 02:35:17 -07:00
QMK Bot
1335d205f4 Merge remote-tracking branch 'origin/master' into develop 2022-03-15 08:35:53 +00:00
jpuerto96
e94c2df3f3
[Keyboard] Io mini1800 (#16115)
* First commit

* first commit

* 2x3u layout functional

* 625u layout

* rotary encoder

* Modifications to keymaps

* Remove ingrained from io_mini branch

* Update readme

* Update info.json

* change hardware availability

* Change rules.mk wording to match other PR

* Update keyboards/io_mini1800/rules.mk

* Update keyboards/io_mini1800/keymaps/default/keymap.c

* Update keyboards/io_mini1800/keymaps/2x3u/keymap.c

* Update keyboards/io_mini1800/io_mini1800.c

* Update keyboards/io_mini1800/keymaps/2x3u/readme.md

* Update keyboards/io_mini1800/readme.md
2022-03-15 01:35:11 -07:00
QMK Bot
037c5b5496 Merge remote-tracking branch 'origin/master' into develop 2022-03-15 08:31:53 +00:00
Albert Y
9aaf4a5a9b
Add split keyboard example for Bootmagic Lite (#16349)
* Add split keyboard example for bootmagic lite

* Add handedness link

* Edit sentence structure

* Apply suggested language correction
2022-03-15 01:31:17 -07:00
QMK Bot
af5fe7fb75 Merge remote-tracking branch 'origin/master' into develop 2022-03-15 08:30:10 +00:00
PaperCraneKeyboards
92a9e7c50b
[Keyboard] Adding Gerald65 (#15872)
* Gerald65 new keyboard files

* removing initial population of pck

* Initial Gerald65 Keyboard files

* Changed diode direction

* added fn layer, added picture to readme

* directed mo keycode to fn layer

* Changes to vendor id and bootloader instructions

* Changed to direct image reference

* Update keyboards/papercranekeyboards/gerald65/readme.md

* Remove no longer used features
2022-03-15 01:29:35 -07:00
QMK Bot
38a257e666 Merge remote-tracking branch 'origin/master' into develop 2022-03-15 07:28:59 +00:00
thompson-ele
87bb1a3890
[Keyboard] Add Bacca70 keyboard (#16626)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-03-15 00:28:21 -07:00
QMK Bot
e784dc79a6 Merge remote-tracking branch 'origin/master' into develop 2022-03-15 04:03:24 +00:00
jack
1ef4e305e3
Fix evancookaudio/sleepingdinosaur (#16654) 2022-03-15 15:02:49 +11:00
QMK Bot
34ce1353f1 Merge remote-tracking branch 'origin/master' into develop 2022-03-15 04:01:31 +00:00
jack
36ddb567cc
[Keyboard] Fix mechlovin/kay65 (#16653) 2022-03-14 21:00:57 -07:00
QMK Bot
e9783df2c5 Merge remote-tracking branch 'origin/master' into develop 2022-03-15 03:56:19 +00:00
Pear
5e5047f071
[Keyboard westm68 rev1 and fine tune westm boards (#16528)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-03-14 20:55:33 -07:00
QMK Bot
4be80cadac Merge remote-tracking branch 'origin/master' into develop 2022-03-15 01:57:00 +00:00
evanmcook
04826d1aa1
[Keyboard] evancookaudio sleepingdinosaur v2 (#16625) 2022-03-14 18:56:27 -07:00
Ryan
2d9c3f9a89
Add SN74x154 driver and convert AL1 custom matrix (#16331) 2022-03-15 11:38:53 +11:00
QMK Bot
588abd24b5 Merge remote-tracking branch 'origin/master' into develop 2022-03-15 00:24:37 +00:00
mechlovin
7fde309799
[Keyboard] Add Kay65 PCB by Team Mechlovin' (#15565)
* add kay65 PCB

* update

* update

* Update readme.md

* Update keyboards/mechlovin/kay65/rev1/rules.mk

* Update keyboards/mechlovin/olly/jf/rules.mk

* Update keyboards/mechlovin/kay65/rev1/rules.mk

* Update keyboards/mechlovin/kay65/rev1/info.json

* Update keymap.c

* update

* Update keyboards/mechlovin/kay65/rev1/rev1.h

* Update keyboards/mechlovin/kay65/rev1/info.json

* Update keyboards/mechlovin/kay65/rev1/info.json

* Update keyboards/mechlovin/kay65/rev1/rules.mk

* Update keymap.c

* Update readme.md

* Update keyboards/mechlovin/olly/jf/readme.md

* Update keyboards/mechlovin/kay65/rev1/config.h
2022-03-14 17:23:57 -07:00
QMK Bot
9e39b99a0e Merge remote-tracking branch 'origin/master' into develop 2022-03-14 22:21:34 +00:00
ethsol
a939adb55c
Sentence correction (#16650) 2022-03-14 22:20:50 +00:00
QMK Bot
6f98a67eda Merge remote-tracking branch 'origin/master' into develop 2022-03-14 22:06:16 +00:00
Yakbats
6c11579876
[Keyboard] Add via keymap to AL1 (#16499) 2022-03-14 15:05:39 -07:00
Stefan Kerkmann
7e669421f8
Rename TICK to TICK_EVENT to prevent naming conflicts (#16649) 2022-03-14 20:06:21 +00:00