From 82dd84e257db8e5fd1eb33c152a0026ee5bee7fe Mon Sep 17 00:00:00 2001 From: yulei Date: Sat, 5 Mar 2022 12:57:19 +0800 Subject: support more leds (#15840) --- keyboards/neson_design/n6/n6.c | 132 ++++++++++++++++++++++++++++++----------- 1 file changed, 99 insertions(+), 33 deletions(-) (limited to 'keyboards/neson_design/n6/n6.c') diff --git a/keyboards/neson_design/n6/n6.c b/keyboards/neson_design/n6/n6.c index e99467fa0c..4d5927cae1 100644 --- a/keyboards/neson_design/n6/n6.c +++ b/keyboards/neson_design/n6/n6.c @@ -34,7 +34,7 @@ enum { }; // alert state update interval -#define ALERT_INTERVAL 600 +#define ALERT_INTERVAL 500 // self testing state update interval #define ST_INTERVAL 100 // self testing start index @@ -46,6 +46,26 @@ enum { // self testing stage end duration #define ST_END_DURATION 10 +// led index +#define ST_LEFT_BEGIN 0 +#ifdef DRIVER_ADDR_2 +#define ST_LEFT_SIZE 4 +#else +#define ST_LEFT_SIZE 2 +#endif +#define ST_LEFT_END (ST_LEFT_BEGIN+ST_LEFT_SIZE-1) +#ifdef DRIVER_ADDR_2 +#define ST_RIGHT_BEGIN 60 +#else +#define ST_RIGHT_BEGIN 30 +#endif +#ifdef DRIVER_ADDR_2 +#define ST_RIGHT_SIZE 4 +#else +#define ST_RIGHT_SIZE 2 +#endif +#define ST_RIGHT_END (ST_RIGHT_BEGIN+ST_RIGHT_SIZE-1) + #ifdef RGBLIGHT_ENABLE extern rgblight_config_t rgblight_config; @@ -94,21 +114,21 @@ static void self_testing(void) IS31FL3731_set_color_all(0, 0, 0); } - if (rgb_state.index >= 1) { - for (int i = rgb_state.index-1; i < 32-rgb_state.index+1; i++) { + if (rgb_state.index >= ST_LEFT_END) { + for (int i = rgb_state.index - 1; i < DRIVER_LED_TOTAL - rgb_state.index + 1; i++) { IS31FL3731_set_color(i, led.r, led.g, led.b); } - if (rgb_state.index==1) { - rgb_state.index=0; + if (rgb_state.index == ST_LEFT_END) { + rgb_state.index = ST_LEFT_BEGIN; } else { - rgb_state.index -= 2; + rgb_state.index -= ST_LEFT_SIZE; } } else{ if (rgb_state.delay > 0) { rgb_state.delay--; } else { // move to stage 2 - rgb_state.index = 2; + rgb_state.index = ST_LEFT_BEGIN+ST_LEFT_SIZE; rgb_state.testing = ST_STAGE_2; } } @@ -116,28 +136,32 @@ static void self_testing(void) case ST_STAGE_2: { // clear all IS31FL3731_set_color_all(0, 0, 0); + int i = 0; // light left and right - IS31FL3731_set_color(0, led.r, led.g, led.b); - IS31FL3731_set_color(1, led.r, led.g, led.b); - IS31FL3731_set_color(30, led.r, led.g, led.b); - IS31FL3731_set_color(31, led.r, led.g, led.b); + for (i = 0; i < ST_LEFT_SIZE; i++) { + IS31FL3731_set_color(ST_LEFT_BEGIN+i, led.r, led.g, led.b); + } + for (i = 0; i < ST_RIGHT_SIZE; i++) { + IS31FL3731_set_color(ST_RIGHT_BEGIN+i, led.r, led.g, led.b); + + } if (rgb_state.dir) { // left to right - for (int i = rgb_state.index; i < rgb_state.index+4; i++) { + for (int i = rgb_state.index; i < rgb_state.index+ST_LEFT_SIZE+ST_RIGHT_SIZE; i++) { IS31FL3731_set_color(i, led.r, led.g, led.b); } - rgb_state.index += 4; - if (rgb_state.index == 30) { + rgb_state.index += ST_LEFT_SIZE+ST_RIGHT_SIZE; + if (rgb_state.index == ST_RIGHT_BEGIN) { rgb_state.dir = !rgb_state.dir; rgb_state.count--; } } else { // right to left - for (int i = rgb_state.index-4; i < rgb_state.index; i++) { + for (int i = rgb_state.index - ST_RIGHT_SIZE; i < rgb_state.index; i++) { IS31FL3731_set_color(i, led.r, led.g, led.b); } - rgb_state.index -= 4; - if (rgb_state.index == 2) { + rgb_state.index -= ST_LEFT_SIZE + ST_RIGHT_SIZE; + if (rgb_state.index == ST_LEFT_BEGIN+ST_LEFT_SIZE) { rgb_state.dir = !rgb_state.dir; rgb_state.count--; } @@ -153,13 +177,13 @@ static void self_testing(void) } break; case ST_STAGE_3: - if (rgb_state.index != 16) { + if (rgb_state.index != DRIVER_LED_TOTAL/2) { IS31FL3731_set_color_all(0, 0, 0); } // light left and right - if (rgb_state.index == 16) { + if (rgb_state.index == DRIVER_LED_TOTAL/2) { if (rgb_state.duration) { rgb_state.duration--; } else { @@ -176,7 +200,7 @@ static void self_testing(void) IS31FL3731_set_color(i, led.r, led.g, led.b); } // right - for (int i = 31; i > 31-rgb_state.index-1; i--) { + for (int i = ST_RIGHT_END; i > ST_RIGHT_END - rgb_state.index - 1; i--) { IS31FL3731_set_color(i, led.r, led.g, led.b); } rgb_state.index ++; @@ -230,27 +254,66 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { {0, C9_14, C8_14, C7_14}, {0, C9_15, C8_15, C6_14}, {0, C9_16, C7_15, C6_15}, + + // right CA + {1, C1_1, C3_2, C4_2}, + {1, C1_2, C2_2, C4_3}, + {1, C1_3, C2_3, C3_3}, + {1, C1_4, C2_4, C3_4}, + {1, C1_5, C2_5, C3_5}, + {1, C1_6, C2_6, C3_6}, + {1, C1_7, C2_7, C3_7}, + {1, C1_8, C2_8, C3_8}, + + {1, C9_1, C8_1, C7_1}, + {1, C9_2, C8_2, C7_2}, + {1, C9_3, C8_3, C7_3}, + {1, C9_4, C8_4, C7_4}, + {1, C9_5, C8_5, C7_5}, + {1, C9_6, C8_6, C7_6}, + {1, C9_7, C8_7, C6_6}, + {1, C9_8, C7_7, C6_7}, + // right CB + {1, C1_9, C3_10, C4_10}, + {1, C1_10, C2_10, C4_11}, + {1, C1_11, C2_11, C3_11}, + {1, C1_12, C2_12, C3_12}, + {1, C1_13, C2_13, C3_13}, + {1, C1_14, C2_14, C3_14}, + {1, C1_15, C2_15, C3_15}, + {1, C1_16, C2_16, C3_16}, + + {1, C9_9, C8_9, C7_9}, + {1, C9_10, C8_10, C7_10}, + {1, C9_11, C8_11, C7_11}, + {1, C9_12, C8_12, C7_12}, + {1, C9_13, C8_13, C7_13}, + {1, C9_14, C8_14, C7_14}, + {1, C9_15, C8_15, C6_14}, + {1, C9_16, C7_15, C6_15}, }; -#endif void matrix_init_kb(void) { - // clear caps led - setPinOutput(CAPS_PIN); - writePinLow(CAPS_PIN); -#ifdef RGBLIGHT_ENABLE + setPinOutput(LED_CAPS_LOCK_PIN); + writePinLow(LED_CAPS_LOCK_PIN); + i2c_init(); IS31FL3731_init(DRIVER_ADDR_1); +#ifdef DRIVER_ADDR_2 + IS31FL3731_init(DRIVER_ADDR_2); +#endif for (int index = 0; index < DRIVER_LED_TOTAL; index++) { IS31FL3731_set_led_control_register(index, true, true, true); } IS31FL3731_update_led_control_registers(DRIVER_ADDR_1, 0); - update_ticks(); +#ifdef DRIVER_ADDR_2 + IS31FL3731_update_led_control_registers(DRIVER_ADDR_2, 1); #endif + update_ticks(); matrix_init_user(); } -#ifdef RGBLIGHT_ENABLE void housekeeping_task_kb(void) { if (rgb_state.state == SELF_TESTING) { @@ -259,7 +322,8 @@ void housekeeping_task_kb(void) //gold 0xFF, 0xD9, 0x00 LED_TYPE led = { .r = 0xFF, - .g = 0xD9, + //.g = 0xD9, + .g = 0xA5, .b = 0x00, }; if (rgb_state.alert) { @@ -279,7 +343,10 @@ void housekeeping_task_kb(void) } } - IS31FL3731_update_pwm_buffers(DRIVER_ADDR_1,0); + IS31FL3731_update_pwm_buffers(DRIVER_ADDR_1, 0); +#ifdef DRIVER_ADDR_2 + IS31FL3731_update_pwm_buffers(DRIVER_ADDR_2, 1); +#endif housekeeping_task_user(); } @@ -293,15 +360,13 @@ void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds) } ws2812_setleds(start_led+DRIVER_LED_TOTAL, 1); } -#endif bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if (res) { - writePin(CAPS_PIN, led_state.caps_lock); + writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock); -#ifdef RGBLIGHT_ENABLE if (rgb_state.state != SELF_TESTING) { if (led_state.caps_lock) { rgb_state.state = CAPS_ALERT; @@ -311,7 +376,8 @@ bool led_update_kb(led_t led_state) rgblight_set(); } } -#endif } return res; } + +#endif \ No newline at end of file -- cgit v1.2.3