QMK Bot
4a98466ef3
Merge remote-tracking branch 'origin/master' into develop
2023-11-10 21:39:30 +00:00
Maria
6876fbe51d
[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
2d7746609f
Merge remote-tracking branch 'origin/master' into develop
2023-11-10 16:42:45 +00:00
ploopyco
38d6e9a75a
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
Ryan
8136cf4bfb
LED drivers: clean up SWx
/CSy
pullup/down resistor config ( #22381 )
2023-11-10 08:39:15 +11:00
QMK Bot
6b19a99a4f
Merge remote-tracking branch 'origin/master' into develop
2023-11-09 19:57:44 +00:00
temp4gh
aee2a9d696
[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
28c1bc9b9f
Merge remote-tracking branch 'origin/master' into develop
2023-11-09 17:54:10 +00:00
gregandcin
e5b7685e7a
Update gregandcin/teaqueen ( #22402 )
2023-11-09 09:53:35 -08:00
QMK Bot
a28149b222
Merge remote-tracking branch 'origin/master' into develop
2023-11-09 17:53:17 +00:00
John Barbero
39d0a14258
Add SNES Macropad keyboard ( #22377 )
...
Co-authored-by: jack <0x6a73@protonmail.com>
2023-11-09 09:52:47 -08:00
QMK Bot
2568d45969
Merge remote-tracking branch 'origin/master' into develop
2023-11-09 02:03:36 +00:00
Panos Sakkos
daabe2d8c5
Update layer state of Lily58 from 'Default' to 'Base' ( #22397 )
2023-11-09 02:03:07 +00:00
Joel Challis
147865cf57
Migrate some common features to generic ( #22403 )
2023-11-09 02:01:44 +00:00
QMK Bot
4e577cbbea
Merge remote-tracking branch 'origin/master' into develop
2023-11-09 01:57:51 +00:00
Matthias Liffers
0b7dba156c
Fix indicator LED definition for Sofle RGB. ( #22408 )
2023-11-09 01:57:16 +00:00
QMK Bot
27b9dd0f98
Merge remote-tracking branch 'origin/master' into develop
2023-11-09 01:55:49 +00:00
John Barbero
10cdd00751
Fix corne keylog ( #22420 )
...
* [Keyboard] Fix bug in set_keylog function
Fixes issue where some keys would not trigger the oled to output the row
and column of a pressed key (would happen with LT(...) for my keymap)
* [Keyboard] Tiny improvement to oled_render_keylog for crkbd
Added improvement suggestion I got for another keyboard
2023-11-09 01:55:08 +00:00
QMK Bot
f56838c680
Merge remote-tracking branch 'origin/master' into develop
2023-11-08 21:01:27 +00:00
Fredrik A. Kristiansen
72f93e7fc2
Add iso85k keyboard ( #22411 )
...
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-11-08 13:00:48 -08:00
Jeayo Keh
75e1a0d610
[Keyboard] Rename soda/{mango,pocket} ( #22151 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
2023-11-08 10:45:24 -07:00
QMK Bot
96ea277381
Merge remote-tracking branch 'origin/master' into develop
2023-11-08 17:44:08 +00:00
Yak
64bbeff57d
Fix Herringbone pro Layouts ( #22317 )
...
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-11-08 10:42:08 -07:00
Less/Rikki
5a281d1ee9
feat(mechwild/clunker): new layouts ( #22342 )
2023-11-08 10:41:38 -07:00
QMK Bot
6f59e18efb
Merge remote-tracking branch 'origin/master' into develop
2023-11-08 17:41:02 +00:00
Kelwin0313
80708a91ef
[Keyboard] Add PCB Utopia88 ( #22257 )
2023-11-08 10:40:28 -07:00
QMK Bot
c1ea29b8e4
Merge remote-tracking branch 'origin/master' into develop
2023-11-08 17:40:04 +00:00
ai03
ebac02a7b2
[Keyboard] Add Duet Switch Tester ( #22367 )
...
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-11-08 10:39:13 -07:00
QMK Bot
2be22a1323
Merge remote-tracking branch 'origin/master' into develop
2023-11-08 08:31:41 +00:00
Reibl János Dániel
2337cd1186
Add riblee handwired split keyboard ( #22277 )
2023-11-08 00:31:06 -08:00
QMK Bot
884f653906
Merge remote-tracking branch 'origin/master' into develop
2023-11-08 02:18:54 +00:00
Ming-Gih Lam
7324650714
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
Ryan
be66e5f2b4
WT RGB cleanups ( #22379 )
2023-11-08 00:58:59 +11:00
QMK Bot
1b303e0453
Merge remote-tracking branch 'origin/master' into develop
2023-11-07 00:43:44 +00:00
Leo Lou
5b25a8aa32
[Keyboard] Add Piantor Pro ( #22361 )
...
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-11-06 17:43:41 -07:00
Duncan Sutherland
67ff0defe2
Teaqueen: correct layout data ( #22406 )
2023-11-06 17:43:04 -07:00
QMK Bot
c6bb5b6755
Merge remote-tracking branch 'origin/master' into develop
2023-11-02 16:37:35 +00:00
ID64F
837cae95ba
boardsource/unicorne - Fixed OLED layers being all set to zero ( #22389 )
2023-11-02 16:36:56 +00:00
Ryan
a27bc60703
LED drivers: add defines for PWM and LED control register counts ( #22383 )
2023-11-01 19:13:25 +00:00
Logan Butler
0a94c2951f
[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
Ryan
b52aca0af8
Relocate LED driver init code ( #22365 )
2023-11-01 00:53:45 +00:00
QMK Bot
eac8e67888
Merge remote-tracking branch 'origin/master' into develop
2023-11-01 00:41:08 +00:00
era
999008f0eb
[Keyboard] Add Klein_SD ( #22371 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
2023-10-31 18:40:25 -06:00
QMK Bot
fccd825212
Merge remote-tracking branch 'origin/master' into develop
2023-11-01 00:18:27 +00:00
gregandcin
2192098f57
[Keyboard] Add TeaQueen ( #22352 )
...
Co-authored-by: jack <0x6a73@protonmail.com>
2023-10-31 18:17:43 -06:00
QMK Bot
49fd13f596
Merge remote-tracking branch 'origin/master' into develop
2023-10-31 01:52:15 +00:00
Matt Chan
cb9705428b
Add Kindakeyboards Conone65 Via support ( #22320 )
2023-10-31 01:51:29 +00:00
QMK Bot
f24d51f5be
Merge remote-tracking branch 'origin/master' into develop
2023-10-31 01:32:32 +00:00
Cipulot
538b79657e
Fix for swapped PID and VID ( #22372 )
2023-10-31 01:31:58 +00:00
Joel Challis
17c3182b1c
Remove use of broken split.main ( #22363 )
2023-10-30 00:49:56 +00:00