summaryrefslogtreecommitdiff
path: root/keyboards/neson_design
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/neson_design')
-rw-r--r--keyboards/neson_design/700e/700e.c40
-rw-r--r--keyboards/neson_design/700e/config.h4
-rw-r--r--keyboards/neson_design/700e/info.json5
-rw-r--r--keyboards/neson_design/n6/config.h4
-rw-r--r--keyboards/neson_design/n6/info.json3
-rw-r--r--keyboards/neson_design/n6/n6.c40
6 files changed, 48 insertions, 48 deletions
diff --git a/keyboards/neson_design/700e/700e.c b/keyboards/neson_design/700e/700e.c
index a5a5ad9120..cf31b6b72b 100644
--- a/keyboards/neson_design/700e/700e.c
+++ b/keyboards/neson_design/700e/700e.c
@@ -107,12 +107,12 @@ static void self_testing(void)
switch(rgb_state.testing) {
case ST_STAGE_1:
if (rgb_state.index !=0 ) {
- IS31FL3731_set_color_all(0, 0, 0);
+ is31fl3731_set_color_all(0, 0, 0);
}
if (rgb_state.index >= ST_LEFT_END) {
for (int i = rgb_state.index - 1; i < RGB_MATRIX_LED_COUNT - rgb_state.index + 1; i++) {
- IS31FL3731_set_color(i, led.r, led.g, led.b);
+ is31fl3731_set_color(i, led.r, led.g, led.b);
}
if (rgb_state.index == ST_LEFT_END) {
rgb_state.index = ST_LEFT_BEGIN;
@@ -131,20 +131,20 @@ static void self_testing(void)
break;
case ST_STAGE_2: {
// clear all
- IS31FL3731_set_color_all(0, 0, 0);
+ is31fl3731_set_color_all(0, 0, 0);
int i = 0;
// light left and right
for (i = 0; i < ST_LEFT_SIZE; i++) {
- IS31FL3731_set_color(ST_LEFT_BEGIN+i, led.r, led.g, led.b);
+ 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);
+ 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+ST_LEFT_SIZE+ST_RIGHT_SIZE; i++) {
- IS31FL3731_set_color(i, led.r, led.g, led.b);
+ is31fl3731_set_color(i, led.r, led.g, led.b);
}
rgb_state.index += ST_LEFT_SIZE+ST_RIGHT_SIZE;
if (rgb_state.index == ST_RIGHT_BEGIN) {
@@ -154,7 +154,7 @@ static void self_testing(void)
} else {
// right to left
for (int i = rgb_state.index - ST_RIGHT_SIZE; i < rgb_state.index; i++) {
- IS31FL3731_set_color(i, led.r, led.g, led.b);
+ is31fl3731_set_color(i, led.r, led.g, led.b);
}
rgb_state.index -= ST_LEFT_SIZE + ST_RIGHT_SIZE;
if (rgb_state.index == ST_LEFT_BEGIN+ST_LEFT_SIZE) {
@@ -174,7 +174,7 @@ static void self_testing(void)
break;
case ST_STAGE_3:
if (rgb_state.index != RGB_MATRIX_LED_COUNT/2) {
- IS31FL3731_set_color_all(0, 0, 0);
+ is31fl3731_set_color_all(0, 0, 0);
}
// light left and right
@@ -193,11 +193,11 @@ static void self_testing(void)
} else {
// left
for (int i = 0; i < rgb_state.index+1; i++) {
- IS31FL3731_set_color(i, led.r, led.g, led.b);
+ is31fl3731_set_color(i, led.r, led.g, led.b);
}
// right
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);
+ is31fl3731_set_color(i, led.r, led.g, led.b);
}
rgb_state.index ++;
}
@@ -295,16 +295,16 @@ void matrix_init_kb(void)
writePinLow(LED_CAPS_LOCK_PIN);
i2c_init();
- IS31FL3731_init(DRIVER_ADDR_1);
+ is31fl3731_init(DRIVER_ADDR_1);
#ifdef DRIVER_ADDR_2
- IS31FL3731_init(DRIVER_ADDR_2);
+ is31fl3731_init(DRIVER_ADDR_2);
#endif
for (int index = 0; index < RGB_MATRIX_LED_COUNT; index++) {
- IS31FL3731_set_led_control_register(index, true, true, true);
+ is31fl3731_set_led_control_register(index, true, true, true);
}
- IS31FL3731_update_led_control_registers(DRIVER_ADDR_1, 0);
+ is31fl3731_update_led_control_registers(DRIVER_ADDR_1, 0);
#ifdef DRIVER_ADDR_2
- IS31FL3731_update_led_control_registers(DRIVER_ADDR_2, 1);
+ is31fl3731_update_led_control_registers(DRIVER_ADDR_2, 1);
#endif
update_ticks();
matrix_init_user();
@@ -321,7 +321,7 @@ void housekeeping_task_kb(void)
self_testing();
} else if (rgb_state.state == CAPS_ALERT) {
if (rgb_state.alert) {
- IS31FL3731_set_color_all(ALERM_LED_R, ALERM_LED_G, ALERM_LED_B);
+ is31fl3731_set_color_all(ALERM_LED_R, ALERM_LED_G, ALERM_LED_B);
LED_TYPE leds[4];
for (int i = 0; i < 4; i++) {
leds[i].r = ALERM_LED_G;
@@ -330,7 +330,7 @@ void housekeeping_task_kb(void)
}
ws2812_setleds(leds, 4);
} else {
- IS31FL3731_set_color_all(0, 0, 0);
+ is31fl3731_set_color_all(0, 0, 0);
LED_TYPE leds[4] = {0};
ws2812_setleds(leds, 4);
}
@@ -341,9 +341,9 @@ 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);
+ is31fl3731_update_pwm_buffers(DRIVER_ADDR_2, 1);
#endif
housekeeping_task_user();
@@ -354,7 +354,7 @@ void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds)
if (rgb_state.state != NORMAL) return;
for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
- IS31FL3731_set_color(i, start_led[i].r, start_led[i].g, start_led[i].b);
+ is31fl3731_set_color(i, start_led[i].r, start_led[i].g, start_led[i].b);
}
LED_TYPE leds[4];
for (int i = 0; i < 4; i++) {
diff --git a/keyboards/neson_design/700e/config.h b/keyboards/neson_design/700e/config.h
index e35f0c4d0a..9a17556610 100644
--- a/keyboards/neson_design/700e/config.h
+++ b/keyboards/neson_design/700e/config.h
@@ -38,7 +38,6 @@
#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL+DRIVER_2_LED_TOTAL)
//rgb light setting
-#define RGBLED_NUM 68
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -48,8 +47,5 @@
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
#define USB_SUSPEND_WAKEUP_DELAY 1000
diff --git a/keyboards/neson_design/700e/info.json b/keyboards/neson_design/700e/info.json
index 3f339ad554..addeafdaea 100644
--- a/keyboards/neson_design/700e/info.json
+++ b/keyboards/neson_design/700e/info.json
@@ -16,6 +16,11 @@
"indicators": {
"caps_lock": "F5"
},
+ "rgblight": {
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 68
+ },
"ws2812": {
"pin": "D5"
},
diff --git a/keyboards/neson_design/n6/config.h b/keyboards/neson_design/n6/config.h
index 9a4c8240c0..f9e1463f64 100644
--- a/keyboards/neson_design/n6/config.h
+++ b/keyboards/neson_design/n6/config.h
@@ -38,7 +38,6 @@
#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL+DRIVER_2_LED_TOTAL)
//rgb light setting
-#define RGBLED_NUM 65
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -49,6 +48,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/neson_design/n6/info.json b/keyboards/neson_design/n6/info.json
index 770748fa29..b6dd5eba41 100644
--- a/keyboards/neson_design/n6/info.json
+++ b/keyboards/neson_design/n6/info.json
@@ -20,6 +20,9 @@
"pin": "B3"
},
"rgblight": {
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 65,
"max_brightness": 192
},
"processor": "atmega32u4",
diff --git a/keyboards/neson_design/n6/n6.c b/keyboards/neson_design/n6/n6.c
index 5727ab655f..cf99404641 100644
--- a/keyboards/neson_design/n6/n6.c
+++ b/keyboards/neson_design/n6/n6.c
@@ -111,12 +111,12 @@ static void self_testing(void)
switch(rgb_state.testing) {
case ST_STAGE_1:
if (rgb_state.index !=0 ) {
- IS31FL3731_set_color_all(0, 0, 0);
+ is31fl3731_set_color_all(0, 0, 0);
}
if (rgb_state.index >= ST_LEFT_END) {
for (int i = rgb_state.index - 1; i < RGB_MATRIX_LED_COUNT - rgb_state.index + 1; i++) {
- IS31FL3731_set_color(i, led.r, led.g, led.b);
+ is31fl3731_set_color(i, led.r, led.g, led.b);
}
if (rgb_state.index == ST_LEFT_END) {
rgb_state.index = ST_LEFT_BEGIN;
@@ -135,20 +135,20 @@ static void self_testing(void)
break;
case ST_STAGE_2: {
// clear all
- IS31FL3731_set_color_all(0, 0, 0);
+ is31fl3731_set_color_all(0, 0, 0);
int i = 0;
// light left and right
for (i = 0; i < ST_LEFT_SIZE; i++) {
- IS31FL3731_set_color(ST_LEFT_BEGIN+i, led.r, led.g, led.b);
+ 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);
+ 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+ST_LEFT_SIZE+ST_RIGHT_SIZE; i++) {
- IS31FL3731_set_color(i, led.r, led.g, led.b);
+ is31fl3731_set_color(i, led.r, led.g, led.b);
}
rgb_state.index += ST_LEFT_SIZE+ST_RIGHT_SIZE;
if (rgb_state.index == ST_RIGHT_BEGIN) {
@@ -158,7 +158,7 @@ static void self_testing(void)
} else {
// right to left
for (int i = rgb_state.index - ST_RIGHT_SIZE; i < rgb_state.index; i++) {
- IS31FL3731_set_color(i, led.r, led.g, led.b);
+ is31fl3731_set_color(i, led.r, led.g, led.b);
}
rgb_state.index -= ST_LEFT_SIZE + ST_RIGHT_SIZE;
if (rgb_state.index == ST_LEFT_BEGIN+ST_LEFT_SIZE) {
@@ -178,7 +178,7 @@ static void self_testing(void)
break;
case ST_STAGE_3:
if (rgb_state.index != RGB_MATRIX_LED_COUNT/2) {
- IS31FL3731_set_color_all(0, 0, 0);
+ is31fl3731_set_color_all(0, 0, 0);
}
// light left and right
@@ -197,11 +197,11 @@ static void self_testing(void)
} else {
// left
for (int i = 0; i < rgb_state.index+1; i++) {
- IS31FL3731_set_color(i, led.r, led.g, led.b);
+ is31fl3731_set_color(i, led.r, led.g, led.b);
}
// right
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);
+ is31fl3731_set_color(i, led.r, led.g, led.b);
}
rgb_state.index ++;
}
@@ -299,16 +299,16 @@ void matrix_init_kb(void)
writePinLow(LED_CAPS_LOCK_PIN);
i2c_init();
- IS31FL3731_init(DRIVER_ADDR_1);
+ is31fl3731_init(DRIVER_ADDR_1);
#ifdef DRIVER_ADDR_2
- IS31FL3731_init(DRIVER_ADDR_2);
+ is31fl3731_init(DRIVER_ADDR_2);
#endif
for (int index = 0; index < RGB_MATRIX_LED_COUNT; index++) {
- IS31FL3731_set_led_control_register(index, true, true, true);
+ is31fl3731_set_led_control_register(index, true, true, true);
}
- IS31FL3731_update_led_control_registers(DRIVER_ADDR_1, 0);
+ is31fl3731_update_led_control_registers(DRIVER_ADDR_1, 0);
#ifdef DRIVER_ADDR_2
- IS31FL3731_update_led_control_registers(DRIVER_ADDR_2, 1);
+ is31fl3731_update_led_control_registers(DRIVER_ADDR_2, 1);
#endif
update_ticks();
matrix_init_user();
@@ -327,13 +327,13 @@ void housekeeping_task_kb(void)
.b = 0x00,
};
if (rgb_state.alert) {
- IS31FL3731_set_color_all(led.r, led.g, led.b);
+ is31fl3731_set_color_all(led.r, led.g, led.b);
ws2812_setleds(&led, 1);
} else {
led.r = 0;
led.g = 0;
led.b = 0;
- IS31FL3731_set_color_all(0, 0, 0);
+ is31fl3731_set_color_all(0, 0, 0);
ws2812_setleds(&led, 1);
}
@@ -343,9 +343,9 @@ 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);
+ is31fl3731_update_pwm_buffers(DRIVER_ADDR_2, 1);
#endif
housekeeping_task_user();
@@ -356,7 +356,7 @@ void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds)
if (rgb_state.state != NORMAL) return;
for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
- IS31FL3731_set_color(i, start_led[i].r, start_led[i].g, start_led[i].b);
+ is31fl3731_set_color(i, start_led[i].r, start_led[i].g, start_led[i].b);
}
ws2812_setleds(start_led+RGB_MATRIX_LED_COUNT, 1);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-04 12:49:01 +0000