From 97bd68705287962550df0c749042c21c0e7c2d03 Mon Sep 17 00:00:00 2001 From: Maria <81305596+toril940@users.noreply.github.com> Date: Tue, 17 Oct 2023 16:21:17 +0100 Subject: [PATCH 01/18] Update keyboards/mariorion_v25/proto/info.json Co-authored-by: Duncan Sutherland --- keyboards/mariorion_v25/proto/info.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/mariorion_v25/proto/info.json b/keyboards/mariorion_v25/proto/info.json index ba1720dfcf1..26d29888946 100644 --- a/keyboards/mariorion_v25/proto/info.json +++ b/keyboards/mariorion_v25/proto/info.json @@ -394,8 +394,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}, From 62f4e6e93a5ce49af1b20b28a4095c7bd41a2738 Mon Sep 17 00:00:00 2001 From: Maria <81305596+toril940@users.noreply.github.com> Date: Tue, 17 Oct 2023 16:21:28 +0100 Subject: [PATCH 02/18] Update keyboards/mariorion_v25/rules.mk Co-authored-by: Duncan Sutherland --- keyboards/mariorion_v25/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 49186f74073b62dd6fcb132a240de7de93667c64 Mon Sep 17 00:00:00 2001 From: Maria <81305596+toril940@users.noreply.github.com> Date: Tue, 17 Oct 2023 16:21:35 +0100 Subject: [PATCH 03/18] Update keyboards/mariorion_v25/proto/info.json Co-authored-by: Duncan Sutherland --- keyboards/mariorion_v25/proto/info.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/mariorion_v25/proto/info.json b/keyboards/mariorion_v25/proto/info.json index 26d29888946..58656a2c29c 100644 --- a/keyboards/mariorion_v25/proto/info.json +++ b/keyboards/mariorion_v25/proto/info.json @@ -485,8 +485,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}, From 978b6f469b84bb7d992e645dc9a6e58d06322142 Mon Sep 17 00:00:00 2001 From: Maria <81305596+toril940@users.noreply.github.com> Date: Tue, 17 Oct 2023 16:21:45 +0100 Subject: [PATCH 04/18] Update keyboards/mariorion_v25/proto/info.json Co-authored-by: Duncan Sutherland --- keyboards/mariorion_v25/proto/info.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/mariorion_v25/proto/info.json b/keyboards/mariorion_v25/proto/info.json index 58656a2c29c..a4e61a91c1f 100644 --- a/keyboards/mariorion_v25/proto/info.json +++ b/keyboards/mariorion_v25/proto/info.json @@ -301,8 +301,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}, From f2afbd628a3464ead3e8c46fbbad6dc337f93ffd Mon Sep 17 00:00:00 2001 From: Maria <81305596+toril940@users.noreply.github.com> Date: Tue, 17 Oct 2023 16:21:54 +0100 Subject: [PATCH 05/18] Update keyboards/mariorion_v25/proto/info.json Co-authored-by: Duncan Sutherland --- keyboards/mariorion_v25/proto/info.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/mariorion_v25/proto/info.json b/keyboards/mariorion_v25/proto/info.json index a4e61a91c1f..6d56032e1fd 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}, From b8a478b26bb4211797e70d1822556ac7fac2492b Mon Sep 17 00:00:00 2001 From: Maria <81305596+toril940@users.noreply.github.com> Date: Tue, 17 Oct 2023 16:22:02 +0100 Subject: [PATCH 06/18] Update keyboards/mariorion_v25/prod/info.json Co-authored-by: Duncan Sutherland --- keyboards/mariorion_v25/prod/info.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/mariorion_v25/prod/info.json b/keyboards/mariorion_v25/prod/info.json index d9680b120d8..0d729b20663 100644 --- a/keyboards/mariorion_v25/prod/info.json +++ b/keyboards/mariorion_v25/prod/info.json @@ -486,8 +486,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}, From 66143f2ac88146591318a815066b44b6b5d248f4 Mon Sep 17 00:00:00 2001 From: Maria <81305596+toril940@users.noreply.github.com> Date: Tue, 17 Oct 2023 16:22:10 +0100 Subject: [PATCH 07/18] Update keyboards/mariorion_v25/prod/info.json Co-authored-by: Duncan Sutherland --- keyboards/mariorion_v25/prod/info.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/mariorion_v25/prod/info.json b/keyboards/mariorion_v25/prod/info.json index 0d729b20663..59042522d22 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}, From 5bedd5665846e7610fff720a5eda8a1073406ded Mon Sep 17 00:00:00 2001 From: Maria <81305596+toril940@users.noreply.github.com> Date: Tue, 17 Oct 2023 16:22:17 +0100 Subject: [PATCH 08/18] Update keyboards/mariorion_v25/prod/info.json Co-authored-by: Duncan Sutherland --- keyboards/mariorion_v25/prod/info.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/mariorion_v25/prod/info.json b/keyboards/mariorion_v25/prod/info.json index 59042522d22..fc1e0db2fe2 100644 --- a/keyboards/mariorion_v25/prod/info.json +++ b/keyboards/mariorion_v25/prod/info.json @@ -393,8 +393,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}, From f5e66e9d77be4f23692888c42c74036a6e9ae313 Mon Sep 17 00:00:00 2001 From: Maria <81305596+toril940@users.noreply.github.com> Date: Tue, 17 Oct 2023 16:22:25 +0100 Subject: [PATCH 09/18] Update keyboards/mariorion_v25/prod/info.json Co-authored-by: Duncan Sutherland --- keyboards/mariorion_v25/prod/info.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/mariorion_v25/prod/info.json b/keyboards/mariorion_v25/prod/info.json index fc1e0db2fe2..3044052907f 100644 --- a/keyboards/mariorion_v25/prod/info.json +++ b/keyboards/mariorion_v25/prod/info.json @@ -300,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}, From 3ecc5d338ac65fca1d456a7bafa8c478fe211789 Mon Sep 17 00:00:00 2001 From: Maria <81305596+toril940@users.noreply.github.com> Date: Tue, 17 Oct 2023 16:22:40 +0100 Subject: [PATCH 10/18] Revert keyboards/gray_studio/think65/solder/solder.c Co-authored-by: Duncan Sutherland --- keyboards/gray_studio/think65/solder/solder.c | 1 + 1 file changed, 1 insertion(+) 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 From 60430217f6e1bfa9bc805c28c58985b039827b30 Mon Sep 17 00:00:00 2001 From: Maria <81305596+toril940@users.noreply.github.com> Date: Tue, 17 Oct 2023 16:22:47 +0100 Subject: [PATCH 11/18] Update keyboards/mariorion_v25/matrix_diagram.md Co-authored-by: Duncan Sutherland --- keyboards/mariorion_v25/matrix_diagram.md | 2 ++ 1 file changed, 2 insertions(+) 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 │ └───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘ From 32f533ce1f7d54f95f54ce45e9791960b8985ffc Mon Sep 17 00:00:00 2001 From: Maria <81305596+toril940@users.noreply.github.com> Date: Tue, 17 Oct 2023 16:22:53 +0100 Subject: [PATCH 12/18] Update keyboards/mariorion_v25/readme.md Co-authored-by: Duncan Sutherland --- keyboards/mariorion_v25/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/mariorion_v25/readme.md b/keyboards/mariorion_v25/readme.md index c17a515385b..1da9fb63803 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) From f601b0fa932b88931fb9d60ffdf3efec88ccf16f Mon Sep 17 00:00:00 2001 From: Maria <81305596+toril940@users.noreply.github.com> Date: Tue, 17 Oct 2023 16:23:01 +0100 Subject: [PATCH 13/18] Update keyboards/mariorion_v25/readme.md Co-authored-by: Duncan Sutherland --- keyboards/mariorion_v25/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/mariorion_v25/readme.md b/keyboards/mariorion_v25/readme.md index 1da9fb63803..2a0e993ce48 100644 --- a/keyboards/mariorion_v25/readme.md +++ b/keyboards/mariorion_v25/readme.md @@ -6,7 +6,7 @@ *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): From 838bd4577d8b06a7e44e62f8387847cfbd2d9acb Mon Sep 17 00:00:00 2001 From: Maria <81305596+toril940@users.noreply.github.com> Date: Sat, 21 Oct 2023 21:56:35 +0100 Subject: [PATCH 14/18] Update keyboards/mariorion_v25/readme.md Co-authored-by: Duncan Sutherland --- keyboards/mariorion_v25/readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/mariorion_v25/readme.md b/keyboards/mariorion_v25/readme.md index 2a0e993ce48..aed39d15d7b 100644 --- a/keyboards/mariorion_v25/readme.md +++ b/keyboards/mariorion_v25/readme.md @@ -19,7 +19,6 @@ Flashing example for this keyboard: 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 From 518871ccd842e7e4a9ce6d7d8c94f92e535ed284 Mon Sep 17 00:00:00 2001 From: Maria <81305596+toril940@users.noreply.github.com> Date: Sat, 21 Oct 2023 21:56:40 +0100 Subject: [PATCH 15/18] Update keyboards/mariorion_v25/readme.md Co-authored-by: Duncan Sutherland --- keyboards/mariorion_v25/readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/mariorion_v25/readme.md b/keyboards/mariorion_v25/readme.md index aed39d15d7b..46843acbdce 100644 --- a/keyboards/mariorion_v25/readme.md +++ b/keyboards/mariorion_v25/readme.md @@ -16,6 +16,7 @@ Make example for this keyboard (after setting up your build environment): 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). From 5415a113e84f9d40d0d15c530792e16079e4d749 Mon Sep 17 00:00:00 2001 From: Maria <81305596+toril940@users.noreply.github.com> Date: Sat, 21 Oct 2023 21:57:48 +0100 Subject: [PATCH 16/18] Update keyboards/mariorion_v25/readme.md Co-authored-by: Duncan Sutherland --- keyboards/mariorion_v25/readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/mariorion_v25/readme.md b/keyboards/mariorion_v25/readme.md index 46843acbdce..798338d90dd 100644 --- a/keyboards/mariorion_v25/readme.md +++ b/keyboards/mariorion_v25/readme.md @@ -12,6 +12,7 @@ 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: From 493d9e9a145c89aa12858228243fbddb40b41ffc Mon Sep 17 00:00:00 2001 From: Maria <81305596+toril940@users.noreply.github.com> Date: Sat, 21 Oct 2023 21:58:36 +0100 Subject: [PATCH 17/18] Update keyboards/mariorion_v25/proto/mariorion_v25.c Co-authored-by: Duncan Sutherland --- keyboards/mariorion_v25/proto/mariorion_v25.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 +} From 08b476234c686f4726c78b878991956b4be5cb15 Mon Sep 17 00:00:00 2001 From: Maria <81305596+toril940@users.noreply.github.com> Date: Sat, 21 Oct 2023 21:58:43 +0100 Subject: [PATCH 18/18] Update keyboards/mariorion_v25/prod/mariorion_v25.c Co-authored-by: Duncan Sutherland --- keyboards/mariorion_v25/prod/mariorion_v25.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 +}