Merge remote-tracking branch 'origin/develop' into xap

This commit is contained in:
QMK Bot 2022-07-29 04:43:19 +00:00
commit 587f750fce
5 changed files with 36 additions and 8 deletions

View File

@ -39,3 +39,17 @@
#define LED_CAPS_LOCK_PIN F6 #define LED_CAPS_LOCK_PIN F6
#define LED_PIN_ON_STATE 0 #define LED_PIN_ON_STATE 0
#define RGB_DI_PIN D2
#ifdef RGB_DI_PIN
#define RGBLED_NUM 1
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 200 /* The maximum brightness level */
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
/*======= RGB function=======*/
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#endif

View File

@ -103,7 +103,7 @@
{ "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 }, { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
{ "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 }, { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
{ "label": "Fn", "x": 12.5, "y": 5.25, "w": 1.25 }, { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1.25 },
{ "label": "Alt", "x": 13.75, "y": 5.25, "w": 1.25 }, { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
{ "label": "\u2190", "x": 15.25, "y": 5.25 }, { "label": "\u2190", "x": 15.25, "y": 5.25 },
{ "label": "\u2193", "x": 16.25, "y": 5.25 }, { "label": "\u2193", "x": 16.25, "y": 5.25 },
{ "label": "\u2192", "x": 17.25, "y": 5.25 } { "label": "\u2192", "x": 17.25, "y": 5.25 }
@ -200,7 +200,7 @@
{ "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 }, { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
{ "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 }, { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
{ "label": "Fn", "x": 12.5, "y": 5.25, "w": 1.25 }, { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1.25 },
{ "label": "Alt", "x": 13.75, "y": 5.25, "w": 1.25 }, { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
{ "label": "\u2190", "x": 15.25, "y": 5.25 }, { "label": "\u2190", "x": 15.25, "y": 5.25 },
{ "label": "\u2193", "x": 16.25, "y": 5.25 }, { "label": "\u2193", "x": 16.25, "y": 5.25 },
{ "label": "\u2192", "x": 17.25, "y": 5.25 } { "label": "\u2192", "x": 17.25, "y": 5.25 }
@ -298,7 +298,7 @@
{ "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 }, { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
{ "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 }, { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
{ "label": "Fn", "x": 12.5, "y": 5.25, "w": 1.25 }, { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1.25 },
{ "label": "Alt", "x": 13.75, "y": 5.25, "w": 1.25 }, { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
{ "label": "\u2190", "x": 15.25, "y": 5.25 }, { "label": "\u2190", "x": 15.25, "y": 5.25 },
{ "label": "\u2193", "x": 16.25, "y": 5.25 }, { "label": "\u2193", "x": 16.25, "y": 5.25 },
{ "label": "\u2192", "x": 17.25, "y": 5.25 } { "label": "\u2192", "x": 17.25, "y": 5.25 }
@ -396,7 +396,7 @@
{ "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 }, { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
{ "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 }, { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
{ "label": "Fn", "x": 12.5, "y": 5.25, "w": 1.25 }, { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1.25 },
{ "label": "Alt", "x": 13.75, "y": 5.25, "w": 1.25 }, { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
{ "label": "\u2190", "x": 15.25, "y": 5.25 }, { "label": "\u2190", "x": 15.25, "y": 5.25 },
{ "label": "\u2193", "x": 16.25, "y": 5.25 }, { "label": "\u2193", "x": 16.25, "y": 5.25 },
{ "label": "\u2192", "x": 17.25, "y": 5.25 } { "label": "\u2192", "x": 17.25, "y": 5.25 }
@ -494,7 +494,7 @@
{ "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 }, { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
{ "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 }, { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
{ "label": "Fn", "x": 12.5, "y": 5.25, "w": 1.25 }, { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1.25 },
{ "label": "Alt", "x": 13.75, "y": 5.25, "w": 1.25 }, { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
{ "label": "\u2190", "x": 15.25, "y": 5.25 }, { "label": "\u2190", "x": 15.25, "y": 5.25 },
{ "label": "\u2193", "x": 16.25, "y": 5.25 }, { "label": "\u2193", "x": 16.25, "y": 5.25 },
{ "label": "\u2192", "x": 17.25, "y": 5.25 } { "label": "\u2192", "x": 17.25, "y": 5.25 }
@ -593,7 +593,7 @@
{ "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 }, { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
{ "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 }, { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
{ "label": "Fn", "x": 12.5, "y": 5.25, "w": 1.25 }, { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1.25 },
{ "label": "Alt", "x": 13.75, "y": 5.25, "w": 1.25 }, { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
{ "label": "\u2190", "x": 15.25, "y": 5.25 }, { "label": "\u2190", "x": 15.25, "y": 5.25 },
{ "label": "\u2193", "x": 16.25, "y": 5.25 }, { "label": "\u2193", "x": 16.25, "y": 5.25 },
{ "label": "\u2192", "x": 17.25, "y": 5.25 } { "label": "\u2192", "x": 17.25, "y": 5.25 }

View File

@ -14,7 +14,7 @@ CONSOLE_ENABLE = yes # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output AUDIO_ENABLE = no # Audio output
LAYOUTS = tkl_f13_ansi tkl_f13_ansi_split_bs_rshift LAYOUTS = tkl_f13_ansi tkl_f13_ansi_split_bs_rshift

View File

@ -39,3 +39,17 @@
#define LED_CAPS_LOCK_PIN F6 #define LED_CAPS_LOCK_PIN F6
#define LED_PIN_ON_STATE 0 #define LED_PIN_ON_STATE 0
#define RGB_DI_PIN D2
#ifdef RGB_DI_PIN
#define RGBLED_NUM 1
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 200 /* The maximum brightness level */
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
/*======= RGB function=======*/
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#endif

View File

@ -14,5 +14,5 @@ CONSOLE_ENABLE = yes # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output AUDIO_ENABLE = no # Audio output