gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-07-22 15:42:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes to LED driver wrt PWM definitions with STM.

Browse Source
This commit is contained in:
toril940 2023-10-26 18:41:58 +01:00
parent cd4a64e86b
commit 50b89d4bc0
7 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
keyboards/mariorion_v25/halconf.h Normal file
View File

@ -0,0 +1,9 @@
#pragma once
#undef HAL_USE_PWM
#define HAL_USE_PWM TRUE
#undef HAL_USE_SPI
#define HAL_USE_SPI FALSE
#include_next "halconf.h"

6
keyboards/mariorion_v25/mcuconf.h Normal file
View File

@ -0,0 +1,6 @@
#pragma once
#define STM32_PWM_USE_TIM17 TRUE
#define STM32_TIM17_SUPPRESS_ISR
#include_next "mcuconf.h"

6
keyboards/mariorion_v25/prod/config.h
View File

@ -32,6 +32,12 @@
//#define NO_ACTION_ONESHOT //#define NO_ACTION_ONESHOT
#define WS2812_EXTERNAL_PULLUP #define WS2812_EXTERNAL_PULLUP
#define WS2812_PWM_DRIVER PWMD17
#define WS2812_PWM_CHANNEL 1
#define WS2812_PWM_PAL_MODE 2
#define WS2812_DMA_STREAM STM32_DMA1_STREAM1
#define WS2812_DMA_CHANNEL 1
// #define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM17_UP
#define CAPS_LOCK_LED A6 #define CAPS_LOCK_LED A6
#define SCROLL_LOCK_LED A15 #define SCROLL_LOCK_LED A15

3
keyboards/mariorion_v25/prod/info.json
View File

@ -10,7 +10,8 @@
"console": false, "console": false,
"extrakey": true, "extrakey": true,
"mousekey": true, "mousekey": true,
"nkro": true "nkro": true,
"rgblight" : true
}, },
"rgblight": { "rgblight": {
"led_count": 25, "led_count": 25,

7
keyboards/mariorion_v25/proto/config.h
View File

@ -21,6 +21,13 @@
#define WS2812_EXTERNAL_PULLUP #define WS2812_EXTERNAL_PULLUP
#define WS2812_PWM_DRIVER PWMD17
#define WS2812_PWM_CHANNEL 1
#define WS2812_PWM_PAL_MODE 2
#define WS2812_DMA_STREAM STM32_DMA1_STREAM1
#define WS2812_DMA_CHANNEL 1
// #define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM17_UP
#define CAPS_LOCK_LED A5 #define CAPS_LOCK_LED A5
#define SCROLL_LOCK_LED A15 #define SCROLL_LOCK_LED A15

3
keyboards/mariorion_v25/proto/info.json
View File

@ -10,7 +10,8 @@
"console": false, "console": false,
"extrakey": true, "extrakey": true,
"mousekey": true, "mousekey": true,
"nkro": true "nkro": true,
"rgblight": true
}, },
"rgblight": { "rgblight": {
"led_count": 25, "led_count": 25,

2
keyboards/mariorion_v25/proto/keymaps/default/keymap.c
View File

@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* └────┴────┴────┴─────────┴───┴──────────┴────┴────┴────┴────┘ └───┴───┴───┘ * └────┴────┴────┴─────────┴───┴──────────┴────┴────┴────┴────┘ └───┴───┴───┘
*/ */
[0] = LAYOUT_all( [0] = LAYOUT_all(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, EE_CLR, QK_BOOT,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN,