1
0
Fork 0
forked from forks/qmk_firmware
Commit graph

25914 commits

Author SHA1 Message Date
Maria 2b06e3f7c5
Update keyboards/mariorion_v25/prod/info.json
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-10-26 18:45:38 +01:00
Maria e05f75fe0d
Update keyboards/mariorion_v25/prod/keymaps/via/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-10-26 18:45:22 +01:00
Maria b22b92cb21
Update keyboards/mariorion_v25/prod/keymaps/via/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-10-26 18:45:05 +01:00
toril940 50b89d4bc0 Fixes to LED driver wrt PWM definitions with STM. 2023-10-26 18:41:58 +01:00
toril940 cd4a64e86b Pushed new info.json and keymap.c files. 2023-10-21 22:55:03 +01:00
toril940 3ac5aaa81f Merge remote-tracking branch 'origin/toril940mariorion_v25' into toril940mariorion_v25 2023-10-21 22:19:36 +01:00
toril940 a6c78ebfbb Pushed new info.json and keymap.c files. 2023-10-21 22:19:24 +01:00
Maria 08b476234c
Update keyboards/mariorion_v25/prod/mariorion_v25.c
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-10-21 21:58:43 +01:00
Maria 493d9e9a14
Update keyboards/mariorion_v25/proto/mariorion_v25.c
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-10-21 21:58:36 +01:00
Maria 5415a113e8
Update keyboards/mariorion_v25/readme.md
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-10-21 21:57:48 +01:00
Maria 518871ccd8
Update keyboards/mariorion_v25/readme.md
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-10-21 21:56:40 +01:00
Maria 838bd4577d
Update keyboards/mariorion_v25/readme.md
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-10-21 21:56:35 +01:00
Maria f601b0fa93
Update keyboards/mariorion_v25/readme.md
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-10-17 16:23:01 +01:00
Maria 32f533ce1f
Update keyboards/mariorion_v25/readme.md
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-10-17 16:22:53 +01:00
Maria 60430217f6
Update keyboards/mariorion_v25/matrix_diagram.md
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-10-17 16:22:47 +01:00
Maria 3ecc5d338a
Revert keyboards/gray_studio/think65/solder/solder.c
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-10-17 16:22:40 +01:00
Maria f5e66e9d77
Update keyboards/mariorion_v25/prod/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-10-17 16:22:25 +01:00
Maria 5bedd56658
Update keyboards/mariorion_v25/prod/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-10-17 16:22:17 +01:00
Maria 66143f2ac8
Update keyboards/mariorion_v25/prod/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-10-17 16:22:10 +01:00
Maria b8a478b26b
Update keyboards/mariorion_v25/prod/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-10-17 16:22:02 +01:00
Maria f2afbd628a
Update keyboards/mariorion_v25/proto/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-10-17 16:21:54 +01:00
Maria 978b6f469b
Update keyboards/mariorion_v25/proto/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-10-17 16:21:45 +01:00
Maria 49186f7407
Update keyboards/mariorion_v25/proto/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-10-17 16:21:35 +01:00
Maria 62f4e6e93a
Update keyboards/mariorion_v25/rules.mk
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-10-17 16:21:28 +01:00
Maria 97bd687052
Update keyboards/mariorion_v25/proto/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-10-17 16:21:17 +01:00
toril940 215bac3167 Merge branch 'toril940mariorion_v25' of github.com:toril940/qmk_firmware into toril940mariorion_v25 2023-10-17 11:58:21 +01:00
toril940 65dbfe4bbd 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) 2023-10-17 11:57:38 +01:00
Maria cd4909c898
Revert keyboards/gray_studio/think65/solder/solder.c
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-10-15 23:27:53 +01:00
toril940 d792055ba9 Merge remote-tracking branch 'origin/toril940mariorion_v25' into toril940mariorion_v25 2023-10-15 23:27:10 +01:00
toril940 a7bfb1f21a 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) 2023-10-15 23:26:55 +01:00
Maria 3307f8c743
Revert keyboards/gray_studio/think65/solder/solder.c
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-10-15 18:19:59 +01:00
Maria c0b5458777
Revert keyboards/gray_studio/think65/solder/solder.c
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-10-15 18:19:50 +01:00
Maria 4a2fa7e7cb
Revert keyboards/gray_studio/think65/solder/solder.c
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-10-15 18:19:32 +01:00
Maria e2b17798ad
Update keyboards/mariorion_v25/readme.md
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-10-15 18:19:22 +01:00
toril940 1f7250221b Amended some changes to info.json - community layouts changed from scope to array. 2023-10-15 14:41:12 +01:00
Maria 556c736aac
Update keyboards/mariorion_v25/prod/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-10-15 14:32:58 +01:00
Maria 1a633a0704
Update keyboards/mariorion_v25/prod/keymaps/default/keymap.c
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-10-15 14:32:50 +01:00
Maria 6d0990a7db
Update keyboards/mariorion_v25/prod/keymaps/via/keymap.c
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-10-15 14:32:41 +01:00
toril940 dd8fbd4d5a Merge remote-tracking branch 'origin/toril940mariorion_v25' into toril940mariorion_v25 2023-10-15 14:32:01 +01:00
toril940 b531a5c9a4 Updated readme.md with more information regarding make commands, and proto vs prod. 2023-10-15 14:31:01 +01:00
Maria 19df2deafe
Update keyboards/mariorion_v25/proto/keymaps/default/keymap.c
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-10-15 14:29:05 +01:00
Maria eb59f5ada5
Update keyboards/mariorion_v25/proto/keymaps/via/keymap.c
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-10-15 14:28:58 +01:00
toril940 a5f706a797 Merge branch 'toril940mariorion_v25' of github.com:toril940/qmk_firmware into toril940mariorion_v25 2023-10-15 14:28:13 +01:00
toril940 307b4f1fcf Merge branch 'toril940mariorion_v25' of github.com:toril940/qmk_firmware into toril940mariorion_v25 2023-10-15 14:25:54 +01:00
Maria 4f14c0130c
Proper addition of layout options
Addition of split bs rshift tsangan layout options.

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-10-15 14:24:52 +01:00
toril940 e6807bcc88 Merge remote-tracking branch 'origin/toril940mariorion_v25' into toril940mariorion_v25 2023-10-14 16:42:58 +01:00
toril940 a4abdaacb0 Merge branch 'toril940mariorion_v25' of github.com:toril940/qmk_firmware into toril940mariorion_v25 2023-10-14 16:42:39 +01:00
toril940 8e8b29aab1 Merge branch 'toril940mariorion_v25' of github.com:toril940/qmk_firmware into toril940mariorion_v25 2023-10-14 16:39:42 +01:00
toril940 d5911c9270 Pushed MariOrion v2.5 to the branch. Prod and proto version added. 2023-10-14 16:38:16 +01:00
toril940 b998c78849 Pushed MariOrion v2.5 to the branch. Prod and proto version added. 2023-10-14 16:23:18 +01:00