summaryrefslogtreecommitdiff
path: root/keyboards/system76/launch_1
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/system76/launch_1')
-rw-r--r--keyboards/system76/launch_1/config.h4
-rw-r--r--keyboards/system76/launch_1/rgb_matrix_kb.inc12
2 files changed, 7 insertions, 9 deletions
diff --git a/keyboards/system76/launch_1/config.h b/keyboards/system76/launch_1/config.h
index 50a6e6f9d7..739a3c78f8 100644
--- a/keyboards/system76/launch_1/config.h
+++ b/keyboards/system76/launch_1/config.h
@@ -43,12 +43,10 @@
#ifdef RGB_MATRIX_ENABLE
# define RGB_DI_PIN E2
-# define DRIVER_LED_TOTAL 84
+# define RGB_MATRIX_LED_COUNT 84
# define RGB_MATRIX_KEYPRESSES // Reacts to keypresses
// # define RGB_MATRIX_KEYRELEASES // Reacts to keyreleases (instead of keypresses)
// # define RGB_MATRIX_FRAMEBUFFER_EFFECTS // Enables framebuffer effects
-# define RGB_DISABLE_TIMEOUT 0 // Number of milliseconds to wait until RGB automatically turns off
-# define RGB_DISABLE_AFTER_TIMEOUT 0 // OBSOLETE: Number of ticks to wait until disabling effects
# define RGB_DISABLE_WHEN_USB_SUSPENDED // Turns off effects when suspended
// Limit brightness to support USB-A at 0.5 A
// TODO: Do this dynamically based on power source
diff --git a/keyboards/system76/launch_1/rgb_matrix_kb.inc b/keyboards/system76/launch_1/rgb_matrix_kb.inc
index 484483e0a1..02de10ed50 100644
--- a/keyboards/system76/launch_1/rgb_matrix_kb.inc
+++ b/keyboards/system76/launch_1/rgb_matrix_kb.inc
@@ -24,13 +24,13 @@ RGB_MATRIX_EFFECT(unlocked)
#include "dynamic_keymap.h"
static bool active_keys_initialized = false;
-static uint8_t active_keys_table[DRIVER_LED_TOTAL] = {0};
+static uint8_t active_keys_table[RGB_MATRIX_LED_COUNT] = {0};
static void active_keys_initialize(void) {
for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
for (uint8_t col = 0; col < MATRIX_COLS; col++) {
uint8_t led = g_led_config.matrix_co[row][col];
- if (led < DRIVER_LED_TOTAL && row < 16 && col < 16) {
+ if (led < RGB_MATRIX_LED_COUNT && row < 16 && col < 16) {
active_keys_table[led] = (row << 4) | col;
}
}
@@ -65,10 +65,10 @@ static bool active_keys(effect_params_t* params) {
}
}
- return led_max < DRIVER_LED_TOTAL;
+ return led_max < RGB_MATRIX_LED_COUNT;
}
-RGB raw_rgb_data[DRIVER_LED_TOTAL] = {0};
+RGB raw_rgb_data[RGB_MATRIX_LED_COUNT] = {0};
static uint8_t normalize_component(uint8_t component) {
uint16_t x = (uint16_t)component;
@@ -94,7 +94,7 @@ static bool raw_rgb(effect_params_t* params) {
RGB rgb = normalize_index(i);
rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
}
- return led_max < DRIVER_LED_TOTAL;
+ return led_max < RGB_MATRIX_LED_COUNT;
}
static uint8_t unlocked_keys[8][2] = {
@@ -151,7 +151,7 @@ static bool unlocked(effect_params_t* params) {
RGB rgb = hsv_to_rgb(hsv);
rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
}
- return led_max < DRIVER_LED_TOTAL;
+ return led_max < RGB_MATRIX_LED_COUNT;
}
#endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS