Commit graph

4303 commits

Author SHA1 Message Date
zvecr
24cb3290f8 Merge remote-tracking branch 'origin/master' into develop 2023-12-04 13:58:34 +00:00
yiancar
3974aaa2b5 Add EE-AT and move W1-AT under geonworks (#22526)
* Add EE-AT and move W1-AT under geonworks
Co-authored-by: yiancar <yiancar@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-12-04 09:07:37 +00:00
yiancar
266ee77f8e Add Event Horizon Keyboard (#22515)
Co-authored-by: yiancar <yiancar@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-12-04 08:57:28 +00:00
Joel Challis
5df6faf2d6 Initial support for CSTM65 (#22513) 2023-12-04 03:07:14 +00:00
QMK Bot
935448170b Merge remote-tracking branch 'origin/master' into develop 2023-12-01 10:07:56 +00:00
yuezp
45b59fc4c5 add keyboard bestway (#22498)
Co-authored-by: “yuezp” <“yuezpchn@126.com”>
2023-12-01 02:07:28 -08:00
Ryan
e102b2c714 keycapsss/plaid_pad: switch to encoder map (#22474) 2023-11-30 10:19:17 +11:00
Álvaro A. Volpato
7dd16407e7 Add Smith and Rune Magnus (#22153)
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-11-28 23:47:08 -08:00
Álvaro A. Volpato
e76dd0ebe0 Add Magnum Ergo 1 by dark (#22139)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-11-28 23:46:15 -08:00
Alabahuy
502ce99006 add tokki (#22463)
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-11-28 19:32:58 -08:00
Nick Brassel
7f200c5ef0 develop -> master, 2023q4 edition 2023-11-28 16:40:47 +11:00
Drashna Jaelre
8ec340381a Fix missed shutdown callbacks (#22549) 2023-11-27 15:39:17 +11:00
Drashna Jaelre
2dc5153f57 Improve and Cleanup Shutdown callbacks (#21060)
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
2023-11-26 22:59:18 +11:00
QMK Bot
5873dc6fb0 Merge remote-tracking branch 'origin/master' into develop 2023-11-22 22:13:48 +00:00
gskygithub
438905c00b [Keyboard] darkproject/kd83a_bfg_edition (#18416)
* Add files via upload

* [keyboard]

* [Keyboard]

* Delete flash_spi.c

* Delete flash_spi.h

* Delete wb32_spi_master.c

* Delete wb32_spi_master.h

* [Keyboard]

* Resolved requested changes

* Resolved requested changes

* Changed rules.mk file accordingly.

* Resolved changes accordingly.

* Update config.h file and rules.mk file

* Removed eeprom_flash.c file

* Update default/keymap.c file

* Delete keyboards/darkproject/kd83a_bfg_edition directory

* Add keyboard

* Add keyboard

* Delete darkproject/kd83a_bfg_edition directory

* Resolved Changes

* Resolved requested changes

* keyboard

* Add keyboard

* Delete keyboard

* Add keyboard

* Delete keyboards/darkproject/kd87a_bfg_edition directory

* update keymap.c file

* update via/keymap.c, config.h and kd83a_bfg_edition.c files

* Delete keymap.c

* Update via/keymap.c, config.h and kd83a_bfg_edition.c files

* update config.h file

* update keymap.c file

* update keymap.c file

* update config.h

* update kd83a_bfg_edition.c

* Resolved requested changes.

* Delete folder which was added accidentally.

* Update keyboards/darkproject/kd83a_bfg_edition/config.h

* Update keyboards/darkproject/kd83a_bfg_edition/keymaps/via/keymap.c

* Update keyboards/darkproject/kd83a_bfg_edition/keymaps/via/keymap.c

* Update keyboards/darkproject/kd83a_bfg_edition/keymaps/via/keymap.c

* Update keyboards/darkproject/kd83a_bfg_edition/keymaps/via/keymap.c

* Update keyboards/darkproject/kd83a_bfg_edition/info.json

* Update keyboards/darkproject/kd83a_bfg_edition/rules.mk

* Update keyboards/darkproject/kd83a_bfg_edition/info.json

* update info.json file

* update config.h file

* Updated requested changes

* update readme.md

* Resolved requested changes

* Update info.json file

* Delete kd83a_bfg_edition.h

* Delete readme.md in default folder

* Update info.json file

* update info.json

* Updated changes

* Updated changes

* Resolved requested changes

* Resolved requested changes
2023-11-22 14:13:16 -08:00
QMK Bot
3d51e3e001 Merge remote-tracking branch 'origin/master' into develop 2023-11-16 16:54:46 +00:00
leyew
7c37c6c440 [Keyboard] Add dnworks 997pt3 (#22466)
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-11-16 09:54:13 -07:00
QMK Bot
5e042b21e0 Merge remote-tracking branch 'origin/master' into develop 2023-11-14 08:11:41 +00:00
leyew
ac0c4d85e9 [Keyboard] Add Eden (#22467)
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-11-14 01:11:12 -07:00
QMK Bot
b10b82fe03 Merge remote-tracking branch 'origin/master' into develop 2023-11-14 01:49:49 +00:00
cole smith
005244a254 Bs equals (#21690)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: jack <0x6A73@pm.me>
2023-11-14 12:49:15 +11:00
QMK Bot
2394e2d8db Merge remote-tracking branch 'origin/master' into develop 2023-11-11 19:08:55 +00:00
jonylee@hfd
acdb207414 add 5087 keyboard (#20557)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2023-11-11 11:08:26 -08:00
QMK Bot
c318512c01 Merge remote-tracking branch 'origin/master' into develop 2023-11-10 21:39:30 +00:00
Maria
52f854102d [Keyboard] Add MariOrion v2.5 (#22273)
* Pushed MariOrion v2.5 to the branch. Prod and proto version added.

* Pushed MariOrion v2.5 to the branch. Prod and proto version added.

* Proper addition of layout options

Addition of split bs rshift tsangan layout options.

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

* Merge branch 'toril940mariorion_v25' of github.com:toril940/qmk_firmware into toril940mariorion_v25

* Merge branch 'toril940mariorion_v25' of github.com:toril940/qmk_firmware into toril940mariorion_v25

* Update keyboards/mariorion_v25/proto/keymaps/via/keymap.c

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

* Update keyboards/mariorion_v25/proto/keymaps/default/keymap.c

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

* Updated readme.md with more information regarding make commands, and proto vs prod.

* Update keyboards/mariorion_v25/prod/keymaps/via/keymap.c

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

* Update keyboards/mariorion_v25/prod/keymaps/default/keymap.c

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

* Update keyboards/mariorion_v25/prod/info.json

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

* Amended some changes to info.json - community layouts changed from scope to array.

* Update keyboards/mariorion_v25/readme.md

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

* Revert keyboards/gray_studio/think65/solder/solder.c

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

* Revert keyboards/gray_studio/think65/solder/solder.c

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

* Revert keyboards/gray_studio/think65/solder/solder.c

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

* Removed via.json from the via keymaps. Replaced with matrix_diagram.md. via.json file moved off to [public mariorion_v25 repo](https://github.com/toril940/orion-v25)

* Revert keyboards/gray_studio/think65/solder/solder.c

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

* Removed via.json from the via keymaps. Replaced with matrix_diagram.md. via.json file moved off to [public mariorion_v25 repo](https://github.com/toril940/orion-v25)

* Update keyboards/mariorion_v25/proto/info.json

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

* Update keyboards/mariorion_v25/rules.mk

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

* Update keyboards/mariorion_v25/proto/info.json

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

* Update keyboards/mariorion_v25/proto/info.json

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

* Update keyboards/mariorion_v25/proto/info.json

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

* Update keyboards/mariorion_v25/prod/info.json

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

* Update keyboards/mariorion_v25/prod/info.json

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

* Update keyboards/mariorion_v25/prod/info.json

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

* Update keyboards/mariorion_v25/prod/info.json

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

* Revert keyboards/gray_studio/think65/solder/solder.c

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

* Update keyboards/mariorion_v25/matrix_diagram.md

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

* Update keyboards/mariorion_v25/readme.md

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

* Update keyboards/mariorion_v25/readme.md

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

* Update keyboards/mariorion_v25/readme.md

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

* Update keyboards/mariorion_v25/readme.md

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

* Update keyboards/mariorion_v25/readme.md

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

* Update keyboards/mariorion_v25/proto/mariorion_v25.c

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

* Update keyboards/mariorion_v25/prod/mariorion_v25.c

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

* Pushed new info.json and keymap.c files.

* Pushed new info.json and keymap.c files.

* Fixes to LED driver wrt PWM definitions with STM.

* Update keyboards/mariorion_v25/prod/keymaps/via/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/mariorion_v25/prod/keymaps/via/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/mariorion_v25/prod/info.json

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/mariorion_v25/prod/mariorion_v25.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/mariorion_v25/proto/info.json

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/mariorion_v25/proto/config.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/mariorion_v25/proto/mariorion_v25.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/mariorion_v25/proto/mariorion_v25.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/mariorion_v25/proto/keymaps/via/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/mariorion_v25/proto/keymaps/via/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Committing a details update to readme.md.

* Committing a details update to readme.md.

* Update keyboards/mariorion_v25/prod/config.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/mariorion_v25/prod/mariorion_v25.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Revert "Committing a details update to readme.md."

This reverts commit 068a82a1fcf1996d87f7f97a10e9f5fbbee79a29.

* Committing a details update to readme.md.

* Update keyboards/mariorion_v25/halconf.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/mariorion_v25/mcuconf.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/mariorion_v25/prod/config.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/mariorion_v25/proto/config.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/mariorion_v25/halconf.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Production pictures replacing the standard ones in the readme.md :)

* waffle87 requests bundled:
- Licence headers added
- Codeblocked matrix_diagram.md
- Consolidated files where possible
- Removed excess from config.h

---------

Co-authored-by: toril940 <anastasialucas940@hotmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-11-10 14:39:00 -07:00
QMK Bot
a89a9ea6f7 Merge remote-tracking branch 'origin/master' into develop 2023-11-10 16:42:45 +00:00
ploopyco
7d99a1ebd7 Add Ploopy Madromys mouse (#21989)
Added PloopyCo madromys/adept mouse
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-11-10 16:42:15 +00:00
QMK Bot
64685f05ae Merge remote-tracking branch 'origin/master' into develop 2023-11-09 19:57:44 +00:00
temp4gh
acb2e06024 [Keyboard] Add alpaca/wfeclipse (#22230)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-11-09 12:57:14 -07:00
QMK Bot
7f8a6c24d0 Merge remote-tracking branch 'origin/master' into develop 2023-11-09 17:54:10 +00:00
gregandcin
3947a5a292 Update gregandcin/teaqueen (#22402) 2023-11-09 09:53:35 -08:00
QMK Bot
9c8ab10674 Merge remote-tracking branch 'origin/master' into develop 2023-11-08 21:01:27 +00:00
Fredrik A. Kristiansen
ae8dffc8a2 Add iso85k keyboard (#22411)
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-11-08 13:00:48 -08:00
Jeayo Keh
42cfc3d3e1 [Keyboard] Rename soda/{mango,pocket} (#22151)
Co-authored-by: Joel Challis <git@zvecr.com>
2023-11-08 10:45:24 -07:00
Less/Rikki
ebe0ee8beb feat(mechwild/clunker): new layouts (#22342) 2023-11-08 10:41:38 -07:00
QMK Bot
7bc1410c69 Merge remote-tracking branch 'origin/master' into develop 2023-11-08 17:41:02 +00:00
Kelwin0313
d5d84089f2 [Keyboard] Add PCB Utopia88 (#22257) 2023-11-08 10:40:28 -07:00
QMK Bot
09a357b01c Merge remote-tracking branch 'origin/master' into develop 2023-11-08 02:18:54 +00:00
Ming-Gih Lam
0ce692e961 Red Herring PCB support (#22409)
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-11-07 18:18:09 -08:00
Logan Butler
73f7a8b157 [Keyboard] matchstickworks/southpad - Move files to rev1, add rev2 (#21574)
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-10-31 20:12:20 -07:00
QMK Bot
12c02b7747 Merge remote-tracking branch 'origin/master' into develop 2023-11-01 00:41:08 +00:00
era
0f98a6a2da [Keyboard] Add Klein_SD (#22371)
Co-authored-by: Joel Challis <git@zvecr.com>
2023-10-31 18:40:25 -06:00
QMK Bot
92b565d7d5 Merge remote-tracking branch 'origin/master' into develop 2023-11-01 00:18:27 +00:00
gregandcin
3cc48f5dd1 [Keyboard] Add TeaQueen (#22352)
Co-authored-by: jack <0x6a73@protonmail.com>
2023-10-31 18:17:43 -06:00
QMK Bot
acfc9dee79 Merge remote-tracking branch 'origin/master' into develop 2023-10-31 01:52:15 +00:00
Matt Chan
899b69638e Add Kindakeyboards Conone65 Via support (#22320) 2023-10-31 01:51:29 +00:00
QMK Bot
85c808f70e Merge remote-tracking branch 'origin/master' into develop 2023-10-28 20:28:40 +00:00
yuezp
e9e729a11e [Keyboard] add enter67 keyboard (#22346)
Co-authored-by: “yuezp” <“yuezpchn@126.com”>
2023-10-28 13:28:03 -07:00
QMK Bot
3aa7b6e7ee Merge remote-tracking branch 'origin/master' into develop 2023-10-27 18:40:52 +00:00
Felix Jen
26cf479a6c [Keyboard] Add Velvet hotswap & solder (#22284) 2023-10-27 12:40:18 -06:00