mirror of
https://github.com/qmk/qmk_firmware.git
synced 2024-12-13 13:20:46 +00:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
commit
b9b64751d7
@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
|
|
||||||
#ifdef RGBLIGHT_ENABLE
|
#ifdef RGBLIGHT_ENABLE
|
||||||
#define RGBLED_NUM 68
|
#define RGBLED_NUM 68
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
#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
|
||||||
|
@ -4,4 +4,3 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define RGBLED_NUM 12
|
#define RGBLED_NUM 12
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
|
@ -4,4 +4,3 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define RGBLED_NUM 12
|
#define RGBLED_NUM 12
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
|
@ -5,7 +5,6 @@
|
|||||||
|
|
||||||
#ifdef RGBLIGHT_ENABLE
|
#ifdef RGBLIGHT_ENABLE
|
||||||
# define RGBLED_NUM 64
|
# define RGBLED_NUM 64
|
||||||
# define RGBLIGHT_SPLIT
|
|
||||||
# define RGBLIGHT_HUE_STEP 10
|
# define RGBLIGHT_HUE_STEP 10
|
||||||
# define RGBLIGHT_SAT_STEP 17
|
# define RGBLIGHT_SAT_STEP 17
|
||||||
# define RGBLIGHT_VAL_STEP 17
|
# define RGBLIGHT_VAL_STEP 17
|
||||||
|
@ -18,7 +18,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define RGBLED_NUM 38
|
#define RGBLED_NUM 38
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
#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
|
||||||
|
@ -29,7 +29,6 @@
|
|||||||
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
|
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
|
||||||
#define RGBLIGHT_EFFECT_BREATHING
|
#define RGBLIGHT_EFFECT_BREATHING
|
||||||
#define RGBLED_NUM 36
|
#define RGBLED_NUM 36
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
#define RGBLIGHT_HUE_STEP 10
|
#define RGBLIGHT_HUE_STEP 10
|
||||||
#define RGBLIGHT_SAT_STEP 17
|
#define RGBLIGHT_SAT_STEP 17
|
||||||
#define RGBLIGHT_VAL_STEP 17
|
#define RGBLIGHT_VAL_STEP 17
|
||||||
|
@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
|
|
||||||
#ifdef RGBLIGHT_ENABLE
|
#ifdef RGBLIGHT_ENABLE
|
||||||
# define RGBLED_NUM 54 // Number of LEDs
|
# define RGBLED_NUM 54 // Number of LEDs
|
||||||
# define RGBLIGHT_SPLIT
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef RGB_MATRIX_ENABLE
|
#ifdef RGB_MATRIX_ENABLE
|
||||||
|
@ -22,7 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
// #define USE_I2C
|
// #define USE_I2C
|
||||||
|
|
||||||
#define RGBLED_NUM 2
|
#define RGBLED_NUM 2
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
|
|
||||||
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
|
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
|
||||||
#define LOCKING_SUPPORT_ENABLE
|
#define LOCKING_SUPPORT_ENABLE
|
||||||
|
@ -27,7 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
|
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
|
||||||
#define RGBLIGHT_EFFECT_BREATHING
|
#define RGBLIGHT_EFFECT_BREATHING
|
||||||
#define RGBLED_NUM 10
|
#define RGBLED_NUM 10
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
#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
|
||||||
|
@ -8,6 +8,9 @@
|
|||||||
"pid": "0x1B1E",
|
"pid": "0x1B1E",
|
||||||
"device_version": "0.0.1"
|
"device_version": "0.0.1"
|
||||||
},
|
},
|
||||||
|
"rgblight": {
|
||||||
|
"split": true
|
||||||
|
},
|
||||||
"ws2812": {
|
"ws2812": {
|
||||||
"pin": "D3"
|
"pin": "D3"
|
||||||
},
|
},
|
||||||
|
@ -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_SPLIT
|
|
||||||
#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
|
||||||
|
@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
#define MATRIX_COL_PINS { B4, E6, C6, B6, B2 }
|
#define MATRIX_COL_PINS { B4, E6, C6, B6, B2 }
|
||||||
|
|
||||||
#define RGBLED_NUM 10
|
#define RGBLED_NUM 10
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
#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
|
||||||
|
@ -44,8 +44,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
|
|
||||||
#define RGBLED_NUM 28 // Number of LEDs
|
#define RGBLED_NUM 28 // Number of LEDs
|
||||||
|
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Feature disable options
|
* Feature disable options
|
||||||
* These options are also useful to firmware size reduction.
|
* These options are also useful to firmware size reduction.
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
"pin": "D3"
|
"pin": "D3"
|
||||||
},
|
},
|
||||||
"rgblight": {
|
"rgblight": {
|
||||||
|
"split": true,
|
||||||
"max_brightness": 120
|
"max_brightness": 120
|
||||||
},
|
},
|
||||||
"split": {
|
"split": {
|
||||||
|
@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
/* ws2812 RGB LED */
|
/* ws2812 RGB LED */
|
||||||
#if !defined(RGBLED_NUM)
|
#if !defined(RGBLED_NUM)
|
||||||
# define RGBLED_NUM 30
|
# define RGBLED_NUM 30
|
||||||
# define RGBLIGHT_SPLIT
|
|
||||||
# define RGBLIGHT_LAYERS
|
# define RGBLIGHT_LAYERS
|
||||||
#endif
|
#endif
|
||||||
#define RGBLIGHT_EFFECT_BREATHING
|
#define RGBLIGHT_EFFECT_BREATHING
|
||||||
|
@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
|
|
||||||
// WS2812 RGB LED strip input and number of LEDs
|
// WS2812 RGB LED strip input and number of LEDs
|
||||||
#define RGBLED_NUM 20
|
#define RGBLED_NUM 20
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
|
|
||||||
#define AUDIO_PIN C6
|
#define AUDIO_PIN C6
|
||||||
|
|
||||||
|
@ -30,7 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
#define WS2812_DMA_CHANNEL 3 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
|
#define WS2812_DMA_CHANNEL 3 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
|
||||||
|
|
||||||
#define RGBLED_NUM 20
|
#define RGBLED_NUM 20
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
|
|
||||||
#define DEBUG_LED_PIN C13
|
#define DEBUG_LED_PIN C13
|
||||||
|
|
||||||
|
@ -33,7 +33,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
|
|
||||||
|
|
||||||
#define RGBLED_NUM 57
|
#define RGBLED_NUM 57
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
|
|
||||||
#define DEBUG_LED_PIN C13
|
#define DEBUG_LED_PIN C13
|
||||||
|
|
||||||
|
@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
|
|
||||||
// WS2812 RGB LED strip input and number of LEDs
|
// WS2812 RGB LED strip input and number of LEDs
|
||||||
#define RGBLED_NUM 20
|
#define RGBLED_NUM 20
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
#define RGBLIGHT_LIMIT_VAL 80
|
#define RGBLIGHT_LIMIT_VAL 80
|
||||||
|
|
||||||
#define DEBUG_LED_PIN D6
|
#define DEBUG_LED_PIN D6
|
||||||
|
@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
#define MASTER_RIGHT
|
#define MASTER_RIGHT
|
||||||
|
|
||||||
# define RGBLED_NUM 12
|
# define RGBLED_NUM 12
|
||||||
# define RGBLIGHT_SPLIT
|
|
||||||
# define RGBLIGHT_HUE_STEP 8
|
# define RGBLIGHT_HUE_STEP 8
|
||||||
# define RGBLIGHT_SAT_STEP 1
|
# define RGBLIGHT_SAT_STEP 1
|
||||||
# define RGBLIGHT_VAL_STEP 1
|
# define RGBLIGHT_VAL_STEP 1
|
||||||
|
@ -64,7 +64,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef RGBLIGHT_ENABLE
|
#ifdef RGBLIGHT_ENABLE
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
// #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
|
||||||
|
@ -64,7 +64,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef RGBLIGHT_ENABLE
|
#ifdef RGBLIGHT_ENABLE
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
// #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
|
||||||
|
@ -19,7 +19,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define RGBLED_NUM 38
|
#define RGBLED_NUM 38
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
#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
|
||||||
|
@ -19,6 +19,9 @@
|
|||||||
"ws2812": {
|
"ws2812": {
|
||||||
"pin": "D2"
|
"pin": "D2"
|
||||||
},
|
},
|
||||||
|
"rgblight": {
|
||||||
|
"split": true
|
||||||
|
},
|
||||||
"processor": "atmega32u4",
|
"processor": "atmega32u4",
|
||||||
"bootloader": "atmel-dfu",
|
"bootloader": "atmel-dfu",
|
||||||
"layouts": {
|
"layouts": {
|
||||||
|
@ -34,7 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
#define RGBLIGHT_EFFECT_TWINKLE
|
#define RGBLIGHT_EFFECT_TWINKLE
|
||||||
|
|
||||||
#define RGBLIGHT_SLEEP
|
#define RGBLIGHT_SLEEP
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
|
|
||||||
#ifndef IOS_DEVICE_ENABLE
|
#ifndef IOS_DEVICE_ENABLE
|
||||||
#if RGBLED_NUM <= 6
|
#if RGBLED_NUM <= 6
|
||||||
|
@ -13,6 +13,9 @@
|
|||||||
"levels": 5,
|
"levels": 5,
|
||||||
"breathing": true
|
"breathing": true
|
||||||
},
|
},
|
||||||
|
"rgblight": {
|
||||||
|
"split": true
|
||||||
|
},
|
||||||
"ws2812": {
|
"ws2812": {
|
||||||
"pin": "D4"
|
"pin": "D4"
|
||||||
},
|
},
|
||||||
|
@ -87,7 +87,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
|
|
||||||
|
|
||||||
#define RGBLIGHT_SLEEP
|
#define RGBLIGHT_SLEEP
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
|
|
||||||
#ifndef IOS_DEVICE_ENABLE
|
#ifndef IOS_DEVICE_ENABLE
|
||||||
#if RGBLED_NUM <= 6
|
#if RGBLED_NUM <= 6
|
||||||
|
@ -12,6 +12,9 @@
|
|||||||
"pin": "B6",
|
"pin": "B6",
|
||||||
"levels": 5
|
"levels": 5
|
||||||
},
|
},
|
||||||
|
"rgblight": {
|
||||||
|
"split": true
|
||||||
|
},
|
||||||
"ws2812": {
|
"ws2812": {
|
||||||
"pin": "D4"
|
"pin": "D4"
|
||||||
},
|
},
|
||||||
|
@ -38,7 +38,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
#define RGBLIGHT_EFFECT_TWINKLE
|
#define RGBLIGHT_EFFECT_TWINKLE
|
||||||
|
|
||||||
#define RGBLIGHT_SLEEP
|
#define RGBLIGHT_SLEEP
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
|
|
||||||
#ifndef IOS_DEVICE_ENABLE
|
#ifndef IOS_DEVICE_ENABLE
|
||||||
#if RGBLED_NUM <= 6
|
#if RGBLED_NUM <= 6
|
||||||
|
@ -12,6 +12,9 @@
|
|||||||
"pin": "C6",
|
"pin": "C6",
|
||||||
"levels": 5
|
"levels": 5
|
||||||
},
|
},
|
||||||
|
"rgblight": {
|
||||||
|
"split": true
|
||||||
|
},
|
||||||
"ws2812": {
|
"ws2812": {
|
||||||
"pin": "D4"
|
"pin": "D4"
|
||||||
},
|
},
|
||||||
|
@ -28,7 +28,6 @@ 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 56
|
#define RGBLED_NUM 56
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
#define RGBLIGHT_HUE_STEP 10
|
#define RGBLIGHT_HUE_STEP 10
|
||||||
#define RGBLIGHT_SAT_STEP 17
|
#define RGBLIGHT_SAT_STEP 17
|
||||||
#define RGBLIGHT_VAL_STEP 17
|
#define RGBLIGHT_VAL_STEP 17
|
||||||
|
@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define RGBLIGHT_SPLIT 1
|
|
||||||
#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
|
||||||
|
@ -19,6 +19,9 @@
|
|||||||
"split": {
|
"split": {
|
||||||
"soft_serial_pin": "D0"
|
"soft_serial_pin": "D0"
|
||||||
},
|
},
|
||||||
|
"rgblight": {
|
||||||
|
"split": true
|
||||||
|
},
|
||||||
"ws2812": {
|
"ws2812": {
|
||||||
"pin": "F0"
|
"pin": "F0"
|
||||||
},
|
},
|
||||||
|
@ -6,7 +6,6 @@
|
|||||||
#define MASTER_LEFT
|
#define MASTER_LEFT
|
||||||
|
|
||||||
#define RGBLED_NUM 88
|
#define RGBLED_NUM 88
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
|
|
||||||
#define RGB_MATRIX_LED_COUNT 88
|
#define RGB_MATRIX_LED_COUNT 88
|
||||||
#define RGB_MATRIX_SPLIT { 44, 44 }
|
#define RGB_MATRIX_SPLIT { 44, 44 }
|
||||||
|
@ -18,7 +18,6 @@
|
|||||||
|
|
||||||
#ifdef RGBLIGHT_ENABLE
|
#ifdef RGBLIGHT_ENABLE
|
||||||
# define RGBLED_NUM 60 // Total number of LEDs
|
# define RGBLED_NUM 60 // Total number of LEDs
|
||||||
# define RGBLIGHT_SPLIT
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Limit the power draw
|
// Limit the power draw
|
||||||
|
@ -21,5 +21,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define RGBLED_NUM 72 // Number of LEDs
|
#define RGBLED_NUM 72 // Number of LEDs
|
||||||
|
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
|
@ -21,4 +21,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define RGBLED_NUM 70
|
#define RGBLED_NUM 70
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
|
@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
#define SELECT_SOFT_SERIAL_SPEED 1
|
#define SELECT_SOFT_SERIAL_SPEED 1
|
||||||
|
|
||||||
# define RGBLED_NUM 68
|
# define RGBLED_NUM 68
|
||||||
# define RGBLIGHT_SPLIT
|
|
||||||
# define RGBLIGHT_HUE_STEP 8
|
# define RGBLIGHT_HUE_STEP 8
|
||||||
# define RGBLIGHT_SAT_STEP 8
|
# define RGBLIGHT_SAT_STEP 8
|
||||||
# ifndef IOS_DEVICE_ENABLE
|
# ifndef IOS_DEVICE_ENABLE
|
||||||
|
@ -9,7 +9,6 @@
|
|||||||
|
|
||||||
#define MASTER_LEFT
|
#define MASTER_LEFT
|
||||||
//#define MASTER_RIGHT
|
//#define MASTER_RIGHT
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
#define SPLIT_LAYER_STATE_ENABLE
|
#define SPLIT_LAYER_STATE_ENABLE
|
||||||
#define SPLIT_LED_STATE_ENABLE
|
#define SPLIT_LED_STATE_ENABLE
|
||||||
#define SPLIT_MODS_ENABLE
|
#define SPLIT_MODS_ENABLE
|
||||||
|
@ -9,7 +9,6 @@
|
|||||||
|
|
||||||
#define MASTER_LEFT
|
#define MASTER_LEFT
|
||||||
//#define MASTER_RIGHT
|
//#define MASTER_RIGHT
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
#define SPLIT_LAYER_STATE_ENABLE
|
#define SPLIT_LAYER_STATE_ENABLE
|
||||||
#define SPLIT_LED_STATE_ENABLE
|
#define SPLIT_LED_STATE_ENABLE
|
||||||
#define SPLIT_MODS_ENABLE
|
#define SPLIT_MODS_ENABLE
|
||||||
|
@ -20,7 +20,6 @@
|
|||||||
#define MASTER_LEFT
|
#define MASTER_LEFT
|
||||||
#define SPLIT_MODS_ENABLE
|
#define SPLIT_MODS_ENABLE
|
||||||
|
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
#define RGBLED_NUM 83
|
#define RGBLED_NUM 83
|
||||||
#ifdef RGB_MATRIX_ENABLE
|
#ifdef RGB_MATRIX_ENABLE
|
||||||
# define RGB_MATRIX_LED_COUNT RGBLED_NUM
|
# define RGB_MATRIX_LED_COUNT RGBLED_NUM
|
||||||
|
@ -20,7 +20,6 @@
|
|||||||
#define MASTER_LEFT
|
#define MASTER_LEFT
|
||||||
#define SPLIT_MODS_ENABLE
|
#define SPLIT_MODS_ENABLE
|
||||||
|
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
#define RGBLED_NUM 100
|
#define RGBLED_NUM 100
|
||||||
#ifdef RGB_MATRIX_ENABLE
|
#ifdef RGB_MATRIX_ENABLE
|
||||||
# define RGB_MATRIX_LED_COUNT RGBLED_NUM
|
# define RGB_MATRIX_LED_COUNT RGBLED_NUM
|
||||||
|
@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
#define USE_I2C
|
#define USE_I2C
|
||||||
|
|
||||||
#define RGBLED_NUM 10
|
#define RGBLED_NUM 10
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
#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
|
||||||
|
@ -23,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
#define LOCKING_RESYNC_ENABLE
|
#define LOCKING_RESYNC_ENABLE
|
||||||
|
|
||||||
#define RGBLED_NUM 8
|
#define RGBLED_NUM 8
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
|
|
||||||
#define RGBLIGHT_HUE_STEP 10
|
#define RGBLIGHT_HUE_STEP 10
|
||||||
#define RGBLIGHT_SAT_STEP 17
|
#define RGBLIGHT_SAT_STEP 17
|
||||||
|
@ -16,6 +16,9 @@
|
|||||||
"split": {
|
"split": {
|
||||||
"soft_serial_pin": "D2"
|
"soft_serial_pin": "D2"
|
||||||
},
|
},
|
||||||
|
"rgblight": {
|
||||||
|
"split": true
|
||||||
|
},
|
||||||
"ws2812": {
|
"ws2812": {
|
||||||
"pin": "D3"
|
"pin": "D3"
|
||||||
},
|
},
|
||||||
|
@ -24,7 +24,6 @@
|
|||||||
#define SERIAL_USART_SPEED 921600
|
#define SERIAL_USART_SPEED 921600
|
||||||
|
|
||||||
#ifdef RGBLIGHT_ENABLE
|
#ifdef RGBLIGHT_ENABLE
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
#define RGBLIGHT_LAYERS
|
#define RGBLIGHT_LAYERS
|
||||||
|
|
||||||
#define RGBLIGHT_DEFAULT_HUE 213
|
#define RGBLIGHT_DEFAULT_HUE 213
|
||||||
|
@ -26,7 +26,6 @@
|
|||||||
|
|
||||||
|
|
||||||
#ifdef RGBLIGHT_ENABLE
|
#ifdef RGBLIGHT_ENABLE
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
#define RGBLIGHT_LAYERS
|
#define RGBLIGHT_LAYERS
|
||||||
#define RGBLED_NUM 16
|
#define RGBLED_NUM 16
|
||||||
#define RGBLIGHT_EFFECT_BREATHING
|
#define RGBLIGHT_EFFECT_BREATHING
|
||||||
|
@ -40,7 +40,6 @@ 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 20
|
#define RGBLED_NUM 20
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
|
|
||||||
#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*/
|
||||||
|
@ -40,7 +40,6 @@ 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 24
|
#define RGBLED_NUM 24
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
|
|
||||||
#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*/
|
||||||
|
@ -36,7 +36,6 @@
|
|||||||
#define RGBLIGHT_EFFECT_ALTERNATING
|
#define RGBLIGHT_EFFECT_ALTERNATING
|
||||||
#define RGBLIGHT_EFFECT_TWINKLE
|
#define RGBLIGHT_EFFECT_TWINKLE
|
||||||
#define RGBLED_NUM 36
|
#define RGBLED_NUM 36
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
|
|
||||||
#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*/
|
||||||
|
@ -36,7 +36,6 @@
|
|||||||
#define RGBLIGHT_EFFECT_ALTERNATING
|
#define RGBLIGHT_EFFECT_ALTERNATING
|
||||||
#define RGBLIGHT_EFFECT_TWINKLE
|
#define RGBLIGHT_EFFECT_TWINKLE
|
||||||
#define RGBLED_NUM 42
|
#define RGBLED_NUM 42
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
|
|
||||||
#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*/
|
||||||
|
@ -36,7 +36,6 @@
|
|||||||
#define RGBLIGHT_EFFECT_ALTERNATING
|
#define RGBLIGHT_EFFECT_ALTERNATING
|
||||||
#define RGBLIGHT_EFFECT_TWINKLE
|
#define RGBLIGHT_EFFECT_TWINKLE
|
||||||
#define RGBLED_NUM 48
|
#define RGBLED_NUM 48
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
|
|
||||||
#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*/
|
||||||
|
@ -36,7 +36,6 @@
|
|||||||
#define RGBLIGHT_EFFECT_ALTERNATING
|
#define RGBLIGHT_EFFECT_ALTERNATING
|
||||||
#define RGBLIGHT_EFFECT_TWINKLE
|
#define RGBLIGHT_EFFECT_TWINKLE
|
||||||
#define RGBLED_NUM 48
|
#define RGBLED_NUM 48
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
|
|
||||||
#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*/
|
||||||
|
@ -36,7 +36,6 @@
|
|||||||
#define RGBLIGHT_EFFECT_ALTERNATING
|
#define RGBLIGHT_EFFECT_ALTERNATING
|
||||||
#define RGBLIGHT_EFFECT_TWINKLE
|
#define RGBLIGHT_EFFECT_TWINKLE
|
||||||
#define RGBLED_NUM 56
|
#define RGBLED_NUM 56
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
|
|
||||||
#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*/
|
||||||
|
@ -36,7 +36,6 @@
|
|||||||
#define RGBLIGHT_EFFECT_ALTERNATING
|
#define RGBLIGHT_EFFECT_ALTERNATING
|
||||||
#define RGBLIGHT_EFFECT_TWINKLE
|
#define RGBLIGHT_EFFECT_TWINKLE
|
||||||
#define RGBLED_NUM 64
|
#define RGBLED_NUM 64
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
|
|
||||||
#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*/
|
||||||
|
@ -36,7 +36,6 @@
|
|||||||
#define RGBLIGHT_EFFECT_ALTERNATING
|
#define RGBLIGHT_EFFECT_ALTERNATING
|
||||||
#define RGBLIGHT_EFFECT_TWINKLE
|
#define RGBLIGHT_EFFECT_TWINKLE
|
||||||
#define RGBLED_NUM 60
|
#define RGBLED_NUM 60
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
|
|
||||||
#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*/
|
||||||
|
@ -37,7 +37,6 @@
|
|||||||
#define RGBLIGHT_EFFECT_ALTERNATING
|
#define RGBLIGHT_EFFECT_ALTERNATING
|
||||||
#define RGBLIGHT_EFFECT_TWINKLE
|
#define RGBLIGHT_EFFECT_TWINKLE
|
||||||
#define RGBLED_NUM 70
|
#define RGBLED_NUM 70
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
#endif
|
#endif
|
||||||
#ifdef RGB_MATRIX_ENABLE
|
#ifdef RGB_MATRIX_ENABLE
|
||||||
#define RGB_MATRIX_LED_COUNT 70
|
#define RGB_MATRIX_LED_COUNT 70
|
||||||
|
@ -36,7 +36,6 @@
|
|||||||
#define RGBLIGHT_EFFECT_ALTERNATING
|
#define RGBLIGHT_EFFECT_ALTERNATING
|
||||||
#define RGBLIGHT_EFFECT_TWINKLE
|
#define RGBLIGHT_EFFECT_TWINKLE
|
||||||
#define RGBLED_NUM 70
|
#define RGBLED_NUM 70
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
|
|
||||||
#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*/
|
||||||
|
@ -36,7 +36,6 @@
|
|||||||
#define RGBLIGHT_EFFECT_ALTERNATING
|
#define RGBLIGHT_EFFECT_ALTERNATING
|
||||||
#define RGBLIGHT_EFFECT_TWINKLE
|
#define RGBLIGHT_EFFECT_TWINKLE
|
||||||
#define RGBLED_NUM 80
|
#define RGBLED_NUM 80
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
|
|
||||||
#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*/
|
||||||
|
@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
#define USE_I2C
|
#define USE_I2C
|
||||||
|
|
||||||
/* ws2812 RGB LED */
|
/* ws2812 RGB LED */
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
#define RGBLED_NUM 2
|
#define RGBLED_NUM 2
|
||||||
#define RGBLIGHT_LAYERS
|
#define RGBLIGHT_LAYERS
|
||||||
#define RGBLIGHT_HUE_STEP 10
|
#define RGBLIGHT_HUE_STEP 10
|
||||||
|
@ -23,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
#define SPLIT_HAND_MATRIX_GRID D4,D3
|
#define SPLIT_HAND_MATRIX_GRID D4,D3
|
||||||
|
|
||||||
/* ws2812 RGB LED */
|
/* ws2812 RGB LED */
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
#define RGBLED_NUM 84
|
#define RGBLED_NUM 84
|
||||||
#define RGBLIGHT_LAYERS
|
#define RGBLIGHT_LAYERS
|
||||||
#define RGBLIGHT_HUE_STEP 10
|
#define RGBLIGHT_HUE_STEP 10
|
||||||
|
@ -24,8 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
|
|
||||||
#define RGBLED_NUM 14 // Number of LEDs
|
#define RGBLED_NUM 14 // Number of LEDs
|
||||||
|
|
||||||
#define RGBLIGHT_SPLIT // sync LEDs between RIGHT and LEFT hand
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Feature disable options
|
* Feature disable options
|
||||||
* These options are also useful to firmware size reduction.
|
* These options are also useful to firmware size reduction.
|
||||||
|
@ -8,6 +8,9 @@
|
|||||||
"pid": "0x5244",
|
"pid": "0x5244",
|
||||||
"device_version": "1.0.0"
|
"device_version": "1.0.0"
|
||||||
},
|
},
|
||||||
|
"rgblight": {
|
||||||
|
"split": true
|
||||||
|
},
|
||||||
"layouts": {
|
"layouts": {
|
||||||
"LAYOUT": {
|
"LAYOUT": {
|
||||||
"layout": [
|
"layout": [
|
||||||
|
@ -22,7 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
|
|
||||||
#ifdef RGBLIGHT_ENABLE
|
#ifdef RGBLIGHT_ENABLE
|
||||||
#define RGBLED_NUM 66 // Number of LEDs
|
#define RGBLED_NUM 66 // Number of LEDs
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
#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
|
||||||
|
@ -27,7 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
|
|
||||||
#ifndef RGBLED_NUM
|
#ifndef RGBLED_NUM
|
||||||
#define RGBLED_NUM 12
|
#define RGBLED_NUM 12
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define RGBLIGHT_EFFECT_BREATHING
|
#define RGBLIGHT_EFFECT_BREATHING
|
||||||
|
@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
|
|
||||||
#ifndef RGBLED_NUM
|
#ifndef RGBLED_NUM
|
||||||
#define RGBLED_NUM 31
|
#define RGBLED_NUM 31
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define RGBLIGHT_EFFECT_BREATHING
|
#define RGBLIGHT_EFFECT_BREATHING
|
||||||
|
@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
|
|
||||||
#ifndef RGBLED_NUM
|
#ifndef RGBLED_NUM
|
||||||
#define RGBLED_NUM 86
|
#define RGBLED_NUM 86
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define RGBLIGHT_EFFECT_BREATHING
|
#define RGBLIGHT_EFFECT_BREATHING
|
||||||
|
@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
|
|
||||||
#ifndef RGBLED_NUM
|
#ifndef RGBLED_NUM
|
||||||
#define RGBLED_NUM 32
|
#define RGBLED_NUM 32
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define RGBLIGHT_EFFECT_BREATHING
|
#define RGBLIGHT_EFFECT_BREATHING
|
||||||
|
@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
|
|
||||||
#ifndef RGBLED_NUM
|
#ifndef RGBLED_NUM
|
||||||
#define RGBLED_NUM 21
|
#define RGBLED_NUM 21
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define RGBLIGHT_EFFECT_BREATHING
|
#define RGBLIGHT_EFFECT_BREATHING
|
||||||
|
@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
|
|
||||||
#ifndef RGBLED_NUM
|
#ifndef RGBLED_NUM
|
||||||
#define RGBLED_NUM 20
|
#define RGBLED_NUM 20
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define RGBLIGHT_EFFECT_BREATHING
|
#define RGBLIGHT_EFFECT_BREATHING
|
||||||
|
@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
|
|
||||||
#define MASTER_RIGHT
|
#define MASTER_RIGHT
|
||||||
|
|
||||||
//#define RGBLIGHT_SPLIT
|
|
||||||
#define RGBLED_NUM 52
|
#define RGBLED_NUM 52
|
||||||
#ifdef RGB_MATRIX_ENABLE
|
#ifdef RGB_MATRIX_ENABLE
|
||||||
#define RGB_MATRIX_LED_COUNT 52
|
#define RGB_MATRIX_LED_COUNT 52
|
||||||
|
@ -35,7 +35,6 @@ 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 RGBLIGHT_SPLIT
|
|
||||||
#define RGBLED_NUM 24 // Number of LEDs
|
#define RGBLED_NUM 24 // Number of LEDs
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -18,7 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define RGBLED_NUM 12
|
#define RGBLED_NUM 12
|
||||||
#define RGBLIGHT_SPLIT
|
|
||||||
#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
|
||||||
|
Loading…
Reference in New Issue
Block a user