67d2bc5b3a
Merge remote-tracking branch 'origin/master' into develop
2023-11-13 02:03:27 +00:00
56b6b28fe9
add `68_ansi` Community Layout to nebula68b ( #22433 )
2023-11-12 19:02:46 -07:00
e884e42ce9
Generalise ADC driver source inclusion ( #22448 )
2023-11-12 22:30:27 +00:00
786ebf8760
Remove requirement for `keymap_steno.h` include in keymaps ( #22423 )
...
* Remove requirement for `keymap_steno.h` include in keymaps
* Add back keymap_steno.h with a note for the time being
2023-11-12 18:25:46 +11:00
b7a1004b61
Merge remote-tracking branch 'origin/master' into develop
2023-11-12 05:31:01 +00:00
c2326c05c0
[Keyboard] Fixes to make snes_macropad play nicer with qmk configurator ( #22432 )
...
* [Keyboard] Change default implementation for get_layer_name_user
Will now show the layer number instead of "Unknown", since this is
what will be shown if QMK Configurator is used to compile the
firmware.
* [Keyboard] Update the layout info
This makes it look sort of like a macropad + gamepad rather than an 4x6
ortholinear keyboard.
* [Keyboard] Fix default implementation of get_layer_name_user
Based on feedback from code review the implementation was swapped in
favor of using get_u8_str. This implied a change to the argument type
from int to uint8_t, which cascaded into the existing keymaps. (This
made sense in general, since the return type of get_highest_layer is
also a uint8_t.)
2023-11-11 22:30:31 -07:00
112a51db9c
Merge remote-tracking branch 'origin/master' into develop
2023-11-12 05:20:13 +00:00
0189c485b9
studiokestra/line_tkl: correct layout data ( #22455 )
...
* fix `layouts` data
* add EoF
2023-11-11 22:19:43 -07:00
2f28c6df6d
Merge remote-tracking branch 'origin/master' into develop
2023-11-11 19:08:55 +00:00
935c894f83
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
1ddc2cbeb9
Fixup snes_macropad on develop ( #22444 )
2023-11-11 07:26:26 +00:00
4a98466ef3
Merge remote-tracking branch 'origin/master' into develop
2023-11-10 21:39:30 +00:00
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
2d7746609f
Merge remote-tracking branch 'origin/master' into develop
2023-11-10 16:42:45 +00:00
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
8136cf4bfb
LED drivers: clean up `SWx`/`CSy` pullup/down resistor config ( #22381 )
2023-11-10 08:39:15 +11:00
6b19a99a4f
Merge remote-tracking branch 'origin/master' into develop
2023-11-09 19:57:44 +00:00
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
28c1bc9b9f
Merge remote-tracking branch 'origin/master' into develop
2023-11-09 17:54:10 +00:00
e5b7685e7a
Update gregandcin/teaqueen ( #22402 )
2023-11-09 09:53:35 -08:00
a28149b222
Merge remote-tracking branch 'origin/master' into develop
2023-11-09 17:53:17 +00:00
39d0a14258
Add SNES Macropad keyboard ( #22377 )
...
Co-authored-by: jack <0x6a73@protonmail.com>
2023-11-09 09:52:47 -08:00
2568d45969
Merge remote-tracking branch 'origin/master' into develop
2023-11-09 02:03:36 +00:00
daabe2d8c5
Update layer state of Lily58 from 'Default' to 'Base' ( #22397 )
2023-11-09 02:03:07 +00:00
147865cf57
Migrate some common features to generic ( #22403 )
2023-11-09 02:01:44 +00:00
4e577cbbea
Merge remote-tracking branch 'origin/master' into develop
2023-11-09 01:57:51 +00:00
0b7dba156c
Fix indicator LED definition for Sofle RGB. ( #22408 )
2023-11-09 01:57:16 +00:00
27b9dd0f98
Merge remote-tracking branch 'origin/master' into develop
2023-11-09 01:55:49 +00:00
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
f56838c680
Merge remote-tracking branch 'origin/master' into develop
2023-11-08 21:01:27 +00:00
72f93e7fc2
Add iso85k keyboard ( #22411 )
...
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-11-08 13:00:48 -08:00
75e1a0d610
[Keyboard] Rename soda/{mango,pocket} ( #22151 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
2023-11-08 10:45:24 -07:00
96ea277381
Merge remote-tracking branch 'origin/master' into develop
2023-11-08 17:44:08 +00:00
64bbeff57d
Fix Herringbone pro Layouts ( #22317 )
...
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-11-08 10:42:08 -07:00
5a281d1ee9
feat(mechwild/clunker): new layouts ( #22342 )
2023-11-08 10:41:38 -07:00
6f59e18efb
Merge remote-tracking branch 'origin/master' into develop
2023-11-08 17:41:02 +00:00
80708a91ef
[Keyboard] Add PCB Utopia88 ( #22257 )
2023-11-08 10:40:28 -07:00
c1ea29b8e4
Merge remote-tracking branch 'origin/master' into develop
2023-11-08 17:40:04 +00:00
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
2be22a1323
Merge remote-tracking branch 'origin/master' into develop
2023-11-08 08:31:41 +00:00
2337cd1186
Add riblee handwired split keyboard ( #22277 )
2023-11-08 00:31:06 -08:00
884f653906
Merge remote-tracking branch 'origin/master' into develop
2023-11-08 02:18:54 +00:00
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
be66e5f2b4
WT RGB cleanups ( #22379 )
2023-11-08 00:58:59 +11:00
1b303e0453
Merge remote-tracking branch 'origin/master' into develop
2023-11-07 00:43:44 +00:00
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
67ff0defe2
Teaqueen: correct layout data ( #22406 )
2023-11-06 17:43:04 -07:00
c6bb5b6755
Merge remote-tracking branch 'origin/master' into develop
2023-11-02 16:37:35 +00:00
837cae95ba
boardsource/unicorne - Fixed OLED layers being all set to zero ( #22389 )
2023-11-02 16:36:56 +00:00
a27bc60703
LED drivers: add defines for PWM and LED control register counts ( #22383 )
2023-11-01 19:13:25 +00:00
QMK Bot
Duncan Sutherland
Joel Challis
Ryan
John Barbero
jonylee@hfd
jack
Maria
ploopyco
temp4gh
gregandcin
John Barbero
Panos Sakkos
Matthias Liffers
Fredrik A. Kristiansen
Jeayo Keh
Yak
Less/Rikki
Kelwin0313
ai03
Reibl János Dániel
Ming-Gih Lam
Leo Lou
ID64F