aboutsummaryrefslogtreecommitdiff
path: root/keyboards/system76/launch_1
diff options
context:
space:
mode:
authorNick Brassel <[email protected]>2024-11-27 21:29:12 +1100
committerNick Brassel <[email protected]>2024-11-27 21:29:12 +1100
commit9f76541b29056150cf57d69569a14a59e13995c7 (patch)
tree66c7398d873fcda88aebe3090603aefe045ff52e /keyboards/system76/launch_1
parent57be4871616ee9a8fe042f6186010d436ec7d4b1 (diff)
parenteb04b94eecbb9b3e64ca9c74f937b5f762440b17 (diff)
downloadqmk_firmware-9f76541b29056150cf57d69569a14a59e13995c7.tar.gz
qmk_firmware-9f76541b29056150cf57d69569a14a59e13995c7.zip
Merge branch 'develop'
Diffstat (limited to 'keyboards/system76/launch_1')
-rw-r--r--keyboards/system76/launch_1/config.h2
-rw-r--r--keyboards/system76/launch_1/keymaps/default/keymap.c2
-rw-r--r--keyboards/system76/launch_1/launch_1.c6
-rw-r--r--keyboards/system76/launch_1/rgb_matrix_kb.inc16
4 files changed, 12 insertions, 14 deletions
diff --git a/keyboards/system76/launch_1/config.h b/keyboards/system76/launch_1/config.h
index 7e7fa9be9c..674dbe75b0 100644
--- a/keyboards/system76/launch_1/config.h
+++ b/keyboards/system76/launch_1/config.h
@@ -17,8 +17,6 @@
#pragma once
-#define RGB_MATRIX_DISABLE_KEYCODES // Disables control of rgb matrix by keycodes (must use code functions to control the feature)
-
// I2C {
#define F_SCL 100000UL // Run I2C bus at 100 kHz
#define I2C_START_RETRY_COUNT 20
diff --git a/keyboards/system76/launch_1/keymaps/default/keymap.c b/keyboards/system76/launch_1/keymaps/default/keymap.c
index f3dfd3420e..c44a4b5521 100644
--- a/keyboards/system76/launch_1/keymaps/default/keymap.c
+++ b/keyboards/system76/launch_1/keymaps/default/keymap.c
@@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[1] = LAYOUT(
QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_VAD, RGB_VAI, KC_TRNS, KC_VOLU,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RM_TOGG, RM_VALD, RM_VALU, KC_TRNS, KC_VOLU,
KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP,
diff --git a/keyboards/system76/launch_1/launch_1.c b/keyboards/system76/launch_1/launch_1.c
index dbe697c19d..c9af479bf5 100644
--- a/keyboards/system76/launch_1/launch_1.c
+++ b/keyboards/system76/launch_1/launch_1.c
@@ -191,7 +191,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
#else
return true;
#endif
- case RGB_VAD:
+ case QK_RGB_MATRIX_VALUE_DOWN:
if (record->event.pressed) {
uint8_t level = rgb_matrix_config.hsv.v;
for (int i = sizeof(levels) - 1; i >= 0; i--) {
@@ -203,7 +203,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
set_value_all_layers(level);
}
return false;
- case RGB_VAI:
+ case QK_RGB_MATRIX_VALUE_UP:
if (record->event.pressed) {
uint8_t level = rgb_matrix_config.hsv.v;
for (int i = 0; i < sizeof(levels); i++) {
@@ -215,7 +215,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
set_value_all_layers(level);
}
return false;
- case RGB_TOG:
+ case QK_RGB_MATRIX_TOGGLE:
if (record->event.pressed) {
uint8_t level = 0;
if (rgb_matrix_config.hsv.v == 0) {
diff --git a/keyboards/system76/launch_1/rgb_matrix_kb.inc b/keyboards/system76/launch_1/rgb_matrix_kb.inc
index f29183dde0..abde7aae19 100644
--- a/keyboards/system76/launch_1/rgb_matrix_kb.inc
+++ b/keyboards/system76/launch_1/rgb_matrix_kb.inc
@@ -46,7 +46,7 @@ static bool active_keys(effect_params_t* params) {
RGB_MATRIX_USE_LIMITS(led_min, led_max);
uint8_t layer = get_highest_layer(layer_state);
- RGB rgb = hsv_to_rgb(rgb_matrix_config.hsv);
+ rgb_t rgb = hsv_to_rgb(rgb_matrix_config.hsv);
for (uint8_t i = led_min; i < led_max; i++) {
RGB_MATRIX_TEST_LED_FLAGS();
@@ -69,7 +69,7 @@ static bool active_keys(effect_params_t* params) {
return led_max < RGB_MATRIX_LED_COUNT;
}
-RGB raw_rgb_data[RGB_MATRIX_LED_COUNT] = {0};
+rgb_t raw_rgb_data[RGB_MATRIX_LED_COUNT] = {0};
static uint8_t normalize_component(uint8_t component) {
uint16_t x = (uint16_t)component;
@@ -78,9 +78,9 @@ static uint8_t normalize_component(uint8_t component) {
return (uint8_t)x;
}
-static RGB normalize_index(uint8_t i) {
- RGB raw = raw_rgb_data[i];
- RGB rgb = {
+static rgb_t normalize_index(uint8_t i) {
+ rgb_t raw = raw_rgb_data[i];
+ rgb_t rgb = {
.r = normalize_component(raw.r),
.g = normalize_component(raw.g),
.b = normalize_component(raw.b),
@@ -92,7 +92,7 @@ static bool raw_rgb(effect_params_t* params) {
RGB_MATRIX_USE_LIMITS(led_min, led_max);
for (uint8_t i = led_min; i < led_max; i++) {
RGB_MATRIX_TEST_LED_FLAGS();
- RGB rgb = normalize_index(i);
+ rgb_t rgb = normalize_index(i);
rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
}
return led_max < RGB_MATRIX_LED_COUNT;
@@ -137,7 +137,7 @@ static bool unlocked(effect_params_t* params) {
for (uint8_t i = led_min; i < led_max; i++) {
RGB_MATRIX_TEST_LED_FLAGS();
- HSV hsv = {
+ hsv_t hsv = {
.h = i + unlocked_ticks,
.s = 0xFF,
.v = 0x70,
@@ -149,7 +149,7 @@ static bool unlocked(effect_params_t* params) {
}
}
- RGB rgb = hsv_to_rgb(hsv);
+ rgb_t rgb = hsv_to_rgb(hsv);
rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
}
return led_max < RGB_MATRIX_LED_COUNT;