summaryrefslogtreecommitdiff
path: root/keyboards/melgeek
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/melgeek')
-rw-r--r--keyboards/melgeek/mach80/rev1/info.json2
-rwxr-xr-xkeyboards/melgeek/mach80/rev1/rev1.c16
-rw-r--r--keyboards/melgeek/mach80/rev2/info.json2
-rwxr-xr-xkeyboards/melgeek/mach80/rev2/rev2.c16
-rw-r--r--keyboards/melgeek/mj61/rev1/info.json2
-rw-r--r--keyboards/melgeek/mj61/rev2/info.json2
-rw-r--r--keyboards/melgeek/mj63/rev1/info.json2
-rw-r--r--keyboards/melgeek/mj63/rev2/info.json2
-rw-r--r--keyboards/melgeek/mj64/rev1/info.json2
-rw-r--r--keyboards/melgeek/mj64/rev2/info.json2
-rw-r--r--keyboards/melgeek/mj64/rev3/info.json2
-rw-r--r--keyboards/melgeek/mj65/info.json2
-rwxr-xr-xkeyboards/melgeek/mj6xy/rev3/config.h5
-rw-r--r--keyboards/melgeek/mj6xy/rev3/info.json7
-rwxr-xr-xkeyboards/melgeek/mojo68/info.json2
-rwxr-xr-xkeyboards/melgeek/mojo68/rev1/rev1.c16
-rw-r--r--keyboards/melgeek/mojo75/info.json2
-rw-r--r--keyboards/melgeek/tegic/info.json2
-rw-r--r--keyboards/melgeek/z70ultra/info.json2
-rw-r--r--keyboards/melgeek/z70ultra/z70ultra.c28
20 files changed, 58 insertions, 58 deletions
diff --git a/keyboards/melgeek/mach80/rev1/info.json b/keyboards/melgeek/mach80/rev1/info.json
index 3a1a27847d..1d7d87b76f 100644
--- a/keyboards/melgeek/mach80/rev1/info.json
+++ b/keyboards/melgeek/mach80/rev1/info.json
@@ -1,6 +1,6 @@
{
"rgb_matrix": {
- "driver": "IS31FL3741"
+ "driver": "is31fl3741"
},
"matrix_pins": {
"cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "D3"],
diff --git a/keyboards/melgeek/mach80/rev1/rev1.c b/keyboards/melgeek/mach80/rev1/rev1.c
index bb04eddd5b..da4c6b73d8 100755
--- a/keyboards/melgeek/mach80/rev1/rev1.c
+++ b/keyboards/melgeek/mach80/rev1/rev1.c
@@ -153,21 +153,21 @@ const is31_led g_is31_indicator_leds[3] = {
bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) {
if (led_state.caps_lock) {
- IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0x00, 0x00, 0xff);
+ is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0x00, 0x00, 0xff);
} else {
- IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0x00, 0x00, 0x00);
+ is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0x00, 0x00, 0x00);
}
if (led_state.num_lock) {
- IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0xff, 0x00, 0x00);
+ is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0xff, 0x00, 0x00);
} else {
- IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0x00, 0x00, 0x00);
+ is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0x00, 0x00, 0x00);
}
if (led_state.scroll_lock) {
- IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0xff, 0x00);
+ is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0xff, 0x00);
} else {
- IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0x00, 0x00);
+ is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0x00, 0x00);
}
}
return true;
@@ -176,10 +176,10 @@ bool led_update_kb(led_t led_state) {
void matrix_init_kb(void) {
for (int i = 0; i < DRIVER_INDICATOR_LED_TOTAL; ++i) {
is31_led led = g_is31_indicator_leds[i];
- IS31FL3741_set_scaling_registers(&led, 0xFF, 0xFF, 0xFF);
+ is31fl3741_set_scaling_registers(&led, 0xFF, 0xFF, 0xFF);
}
- IS31FL3741_update_led_control_registers(DRIVER_ADDR_1, 0);
+ is31fl3741_update_led_control_registers(DRIVER_ADDR_1, 0);
matrix_init_user();
}
diff --git a/keyboards/melgeek/mach80/rev2/info.json b/keyboards/melgeek/mach80/rev2/info.json
index 3a1a27847d..1d7d87b76f 100644
--- a/keyboards/melgeek/mach80/rev2/info.json
+++ b/keyboards/melgeek/mach80/rev2/info.json
@@ -1,6 +1,6 @@
{
"rgb_matrix": {
- "driver": "IS31FL3741"
+ "driver": "is31fl3741"
},
"matrix_pins": {
"cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "D3"],
diff --git a/keyboards/melgeek/mach80/rev2/rev2.c b/keyboards/melgeek/mach80/rev2/rev2.c
index 7e578c78b5..632466376d 100755
--- a/keyboards/melgeek/mach80/rev2/rev2.c
+++ b/keyboards/melgeek/mach80/rev2/rev2.c
@@ -151,21 +151,21 @@ const is31_led g_is31_indicator_leds[3] = {
bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) {
if (led_state.caps_lock) {
- IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0x00, 0x00, 0xff);
+ is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0x00, 0x00, 0xff);
} else {
- IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0x00, 0x00, 0x00);
+ is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0x00, 0x00, 0x00);
}
if (led_state.num_lock) {
- IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0xff, 0x00, 0x00);
+ is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0xff, 0x00, 0x00);
} else {
- IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0x00, 0x00, 0x00);
+ is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0x00, 0x00, 0x00);
}
if (led_state.scroll_lock) {
- IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0xff, 0x00);
+ is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0xff, 0x00);
} else {
- IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0x00, 0x00);
+ is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0x00, 0x00);
}
}
return true;
@@ -174,10 +174,10 @@ bool led_update_kb(led_t led_state) {
void matrix_init_kb(void) {
for (int i = 0; i < DRIVER_INDICATOR_LED_TOTAL; ++i) {
is31_led led = g_is31_indicator_leds[i];
- IS31FL3741_set_scaling_registers(&led, 0xFF, 0xFF, 0xFF);
+ is31fl3741_set_scaling_registers(&led, 0xFF, 0xFF, 0xFF);
}
- IS31FL3741_update_led_control_registers(DRIVER_ADDR_1, 0);
+ is31fl3741_update_led_control_registers(DRIVER_ADDR_1, 0);
matrix_init_user();
}
diff --git a/keyboards/melgeek/mj61/rev1/info.json b/keyboards/melgeek/mj61/rev1/info.json
index c146adef04..705023fb8e 100644
--- a/keyboards/melgeek/mj61/rev1/info.json
+++ b/keyboards/melgeek/mj61/rev1/info.json
@@ -1,6 +1,6 @@
{
"rgb_matrix": {
- "driver": "IS31FL3741"
+ "driver": "is31fl3741"
},
"matrix_pins": {
"cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
diff --git a/keyboards/melgeek/mj61/rev2/info.json b/keyboards/melgeek/mj61/rev2/info.json
index 330137a02a..62b2c58f15 100644
--- a/keyboards/melgeek/mj61/rev2/info.json
+++ b/keyboards/melgeek/mj61/rev2/info.json
@@ -1,6 +1,6 @@
{
"rgb_matrix": {
- "driver": "IS31FL3741"
+ "driver": "is31fl3741"
},
"matrix_pins": {
"cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
diff --git a/keyboards/melgeek/mj63/rev1/info.json b/keyboards/melgeek/mj63/rev1/info.json
index c146adef04..705023fb8e 100644
--- a/keyboards/melgeek/mj63/rev1/info.json
+++ b/keyboards/melgeek/mj63/rev1/info.json
@@ -1,6 +1,6 @@
{
"rgb_matrix": {
- "driver": "IS31FL3741"
+ "driver": "is31fl3741"
},
"matrix_pins": {
"cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
diff --git a/keyboards/melgeek/mj63/rev2/info.json b/keyboards/melgeek/mj63/rev2/info.json
index 330137a02a..62b2c58f15 100644
--- a/keyboards/melgeek/mj63/rev2/info.json
+++ b/keyboards/melgeek/mj63/rev2/info.json
@@ -1,6 +1,6 @@
{
"rgb_matrix": {
- "driver": "IS31FL3741"
+ "driver": "is31fl3741"
},
"matrix_pins": {
"cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
diff --git a/keyboards/melgeek/mj64/rev1/info.json b/keyboards/melgeek/mj64/rev1/info.json
index c146adef04..705023fb8e 100644
--- a/keyboards/melgeek/mj64/rev1/info.json
+++ b/keyboards/melgeek/mj64/rev1/info.json
@@ -1,6 +1,6 @@
{
"rgb_matrix": {
- "driver": "IS31FL3741"
+ "driver": "is31fl3741"
},
"matrix_pins": {
"cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
diff --git a/keyboards/melgeek/mj64/rev2/info.json b/keyboards/melgeek/mj64/rev2/info.json
index c146adef04..705023fb8e 100644
--- a/keyboards/melgeek/mj64/rev2/info.json
+++ b/keyboards/melgeek/mj64/rev2/info.json
@@ -1,6 +1,6 @@
{
"rgb_matrix": {
- "driver": "IS31FL3741"
+ "driver": "is31fl3741"
},
"matrix_pins": {
"cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
diff --git a/keyboards/melgeek/mj64/rev3/info.json b/keyboards/melgeek/mj64/rev3/info.json
index 330137a02a..62b2c58f15 100644
--- a/keyboards/melgeek/mj64/rev3/info.json
+++ b/keyboards/melgeek/mj64/rev3/info.json
@@ -1,6 +1,6 @@
{
"rgb_matrix": {
- "driver": "IS31FL3741"
+ "driver": "is31fl3741"
},
"matrix_pins": {
"cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
diff --git a/keyboards/melgeek/mj65/info.json b/keyboards/melgeek/mj65/info.json
index 71fce4cf7a..061b4bc83e 100644
--- a/keyboards/melgeek/mj65/info.json
+++ b/keyboards/melgeek/mj65/info.json
@@ -9,7 +9,7 @@
"device_version": "0.0.1"
},
"rgb_matrix": {
- "driver": "IS31FL3741"
+ "driver": "is31fl3741"
},
"matrix_pins": {
"cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "B14"],
diff --git a/keyboards/melgeek/mj6xy/rev3/config.h b/keyboards/melgeek/mj6xy/rev3/config.h
index dbe73b7e3d..415fc3f2aa 100755
--- a/keyboards/melgeek/mj6xy/rev3/config.h
+++ b/keyboards/melgeek/mj6xy/rev3/config.h
@@ -28,8 +28,3 @@
# define RGBLIGHT_EFFECT_TWINKLE
# define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6)
# define RGBLIGHT_DEFAULT_SPD 10
-# define RGBLED_NUM 16
-# define RGBLIGHT_HUE_STEP 8
-# define RGBLIGHT_SAT_STEP 8
-# define RGBLIGHT_VAL_STEP 8
-# define RGBLIGHT_SLEEP
diff --git a/keyboards/melgeek/mj6xy/rev3/info.json b/keyboards/melgeek/mj6xy/rev3/info.json
index 5dd66001c5..74e77035ca 100644
--- a/keyboards/melgeek/mj6xy/rev3/info.json
+++ b/keyboards/melgeek/mj6xy/rev3/info.json
@@ -5,10 +5,15 @@
},
"diode_direction": "COL2ROW",
"backlight": {
- "driver": "software",
"pin": "B7",
"levels": 10
},
+ "rgblight": {
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 16,
+ "sleep": true
+ },
"ws2812": {
"pin": "C6"
}
diff --git a/keyboards/melgeek/mojo68/info.json b/keyboards/melgeek/mojo68/info.json
index c5dcb5d410..7e160d0c59 100755
--- a/keyboards/melgeek/mojo68/info.json
+++ b/keyboards/melgeek/mojo68/info.json
@@ -9,7 +9,7 @@
"device_version": "0.0.1"
},
"rgb_matrix": {
- "driver": "IS31FL3741"
+ "driver": "is31fl3741"
},
"matrix_pins": {
"cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
diff --git a/keyboards/melgeek/mojo68/rev1/rev1.c b/keyboards/melgeek/mojo68/rev1/rev1.c
index cadc625adb..bea523c84e 100755
--- a/keyboards/melgeek/mojo68/rev1/rev1.c
+++ b/keyboards/melgeek/mojo68/rev1/rev1.c
@@ -121,21 +121,21 @@ const is31_led g_is31_indicator_leds[3] = {
bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) {
if (led_state.caps_lock) {
- IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0xff, 0x00, 0x00);
+ is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0xff, 0x00, 0x00);
} else {
- IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0x00, 0x00, 0x00);
+ is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0x00, 0x00, 0x00);
}
if (led_state.num_lock) {
- IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0x00, 0xff, 0x00);
+ is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0x00, 0xff, 0x00);
} else {
- IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0x00, 0x00, 0x00);
+ is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0x00, 0x00, 0x00);
}
if (led_state.scroll_lock) {
- IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0x00, 0xff);
+ is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0x00, 0xff);
} else {
- IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0x00, 0x00);
+ is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0x00, 0x00);
}
}
return true;
@@ -144,10 +144,10 @@ bool led_update_kb(led_t led_state) {
void matrix_init_kb(void) {
for (int i = 0; i < DRIVER_INDICATOR_LED_TOTAL; ++i) {
is31_led led = g_is31_indicator_leds[i];
- IS31FL3741_set_scaling_registers(&led, 0xFF, 0xFF, 0xFF);
+ is31fl3741_set_scaling_registers(&led, 0xFF, 0xFF, 0xFF);
}
- IS31FL3741_update_led_control_registers(DRIVER_ADDR_1, 0);
+ is31fl3741_update_led_control_registers(DRIVER_ADDR_1, 0);
matrix_init_user();
}
diff --git a/keyboards/melgeek/mojo75/info.json b/keyboards/melgeek/mojo75/info.json
index 7d7c6db3ff..c22c5710a5 100644
--- a/keyboards/melgeek/mojo75/info.json
+++ b/keyboards/melgeek/mojo75/info.json
@@ -9,7 +9,7 @@
"device_version": "0.0.1"
},
"rgb_matrix": {
- "driver": "IS31FL3741"
+ "driver": "is31fl3741"
},
"matrix_pins": {
"cols": ["B12", "B13", "B14", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
diff --git a/keyboards/melgeek/tegic/info.json b/keyboards/melgeek/tegic/info.json
index 31aa067323..c54f53ca61 100644
--- a/keyboards/melgeek/tegic/info.json
+++ b/keyboards/melgeek/tegic/info.json
@@ -9,7 +9,7 @@
"device_version": "0.0.1"
},
"rgb_matrix": {
- "driver": "IS31FL3741"
+ "driver": "is31fl3741"
},
"matrix_pins": {
"cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
diff --git a/keyboards/melgeek/z70ultra/info.json b/keyboards/melgeek/z70ultra/info.json
index 697d107a4f..ae555e046b 100644
--- a/keyboards/melgeek/z70ultra/info.json
+++ b/keyboards/melgeek/z70ultra/info.json
@@ -9,7 +9,7 @@
"device_version": "0.0.1"
},
"rgb_matrix": {
- "driver": "IS31FL3741"
+ "driver": "is31fl3741"
},
"matrix_pins": {
"cols": ["B11", "B10", "B1", "A10", "B5", "B4", "B3", "A15", "A2", "A1", "A0", "C15", "C14", "C13"],
diff --git a/keyboards/melgeek/z70ultra/z70ultra.c b/keyboards/melgeek/z70ultra/z70ultra.c
index 9ff2e778c6..d0b23c3bf8 100644
--- a/keyboards/melgeek/z70ultra/z70ultra.c
+++ b/keyboards/melgeek/z70ultra/z70ultra.c
@@ -129,27 +129,27 @@ const is31_led g_is31_indicator_leds[6] = {
bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) {
if (led_state.caps_lock) {
- IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0xff, 0x00, 0x00);
- IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[3], 0xff, 0x00, 0x00);
+ is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0xff, 0x00, 0x00);
+ is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[3], 0xff, 0x00, 0x00);
} else {
- IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0x00, 0x00, 0x00);
- IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[3], 0x00, 0x00, 0x00);
+ is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0x00, 0x00, 0x00);
+ is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[3], 0x00, 0x00, 0x00);
}
if (led_state.num_lock) {
- IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0x00, 0xff, 0x00);
- IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[4], 0x00, 0xff, 0x00);
+ is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0x00, 0xff, 0x00);
+ is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[4], 0x00, 0xff, 0x00);
} else {
- IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0x00, 0x00, 0x00);
- IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[4], 0x00, 0x00, 0x00);
+ is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0x00, 0x00, 0x00);
+ is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[4], 0x00, 0x00, 0x00);
}
if (led_state.scroll_lock) {
- IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0x00, 0xff);
- IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[5], 0x00, 0x00, 0xff);
+ is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0x00, 0xff);
+ is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[5], 0x00, 0x00, 0xff);
} else {
- IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0x00, 0x00);
- IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[5], 0x00, 0x00, 0x00);
+ is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0x00, 0x00);
+ is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[5], 0x00, 0x00, 0x00);
}
}
return true;
@@ -158,10 +158,10 @@ bool led_update_kb(led_t led_state) {
void matrix_init_kb(void) {
for (int i = 0; i < DRIVER_INDICATOR_LED_TOTAL; ++i) {
is31_led led = g_is31_indicator_leds[i];
- IS31FL3741_set_scaling_registers(&led, 0xFF, 0xFF, 0xFF);
+ is31fl3741_set_scaling_registers(&led, 0xFF, 0xFF, 0xFF);
}
- IS31FL3741_update_led_control_registers(DRIVER_ADDR_1, 0);
+ is31fl3741_update_led_control_registers(DRIVER_ADDR_1, 0);
matrix_init_user();
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-04 11:09:33 +0000