c8a28e8e9b
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
4228f55551
Add ScottoWing handwired keyboard ( #22506 )
...
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-11-28 19:33:17 -08:00
1e5151bf63
add tokki ( #22463 )
...
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-11-28 19:32:58 -08:00
3024b05cbb
cablecardesigns/phoenix: correct layout data ( #22517 )
2023-11-28 19:30:12 -08:00
094357c403
Fix missed shutdown callbacks ( #22549 )
2023-11-27 15:39:17 +11:00
1ed03f498f
Remove userspace keymaps ( #22544 )
2023-11-27 05:36:45 +11:00
3ef06aa732
Improve and Cleanup Shutdown callbacks ( #21060 )
...
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
2023-11-26 22:59:18 +11:00
3a74fa5bf7
Merge remote-tracking branch 'origin/master' into develop
2023-11-23 05:08:37 +00:00
0379d1f59e
DC60: Fix 2u Backspace Support ( #22533 )
2023-11-23 05:08:07 +00:00
bf0d1fde5d
Merge remote-tracking branch 'origin/master' into develop
2023-11-22 22:13:48 +00:00
98013e25c6
[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
b35bac6afb
Remove unnecessary driver counts ( #22435 )
2023-11-22 21:37:32 +00:00
a0a6820c1b
Migrate some dip switch config to info.json ( #22437 )
2023-11-23 08:33:59 +11:00
dda6e7fb36
LED drivers: register naming cleanups ( #22436 )
2023-11-20 15:48:23 +00:00
e279c78ba3
Enable linking of encoders to switch within layout macros ( #22264 )
2023-11-20 15:41:48 +00:00
67a87f67a0
Merge remote-tracking branch 'origin/master' into develop
2023-11-16 16:54:46 +00:00
1e4f7aa029
[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
cc7542b917
Merge remote-tracking branch 'origin/master' into develop
2023-11-15 15:23:35 +00:00
adcc4d376c
Add leonardo build target for leonardo + usb2.0 shield based projects ( #22243 )
2023-11-15 15:23:03 +00:00
c4d3521ba6
Merge remote-tracking branch 'origin/master' into develop
2023-11-14 08:11:41 +00:00
d7b44239c2
[Keyboard] Add Eden ( #22467 )
...
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-11-14 01:11:12 -07:00
79a6419dee
Merge remote-tracking branch 'origin/master' into develop
2023-11-14 01:49:49 +00:00
44062b5056
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
1efc79063c
Migrate some EEPROM config to info.json ( #22434 )
2023-11-14 09:30:19 +11:00
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
Álvaro A. Volpato
Joe Scotto
Alabahuy
Duncan Sutherland
Drashna Jaelre
Joel Challis
QMK Bot
James Young
gskygithub
Ryan
leyew
Le Zhang
cole smith
John Barbero
jonylee@hfd
jack
Maria
ploopyco
temp4gh
gregandcin
John Barbero
Panos Sakkos