summaryrefslogtreecommitdiff
path: root/keyboards/matrix
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/matrix')
-rw-r--r--keyboards/matrix/abelx/config.h1
-rw-r--r--keyboards/matrix/abelx/info.json3
-rw-r--r--keyboards/matrix/cain_re/config.h8
-rw-r--r--keyboards/matrix/cain_re/info.json7
-rw-r--r--keyboards/matrix/falcon/config.h4
-rw-r--r--keyboards/matrix/falcon/info.json5
-rw-r--r--keyboards/matrix/m12og/rev1/config.h3
-rw-r--r--keyboards/matrix/m12og/rev1/info.json4
-rw-r--r--keyboards/matrix/m12og/rev2/config.h5
-rw-r--r--keyboards/matrix/m12og/rev2/info.json6
-rw-r--r--keyboards/matrix/m20add/config.h3
-rw-r--r--keyboards/matrix/m20add/info.json3
-rw-r--r--keyboards/matrix/m20add/rgb_ring.c54
-rw-r--r--keyboards/matrix/me/config.h4
-rw-r--r--keyboards/matrix/me/info.json5
-rw-r--r--keyboards/matrix/noah/config.h7
-rw-r--r--keyboards/matrix/noah/info.json6
-rw-r--r--keyboards/matrix/noah/noah.c8
-rw-r--r--keyboards/matrix/noah/rules.mk1
19 files changed, 70 insertions, 67 deletions
diff --git a/keyboards/matrix/abelx/config.h b/keyboards/matrix/abelx/config.h
index a1eaecf36e..7f6793b979 100644
--- a/keyboards/matrix/abelx/config.h
+++ b/keyboards/matrix/abelx/config.h
@@ -90,7 +90,6 @@
// rgb light setting
-#define RGBLED_NUM 9
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/matrix/abelx/info.json b/keyboards/matrix/abelx/info.json
index 60a272dc1f..f020f429d6 100644
--- a/keyboards/matrix/abelx/info.json
+++ b/keyboards/matrix/abelx/info.json
@@ -8,6 +8,9 @@
"pid": "0xAB87",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 9
+ },
"ws2812": {
"pin": "B4"
},
diff --git a/keyboards/matrix/cain_re/config.h b/keyboards/matrix/cain_re/config.h
index 017961460c..9555d0962f 100644
--- a/keyboards/matrix/cain_re/config.h
+++ b/keyboards/matrix/cain_re/config.h
@@ -30,14 +30,6 @@
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-
-#define RGBLED_NUM 14
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
-#define RGBLIGHT_LED_MAP { 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 1, 2, 3 }
-
#define CAPS_PIN D3
#define NUM_PIN F7
#define SCROLL_PIN B0
diff --git a/keyboards/matrix/cain_re/info.json b/keyboards/matrix/cain_re/info.json
index 5b89ed83ef..f3d0aa4179 100644
--- a/keyboards/matrix/cain_re/info.json
+++ b/keyboards/matrix/cain_re/info.json
@@ -8,6 +8,13 @@
"pid": "0x0106",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 14,
+ "sleep": true,
+ "led_map": [4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 1, 2, 3]
+ },
"ws2812": {
"pin": "E6"
},
diff --git a/keyboards/matrix/falcon/config.h b/keyboards/matrix/falcon/config.h
index d817e8b6f2..c6a2944a57 100644
--- a/keyboards/matrix/falcon/config.h
+++ b/keyboards/matrix/falcon/config.h
@@ -27,7 +27,6 @@
//#define NO_PRINT
//rgb light setting
-#define RGBLED_NUM 4
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -38,9 +37,6 @@
#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
//pin setting
#define LED_POWER_PIN D5
diff --git a/keyboards/matrix/falcon/info.json b/keyboards/matrix/falcon/info.json
index 6c0bb7b085..7032bbf955 100644
--- a/keyboards/matrix/falcon/info.json
+++ b/keyboards/matrix/falcon/info.json
@@ -16,6 +16,11 @@
"indicators": {
"caps_lock": "E2"
},
+ "rgblight": {
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 4
+ },
"ws2812": {
"pin": "D1"
},
diff --git a/keyboards/matrix/m12og/rev1/config.h b/keyboards/matrix/m12og/rev1/config.h
index f0ad633575..5ed4aa0075 100644
--- a/keyboards/matrix/m12og/rev1/config.h
+++ b/keyboards/matrix/m12og/rev1/config.h
@@ -42,7 +42,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-
-#define RGBLED_NUM 16
-#define RGBLIGHT_SLEEP
#define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
diff --git a/keyboards/matrix/m12og/rev1/info.json b/keyboards/matrix/m12og/rev1/info.json
index b74c059008..8187c81539 100644
--- a/keyboards/matrix/m12og/rev1/info.json
+++ b/keyboards/matrix/m12og/rev1/info.json
@@ -12,6 +12,10 @@
"caps_lock": "B6",
"scroll_lock": "B5"
},
+ "rgblight": {
+ "led_count": 16,
+ "sleep": true
+ },
"ws2812": {
"pin": "B8"
},
diff --git a/keyboards/matrix/m12og/rev2/config.h b/keyboards/matrix/m12og/rev2/config.h
index 7fb34f5001..5804100fb2 100644
--- a/keyboards/matrix/m12og/rev2/config.h
+++ b/keyboards/matrix/m12og/rev2/config.h
@@ -14,9 +14,4 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 16
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
#define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
diff --git a/keyboards/matrix/m12og/rev2/info.json b/keyboards/matrix/m12og/rev2/info.json
index e6e77ba1ee..de16cb4177 100644
--- a/keyboards/matrix/m12og/rev2/info.json
+++ b/keyboards/matrix/m12og/rev2/info.json
@@ -8,6 +8,12 @@
"pid": "0x8712",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 16,
+ "sleep": true
+ },
"ws2812": {
"pin": "B3"
},
diff --git a/keyboards/matrix/m20add/config.h b/keyboards/matrix/m20add/config.h
index 421773affc..5e301cf1c4 100644
--- a/keyboards/matrix/m20add/config.h
+++ b/keyboards/matrix/m20add/config.h
@@ -79,7 +79,6 @@
#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2
// rgb light setting
-#define RGBLED_NUM 20
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -94,4 +93,4 @@
#define DRIVER_ADDR_1 0b1110100
#define DRIVER_COUNT 1
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT 20
diff --git a/keyboards/matrix/m20add/info.json b/keyboards/matrix/m20add/info.json
index 7d88bb81f5..25abd25827 100644
--- a/keyboards/matrix/m20add/info.json
+++ b/keyboards/matrix/m20add/info.json
@@ -8,6 +8,9 @@
"pid": "0x20AD",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"pin": "B4"
},
diff --git a/keyboards/matrix/m20add/rgb_ring.c b/keyboards/matrix/m20add/rgb_ring.c
index 4466ec3bea..4567f0348d 100644
--- a/keyboards/matrix/m20add/rgb_ring.c
+++ b/keyboards/matrix/m20add/rgb_ring.c
@@ -135,13 +135,13 @@ static void testing_mode(void)
if (timer_elapsed(animation_status.last_timer) > EFFECT_TEST_INTERVAL) {
HSV h = {rgblight_config.hue, rgblight_config.sat, rgblight_config.val};
RGB c = hsv_to_rgb(h);
- //IS31FL3731_set_color_all(c.r, c.g, c.b);
- IS31FL3731_set_color_all(0, 0, 0);
- IS31FL3731_set_color(rgb_ring.outer_index+RING_OUTER_BEGIN, c.r, c.g, c.b);
+ //is31fl3731_set_color_all(c.r, c.g, c.b);
+ is31fl3731_set_color_all(0, 0, 0);
+ is31fl3731_set_color(rgb_ring.outer_index+RING_OUTER_BEGIN, c.r, c.g, c.b);
h.v = EFFECT_TEST_VAL_STEP*rgb_ring.outer_index;
c = hsv_to_rgb(h);
for (uint8_t i = RING_INNER_BEGIN; i <= RING_INNER_END; i++) {
- IS31FL3731_set_color(i, c.r, c.g, c.b);
+ is31fl3731_set_color(i, c.r, c.g, c.b);
}
rgb_ring.outer_index = (rgb_ring.outer_index + 1) % RING_OUTER_SIZE;
//rgb_ring.inner_index = (rgb_ring.inner_index + 1) % RING_INNER_SIZE;
@@ -183,7 +183,7 @@ static void ring_effect_no_1(void)
HSV h = {rgblight_config.hue, rgblight_config.sat, rgblight_config.val};
for (uint8_t i = RING_OUTER_BEGIN; i <= RING_OUTER_END; i++) {
RGB c = hsv_to_rgb(h);
- IS31FL3731_set_color(i, c.r, c.g, c.b);
+ is31fl3731_set_color(i, c.r, c.g, c.b);
}
rgblight_config.hue += EFFECT_1_HUE_STEP;
rgb_ring.effect_count++;
@@ -200,12 +200,12 @@ static void ring_effect_no_1(void)
static void ring_effect_no_2(void)
{
if (need_update(EFFECT_2_INTERVAL)) {
- IS31FL3731_set_color_all(0, 0, 0);
+ is31fl3731_set_color_all(0, 0, 0);
HSV h = {rgblight_config.hue, rgblight_config.sat, rgblight_config.val};
RGB c = hsv_to_rgb(h);
- IS31FL3731_set_color(rgb_ring.led_begin, c.r, c.g, c.b);
- IS31FL3731_set_color(rgb_ring.led_end, c.r, c.g, c.b);
+ is31fl3731_set_color(rgb_ring.led_begin, c.r, c.g, c.b);
+ is31fl3731_set_color(rgb_ring.led_end, c.r, c.g, c.b);
rgb_ring.led_begin = (rgb_ring.led_begin + 1) % RING_OUTER_SIZE;
rgb_ring.led_end = (rgb_ring.led_end + RING_OUTER_SIZE - 1) % RING_OUTER_SIZE;
@@ -225,19 +225,19 @@ static void ring_effect_no_2(void)
static void ring_effect_no_3(void)
{
if (rgb_ring.effect_count == 0) {
- IS31FL3731_set_color_all(0, 0, 0);
+ is31fl3731_set_color_all(0, 0, 0);
}
if (need_update(EFFECT_3_INTERVAL)) {
HSV h = {rgblight_config.hue, rgblight_config.sat, rgblight_config.val};
if (rgb_ring.led_clear) {
- IS31FL3731_set_color(rgb_ring.led_begin, 0, 0, 0);
- IS31FL3731_set_color(rgb_ring.led_end, 0, 0, 0);
+ is31fl3731_set_color(rgb_ring.led_begin, 0, 0, 0);
+ is31fl3731_set_color(rgb_ring.led_end, 0, 0, 0);
} else {
RGB c = hsv_to_rgb(h);
- IS31FL3731_set_color(rgb_ring.led_begin, c.r, c.g, c.b);
- IS31FL3731_set_color(rgb_ring.led_end, c.r, c.g, c.b);
+ is31fl3731_set_color(rgb_ring.led_begin, c.r, c.g, c.b);
+ is31fl3731_set_color(rgb_ring.led_end, c.r, c.g, c.b);
}
rgb_ring.led_begin = (rgb_ring.led_begin + 1) % RING_OUTER_SIZE;
@@ -273,12 +273,12 @@ static void ring_effect_no_3(void)
static void ring_effect_no_4(void)
{
if (need_update(EFFECT_4_INTERVAL)) {
- IS31FL3731_set_color_all(0, 0, 0);
+ is31fl3731_set_color_all(0, 0, 0);
HSV h = {rgblight_config.hue, rgblight_config.sat, rgblight_config.val};
RGB c = hsv_to_rgb(h);
- IS31FL3731_set_color(rgb_ring.led_begin, c.r, c.g, c.b);
- IS31FL3731_set_color(rgb_ring.led_end, c.r, c.g, c.b);
+ is31fl3731_set_color(rgb_ring.led_begin, c.r, c.g, c.b);
+ is31fl3731_set_color(rgb_ring.led_end, c.r, c.g, c.b);
rgb_ring.led_begin = (rgb_ring.led_begin + EFFECT_4_STEP) % RING_OUTER_SIZE;
rgb_ring.led_end = (rgb_ring.led_end + RING_OUTER_SIZE - EFFECT_4_STEP) % RING_OUTER_SIZE;
@@ -297,16 +297,16 @@ static void ring_effect_no_4(void)
static void ring_effect_no_5(void)
{
if (need_update(EFFECT_5_INTERVAL)) {
- IS31FL3731_set_color_all(0, 0, 0);
+ is31fl3731_set_color_all(0, 0, 0);
for (uint8_t i = RING_INNER_BEGIN; i <= RING_INNER_END; i++) {
HSV h = {rgblight_config.hue, rgblight_config.sat, rgblight_config.val};
RGB c = hsv_to_rgb(h);
- IS31FL3731_set_color(i, c.r, c.g, c.b);
+ is31fl3731_set_color(i, c.r, c.g, c.b);
}
for (uint8_t i = RING_OUTER_BEGIN; i <= RING_OUTER_END; i++) {
HSV h = {rgblight_config.hue+EFFECT_5_HUE_STEP, rgblight_config.sat, rgblight_config.val};
RGB c = hsv_to_rgb(h);
- IS31FL3731_set_color(i, c.r, c.g, c.b);
+ is31fl3731_set_color(i, c.r, c.g, c.b);
}
rgblight_config.hue += EFFECT_5_HUE_STEP;
rgb_ring.effect_count++;
@@ -323,16 +323,16 @@ static void ring_effect_no_5(void)
static void ring_effect_no_6(void)
{
if (need_update(EFFECT_6_INTERVAL)) {
- IS31FL3731_set_color_all(0, 0, 0);
+ is31fl3731_set_color_all(0, 0, 0);
for (uint8_t i = RING_INNER_BEGIN; i <= RING_INNER_END; i++) {
HSV h = {rgblight_config.hue+i*EFFECT_I_HUE_STEP, rgblight_config.sat, rgblight_config.val};
RGB c = hsv_to_rgb(h);
- IS31FL3731_set_color(i, c.r, c.g, c.b);
+ is31fl3731_set_color(i, c.r, c.g, c.b);
}
for (uint8_t i = RING_OUTER_BEGIN; i <= RING_OUTER_END; i++) {
HSV h = {rgblight_config.hue+i*EFFECT_O_HUE_STEP, rgblight_config.sat, rgblight_config.val};
RGB c = hsv_to_rgb(h);
- IS31FL3731_set_color(i, c.r, c.g, c.b);
+ is31fl3731_set_color(i, c.r, c.g, c.b);
}
rgblight_config.hue += EFFECT_I_HUE_STEP;
rgb_ring.effect_count++;
@@ -364,7 +364,7 @@ void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds)
}
for (uint8_t i = 0; i < num_leds; 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);
}
}
@@ -372,12 +372,12 @@ void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds)
void rgb_ring_init(void)
{
i2c_init();
- IS31FL3731_init(DRIVER_ADDR_1);
+ is31fl3731_init(DRIVER_ADDR_1);
for (int index = 0; index < RGB_MATRIX_LED_COUNT; index++) {
bool enabled = true;
- IS31FL3731_set_led_control_register(index, enabled, enabled, enabled);
+ is31fl3731_set_led_control_register(index, enabled, enabled, enabled);
}
- IS31FL3731_update_led_control_registers(DRIVER_ADDR_1, 0);
+ is31fl3731_update_led_control_registers(DRIVER_ADDR_1, 0);
}
void rgb_ring_task(void)
@@ -396,7 +396,7 @@ void rgb_ring_task(void)
break;
};
- IS31FL3731_update_pwm_buffers(DRIVER_ADDR_1, 0);
+ is31fl3731_update_pwm_buffers(DRIVER_ADDR_1, 0);
}
bool process_record_kb(uint16_t keycode, keyrecord_t *record)
diff --git a/keyboards/matrix/me/config.h b/keyboards/matrix/me/config.h
index 8ee1b57bde..b0c06bed41 100644
--- a/keyboards/matrix/me/config.h
+++ b/keyboards/matrix/me/config.h
@@ -27,7 +27,6 @@
//#define NO_PRINT
//rgb light setting
-#define RGBLED_NUM 4
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -38,6 +37,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/matrix/me/info.json b/keyboards/matrix/me/info.json
index 935035317c..5917c66d68 100644
--- a/keyboards/matrix/me/info.json
+++ b/keyboards/matrix/me/info.json
@@ -17,6 +17,11 @@
"caps_lock": "E6",
"scroll_lock": "D2"
},
+ "rgblight": {
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 4
+ },
"ws2812": {
"pin": "E2"
},
diff --git a/keyboards/matrix/noah/config.h b/keyboards/matrix/noah/config.h
index 5a74ab5206..4a3e4d83c9 100644
--- a/keyboards/matrix/noah/config.h
+++ b/keyboards/matrix/noah/config.h
@@ -75,7 +75,6 @@
# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
/* indicator rgb */
-#define RGBLED_NUM 7
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -86,9 +85,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-
-
-// tapping setting
-//#define TAPPING_TERM 200
-//#define RETRO_TAPPING
-//#define PERMISSIVE_HOLD
diff --git a/keyboards/matrix/noah/info.json b/keyboards/matrix/noah/info.json
index 33dedc6bce..192be4a9b5 100644
--- a/keyboards/matrix/noah/info.json
+++ b/keyboards/matrix/noah/info.json
@@ -8,11 +8,15 @@
"pid": "0x0065",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "driver": "custom",
+ "led_count": 7
+ },
"ws2812": {
"pin": "B1"
},
"rgb_matrix": {
- "driver": "IS31FL3731"
+ "driver": "is31fl3731"
},
"community_layouts": ["65_iso_blocker"],
"layouts": {
diff --git a/keyboards/matrix/noah/noah.c b/keyboards/matrix/noah/noah.c
index 671d272d85..0969998fa9 100644
--- a/keyboards/matrix/noah/noah.c
+++ b/keyboards/matrix/noah/noah.c
@@ -32,14 +32,14 @@ void rgblight_set(void) {
}
}
if (noah_led_mode) {
- uint8_t ind_led = host_keyboard_leds();
- if (IS_LED_ON(ind_led, USB_LED_CAPS_LOCK)) {
+ led_t led_state = host_keyboard_led_state();
+ if (led_state.caps_lock) {
noah_leds[0] = led[0];
}
- if (IS_LED_ON(ind_led, USB_LED_SCROLL_LOCK)) {
+ if (led_state.scroll_lock) {
noah_leds[1] = led[1];
}
- if (IS_LED_ON(ind_led, USB_LED_NUM_LOCK)) {
+ if (led_state.num_lock) {
noah_leds[2] = led[2];
}
for (int32_t i = 0; i < 4; i++) {
diff --git a/keyboards/matrix/noah/rules.mk b/keyboards/matrix/noah/rules.mk
index 55ea2f42b0..3b75264222 100644
--- a/keyboards/matrix/noah/rules.mk
+++ b/keyboards/matrix/noah/rules.mk
@@ -27,7 +27,6 @@ NO_USB_STARTUP_CHECK = yes # Disable initialization only when usb is plugged in
RGB_MATRIX_ENABLE = yes
RGBLIGHT_ENABLE = yes
-RGBLIGHT_CUSTOM_DRIVER = yes
WS2812_DRIVER_REQUIRED = yes
CUSTOM_MATRIX = yes
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-04 10:43:10 +0000