Move RGBLIGHT_LED_MAP to data driven (#21095)

This commit is contained in:
Ryan 2023-06-14 22:01:13 +10:00 committed by GitHub
parent 6c4286152f
commit 9551a0a38a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
84 changed files with 68 additions and 306 deletions

View File

@ -117,6 +117,7 @@
"RGBLIGHT_LAYER_BLINK": {"info_key": "rgblight.layers.blink", "value_type": "bool"}, "RGBLIGHT_LAYER_BLINK": {"info_key": "rgblight.layers.blink", "value_type": "bool"},
"RGBLIGHT_LAYERS": {"info_key": "rgblight.layers.enabled", "value_type": "bool"}, "RGBLIGHT_LAYERS": {"info_key": "rgblight.layers.enabled", "value_type": "bool"},
"RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF": {"info_key": "rgblight.layers.override_rgb", "value_type": "bool"}, "RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF": {"info_key": "rgblight.layers.override_rgb", "value_type": "bool"},
"RGBLIGHT_LED_MAP": {"info_key": "rgblight.led_map", "value_type": "array.int"},
"RGBLIGHT_LIMIT_VAL": {"info_key": "rgblight.max_brightness", "value_type": "int"}, "RGBLIGHT_LIMIT_VAL": {"info_key": "rgblight.max_brightness", "value_type": "int"},
"RGBLIGHT_MAX_LAYERS": {"info_key": "rgblight.layers.max", "value_type": "int"}, "RGBLIGHT_MAX_LAYERS": {"info_key": "rgblight.layers.max", "value_type": "int"},
"RGBLIGHT_SAT_STEP": {"info_key": "rgblight.saturation_steps", "value_type": "int"}, "RGBLIGHT_SAT_STEP": {"info_key": "rgblight.saturation_steps", "value_type": "int"},

View File

@ -491,6 +491,11 @@
} }
}, },
"led_count": {"$ref": "qmk.definitions.v1#/unsigned_int"}, "led_count": {"$ref": "qmk.definitions.v1#/unsigned_int"},
"led_map": {
"type": "array",
"minItems": 2,
"items": {"$ref": "qmk.definitions.v1#/unsigned_int"}
},
"max_brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, "max_brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"},
"pin": { "pin": {
"$ref": "qmk.definitions.v1#/mcu_pin", "$ref": "qmk.definitions.v1#/mcu_pin",

View File

@ -524,37 +524,6 @@ By defining `RGBLIGHT_LED_MAP` as in the example below, you can specify the LED
``` ```
<img src="https://user-images.githubusercontent.com/2170248/55743725-08ad7a80-5a6e-11e9-83ed-126a2b0209fc.JPG" alt="simple mapped" width="50%"/> <img src="https://user-images.githubusercontent.com/2170248/55743725-08ad7a80-5a6e-11e9-83ed-126a2b0209fc.JPG" alt="simple mapped" width="50%"/>
For keyboards that use the RGB LEDs as a backlight for each key, you can also define it as in the example below.
```c
// config.h
#define RGBLED_NUM 30
/* RGB LED Conversion macro from physical array to electric array */
#define LED_LAYOUT( \
L00, L01, L02, L03, L04, L05, \
L10, L11, L12, L13, L14, L15, \
L20, L21, L22, L23, L24, L25, \
L30, L31, L32, L33, L34, L35, \
L40, L41, L42, L43, L44, L45 ) \
{ \
L05, L04, L03, L02, L01, L00, \
L10, L11, L12, L13, L14, L15, \
L25, L24, L23, L22, L21, L20, \
L30, L31, L32, L33, L34, L35, \
L46, L45, L44, L43, L42, L41 \
}
/* RGB LED logical order map */
/* Top->Bottom, Right->Left */
#define RGBLIGHT_LED_MAP LED_LAYOUT( \
25, 20, 15, 10, 5, 0, \
26, 21, 16, 11, 6, 1, \
27, 22, 17, 12, 7, 2, \
28, 23, 18, 13, 8, 3, \
29, 24, 19, 14, 9, 4 )
``` ```
## Clipping Range ## Clipping Range

View File

@ -34,7 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef RGBLED_CONT #ifdef RGBLED_CONT
#define RGBLED_NUM 60 #define RGBLED_NUM 60
#define RGBLED_SPLIT { 30, 30 } #define RGBLED_SPLIT { 30, 30 }
// #define RGBLIGHT_LED_MAP {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29}
#else #else
#define RGBLED_NUM 30 #define RGBLED_NUM 30
#endif #endif

View File

@ -34,7 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef RGBLED_CONT #ifdef RGBLED_CONT
#define RGBLED_NUM 60 #define RGBLED_NUM 60
#define RGBLED_SPLIT { 30, 30 } #define RGBLED_SPLIT { 30, 30 }
// #define RGBLIGHT_LED_MAP {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29}
#else #else
#define RGBLED_NUM 30 #define RGBLED_NUM 30
#endif #endif

View File

@ -21,29 +21,6 @@
# define RGBLIGHT_EFFECT_KNIGHT # define RGBLIGHT_EFFECT_KNIGHT
# define RGBLIGHT_EFFECT_SNAKE # define RGBLIGHT_EFFECT_SNAKE
# define RGBLIGHT_EFFECT_CHRISTMAS # define RGBLIGHT_EFFECT_CHRISTMAS
// RGB LED Conversion macro from physical array to electric array. This results in better looking animated effects.
# define LED_LAYOUT( \
/* LED matrix */ \
L01, L02, L03, L04, L05, L06, L011, L012, L013, L014, L015, L016, \
L11, L12, L13, L14, L15, L16, L111, L112, L113, L114, L115, L116, \
L20, L21, L22, L23, L24, L25, L26, L211, L212, L213, L214, L215, L216, L217, \
L31, L32, L33, L34, L35, L36, L37, L38, L39, L310, L311, L312, L313, L314, L315, L316, \
L44, L45, L46, L47, L48, L49, L410, L411, L412, L413 )\
{ \
/* left half - electrical wiring order */ \
L47,L48,L38,L37,L36,L26,L16,L06,L05,L15,L25,L35,L46,L45,L34,L24,L14,L04,L03,L13,L23,L33,L44,L32,L22,L12,L02,L01,L11,L21,L31,L20, \
/* right half - electrical wiring order */ \
L410,L49,L39,L310,L311,L211,L111,L011,L012,L112,L212,L312,L411,L412,L313,L213,L113,L013,L014,L114,L214,L314,L413,L315,L215,L115,L015,L016,L116,L216,L316,L217 \
}
# define RGBLIGHT_LED_MAP LED_LAYOUT( \
/* animation order. */ \
4, 8, 12, 17, 22, 27, 40, 45, 50, 54, 58, 62, \
3, 7, 11, 16, 21, 26, 39, 44, 49, 53, 57, 61, \
0, 2, 6, 10, 15, 20, 25, 38, 43, 48, 52, 56, 60, 63, \
1, 5, 9, 14, 19, 24, 29, 31, 33, 35, 37, 42, 47, 51, 55, 59, \
13, 18, 23, 28, 30, 32, 34, 36, 41, 46 )
#endif #endif
#ifdef OLED_ENABLE #ifdef OLED_ENABLE

View File

@ -26,6 +26,7 @@
}, },
"rgblight": { "rgblight": {
"max_brightness": 100, "max_brightness": 100,
"led_map": [28, 30, 31, 29, 24, 25, 26, 27, 22, 21, 20, 19, 23, 18, 14, 15, 16, 17, 12, 11, 10, 9, 13, 5, 6, 7, 8, 4, 3, 2, 1, 0, 34, 32, 33, 35, 37, 38, 39, 40, 45, 44, 43, 42, 36, 41, 47, 48, 49, 50, 54, 53, 52, 51, 46, 55, 56, 57, 58, 62, 61, 60, 59, 63],
"split_count": [32, 32] "split_count": [32, 32]
}, },
"processor": "atmega32u4", "processor": "atmega32u4",

View File

@ -49,7 +49,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE #define RGBLIGHT_EFFECT_TWINKLE
#define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 6, 7, 8, 9, 10, 11, 12, 13, 14, 5 }
/* COL2ROW, ROW2COL*/ /* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW #define DIODE_DIRECTION COL2ROW

View File

@ -12,6 +12,9 @@
"caps_lock": "B2", "caps_lock": "B2",
"num_lock": "B3" "num_lock": "B3"
}, },
"rgblight": {
"led_map": [0, 1, 2, 3, 4, 6, 7, 8, 9, 10, 11, 12, 13, 14, 5]
},
"ws2812": { "ws2812": {
"pin": "E6" "pin": "E6"
}, },

View File

@ -29,7 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define RGBLIGHT_EFFECT_TWINKLE # define RGBLIGHT_EFFECT_TWINKLE
# define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 5 # define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 5
# define RGBLED_NUM 12 # define RGBLED_NUM 12
# define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 }
# define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8 # define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8 # define RGBLIGHT_VAL_STEP 8

View File

@ -18,14 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once #pragma once
#define RGBLED_NUM 33 #define RGBLED_NUM 33
#define RGBLIGHT_LED_MAP { \
0, 1, 2, 3, \
7, 6, 5, 4, \
8, 9, 10, 11, \
15, 14, 13, 12, \
16, 17, 18, 19, \
22, 21, 20, \
25, 24, 23, 26, 27, 28, 29, 30, 31, 32 }
#define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_VAL_STEP 8

View File

@ -12,7 +12,8 @@
"pin": "C6" "pin": "C6"
}, },
"rgblight": { "rgblight": {
"max_brightness": 32 "max_brightness": 32,
"led_map": [0, 1, 2, 3, 7, 6, 5, 4, 8, 9, 10, 11, 15, 14, 13, 12, 16, 17, 18, 19, 22, 21, 20, 25, 24, 23, 26, 27, 28, 29, 30, 31, 32]
}, },
"matrix_pins": { "matrix_pins": {
"cols": ["C7", "D6", "B3", "B0", "B1"], "cols": ["C7", "D6", "B3", "B0", "B1"],

View File

@ -1,5 +0,0 @@
// Copyright 2023 Massdrop, Inc.
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#define RGBLIGHT_LED_MAP {4, 0, 1, 2, 3}

View File

@ -25,6 +25,7 @@
"diode_direction": "ROW2COL", "diode_direction": "ROW2COL",
"rgblight": { "rgblight": {
"led_count": 5, "led_count": 5,
"led_map": [4, 0, 1, 2, 3],
"sleep": true, "sleep": true,
"animations": { "animations": {
"alternating": true, "alternating": true,

View File

@ -139,25 +139,3 @@ typedef union {
} keyboard_config_t; } keyboard_config_t;
extern keyboard_config_t keyboard_config; extern keyboard_config_t keyboard_config;
/* ---- LEFT HAND ---- ---- RIGHT HAND ---- */
#define LED_LAYOUT_ergodox_pretty( \
L01,L02,L03,L04,L05, R01,R02,R03,R04,R05, \
L11,L12,L13,L14,L15, R11,R12,R13,R14,R15, \
L21,L22,L23,L24,L25, R21,R22,R23,R24,R25, \
L31,L32,L33,L34,L35, R31,R32,R33,R34,R35, \
L41,L42,L43,L44, R42,R43,R44,R45 ) \
\
/* matrix positions */ \
{ R01, R02, R03, R04, R05, \
R11, R12, R13, R14, R15, \
R21, R22, R23, R24, R25, \
R31, R32, R33, R34, R35, \
R42, R43, R44, R45, \
\
L05, L04, L03, L02, L01, \
L15, L14, L13, L12, L11, \
L25, L24, L23, L22, L21, \
L35, L34, L33, L32, L31, \
L44, L43, L42, L41 \
}

View File

@ -30,7 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* ws2812 RGB LED */ /* ws2812 RGB LED */
#define RGBLED_NUM 16 #define RGBLED_NUM 16
#define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 7, 15, 14, 13, 12, 11, 10, 9, 8}
#define RGBLIGHT_SPLIT #define RGBLIGHT_SPLIT
#define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_MOOD

View File

@ -19,6 +19,7 @@
] ]
}, },
"rgblight": { "rgblight": {
"led_map": [0, 1, 2, 3, 4, 5, 6, 7, 15, 14, 13, 12, 11, 10, 9, 8],
"split_count": [8, 8] "split_count": [8, 8]
}, },
"ws2812": { "ws2812": {

View File

@ -41,28 +41,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// By default, LEDs of the buttons which are pressed turn on. // By default, LEDs of the buttons which are pressed turn on.
// # define RGBLIGHT_EFFECT_TWINKLE // # define RGBLIGHT_EFFECT_TWINKLE
// # define RGBLIGHT_EFFECT_KNIGHT // # define RGBLIGHT_EFFECT_KNIGHT
// RGBLIGHT LED MAP
// Right 1st row (12 LEDs)
// ENCODER
// Right 2nd .. 5th row(13, 12, 13, 12 LEDs)
// Left 1st .. 5th row (12 LEDs x 5 rows)
# define RGBLIGHT_LED_MAP { \
60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, \
97, \
84, 83, 82, 81, 80, 79, 78, 77, 76, 75, 74, 73, 72, \
85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, \
110, 109, 108, 107, 106, 105, 104, 103, 102, 101, 100, 99, 98, \
111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, \
\
11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, \
12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, \
35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, \
36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, \
59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49, 48 \
}
#endif #endif
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE

View File

@ -12,7 +12,8 @@
"driver": "WS2812" "driver": "WS2812"
}, },
"rgblight": { "rgblight": {
"max_brightness": 80 "max_brightness": 80,
"led_map": [60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 97, 84, 83, 82, 81, 80, 79, 78, 77, 76, 75, 74, 73, 72, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 110, 109, 108, 107, 106, 105, 104, 103, 102, 101, 100, 99, 98, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49, 48]
}, },
"matrix_pins": { "matrix_pins": {
"cols": ["B1", "F7", "F6", "F5", "F4", "B3", "B2", "B6", "D0", "D1"], "cols": ["B1", "F7", "F6", "F5", "F4", "B3", "B2", "B6", "D0", "D1"],

View File

@ -21,8 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#if !defined(RGBLED_NUM) #if !defined(RGBLED_NUM)
# define RGBLED_NUM 30 # define RGBLED_NUM 30
# define RGBLIGHT_SPLIT # define RGBLIGHT_SPLIT
// Switch RGB sides with LED MAP.
# define RGBLIGHT_LED_MAP { 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30}
# define RGBLIGHT_LAYERS # define RGBLIGHT_LAYERS
#endif #endif
#define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_BREATHING

View File

@ -17,6 +17,7 @@
"soft_serial_pin": "D0" "soft_serial_pin": "D0"
}, },
"rgblight": { "rgblight": {
"led_map": [15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30],
"split_count": [16, 14] "split_count": [16, 14]
}, },
"ws2812": { "ws2812": {

View File

@ -23,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_DMA_STREAM STM32_DMA1_STREAM6 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. #define WS2812_DMA_STREAM STM32_DMA1_STREAM6 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
#define WS2812_DMA_CHANNEL 2 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. #define WS2812_DMA_CHANNEL 2 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
#define WS2812_PWM_TARGET_PERIOD 800000 #define WS2812_PWM_TARGET_PERIOD 800000
#define RGBLIGHT_LED_MAP { 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 23, 21, 19, 17, 15, 13, 11, 9, 7, 5, 3, 1 }
# define RGBLED_NUM 24 # define RGBLED_NUM 24
# define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_HUE_STEP 8

View File

@ -8,6 +8,9 @@
"pid": "0x2137", "pid": "0x2137",
"device_version": "0.0.1" "device_version": "0.0.1"
}, },
"rgblight": {
"led_map": [0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 23, 21, 19, 17, 15, 13, 11, 9, 7, 5, 3, 1]
},
"ws2812": { "ws2812": {
"pin": "B9" "pin": "B9"
}, },

View File

@ -49,7 +49,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#endif #endif
#define RGBLED_NUM 14 // Left(4) + Right(2) + Under(8) #define RGBLED_NUM 14 // Left(4) + Right(2) + Under(8)
#define RGBLIGHT_LED_MAP {0,1,2,3,13,12,4,5,6,7,8,9,10,11} // Left --> Right --> Under
#define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_VAL_STEP 8

View File

@ -14,6 +14,9 @@
{"pin_a": "B3", "pin_b": "B2"} {"pin_a": "B3", "pin_b": "B2"}
] ]
}, },
"rgblight": {
"led_map": [0, 1, 2, 3, 13, 12, 4, 5, 6, 7, 8, 9, 10, 11]
},
"ws2812": { "ws2812": {
"pin": "F0" "pin": "F0"
}, },

View File

@ -35,5 +35,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE #define RGBLIGHT_EFFECT_TWINKLE
#define RGBLED_NUM 16 // Number of LEDs #define RGBLED_NUM 16 // Number of LEDs
#define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 12, 13, 14, 15, 4, 5, 6, 7, 8, 9, 10, 11 }
#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2) #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)

View File

@ -25,6 +25,7 @@
"soft_serial_pin": "D0" "soft_serial_pin": "D0"
}, },
"rgblight": { "rgblight": {
"led_map": [0, 1, 2, 3, 12, 13, 14, 15, 4, 5, 6, 7, 8, 9, 10, 11],
"split_count": [8, 8] "split_count": [8, 8]
}, },
"ws2812": { "ws2812": {

View File

@ -39,4 +39,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE #define RGBLIGHT_EFFECT_TWINKLE
#define RGBLED_NUM 16 // Number of LEDs #define RGBLED_NUM 16 // Number of LEDs
#define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 }

View File

@ -22,6 +22,7 @@
"pin": "B5" "pin": "B5"
}, },
"rgblight": { "rgblight": {
"led_map": [1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8],
"split_count": [8, 8] "split_count": [8, 8]
}, },
"ws2812": { "ws2812": {

View File

@ -24,7 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* ws2812 RGB LED */ /* ws2812 RGB LED */
#define RGBLED_NUM 16 // Number of LEDs #define RGBLED_NUM 16 // Number of LEDs
#define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 }
#define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL #define RGBLIGHT_EFFECT_RAINBOW_SWIRL

View File

@ -22,6 +22,7 @@
"pin": "B5" "pin": "B5"
}, },
"rgblight": { "rgblight": {
"led_map": [1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8],
"split_count": [8, 8] "split_count": [8, 8]
}, },
"ws2812": { "ws2812": {

View File

@ -24,7 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* ws2812 RGB LED */ /* ws2812 RGB LED */
#define RGBLED_NUM 16 // Number of LEDs #define RGBLED_NUM 16 // Number of LEDs
#define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 }
#define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL #define RGBLIGHT_EFFECT_RAINBOW_SWIRL

View File

@ -22,6 +22,7 @@
"pin": "B5" "pin": "B5"
}, },
"rgblight": { "rgblight": {
"led_map": [1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8],
"split_count": [8, 8] "split_count": [8, 8]
}, },
"ws2812": { "ws2812": {

View File

@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* ws2812 RGB LED */ /* ws2812 RGB LED */
#define RGBLED_NUM 16 // Number of LEDs #define RGBLED_NUM 16 // Number of LEDs
#define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 }
#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2) #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
#define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_MOOD

View File

@ -19,6 +19,7 @@
] ]
}, },
"rgblight": { "rgblight": {
"led_map": [1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8],
"split_count": [8, 8] "split_count": [8, 8]
}, },
"ws2812": { "ws2812": {

View File

@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* ws2812 RGB LED */ /* ws2812 RGB LED */
#define RGBLED_NUM 16 // Number of LEDs #define RGBLED_NUM 16 // Number of LEDs
#define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 }
#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2) #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
#define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_MOOD

View File

@ -19,6 +19,7 @@
] ]
}, },
"rgblight": { "rgblight": {
"led_map": [1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8],
"split_count": [8, 8] "split_count": [8, 8]
}, },
"ws2812": { "ws2812": {

View File

@ -26,8 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Synchronize Caps Lock LED across halves */ /* Synchronize Caps Lock LED across halves */
#define SPLIT_LED_STATE_ENABLE #define SPLIT_LED_STATE_ENABLE
/* ws2812 RGB LED */
#define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 }
#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2) #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2

View File

@ -49,6 +49,7 @@
}, },
"rgblight": { "rgblight": {
"led_count": 16, "led_count": 16,
"led_map": [1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8],
"split_count": [8, 8], "split_count": [8, 8],
"animations": { "animations": {
"alternating": true, "alternating": true,

View File

@ -26,8 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Synchronize Caps Lock LED across halves */ /* Synchronize Caps Lock LED across halves */
#define SPLIT_LED_STATE_ENABLE #define SPLIT_LED_STATE_ENABLE
/* ws2812 RGB LED */
#define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 }
#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2) #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2

View File

@ -49,6 +49,7 @@
}, },
"rgblight": { "rgblight": {
"led_count": 16, "led_count": 16,
"led_map": [1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8],
"split_count": [8, 8], "split_count": [8, 8],
"animations": { "animations": {
"alternating": true, "alternating": true,

View File

@ -36,7 +36,6 @@
#define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_SLEEP #define RGBLIGHT_SLEEP
#define RGBLIGHT_LED_MAP { 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 1, 2, 3 }
#define CAPS_PIN D3 #define CAPS_PIN D3
#define NUM_PIN F7 #define NUM_PIN F7

View File

@ -8,6 +8,9 @@
"pid": "0x0106", "pid": "0x0106",
"device_version": "0.0.1" "device_version": "0.0.1"
}, },
"rgblight": {
"led_map": [4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 1, 2, 3]
},
"ws2812": { "ws2812": {
"pin": "E6" "pin": "E6"
}, },

View File

@ -34,37 +34,6 @@ extern bool mcp23018_leds[];
#define ML_LED_5(status) mcp23018_leds[1] = (bool)status #define ML_LED_5(status) mcp23018_leds[1] = (bool)status
#define ML_LED_6(status) mcp23018_leds[2] = (bool)status #define ML_LED_6(status) mcp23018_leds[2] = (bool)status
// clang-format off
#define LED_LAYOUT_moonlander( \
l00, l01, l02, l03, l04, l05, l06, l60, l61, l62, l63, l64, l65, l66, \
l10, l11, l12, l13, l14, l15, l16, l70, l71, l72, l73, l74, l75, l76, \
l20, l21, l22, l23, l24, l25, l26, l80, l81, l82, l83, l84, l85, l86, \
l30, l31, l32, l33, l34, l35, l91, l92, l93, l94, l95, l96, \
l40, l41, l42, l43, l44, l53, lb3, la2, la3, la4, la5, la6, \
l50, l51, l52, lb4, lb5, lb6 \
) \
{ \
l00, l10, l20, l30, l40, \
l01, l11, l21, l31, l41, \
l02, l12, l22, l32, l42, \
l03, l13, l23, l33, l43, \
l04, l14, l24, l34, l44, \
l05, l15, l25, l35, \
l06, l16, l26, \
l50, l51, l52, l53, \
\
l66, l76, l86, l96, la6, \
l65, l75, l85, l95, la5, \
l64, l74, l84, l94, la4, \
l63, l73, l83, l93, la3, \
l62, l72, l82, l92, la2, \
l61, l71, l81, l91, \
l60, l70, l80, \
lb6, lb5, lb4, lb3 \
}
// clang-format on
enum planck_ez_keycodes { enum planck_ez_keycodes {
TOGGLE_LAYER_COLOR = QK_KB_0, TOGGLE_LAYER_COLOR = QK_KB_0,
LED_LEVEL, LED_LEVEL,

View File

@ -30,7 +30,6 @@
#define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE #define RGBLIGHT_EFFECT_TWINKLE
#define RGBLED_NUM 11 #define RGBLED_NUM 11
#define RGBLIGHT_LED_MAP { 4, 3, 2, 1, 0, 10, 9, 8, 7, 6, 5 }
#define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_VAL_STEP 8

View File

@ -30,7 +30,8 @@
"pin": "D5" "pin": "D5"
}, },
"rgblight": { "rgblight": {
"max_brightness": 200 "max_brightness": 200,
"led_map": [4, 3, 2, 1, 0, 10, 9, 8, 7, 6, 5]
}, },
"processor": "atmega32u4", "processor": "atmega32u4",
"bootloader": "atmel-dfu", "bootloader": "atmel-dfu",

View File

@ -59,7 +59,6 @@
/* Optional SMT LED pins */ /* Optional SMT LED pins */
#define RGBLED_NUM 10 #define RGBLED_NUM 10
#define RGBLIGHT_LED_MAP { 8, 9, 0, 1, 2, 6, 7, 3, 4, 5 }
#define RGBLIGHT_SLEEP #define RGBLIGHT_SLEEP
#define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_MOOD

View File

@ -8,6 +8,7 @@
"device_version": "0.0.1" "device_version": "0.0.1"
}, },
"rgblight": { "rgblight": {
"led_map": [8, 9, 0, 1, 2, 6, 7, 3, 4, 5],
"split_count": [5, 5] "split_count": [5, 5]
}, },
"ws2812": { "ws2812": {

View File

@ -19,8 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef RGBLIGHT_ENABLE #ifdef RGBLIGHT_ENABLE
#define RGBLED_NUM 12 #define RGBLED_NUM 12
#define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, \
11, 10, 9, 8, 7, 6 }
#endif #endif
#define OLED_DISPLAY_128X64 #define OLED_DISPLAY_128X64

View File

@ -17,6 +17,7 @@
"soft_serial_pin": "D2" "soft_serial_pin": "D2"
}, },
"rgblight": { "rgblight": {
"led_map": [0, 1, 2, 3, 4, 5, 11, 10, 9, 8, 7, 6],
"split_count": [6, 6] "split_count": [6, 6]
}, },
"ws2812": { "ws2812": {

View File

@ -18,7 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once #pragma once
#define RGBLED_NUM 14 #define RGBLED_NUM 14
#define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 13, 12,11, 10, 9, 8, 7}
#define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL #define RGBLIGHT_EFFECT_RAINBOW_SWIRL

View File

@ -13,6 +13,9 @@
"rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"] "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"rgblight": {
"led_map": [0, 1, 2, 3, 4, 5, 6, 13, 12, 11, 10, 9, 8, 7]
},
"ws2812": { "ws2812": {
"pin": "B6" "pin": "B6"
}, },

View File

@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define SPLIT_HAND_PIN D1 #define SPLIT_HAND_PIN D1
#define RGBLED_NUM 14 #define RGBLED_NUM 14
#define RGBLIGHT_LED_MAP { 6, 5, 4, 3, 2, 1, 0, 13, 12,11, 10, 9, 8, 7}
#define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL #define RGBLIGHT_EFFECT_RAINBOW_SWIRL

View File

@ -17,6 +17,7 @@
"soft_serial_pin": "D3" "soft_serial_pin": "D3"
}, },
"rgblight": { "rgblight": {
"led_map": [6, 5, 4, 3, 2, 1, 0, 13, 12, 11, 10, 9, 8, 7],
"split_count": [7, 7] "split_count": [7, 7]
}, },
"ws2812": { "ws2812": {

View File

@ -36,23 +36,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef RGBLED_NUM #ifndef RGBLED_NUM
#define RGBLED_NUM 69 #define RGBLED_NUM 69
#define RGBLIGHT_LED_MAP { \
0, 1, 2, 3, \
8, 7, 6, 5, 4, \
9,10,11,12,13, \
18,17,16,15,14, \
19,20,21,22,23, \
28,27,26,25,24, \
29,30,31,32,33, \
38,37,36,35,34, \
39,40,41,42,43, \
48,47,46,45,44, \
49,50,51,52,53, \
58,57,56,55,54, \
59,60,61,62,63, \
68,67,66,65,64 \
}
#define RGBLIGHT_SLEEP #define RGBLIGHT_SLEEP
#endif #endif

View File

@ -13,6 +13,9 @@
{"pin_a": "B4", "pin_b": "B5"} {"pin_a": "B4", "pin_b": "B5"}
] ]
}, },
"rgblight": {
"led_map": [0, 1, 2, 3, 8, 7, 6, 5, 4, 9, 10, 11, 12, 13, 18, 17, 16, 15, 14, 19, 20, 21, 22, 23, 28, 27, 26, 25, 24, 29, 30, 31, 32, 33, 38, 37, 36, 35, 34, 39, 40, 41, 42, 43, 48, 47, 46, 45, 44, 49, 50, 51, 52, 53, 58, 57, 56, 55, 54, 59, 60, 61, 62, 63, 68, 67, 66, 65, 64]
},
"ws2812": { "ws2812": {
"pin": "D3" "pin": "D3"
}, },

View File

@ -42,10 +42,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLED_NUM 24 #define RGBLED_NUM 24
#define RGBLIGHT_SPLIT #define RGBLIGHT_SPLIT
// The LEDs on the slave half go in reverse order
#define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, \
23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12}
#define SELECT_SOFT_SERIAL_SPEED 1 #define SELECT_SOFT_SERIAL_SPEED 1
/*Sets the protocol speed when using serial communication*/ /*Sets the protocol speed when using serial communication*/
//Speeds: //Speeds:

View File

@ -21,6 +21,7 @@
"soft_serial_pin": "D0" "soft_serial_pin": "D0"
}, },
"rgblight": { "rgblight": {
"led_map": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12],
"split_count": [12, 12] "split_count": [12, 12]
}, },
"ws2812": { "ws2812": {

View File

@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "0xc_pad.h" #include "quantum.h"
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { { led_config_t g_led_config = { {

View File

@ -1,24 +0,0 @@
/* Copyright 2021 s-ol
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "quantum.h"
#define LED_LAYOUT( \
\
k01, k05, k02, k06, k10, k03, k07, k11, k15, k08, k12, k16) \
\
{ k01, k02, k03, k08, k07, k06, k05, k10, k11, k12, k16, k15, }

View File

@ -24,7 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define LOCKING_RESYNC_ENABLE #define LOCKING_RESYNC_ENABLE
#define RGBLED_NUM 12 // Number of LEDs #define RGBLED_NUM 12 // Number of LEDs
#define RGBLIGHT_LED_MAP { 0, 1, 3, 2, 2, 3, 2, 3, 4, 5, 6, 7 }
#ifndef IOS_DEVICE_ENABLE #ifndef IOS_DEVICE_ENABLE
#define RGBLIGHT_LIMIT_VAL 180 #define RGBLIGHT_LIMIT_VAL 180

View File

@ -22,6 +22,9 @@
} }
} }
}, },
"rgblight": {
"led_map": [0, 1, 3, 2, 2, 3, 2, 3, 4, 5, 6, 7]
},
"ws2812": { "ws2812": {
"pin": "B6" "pin": "B6"
}, },

View File

@ -34,14 +34,6 @@
#define RGBLIGHT_EFFECT_TWINKLE #define RGBLIGHT_EFFECT_TWINKLE
#define RGBLED_NUM 102 #define RGBLED_NUM 102
#define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,\
12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, \
26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, \
40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, \
54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, \
68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, \
82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, \
96, 97, 98, 99, 100, 101, 102 } // 1 --> ScollLock 2 --> CapsLock 3 --> Bluetooth 4 --> NumLock
#define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_VAL_STEP 8

View File

@ -36,8 +36,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_TYPING_HEATMAP #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_TYPING_HEATMAP
#else #else
#define RGBLIGHT_LED_MAP { 0,1,2,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,3,4,5,6, \
26,27,28,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,29,30,31,32 }
#define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_VAL_STEP 8

View File

@ -16,6 +16,7 @@
}, },
"rgblight": { "rgblight": {
"max_brightness": 150, "max_brightness": 150,
"led_map": [0, 1, 2, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 3, 4, 5, 6, 26, 27, 28, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 29, 30, 31, 32],
"split_count": [26, 26] "split_count": [26, 26]
}, },
"matrix_pins": { "matrix_pins": {

View File

@ -37,30 +37,4 @@
# define RGBLIGHT_VAL_STEP 17 # define RGBLIGHT_VAL_STEP 17
//# define RGBLIGHT_LAYERS //Enable layer light indicators. Not required as updates are done in layer_state_set_user and led_update_user (+588). //# define RGBLIGHT_LAYERS //Enable layer light indicators. Not required as updates are done in layer_state_set_user and led_update_user (+588).
# define RGBLIGHT_SLEEP //Turn off LEDs when computer sleeping (+72) # define RGBLIGHT_SLEEP //Turn off LEDs when computer sleeping (+72)
//RGB LED Conversion macro from physical array to electric array (+146). This results in better looking animated effects.
//First section is the LED matrix, second section is the electrical wiring order, and the third section is the desired mapping
# define LED_LAYOUT( \
L00, L01, L02, L03, L04, L05, L08, L09, L010, L011, L012, L013, \
L10, L12, L14, L19, L111, L113, \
L20, L21, L22, L23, L24, L25, L28, L29, L210, L211, L212, L213, \
L30, L31, L32, L33, L34, L35, L38, L39, L310, L311, L312, L313, \
L40, L42, L44, L49, L411, L413, \
L50, L51, L52, L53, L54, L55, L58, L59, L510, L511, L512, L513, \
L62, L63, L64, L65, L66, L67, L68, L69, L610, L611, \
L71, L76, L77, L712 )\
{ \
L14,L12,L10,L40,L42,L44,L71,L76,L66,L65,L55,L35,L25,L05,L04,L24,L34,L54,L64,L63,L53,L33,L23,L03,L02,L22,L32,L52,L62,L51,L31,L21,L01,L00,L20,L30,L50,L19,L111,L113,L413,L411,L49,L712,L77,L67,L68,L58,L38,L28,L08,L09,L29,L39,L59,L69,L610,L510,L310,L210,L010,L011,L211,L311,L511,L611,L512,L312,L212,L012,L013,L213,L313,L513, \
}
//RGB LED logical order map
# define RGBLIGHT_LED_MAP LED_LAYOUT( \
5, 6, 17, 18, 29, 30, 43, 44, 55, 56, 67, 68, \
4, 16, 28, 45, 57, 69, \
3, 7, 15, 19, 27, 31, 42, 46, 54, 58, 66, 70, \
2, 8, 14, 20, 26, 32, 41, 47, 53, 59, 65, 71, \
1, 13, 25, 48, 60, 72, \
0, 9, 12, 21, 24, 33, 40, 49, 52, 61, 64, 73, \
11, 22, 23, 34, 35, 38, 39, 50, 51, 62, \
10, 36, 37, 63 )
#endif #endif

View File

@ -11,6 +11,7 @@
}, },
"rgblight": { "rgblight": {
"max_brightness": 100, "max_brightness": 100,
"led_map": [28, 16, 4, 1, 13, 25, 10, 36, 35, 34, 33, 32, 31, 30, 29, 27, 26, 24, 23, 22, 21, 20, 19, 18, 17, 15, 14, 12, 11, 9, 8, 7, 6, 5, 3, 2, 0, 45, 57, 69, 72, 60, 48, 63, 37, 38, 39, 40, 41, 42, 43, 44, 46, 47, 49, 50, 51, 52, 53, 54, 55, 56, 58, 59, 61, 62, 64, 65, 66, 67, 68, 70, 71, 73],
"split_count": [37, 37] "split_count": [37, 37]
}, },
"matrix_pins": { "matrix_pins": {

View File

@ -21,7 +21,6 @@ SPDX-License-Identifier: GPL-2.0-or-later */
#define RGBLIGHT_EFFECT_TWINKLE #define RGBLIGHT_EFFECT_TWINKLE
#define RGBLED_NUM 1 #define RGBLED_NUM 1
#define RGBLIGHT_LAYERS #define RGBLIGHT_LAYERS
#define RGBLIGHT_LED_MAP { 0, 1 }
#define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_VAL_STEP 8

View File

@ -33,7 +33,6 @@
#define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE #define RGBLIGHT_EFFECT_TWINKLE
#define RGBLED_NUM 6 #define RGBLED_NUM 6
#define RGBLIGHT_LED_MAP { 5, 4, 3, 2, 1, 0 }
#define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_VAL_STEP 8

View File

@ -18,6 +18,9 @@
{"pin_a": "B6", "pin_b": "B5"} {"pin_a": "B6", "pin_b": "B5"}
] ]
}, },
"rgblight": {
"led_map": [5, 4, 3, 2, 1, 0]
},
"ws2812": { "ws2812": {
"pin": "D3" "pin": "D3"
}, },

View File

@ -17,15 +17,6 @@
#pragma once #pragma once
# define RGBLED_NUM 22 # define RGBLED_NUM 22
/* RGB LED logical order map */
/* Top->Bottom, Right->Left */
#define RGBLIGHT_LED_MAP { \
19, 18, 17, 16, 15, 14, 13, 12, 11, \
20, 10, \
21, 9, \
0, 1, 2, 3, 4, 5, 6, 7, 8 }
# define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL # define RGBLIGHT_EFFECT_RAINBOW_SWIRL

View File

@ -12,7 +12,8 @@
"pin": "D0" "pin": "D0"
}, },
"rgblight": { "rgblight": {
"max_brightness": 192 "max_brightness": 192,
"led_map": [19, 18, 17, 16, 15, 14, 13, 12, 11, 20, 10, 21, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8]
}, },
"matrix_pins": { "matrix_pins": {
"cols": ["B6", "D4", "D6", "D7", "B4", "B5", "C6", "C7"], "cols": ["B6", "D4", "D6", "D7", "B4", "B5", "C6", "C7"],

View File

@ -27,7 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* RGB Lighting */ /* RGB Lighting */
#define RGBLED_NUM 7 // Layer Indicator(2) + Rotary Encoder(5) #define RGBLED_NUM 7 // Layer Indicator(2) + Rotary Encoder(5)
#define RGBLIGHT_LED_MAP {1, 2, 0, 3, 4, 5, 6} // align LEDs from Left to Right
#define RGBLIGHT_HUE_STEP 4 #define RGBLIGHT_HUE_STEP 4
#define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_VAL_STEP 8

View File

@ -12,6 +12,9 @@
"cols": ["B3", "E6", "F1", "F5", "F7", "B2", "F0", "F4", "F6", "C7"], "cols": ["B3", "E6", "F1", "F5", "F7", "B2", "F0", "F4", "F6", "C7"],
"rows": ["B3", "E6", "F1", "F5", "F7", "B2", "F0", "F4", "F6", "C7"] "rows": ["B3", "E6", "F1", "F5", "F7", "B2", "F0", "F4", "F6", "C7"]
}, },
"rgblight": {
"led_map": [1, 2, 0, 3, 4, 5, 6]
},
"ws2812": { "ws2812": {
"pin": "B7" "pin": "B7"
}, },

View File

@ -19,8 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLED_NUM 12 #define RGBLED_NUM 12
#define RGBLIGHT_SPLIT #define RGBLIGHT_SPLIT
#define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, \
11, 10, 9, 8, 7, 6 }
#define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_VAL_STEP 8

View File

@ -17,6 +17,7 @@
"soft_serial_pin": "D2" "soft_serial_pin": "D2"
}, },
"rgblight": { "rgblight": {
"led_map": [0, 1, 2, 3, 4, 5, 11, 10, 9, 8, 7, 6],
"split_count": [6, 6] "split_count": [6, 6]
}, },
"ws2812": { "ws2812": {

View File

@ -15,9 +15,6 @@
#define WS2812_PIO_USE_PIO1 #define WS2812_PIO_USE_PIO1
#define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, \
11, 10, 9, 8, 7, 6 }
/* /*
* Feature disable options * Feature disable options
* These options are also useful to firmware size reduction. * These options are also useful to firmware size reduction.

View File

@ -26,6 +26,7 @@
}, },
"rgblight": { "rgblight": {
"led_count": 12, "led_count": 12,
"led_map": [0, 1, 2, 3, 4, 5, 11, 10, 9, 8, 7, 6],
"sleep": true, "sleep": true,
"split": true, "split": true,
"split_count": [6, 6], "split_count": [6, 6],

View File

@ -1,20 +0,0 @@
/*
Copyright 2021 yushakobo
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
# define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 8, 7 }

View File

@ -2,6 +2,9 @@
"usb": { "usb": {
"device_version": "0.0.1" "device_version": "0.0.1"
}, },
"rgblight": {
"led_map": [0, 1, 2, 3, 4, 5, 6, 8, 7]
},
"matrix_pins": { "matrix_pins": {
"cols": ["F5", "F6", "B2", "B3", "B1", "F7"], "cols": ["F5", "F6", "B2", "B3", "B1", "F7"],
"rows": ["D4", "C6", "D7", "E6", "B4", "F4"] "rows": ["D4", "C6", "D7", "E6", "B4", "F4"]

View File

@ -18,14 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once #pragma once
#define EE_HANDS #define EE_HANDS
# define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 8, 7, \
9, 10, 11, 12, 13, 14, \
20, 19, 18, 17, 16, 15, \
21, 22, 23, 24, 25, 26, \
33, 32, 31, 30, 29, 28, 27, \
34, 35, 36, 37, 38, 39, 40 }
# define RGBLED_NUM 9+32 # define RGBLED_NUM 9+32
# define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8 # define RGBLIGHT_SAT_STEP 8

View File

@ -39,6 +39,7 @@
}, },
"rgblight": { "rgblight": {
"max_brightness": 120, "max_brightness": 120,
"led_map": [0, 1, 2, 3, 4, 5, 6, 8, 7, 9, 10, 11, 12, 13, 14, 20, 19, 18, 17, 16, 15, 21, 22, 23, 24, 25, 26, 33, 32, 31, 30, 29, 28, 27, 34, 35, 36, 37, 38, 39, 40],
"split_count": [9, 32] "split_count": [9, 32]
}, },
"processor": "atmega32u4", "processor": "atmega32u4",

View File

@ -42,11 +42,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef RGBLIGHT_ENABLE #ifdef RGBLIGHT_ENABLE
# define RGBLIGHT_LED_MAP {\
6, 7, 12, 13, 14, 15,\
16, 17, 11, 10, 9, 8,\
0, 1, 2, 3, 4, 5\
}
# define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8 # define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8 # define RGBLIGHT_VAL_STEP 8

View File

@ -12,7 +12,8 @@
"driver": "WS2812" "driver": "WS2812"
}, },
"rgblight": { "rgblight": {
"max_brightness": 150 "max_brightness": 150,
"led_map": [6, 7, 12, 13, 14, 15, 16, 17, 11, 10, 9, 8, 0, 1, 2, 3, 4, 5]
}, },
"matrix_pins": { "matrix_pins": {
"cols": ["F5", "D4", "E6", "F7", "C6", "D7"], "cols": ["F5", "D4", "E6", "F7", "C6", "D7"],