From 5b8de1189014574754d4defa5cd6238cd852ab78 Mon Sep 17 00:00:00 2001 From: Takeshi Nishio Date: Sat, 1 Aug 2020 10:24:42 +0900 Subject: [PATCH] =?UTF-8?q?Update=20LED=E8=A8=AD=E5=AE=9A=E3=82=92?= =?UTF-8?q?=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- keyboards/jones/v.0.1/config.h | 7 +-- .../jones/v.0.1/keymaps/default/keymap.c | 48 ++++++++++--------- 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/keyboards/jones/v.0.1/config.h b/keyboards/jones/v.0.1/config.h index 20a350f854d..b4faf9e53e6 100644 --- a/keyboards/jones/v.0.1/config.h +++ b/keyboards/jones/v.0.1/config.h @@ -61,13 +61,14 @@ along with this program. If not, see . #ifdef RGB_DI_PIN #define RGBLED_NUM 2 #define RGBLIGHT_HUE_STEP 10 - #define RGBLIGHT_SAT_STEP 10 - #define RGBLIGHT_VAL_STEP 10 + #define RGBLIGHT_SAT_STEP 17 + #define RGBLIGHT_VAL_STEP 17 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ // #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ /*== Lighting Layers ==*/ +#define RGBLIGHT_LAYERS // #define RGBLIGHT_MAX_LAYERS 2 - // #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF // Overriding RGB Lighting on/off status + #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF // Overriding RGB Lighting on/off status /*== all animations enable ==*/ // #define RGBLIGHT_ANIMATIONS /*== or choose animations ==*/ diff --git a/keyboards/jones/v.0.1/keymaps/default/keymap.c b/keyboards/jones/v.0.1/keymaps/default/keymap.c index 2086cd09431..2abd7769488 100644 --- a/keyboards/jones/v.0.1/keymaps/default/keymap.c +++ b/keyboards/jones/v.0.1/keymaps/default/keymap.c @@ -226,38 +226,41 @@ switch (keycode) { } // レイヤー切り替えにともなって、インジケータLEDを発光 -layer_state_t layer_state_set_user(layer_state_t state) { - #ifdef RGBLIGHT_ENABLE - switch (get_highest_layer(state)) { - case _LOWER: - rgblight_sethsv_at(HSV_CYAN,0); - break; - case _RAISE: - rgblight_sethsv_at(HSV_RED,0); - break; - case _ADJUST: - rgblight_sethsv_at(HSV_GREEN,0); - break; - default: // for any other layers, or the default layer - rgblight_sethsv(0,0,0); - break; - } - #endif - return state; -} +// layer_state_t layer_state_set_user(layer_state_t state) { +// #ifdef RGBLIGHT_ENABLE +// // rgblight_sethsv_at (200,200,200, 0); +// +// switch (get_highest_layer(state)) { +// case _LOWER: +// rgblight_sethsv_range(HSV_CYAN,0,2); +// break; +// case _RAISE: +// rgblight_sethsv_range(HSV_RED,0,1); +// break; +// case _ADJUST: +// rgblight_sethsv_range(HSV_GREEN,0,1); +// break; +// default: // for any other layers, or the default layer +// rgblight_sethsv_range(200,200,200,0,2); +// break; +// } +// rgblight_set_effect_range(0,1); +// #endif +// return state; +// } #ifdef RGBLIGHT_LAYERS // Light LEDs 1 in cyan when keyboard layer 1 is active const rgblight_segment_t PROGMEM my_layer1_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {0, 1, HSV_CYAN} + {0, 2, HSV_CYAN} ); // Light LEDs 1 in red when keyboard layer 2 is active const rgblight_segment_t PROGMEM my_layer2_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {0, 1, HSV_RED} + {0, 2, HSV_RED} ); // Light LEDs 1 in green when keyboard layer 3 is active const rgblight_segment_t PROGMEM my_layer3_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {1, 1, HSV_GREEN} + {1, 2, HSV_GREEN} ); // Define the array of layers. Later layers take precedence const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST( @@ -275,6 +278,7 @@ layer_state_t layer_state_set_user(layer_state_t state) { rgblight_set_layer_state(1, layer_state_cmp(state, 1)); rgblight_set_layer_state(2, layer_state_cmp(state, 2)); rgblight_set_layer_state(3, layer_state_cmp(state, 3)); + return state; } #endif