aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixup snes_macropad on develop (#22444)jack2023-11-111-11/+3
|
* snled27351: fix missing `i2c_init()` (#22446)Ryan2023-11-112-0/+4
|
* Merge remote-tracking branch 'origin/master' into developQMK Bot2023-11-1015-0/+2034
|\
| * [Keyboard] Add MariOrion v2.5 (#22273)Maria2023-11-1015-0/+2034
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-11-1013-0/+395
|\|
| * Add Ploopy Madromys mouse (#21989)ploopyco2023-11-1013-0/+395
| | | | | | | | Added PloopyCo madromys/adept mouse Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Infer LED DRIVER_COUNT from configured addresses (#22311)Joel Challis2023-11-1018-57/+138
| |
* | LED drivers: clean up `SWx`/`CSy` pullup/down resistor config (#22381)Ryan2023-11-0918-218/+302
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-11-096-0/+316
|\|
| * [Keyboard] Add alpaca/wfeclipse (#22230)temp4gh2023-11-096-0/+316
| | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-11-094-20/+2
|\|
| * Update gregandcin/teaqueen (#22402)gregandcin2023-11-094-20/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-11-0911-0/+682
|\|
| * Add SNES Macropad keyboard (#22377)John Barbero2023-11-0911-0/+682
| | | | | | | | Co-authored-by: jack <0x6a73@protonmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-11-091-1/+1
|\|
| * Update layer state of Lily58 from 'Default' to 'Base' (#22397)Panos Sakkos2023-11-091-1/+1
| |
* | Migrate some common features to generic (#22403)Joel Challis2023-11-099-72/+36
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-11-091-2/+2
|\|
| * Fix indicator LED definition for Sofle RGB. (#22408)Matthias Liffers2023-11-091-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-11-091-6/+6
|\|
| * Fix corne keylog (#22420)John Barbero2023-11-091-6/+6
| | | | | | | | | | | | | | | | | | | | * [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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-11-086-0/+206
|\|
| * Add iso85k keyboard (#22411)Fredrik A. Kristiansen2023-11-086-0/+206
| | | | | | | | Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* | [Keyboard] Rename soda/{mango,pocket} (#22151)Jeayo Keh2023-11-0818-13/+18
| | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-11-081-5/+5
|\|
| * Fix Herringbone pro Layouts (#22317)Yak2023-11-081-5/+5
| | | | | | | | Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* | feat(mechwild/clunker): new layouts (#22342)Less/Rikki2023-11-084-89/+597
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-11-086-0/+230
|\|
| * [Keyboard] Add PCB Utopia88 (#22257)Kelwin03132023-11-086-0/+230
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-11-088-0/+230
|\|
| * [Keyboard] Add Duet Switch Tester (#22367)ai032023-11-088-0/+230
| | | | | | | | | | Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-11-087-0/+314
|\|
| * Add riblee handwired split keyboard (#22277)Reibl János Dániel2023-11-087-0/+314
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-11-089-0/+332
|\|
| * Red Herring PCB support (#22409)Ming-Gih Lam2023-11-089-0/+332
| | | | | | | | | | Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> Co-authored-by: jack <0x6a73@protonmail.com>
* | WT RGB cleanups (#22379)Ryan2023-11-0726-843/+1973
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-11-076-64/+244
|\|
| * [Keyboard] Add Piantor Pro (#22361)Leo Lou2023-11-075-0/+171
| | | | | | | | | | Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> Co-authored-by: jack <0x6a73@protonmail.com>
| * Teaqueen: correct layout data (#22406)Duncan Sutherland2023-11-071-64/+73
| |
* | Allow generic_features to handle subdirectories (#22400)Joel Challis2023-11-041-0/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-11-041-3/+2
|\|
| * docs(rgblight): fix typos (#22399)Kiryl Mialeshka2023-11-041-3/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-11-021-3/+3
|\|
| * boardsource/unicorne - Fixed OLED layers being all set to zero (#22389)ID64F2023-11-021-3/+3
| |
* | LED drivers: use `PACKED` define from util.h (#22380)Ryan2023-11-0216-25/+41
| |
* | Improve argument handling of c2json (#22170)Joel Challis2023-11-013-42/+46
| | | | | | | | | | * Improve argument handling of c2json * Add automagic
* | LED drivers: add defines for PWM and LED control register counts (#22383)Ryan2023-11-0115-91/+130
| |
* | [Keyboard] matchstickworks/southpad - Move files to rev1, add rev2 (#21574)Logan Butler2023-11-0113-64/+194
| | | | | | | | | | | | Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Generate switch statement helpers for keycode ranges (#20059)Joel Challis2023-11-013-5/+35
| |
* | Implement data driven lighting defaults (#21825)Joel Challis2023-11-014-7/+130
| |
generated by cgit v1.2.3 (git 2.39.1) at 2026-04-18 08:48:38 +0200