forked from forks/qmk_firmware
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 068a82a1fc.
* 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>
16 lines
384 B
C
16 lines
384 B
C
// Copyright 2023 Maria (@toril940)
|
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
#pragma once
|
|
|
|
#define WS2812_EXTERNAL_PULLUP
|
|
|
|
#define WS2812_PWM_DRIVER PWMD17
|
|
#define WS2812_PWM_CHANNEL 1
|
|
#define WS2812_DMA_STREAM STM32_DMA1_STREAM1
|
|
#define WS2812_DMA_CHANNEL 1
|
|
// #define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM17_UP
|
|
|
|
#define INDICATOR_0 C9
|
|
#define INDICATOR_1 C8
|
|
#define INDICATOR_2 C7 |