Add MariOrion v2.5 to firmware. #22273
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,41 @@ | ||||||||
| // Copyright <year> <name> <email> @<github_username> | ||||||||
| // | ||||||||
| // This program is free software: you can redistribute it and/or modify | ||||||||
| // it under the terms of the GNU General Public License as published by | ||||||||
| // the Free Software Foundation, either version 2 of the License, or | ||||||||
| // (at your option) any later version. | ||||||||
| // | ||||||||
| // This program is distributed in the hope that it will be useful, | ||||||||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||||||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||||||||
| // GNU General Public License for more details. | ||||||||
| // | ||||||||
| // You should have received a copy of the GNU General Public License | ||||||||
| // along with this program. If not, see <http://www.gnu.org/licenses/>. | ||||||||
ninetailedtori marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||||
|
|
||||||||
| #pragma once | ||||||||
|
|
||||||||
| /* | ||||||||
| * Feature disable options | ||||||||
| * These options are also useful to firmware size reduction. | ||||||||
| */ | ||||||||
|
|
||||||||
| /* disable debug print */ | ||||||||
| //#define NO_DEBUG | ||||||||
|
|
||||||||
| /* disable print */ | ||||||||
| //#define NO_PRINT | ||||||||
|
|
||||||||
| /* disable action features */ | ||||||||
| //#define NO_ACTION_LAYER | ||||||||
| //#define NO_ACTION_TAPPING | ||||||||
| //#define NO_ACTION_ONESHOT | ||||||||
|
|
||||||||
ninetailedtori marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||||
| #define WS2812_EXTERNAL_PULLUP | ||||||||
|
|
||||||||
| #define CAPS_LOCK_LED A6 | ||||||||
| #define SCROLL_LOCK_LED A15 | ||||||||
|
|
||||||||
ninetailedtori marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||||
| #define INDICATOR_0 C9 | ||||||||
| #define INDICATOR_1 C8 | ||||||||
| #define INDICATOR_2 C7 | ||||||||
|
There was a problem hiding this comment. add EoF
Suggested change
|
||||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,241 @@ | ||
| { | ||
| "manufacturer": "Maria", | ||
| "keyboard_name": "mariorion_v25", | ||
| "maintainer": "toril940", | ||
| "bootloader": "stm32-dfu", | ||
| "diode_direction": "COL2ROW", | ||
| "features": { | ||
| "bootmagic": true, | ||
| "command": false, | ||
| "console": false, | ||
| "extrakey": true, | ||
| "mousekey": true, | ||
| "nkro": true | ||
| }, | ||
ninetailedtori marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| "rgblight": { | ||
| "led_count": 25, | ||
| "animations": { | ||
| "static_light": true, | ||
| "breathing": true, | ||
| "rainbow_mood": true, | ||
| "rainbow_swirl": true, | ||
| "snake": true, | ||
| "christmas": true, | ||
| "static_gradient": true, | ||
| "twinkle": true | ||
| }, | ||
| "driver": "ws2812", | ||
| "led_map": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 24, 23, 22, 21, 20], | ||
| "sleep": true | ||
| }, | ||
| "ws2812": { | ||
| "driver": "pwm", | ||
| "pin": "B9" | ||
| }, | ||
| "matrix_pins": { | ||
| "cols": ["A4", "A5", "A7", "C4", "C5", "B0", "B1", "B2", "B10", "B11", "B13", "B14", "B15", "C6", "B12", | ||
| "F0", "C15", "C14"], | ||
| "rows": ["B5", "B4", "B3", "A2", "C13", "B8"] | ||
| }, | ||
| "processor": "STM32F072", | ||
| "url": "", | ||
| "usb": { | ||
| "device_version": "1.0.0", | ||
| "pid": "0x1111", | ||
| "vid": "0x1111" | ||
| }, | ||
| "layouts": { | ||
| "LAYOUT_tkl_ansi": { | ||
| "layout": [ | ||
| {"matrix": [0, 0], "x": 0, "y": 0}, | ||
| {"matrix": [0, 2], "x": 2, "y": 0}, | ||
| {"matrix": [0, 3], "x": 3, "y": 0}, | ||
| {"matrix": [0, 4], "x": 4, "y": 0}, | ||
| {"matrix": [0, 5], "x": 5, "y": 0}, | ||
| {"matrix": [0, 6], "x": 6.5, "y": 0}, | ||
| {"matrix": [0, 7], "x": 7.5, "y": 0}, | ||
| {"matrix": [0, 8], "x": 8.5, "y": 0}, | ||
| {"matrix": [0, 9], "x": 9.5, "y": 0}, | ||
| {"matrix": [0, 11], "x": 11, "y": 0}, | ||
| {"matrix": [0, 12], "x": 12, "y": 0}, | ||
| {"matrix": [0, 13], "x": 13, "y": 0}, | ||
| {"matrix": [0, 14], "x": 14, "y": 0}, | ||
| {"matrix": [0, 15], "x": 15.25, "y": 0}, | ||
| {"matrix": [0, 16], "x": 16.25, "y": 0}, | ||
| {"matrix": [0, 17], "x": 17.25, "y": 0}, | ||
| {"matrix": [1, 0], "x": 0, "y": 1.25}, | ||
| {"matrix": [1, 1], "x": 1, "y": 1.25}, | ||
| {"matrix": [1, 2], "x": 2, "y": 1.25}, | ||
| {"matrix": [1, 3], "x": 3, "y": 1.25}, | ||
| {"matrix": [1, 4], "x": 4, "y": 1.25}, | ||
| {"matrix": [1, 5], "x": 5, "y": 1.25}, | ||
| {"matrix": [1, 6], "x": 6, "y": 1.25}, | ||
| {"matrix": [1, 7], "x": 7, "y": 1.25}, | ||
| {"matrix": [1, 8], "x": 8, "y": 1.25}, | ||
| {"matrix": [1, 9], "x": 9, "y": 1.25}, | ||
| {"matrix": [1, 10], "x": 10, "y": 1.25}, | ||
| {"matrix": [1, 11], "x": 11, "y": 1.25}, | ||
| {"matrix": [1, 12], "x": 12, "y": 1.25}, | ||
| {"matrix": [1, 13], "x": 13, "y": 1.25}, | ||
| {"matrix": [1, 14], "x": 14, "y": 1.25}, | ||
| {"matrix": [1, 15], "x": 15.25, "y": 1.25}, | ||
| {"matrix": [1, 16], "x": 16.25, "y": 1.25}, | ||
| {"matrix": [1, 17], "x": 17.25, "y": 1.25}, | ||
| {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, | ||
| {"matrix": [2, 1], "x": 1.5, "y": 2.25}, | ||
| {"matrix": [2, 2], "x": 2.5, "y": 2.25}, | ||
| {"matrix": [2, 3], "x": 3.5, "y": 2.25}, | ||
| {"matrix": [2, 4], "x": 4.5, "y": 2.25}, | ||
| {"matrix": [2, 5], "x": 5.5, "y": 2.25}, | ||
| {"matrix": [2, 6], "x": 6.5, "y": 2.25}, | ||
| {"matrix": [2, 7], "x": 7.5, "y": 2.25}, | ||
| {"matrix": [2, 8], "x": 8.5, "y": 2.25}, | ||
| {"matrix": [2, 9], "x": 9.5, "y": 2.25}, | ||
| {"matrix": [2, 10], "x": 10.5, "y": 2.25}, | ||
| {"matrix": [2, 11], "x": 11.5, "y": 2.25}, | ||
| {"matrix": [2, 12], "x": 12.5, "y": 2.25}, | ||
| {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, | ||
| {"matrix": [2, 15], "x":15.25, "y":2.25}, | ||
| {"matrix": [2, 16], "x": 16.25, "y": 2.25}, | ||
| {"matrix": [2, 17], "x": 17.25, "y": 2.25}, | ||
| {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, | ||
| {"matrix": [3, 1], "x": 1.75, "y": 3.25}, | ||
| {"matrix": [3, 2], "x": 2.75, "y": 3.25}, | ||
| {"matrix": [3, 3], "x": 3.75, "y": 3.25}, | ||
| {"matrix": [3, 4], "x": 4.75, "y": 3.25}, | ||
| {"matrix": [3, 5], "x": 5.75, "y": 3.25}, | ||
| {"matrix": [3, 6], "x": 6.75, "y": 3.25}, | ||
| {"matrix": [3, 7], "x": 7.75, "y": 3.25}, | ||
| {"matrix": [3, 8], "x": 8.75, "y": 3.25}, | ||
| {"matrix": [3, 9], "x": 9.75, "y": 3.25}, | ||
| {"matrix": [3, 10], "x": 10.75, "y": 3.25}, | ||
| {"matrix": [3, 11], "x": 11.75, "y": 3.25}, | ||
| {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, | ||
| {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, | ||
| {"matrix": [4, 1], "x": 1.25, "y": 4.25}, | ||
ninetailedtori marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| {"matrix": [4, 2], "x": 2.25, "y": 4.25}, | ||
| {"matrix": [4, 3], "x": 3.25, "y": 4.25}, | ||
| {"matrix": [4, 4], "x": 4.25, "y": 4.25}, | ||
| {"matrix": [4, 5], "x": 5.25, "y": 4.25}, | ||
| {"matrix": [4, 6], "x": 6.25, "y": 4.25}, | ||
| {"matrix": [4, 7], "x": 7.25, "y": 4.25}, | ||
| {"matrix": [4, 8], "x": 8.25, "y": 4.25}, | ||
| {"matrix": [4, 9], "x": 9.25, "y": 4.25}, | ||
| {"matrix": [4, 10], "x": 10.25, "y": 4.25}, | ||
| {"matrix": [4, 11], "x": 11.25, "y": 4.25}, | ||
| {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, | ||
| {"matrix": [4, 13], "x": 14, "y": 4.25}, | ||
| {"matrix": [4, 16], "x": 16.25, "y": 4.25}, | ||
| {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, | ||
| {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, | ||
| {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, | ||
| {"matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 2.375}, | ||
| {"matrix": [5, 5], "x": 6.25, "y": 5.25}, | ||
| {"matrix": [5, 7], "x": 7.25, "y": 5.25, "w": 2.375}, | ||
| {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25}, | ||
| {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25}, | ||
| {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25}, | ||
| {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25}, | ||
| {"matrix": [5, 15], "x": 15.25, "y": 5.25}, | ||
| {"matrix": [5, 16], "x": 16.25, "y": 5.25}, | ||
| {"matrix": [5, 17], "x": 17.25, "y": 5.25} | ||
| ] | ||
| }, | ||
| "LAYOUT_tkl_iso": { | ||
| "layout": [ | ||
| {"matrix": [0, 0], "x": 0, "y": 0}, | ||
| {"matrix": [0, 2], "x": 2, "y": 0}, | ||
| {"matrix": [0, 3], "x": 3, "y": 0}, | ||
| {"matrix": [0, 4], "x": 4, "y": 0}, | ||
| {"matrix": [0, 5], "x": 5, "y": 0}, | ||
| {"matrix": [0, 6], "x": 6.5, "y": 0}, | ||
| {"matrix": [0, 7], "x": 7.5, "y": 0}, | ||
| {"matrix": [0, 8], "x": 8.5, "y": 0}, | ||
| {"matrix": [0, 9], "x": 9.5, "y": 0}, | ||
| {"matrix": [0, 11], "x": 11, "y": 0}, | ||
| {"matrix": [0, 12], "x": 12, "y": 0}, | ||
| {"matrix": [0, 13], "x": 13, "y": 0}, | ||
| {"matrix": [0, 14], "x": 14, "y": 0}, | ||
| {"matrix": [0, 15], "x": 15.25, "y": 0}, | ||
| {"matrix": [0, 16], "x": 16.25, "y": 0}, | ||
| {"matrix": [0, 17], "x": 17.25, "y": 0}, | ||
| {"matrix": [1, 0], "x": 0, "y": 1.25}, | ||
| {"matrix": [1, 1], "x": 1, "y": 1.25}, | ||
| {"matrix": [1, 2], "x": 2, "y": 1.25}, | ||
| {"matrix": [1, 3], "x": 3, "y": 1.25}, | ||
| {"matrix": [1, 4], "x": 4, "y": 1.25}, | ||
| {"matrix": [1, 5], "x": 5, "y": 1.25}, | ||
| {"matrix": [1, 6], "x": 6, "y": 1.25}, | ||
| {"matrix": [1, 7], "x": 7, "y": 1.25}, | ||
| {"matrix": [1, 8], "x": 8, "y": 1.25}, | ||
| {"matrix": [1, 9], "x": 9, "y": 1.25}, | ||
| {"matrix": [1, 10], "x": 10, "y": 1.25}, | ||
| {"matrix": [1, 11], "x": 11, "y": 1.25}, | ||
| {"matrix": [1, 12], "x": 12, "y": 1.25}, | ||
| {"matrix": [1, 13], "x": 13, "y": 1.25}, | ||
| {"matrix": [1, 14], "x": 14, "y": 1.25}, | ||
| {"matrix": [1, 15], "x": 15.25, "y": 1.25}, | ||
| {"matrix": [1, 16], "x": 16.25, "y": 1.25}, | ||
| {"matrix": [1, 17], "x": 17.25, "y": 1.25}, | ||
| {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, | ||
| {"matrix": [2, 1], "x": 1.5, "y": 2.25}, | ||
| {"matrix": [2, 2], "x": 2.5, "y": 2.25}, | ||
| {"matrix": [2, 3], "x": 3.5, "y": 2.25}, | ||
| {"matrix": [2, 4], "x": 4.5, "y": 2.25}, | ||
| {"matrix": [2, 5], "x": 5.5, "y": 2.25}, | ||
| {"matrix": [2, 6], "x": 6.5, "y": 2.25}, | ||
| {"matrix": [2, 7], "x": 7.5, "y": 2.25}, | ||
| {"matrix": [2, 8], "x": 8.5, "y": 2.25}, | ||
| {"matrix": [2, 9], "x": 9.5, "y": 2.25}, | ||
| {"matrix": [2, 10], "x": 10.5, "y": 2.25}, | ||
| {"matrix": [2, 11], "x": 11.5, "y": 2.25}, | ||
| {"matrix": [2, 12], "x": 12.5, "y": 2.25}, | ||
| {"matrix": [2, 15], "x": 15.25, "y": 2.25}, | ||
| {"matrix": [2, 16], "x": 16.25, "y": 2.25}, | ||
| {"matrix": [2, 17], "x": 17.25, "y": 2.25}, | ||
| {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, | ||
| {"matrix": [3, 1], "x": 1.75, "y": 3.25}, | ||
| {"matrix": [3, 2], "x": 2.75, "y": 3.25}, | ||
| {"matrix": [3, 3], "x": 3.75, "y": 3.25}, | ||
| {"matrix": [3, 4], "x": 4.75, "y": 3.25}, | ||
| {"matrix": [3, 5], "x": 5.75, "y": 3.25}, | ||
| {"matrix": [3, 6], "x": 6.75, "y": 3.25}, | ||
| {"matrix": [3, 7], "x": 7.75, "y": 3.25}, | ||
| {"matrix": [3, 8], "x": 8.75, "y": 3.25}, | ||
| {"matrix": [3, 9], "x": 9.75, "y": 3.25}, | ||
| {"matrix": [3, 10], "x": 10.75, "y": 3.25}, | ||
| {"matrix": [3, 11], "x": 11.75, "y": 3.25}, | ||
| {"matrix": [3, 12], "x": 12.75, "y": 3.25}, | ||
| {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, | ||
| {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, | ||
| {"matrix": [4, 1], "x": 1.25, "y": 4.25}, | ||
| {"matrix": [4, 2], "x": 2.25, "y": 4.25}, | ||
| {"matrix": [4, 3], "x": 3.25, "y": 4.25}, | ||
| {"matrix": [4, 4], "x": 4.25, "y": 4.25}, | ||
| {"matrix": [4, 5], "x": 5.25, "y": 4.25}, | ||
| {"matrix": [4, 6], "x": 6.25, "y": 4.25}, | ||
| {"matrix": [4, 7], "x": 7.25, "y": 4.25}, | ||
| {"matrix": [4, 8], "x": 8.25, "y": 4.25}, | ||
| {"matrix": [4, 9], "x": 9.25, "y": 4.25}, | ||
| {"matrix": [4, 10], "x": 10.25, "y": 4.25}, | ||
| {"matrix": [4, 11], "x": 11.25, "y": 4.25}, | ||
| {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, | ||
| {"matrix": [4, 13], "x": 14, "y": 4.25}, | ||
| {"matrix": [4, 16], "x": 16.25, "y": 4.25}, | ||
| {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, | ||
| {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, | ||
| {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, | ||
| {"matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 2.375}, | ||
| {"matrix": [5, 5], "x": 6.25, "y": 5.25}, | ||
| {"matrix": [5, 7], "x": 7.25, "y": 5.25, "w": 2.375}, | ||
| {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25}, | ||
| {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25}, | ||
| {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25}, | ||
| {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25}, | ||
| {"matrix": [5, 15], "x": 15.25, "y": 5.25}, | ||
| {"matrix": [5, 16], "x": 16.25, "y": 5.25}, | ||
| {"matrix": [5, 17], "x": 17.25, "y": 5.25} | ||
| ] | ||
| } | ||
| } | ||
| } | ||
ninetailedtori marked this conversation as resolved.
Show resolved
Hide resolved
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are changes to this file (a not in scope of PR keyboard) intentional? 😳
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lol, I didn't even realise that got changed! No that's not intentional...how should I remove that from the pr?