mirror of
https://github.com/Keychron/qmk_firmware.git
synced 2024-11-24 17:37:40 +06:00
6876fbe51d
* 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>
4.2 KiB
4.2 KiB
Matrix Diagram for MariOrion v2.5
┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
│00 │ │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D │ │0F │0G │0H │
└───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐ ┌───────┐
│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │ │2F │1G │1H │ │1D │ 2u Backspace
├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤ └─┬─────┤
│20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │ │3F │2G │2H │ │ │
├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ ┌──┴┐3D │ ISO Enter
│30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D │ │3C │ │
├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌───┐ └───┴────┘
│40 │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C │4D │ │4G │
├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ ┌───┼───┼───┐
│50 │51 │52 │55 │5A │5B │5C │5D │ │5F │5G │5H │
└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
┌────────┐ ┌──────────┐
│40 │ 2.25u LShift 2.75u RShift │4C │
└────────┘ └──────────┘
┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
│50 │51 │52 │55 │5B │5C │5D │ Tsangan/WKL
└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
┌─────┬───┬─────┬───────────┬───┬───────────┬─────┬───┬─────┐
│50 │51 │52 │53 │55 │57 │5B │5C │5D │ Split 7u Spacebar
└─────┴───┴─────┴───────────┴───┴───────────┴─────┴───┴─────┘
┌─────┬───┬───────────────────────────────────────┬───┬─────┐
│50 │51 │55 │5C │5D │ 10u Spacebar
└─────┴───┴───────────────────────────────────────┴───┴─────┘