Fixes to LED driver wrt PWM definitions with STM.

qmk · waffle87 · Nov 10, 2023 · Oct 14, 2023 · Oct 14, 2023 · Oct 14, 2023
commit 50b89d4bc0de975784d6ca4dbcb53d576034b96f
diff --git a/keyboards/mariorion_v25/halconf.h b/keyboards/mariorion_v25/halconf.h
@@ -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"
diff --git a/keyboards/mariorion_v25/mcuconf.h b/keyboards/mariorion_v25/mcuconf.h
@@ -0,0 +1,6 @@
+#pragma once
+
+#define STM32_PWM_USE_TIM17 TRUE
+#define STM32_TIM17_SUPPRESS_ISR
+
+#include_next "mcuconf.h"
diff --git a/keyboards/mariorion_v25/prod/config.h b/keyboards/mariorion_v25/prod/config.h
@@ -32,6 +32,12 @@
 //#define NO_ACTION_ONESHOT
 
 #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 SCROLL_LOCK_LED A15

diff --git a/keyboards/mariorion_v25/prod/info.json b/keyboards/mariorion_v25/prod/info.json
@@ -10,7 +10,8 @@
         "console": false,
         "extrakey": true,
         "mousekey": true,
-        "nkro": true
+        "nkro": true,
+        "rgblight" : true
     },
     "rgblight": {
         "led_count": 25,

diff --git a/keyboards/mariorion_v25/proto/config.h b/keyboards/mariorion_v25/proto/config.h
@@ -21,6 +21,13 @@
 
 #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 SCROLL_LOCK_LED A15
 

diff --git a/keyboards/mariorion_v25/proto/info.json b/keyboards/mariorion_v25/proto/info.json
@@ -10,7 +10,8 @@
         "console": false,
         "extrakey": true,
         "mousekey": true,
-        "nkro": true
+        "nkro": true,
+        "rgblight": true
     },
     "rgblight": {
         "led_count": 25,

diff --git a/keyboards/mariorion_v25/proto/keymaps/default/keymap.c b/keyboards/mariorion_v25/proto/keymaps/default/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	 * └────┴────┴────┴─────────┴───┴──────────┴────┴────┴────┴────┘ └───┴───┴───┘
 	 */
 	[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_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,