diff --git a/keyboards/gray_studio/think65/solder/solder.c b/keyboards/gray_studio/think65/solder/solder.c index 1be2c69eb9a..f97a005218c 100644 --- a/keyboards/gray_studio/think65/solder/solder.c +++ b/keyboards/gray_studio/think65/solder/solder.c @@ -19,6 +19,7 @@ // You can leave any or all of these undefined. // These are only required if you want to perform custom actions. + void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up diff --git a/keyboards/mariorion_v25/matrix_diagram.md b/keyboards/mariorion_v25/matrix_diagram.md index 3b4b65fd1f4..352fb637034 100644 --- a/keyboards/mariorion_v25/matrix_diagram.md +++ b/keyboards/mariorion_v25/matrix_diagram.md @@ -1,3 +1,5 @@ +# Matrix Diagram for MariOrion v2.5 + ┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐ │00 │ │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D │ │0F │0G │0H │ └───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘ diff --git a/keyboards/mariorion_v25/prod/info.json b/keyboards/mariorion_v25/prod/info.json index 76e8306de1f..40e723d8ae9 100644 --- a/keyboards/mariorion_v25/prod/info.json +++ b/keyboards/mariorion_v25/prod/info.json @@ -208,8 +208,7 @@ {"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}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.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}, @@ -301,8 +300,7 @@ {"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}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.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}, @@ -394,8 +392,7 @@ {"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}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.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}, @@ -486,8 +483,7 @@ {"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}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.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}, diff --git a/keyboards/mariorion_v25/prod/mariorion_v25.c b/keyboards/mariorion_v25/prod/mariorion_v25.c index f106829cedd..fce5b49a5ca 100644 --- a/keyboards/mariorion_v25/prod/mariorion_v25.c +++ b/keyboards/mariorion_v25/prod/mariorion_v25.c @@ -79,4 +79,4 @@ void suspend_wakeup_init_kb(void) { writePinHigh(INDICATOR_2); suspend_wakeup_init_user(); -} \ No newline at end of file +} diff --git a/keyboards/mariorion_v25/proto/info.json b/keyboards/mariorion_v25/proto/info.json index 782a9f51f0b..3e99ba93789 100644 --- a/keyboards/mariorion_v25/proto/info.json +++ b/keyboards/mariorion_v25/proto/info.json @@ -208,8 +208,7 @@ {"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}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.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}, @@ -301,8 +300,7 @@ {"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}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.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}, @@ -394,8 +392,7 @@ {"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}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.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}, @@ -486,8 +483,7 @@ {"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}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.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}, diff --git a/keyboards/mariorion_v25/proto/mariorion_v25.c b/keyboards/mariorion_v25/proto/mariorion_v25.c index f106829cedd..fce5b49a5ca 100644 --- a/keyboards/mariorion_v25/proto/mariorion_v25.c +++ b/keyboards/mariorion_v25/proto/mariorion_v25.c @@ -79,4 +79,4 @@ void suspend_wakeup_init_kb(void) { writePinHigh(INDICATOR_2); suspend_wakeup_init_user(); -} \ No newline at end of file +} diff --git a/keyboards/mariorion_v25/readme.md b/keyboards/mariorion_v25/readme.md index c17a515385b..798338d90dd 100644 --- a/keyboards/mariorion_v25/readme.md +++ b/keyboards/mariorion_v25/readme.md @@ -1,4 +1,4 @@ -# mariorion_v25 +# MariOrion v2.5 ![mariorion_v25_1](https://i.imgur.com/3OrUK2ph.jpeg) ![mariorion_v25_2](https://i.imgur.com/OvMBHOlh.jpeg) @@ -6,20 +6,21 @@ *A short description of the keyboard/project* * Keyboard Maintainer: [Maria](https://github.com/toril940) -* Hardware Supported: MariOrion v2.5 +* Hardware Supported: MariOrion v2.5 PCB * Hardware Availability: *Links to where you can find this hardware* Make example for this keyboard (after setting up your build environment): make mariorion_v25/prod:default + make mariorion_v25/proto:default Flashing example for this keyboard: make mariorion_v25/prod:default:flash + make mariorion_v25/proto:default:flash See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). -Note: change prod to proto if you have a prototype PCB. ## Bootloader diff --git a/keyboards/mariorion_v25/rules.mk b/keyboards/mariorion_v25/rules.mk index 14b03414efd..f0bfa47284c 100644 --- a/keyboards/mariorion_v25/rules.mk +++ b/keyboards/mariorion_v25/rules.mk @@ -1 +1 @@ -DEFAULT_FOLDER = mariorion_v25/prod \ No newline at end of file +DEFAULT_FOLDER = mariorion_v25/prod