mirrors/qmk_userspace
1
0
Fork 1
mirror of https://github.com/qmk/qmk_userspace.git synced 2025-05-04 22:54:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions
4280 commits 1 branch 1 tag 12 MiB
Commit graph

4280 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
QMK Bot
cd3b6a6390 Merge remote-tracking branch 'origin/master' into develop 2023-10-27 08:23:43 +00:00
millet
6c5ba1d7a7 [Keyboard] doksin (#22220) 2023-10-27 01:23:02 -07:00
QMK Bot
a670499d12 Merge remote-tracking branch 'origin/master' into develop 2023-10-27 07:32:28 +00:00
gskygithub
6f81132c4d Add darkproject/kd87a_bfg_edition keyboard (#18981) 
Co-authored-by: gksygithub <106651989+gksygithub@users.noreply.github.com>
 2023-10-27 00:31:54 -07:00
4pplet
8ce864c037 [Keyboard] Add Waffling60 revision e (#21664) 
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2023-10-26 23:42:11 -07:00
QMK Bot
97bfa907a6 Merge remote-tracking branch 'origin/master' into develop 2023-10-27 06:40:57 +00:00
4pplet
3e25865039 [Keyboard] Waffling60 Rev E ANSI Hotswap (#22270) 
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
 2023-10-26 23:40:21 -07:00
QMK Bot
ad961f8409 Merge remote-tracking branch 'origin/master' into develop 2023-10-27 06:38:56 +00:00
khchen2004
afd9fbfe01 [Keyboard] add pisces pcb (#22334) 2023-10-26 23:38:22 -07:00
QMK Bot
cf200c60d1 Merge remote-tracking branch 'origin/master' into develop 2023-10-25 23:07:48 +00:00
Olivia J
b37d6f476d [Keyboard] Add LGBTKL (#22331) 
Co-authored-by: jack <0x6a73@protonmail.com>
 2023-10-25 17:07:00 -06:00
QMK Bot
e52d31a0c7 Merge remote-tracking branch 'origin/master' into develop 2023-10-23 18:13:13 +00:00
owlab-git
0ce1cc0a82 [Keyboard] Add QK100 (#21782) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2023-10-23 12:12:27 -06:00
QMK Bot
bf021b54e9 Merge remote-tracking branch 'origin/master' into develop 2023-10-23 18:10:35 +00:00
Yonghyuk Choi
374f40476b [Keyboard] Add purin (#22306) 2023-10-23 12:09:51 -06:00
Joel Challis
955445a74f Consolidate some EEPROM Driver configuration (#22321) 2023-10-23 00:37:27 +01:00
studiokestra
cfea20255b Rename LINE FRIENDS TKL keyboard (#22310) 2023-10-22 15:56:46 +01:00
QMK Bot
58a7e8bc79 Merge remote-tracking branch 'origin/master' into develop 2023-10-14 12:11:45 +00:00
Nick Brassel
348e79aad4 Fix typo in keychron v6 encoder map enable (#22272) 2023-10-14 23:10:55 +11:00
QMK Bot
26bf42e114 Merge remote-tracking branch 'origin/master' into develop 2023-10-14 07:04:36 +00:00
jukaie
1ba8dc38b2 [Keyboard] jukaie/jk01 (#20573) 
* ADD Keyboard

* Resolved requested changes

* update keymap.c file

* resolved requested changes

* updated info.json file

* Updated requested changes

* Delete JK01.h file

* Resolved requested changes

* Delete readme.md

* add rules.mk to default folder

* Upload default/keymap.c

* Add via/keymap.c

* Updated info.Json file

* Change VID in info.json

* Resolved requested changes

* Resolved requested changes.

* Resolved requested changes

* Updated changes

---------

Co-authored-by: gksygithub <gskyGit@gsky.com.tw>
 2023-10-14 00:03:29 -07:00
QMK Bot
9363787b9a Merge remote-tracking branch 'origin/master' into develop 2023-10-14 04:31:03 +00:00
MakotoKurauchi
42f86b4ade Enable encoder map on navpad1.0 (#22266) 2023-10-13 21:30:25 -07:00