From 51620c10424c1ca4be2e7cae922eb271e0c679ca Mon Sep 17 00:00:00 2001 From: Felix Springer <39434424+jumper149@users.noreply.github.com> Date: Mon, 19 Sep 2022 20:42:38 +0200 Subject: Fix boardsource/lulu RGB matrix (#18407) * Fix ordering of entries for RGB matrix. * Fix typos in RGB matrix definition. These matrix indices overlapped. * Improve positions in RGB matrix. The rotary encoder and the key below that are in a new column. The rotary encoder's height is inbetween rows. The key below is kind of off-axis and thus hard to pin down to a specific location. The modifer keys in the bottom row are staggered compared to the other columns. --- keyboards/boardsource/lulu/info.json | 90 ++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 45 deletions(-) (limited to 'keyboards/boardsource') diff --git a/keyboards/boardsource/lulu/info.json b/keyboards/boardsource/lulu/info.json index 3418cd6e7a..8c3b03d1d2 100644 --- a/keyboards/boardsource/lulu/info.json +++ b/keyboards/boardsource/lulu/info.json @@ -36,70 +36,70 @@ { "flags": 2, "x": 17, "y": 10 }, { "flags": 2, "x": 51, "y": 10 }, { "flags": 2, "x": 86, "y": 10 }, + { "flags": 4, "matrix": [0, 5], "x": 86, "y": 0 }, + { "flags": 4, "matrix": [0, 4], "x": 68, "y": 0 }, + { "flags": 4, "matrix": [0, 3], "x": 51, "y": 0 }, + { "flags": 4, "matrix": [0, 2], "x": 34, "y": 0 }, + { "flags": 4, "matrix": [0, 1], "x": 17, "y": 0 }, + { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 }, + { "flags": 1, "matrix": [1, 0], "x": 0, "y": 16 }, + { "flags": 4, "matrix": [1, 1], "x": 17, "y": 16 }, + { "flags": 4, "matrix": [1, 2], "x": 34, "y": 16 }, + { "flags": 4, "matrix": [1, 3], "x": 51, "y": 16 }, + { "flags": 4, "matrix": [1, 4], "x": 68, "y": 16 }, + { "flags": 4, "matrix": [1, 5], "x": 86, "y": 16 }, + { "flags": 4, "matrix": [2, 5], "x": 86, "y": 32 }, + { "flags": 4, "matrix": [2, 4], "x": 68, "y": 32 }, + { "flags": 4, "matrix": [2, 3], "x": 51, "y": 32 }, + { "flags": 4, "matrix": [2, 2], "x": 34, "y": 32 }, + { "flags": 4, "matrix": [2, 1], "x": 17, "y": 32 }, + { "flags": 1, "matrix": [2, 0], "x": 0, "y": 32 }, + { "flags": 1, "matrix": [3, 0], "x": 0, "y": 48 }, + { "flags": 4, "matrix": [3, 1], "x": 17, "y": 48 }, + { "flags": 4, "matrix": [3, 2], "x": 34, "y": 48 }, + { "flags": 4, "matrix": [3, 3], "x": 51, "y": 48 }, + { "flags": 4, "matrix": [3, 4], "x": 68, "y": 48 }, + { "flags": 4, "matrix": [3, 5], "x": 86, "y": 48 }, + { "flags": 4, "matrix": [4, 5], "x": 103, "y": 40 }, + { "flags": 1, "matrix": [4, 4], "x": 96, "y": 64 }, + { "flags": 1, "matrix": [4, 3], "x": 77, "y": 64 }, + { "flags": 1, "matrix": [4, 2], "x": 60, "y": 64 }, + { "flags": 1, "matrix": [4, 1], "x": 43, "y": 64 }, { "flags": 2, "x": 137, "y": 55 }, { "flags": 2, "x": 172, "y": 55 }, { "flags": 2, "x": 206, "y": 40 }, { "flags": 2, "x": 206, "y": 10 }, { "flags": 2, "x": 172, "y": 10 }, { "flags": 2, "x": 137, "y": 10 }, - { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 }, - { "flags": 4, "matrix": [0, 1], "x": 17, "y": 0 }, - { "flags": 4, "matrix": [0, 2], "x": 34, "y": 0 }, - { "flags": 4, "matrix": [0, 3], "x": 51, "y": 0 }, - { "flags": 4, "matrix": [0, 4], "x": 68, "y": 0 }, - { "flags": 4, "matrix": [0, 5], "x": 86, "y": 0 }, { "flags": 4, "matrix": [5, 5], "x": 137, "y": 0 }, { "flags": 4, "matrix": [5, 4], "x": 155, "y": 0 }, { "flags": 4, "matrix": [5, 3], "x": 172, "y": 0 }, { "flags": 4, "matrix": [5, 2], "x": 189, "y": 0 }, { "flags": 4, "matrix": [5, 1], "x": 206, "y": 0 }, { "flags": 1, "matrix": [5, 0], "x": 224, "y": 0 }, - { "flags": 1, "matrix": [1, 0], "x": 0, "y": 16 }, - { "flags": 4, "matrix": [1, 1], "x": 17, "y": 16 }, - { "flags": 4, "matrix": [1, 2], "x": 34, "y": 16 }, - { "flags": 4, "matrix": [1, 3], "x": 51, "y": 16 }, - { "flags": 4, "matrix": [1, 4], "x": 68, "y": 16 }, - { "flags": 4, "matrix": [1, 5], "x": 86, "y": 16 }, - { "flags": 4, "matrix": [6, 5], "x": 137, "y": 16 }, - { "flags": 4, "matrix": [6, 4], "x": 155, "y": 16 }, - { "flags": 4, "matrix": [6, 3], "x": 172, "y": 16 }, - { "flags": 4, "matrix": [6, 2], "x": 189, "y": 16 }, + { "flags": 1, "matrix": [6, 0], "x": 224, "y": 16 }, { "flags": 4, "matrix": [6, 1], "x": 206, "y": 16 }, - { "flags": 1, "matrix": [6, 4], "x": 224, "y": 16 }, - { "flags": 1, "matrix": [2, 0], "x": 0, "y": 32 }, - { "flags": 4, "matrix": [2, 1], "x": 17, "y": 32 }, - { "flags": 4, "matrix": [2, 2], "x": 34, "y": 32 }, - { "flags": 4, "matrix": [2, 3], "x": 51, "y": 32 }, - { "flags": 4, "matrix": [2, 4], "x": 68, "y": 32 }, - { "flags": 4, "matrix": [2, 5], "x": 86, "y": 32 }, + { "flags": 4, "matrix": [6, 2], "x": 189, "y": 16 }, + { "flags": 4, "matrix": [6, 3], "x": 172, "y": 16 }, + { "flags": 4, "matrix": [6, 4], "x": 155, "y": 16 }, + { "flags": 4, "matrix": [6, 5], "x": 137, "y": 16 }, { "flags": 4, "matrix": [7, 5], "x": 137, "y": 32 }, { "flags": 4, "matrix": [7, 4], "x": 155, "y": 32 }, { "flags": 4, "matrix": [7, 3], "x": 172, "y": 32 }, { "flags": 4, "matrix": [7, 2], "x": 189, "y": 32 }, { "flags": 4, "matrix": [7, 1], "x": 206, "y": 32 }, - { "flags": 1, "matrix": [7, 4], "x": 224, "y": 32 }, - { "flags": 1, "matrix": [3, 0], "x": 0, "y": 48 }, - { "flags": 4, "matrix": [3, 1], "x": 17, "y": 48 }, - { "flags": 4, "matrix": [3, 2], "x": 34, "y": 48 }, - { "flags": 4, "matrix": [3, 3], "x": 51, "y": 48 }, - { "flags": 4, "matrix": [3, 4], "x": 68, "y": 48 }, - { "flags": 4, "matrix": [3, 5], "x": 86, "y": 48 }, - { "flags": 4, "matrix": [4, 5], "x": 103, "y": 48 }, - { "flags": 4, "matrix": [9, 5], "x": 120, "y": 48 }, - { "flags": 4, "matrix": [8, 5], "x": 137, "y": 48 }, - { "flags": 4, "matrix": [8, 4], "x": 155, "y": 48 }, - { "flags": 4, "matrix": [8, 3], "x": 172, "y": 48 }, - { "flags": 4, "matrix": [8, 2], "x": 189, "y": 48 }, + { "flags": 1, "matrix": [7, 0], "x": 224, "y": 32 }, + { "flags": 1, "matrix": [8, 0], "x": 224, "y": 48 }, { "flags": 4, "matrix": [8, 1], "x": 206, "y": 48 }, - { "flags": 1, "matrix": [8, 4], "x": 224, "y": 48 }, - { "flags": 1, "matrix": [4, 1], "x": 34, "y": 64 }, - { "flags": 1, "matrix": [4, 2], "x": 51, "y": 64 }, - { "flags": 1, "matrix": [4, 3], "x": 68, "y": 64 }, - { "flags": 1, "matrix": [4, 4], "x": 86, "y": 64 }, - { "flags": 1, "matrix": [9, 4], "x": 137, "y": 64 }, - { "flags": 1, "matrix": [9, 3], "x": 155, "y": 64 }, - { "flags": 1, "matrix": [9, 2], "x": 172, "y": 64 }, - { "flags": 1, "matrix": [9, 1], "x": 189, "y": 64 } + { "flags": 4, "matrix": [8, 2], "x": 189, "y": 48 }, + { "flags": 4, "matrix": [8, 3], "x": 172, "y": 48 }, + { "flags": 4, "matrix": [8, 4], "x": 155, "y": 48 }, + { "flags": 4, "matrix": [8, 5], "x": 137, "y": 48 }, + { "flags": 4, "matrix": [9, 5], "x": 120, "y": 40 }, + { "flags": 1, "matrix": [9, 4], "x": 127, "y": 64 }, + { "flags": 1, "matrix": [9, 3], "x": 146, "y": 64 }, + { "flags": 1, "matrix": [9, 2], "x": 163, "y": 64 }, + { "flags": 1, "matrix": [9, 1], "x": 180, "y": 64 } ] }, "layouts": { -- cgit v1.2.3 From 36c410592dbd35da33ccc5fd6d2a5cbf4b25a708 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 23 Sep 2022 22:46:23 +1000 Subject: Change `DRIVER_LED_COUNT` to `{LED,RGB}_MATRIX_LED_COUNT` (#18399) --- keyboards/boardsource/beiwagon/config.h | 2 +- keyboards/boardsource/lulu/config.h | 2 +- keyboards/boardsource/microdox/v2/config.h | 2 +- keyboards/boardsource/technik_o/config.h | 2 +- keyboards/boardsource/technik_s/config.h | 2 +- keyboards/boardsource/the_mark/config.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'keyboards/boardsource') diff --git a/keyboards/boardsource/beiwagon/config.h b/keyboards/boardsource/beiwagon/config.h index 6ce8d2d420..587dda7381 100644 --- a/keyboards/boardsource/beiwagon/config.h +++ b/keyboards/boardsource/beiwagon/config.h @@ -17,7 +17,7 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN C6 -#define DRIVER_LED_TOTAL 18 +#define RGB_MATRIX_LED_COUNT 18 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT #define ENABLE_RGB_MATRIX_BREATHING diff --git a/keyboards/boardsource/lulu/config.h b/keyboards/boardsource/lulu/config.h index 8e635a24eb..382b1b6b3f 100644 --- a/keyboards/boardsource/lulu/config.h +++ b/keyboards/boardsource/lulu/config.h @@ -3,7 +3,7 @@ #pragma once #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 -#define DRIVER_LED_TOTAL 70 +#define RGB_MATRIX_LED_COUNT 70 #define RGB_MATRIX_SPLIT { 35, 35 } #define ENABLE_RGB_MATRIX_ALPHAS_MODS #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN diff --git a/keyboards/boardsource/microdox/v2/config.h b/keyboards/boardsource/microdox/v2/config.h index e6a7ddc16b..4846bf5146 100644 --- a/keyboards/boardsource/microdox/v2/config.h +++ b/keyboards/boardsource/microdox/v2/config.h @@ -4,7 +4,7 @@ #define RGB_DI_PIN B5 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 -#define DRIVER_LED_TOTAL 44 +#define RGB_MATRIX_LED_COUNT 44 #define RGB_MATRIX_SPLIT { 22, 22 } #define RGB_DISABLE_WHEN_USB_SUSPENDED #define ENABLE_RGB_MATRIX_ALPHAS_MODS diff --git a/keyboards/boardsource/technik_o/config.h b/keyboards/boardsource/technik_o/config.h index bbaacd33c4..c6edbf1c4e 100644 --- a/keyboards/boardsource/technik_o/config.h +++ b/keyboards/boardsource/technik_o/config.h @@ -18,7 +18,7 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN C6 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 -#define DRIVER_LED_TOTAL 58 +#define RGB_MATRIX_LED_COUNT 58 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT #define ENABLE_RGB_MATRIX_BREATHING diff --git a/keyboards/boardsource/technik_s/config.h b/keyboards/boardsource/technik_s/config.h index 2141a2a0a9..ab4d79147c 100644 --- a/keyboards/boardsource/technik_s/config.h +++ b/keyboards/boardsource/technik_s/config.h @@ -18,7 +18,7 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN C6 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 -#define DRIVER_LED_TOTAL 55 +#define RGB_MATRIX_LED_COUNT 55 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT #define ENABLE_RGB_MATRIX_BREATHING diff --git a/keyboards/boardsource/the_mark/config.h b/keyboards/boardsource/the_mark/config.h index 61628e1821..6d9c9642de 100644 --- a/keyboards/boardsource/the_mark/config.h +++ b/keyboards/boardsource/the_mark/config.h @@ -17,7 +17,7 @@ along with this program. If not, see . #pragma once #ifdef RGB_MATRIX_ENABLE -# define DRIVER_LED_TOTAL 24 +# define RGB_MATRIX_LED_COUNT 24 # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 # define RGB_DISABLE_WHEN_USB_SUSPENDED # define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN -- cgit v1.2.3 From 64b1ed45507a15d5594b1f90b936c2096918f5a4 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Tue, 4 Oct 2022 15:24:22 -0700 Subject: Fix Per Key LED Indicator Callbacks (#18450) Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com> Co-authored-by: Nick Brassel --- .../boardsource/the_mark/keymaps/stanrc85/keymap.c | 27 +++++++++++----------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'keyboards/boardsource') diff --git a/keyboards/boardsource/the_mark/keymaps/stanrc85/keymap.c b/keyboards/boardsource/the_mark/keymaps/stanrc85/keymap.c index 0d958b883a..5b37bb6667 100644 --- a/keyboards/boardsource/the_mark/keymaps/stanrc85/keymap.c +++ b/keyboards/boardsource/the_mark/keymaps/stanrc85/keymap.c @@ -19,17 +19,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ [_QWERTY] = LAYOUT_all( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_MPLY, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, CA_SCLN, - KC_CTLE, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, CA_QUOT, - KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_MPLY, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, CA_SCLN, + KC_CTLE, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, CA_QUOT, + KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LGUI, KC_LALT, LT_SPCF, LT_SPCF, LT_SPCF, TD_TWIN, MO(_FN2_60), KC_GRV, KC_LEFT, KC_DOWN, KC_RGHT ), [_DEFAULT] = LAYOUT_all( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_MPLY, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, CA_SCLN, - KC_CTLE, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, CA_QUOT, - KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_MPLY, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, CA_SCLN, + KC_CTLE, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, CA_QUOT, + KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LGUI, KC_LALT, LT_SPCF, LT_SPCF, LT_SPCF, TD_TWIN, MO(_FN2_60), KC_GRV, KC_LEFT, KC_DOWN, KC_RGHT ), [_FN1_60] = LAYOUT_all( @@ -43,24 +43,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, RGB_SAI, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MAKE, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG(_DEFAULT) ) }; -void rgb_matrix_indicators_user(void) { +bool rgb_matrix_indicators_user(void) { uint8_t layer = get_highest_layer(layer_state); switch (layer) { case _FN1_60: - rgb_matrix_set_color(10, 0, 0, 255); + rgb_matrix_set_color(10, 0, 0, 255); break; case _FN2_60: - rgb_matrix_set_color(10, 255, 255, 255); + rgb_matrix_set_color(10, 255, 255, 255); break; case _DEFAULT: - rgb_matrix_set_color(10, 0, 255, 0); + rgb_matrix_set_color(10, 0, 255, 0); break; default: break; @@ -68,6 +68,7 @@ void rgb_matrix_indicators_user(void) { if (host_keyboard_led_state().caps_lock) { rgb_matrix_set_color(10, 255, 0, 0); } + return false; } void matrix_init_kb(void){ -- cgit v1.2.3 From be1c9af209c491c13331fa1da895ce196ba2fcda Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Sat, 15 Oct 2022 09:54:52 -0700 Subject: Update info.json configs to explicitly list RGBLIGHT animations (#18730) --- keyboards/boardsource/holiday/spooky/info.json | 11 ++++++++++- keyboards/boardsource/microdox/v1/info.json | 11 ++++++++++- keyboards/boardsource/the_mark/info.json | 11 ++++++++++- 3 files changed, 30 insertions(+), 3 deletions(-) (limited to 'keyboards/boardsource') diff --git a/keyboards/boardsource/holiday/spooky/info.json b/keyboards/boardsource/holiday/spooky/info.json index 56be9f7d26..393b4fd806 100644 --- a/keyboards/boardsource/holiday/spooky/info.json +++ b/keyboards/boardsource/holiday/spooky/info.json @@ -25,7 +25,16 @@ "pin": "D3", "sleep": true, "animations": { - "all": true + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true } }, "community_layouts": [ diff --git a/keyboards/boardsource/microdox/v1/info.json b/keyboards/boardsource/microdox/v1/info.json index 85f2e61457..ba8307221a 100644 --- a/keyboards/boardsource/microdox/v1/info.json +++ b/keyboards/boardsource/microdox/v1/info.json @@ -19,7 +19,16 @@ "split_count": [6, 6], "max_brightness": 150, "animations": { - "all": true + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true } } } diff --git a/keyboards/boardsource/the_mark/info.json b/keyboards/boardsource/the_mark/info.json index 7518a39026..46f10affcd 100644 --- a/keyboards/boardsource/the_mark/info.json +++ b/keyboards/boardsource/the_mark/info.json @@ -28,7 +28,16 @@ "sleep": true, "max_brightness": 200, "animations": { - "all": true + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true } }, "rgb_matrix": { -- cgit v1.2.3 From 74223c34a969c0877bde035c721c21a1f25890fa Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 17 Oct 2022 00:14:40 +1100 Subject: Remove legacy keycodes, part 6 (#18740) * `KC_RSHIFT` -> `KC_RSFT` * `KC_RCTRL` -> `KC_RCTL` * `KC_LSHIFT` -> `KC_LSFT` * `KC_LCTRL` -> `KC_LCTL` --- keyboards/boardsource/lulu/keymaps/via/keymap.c | 2 +- keyboards/boardsource/technik_s/keymaps/default/keymap.c | 2 +- keyboards/boardsource/technik_s/keymaps/via/keymap.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'keyboards/boardsource') diff --git a/keyboards/boardsource/lulu/keymaps/via/keymap.c b/keyboards/boardsource/lulu/keymaps/via/keymap.c index de635a6128..ac9efbfac1 100644 --- a/keyboards/boardsource/lulu/keymaps/via/keymap.c +++ b/keyboards/boardsource/lulu/keymaps/via/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, - KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC, KC_RBRC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_ENT, RAISE, KC_BSPC, KC_RGUI ), diff --git a/keyboards/boardsource/technik_s/keymaps/default/keymap.c b/keyboards/boardsource/technik_s/keymaps/default/keymap.c index 00e17b15f0..d79470e4d1 100644 --- a/keyboards/boardsource/technik_s/keymaps/default/keymap.c +++ b/keyboards/boardsource/technik_s/keymaps/default/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_MAIN] = LAYOUT( KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, - KC_LSHIFT,KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_UP, KC_ENT , + KC_LSFT,KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_UP, KC_ENT , RGB_TOG, KC_LCTL, KC_LALT, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_RIGHT ), [_RAISE] = LAYOUT( diff --git a/keyboards/boardsource/technik_s/keymaps/via/keymap.c b/keyboards/boardsource/technik_s/keymaps/via/keymap.c index f85b1ff186..bf02f130e8 100644 --- a/keyboards/boardsource/technik_s/keymaps/via/keymap.c +++ b/keyboards/boardsource/technik_s/keymaps/via/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_MAIN] = LAYOUT( KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, - KC_LSHIFT,KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_UP, KC_ENT , + KC_LSFT,KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_UP, KC_ENT , RGB_TOG, KC_LCTL, KC_LALT, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_RIGHT ), [_RAISE] = LAYOUT( -- cgit v1.2.3 From d8183c52492557fdc8f35cec67c70170bae55efa Mon Sep 17 00:00:00 2001 From: Manna Harbour <51143715+manna-harbour@users.noreply.github.com> Date: Thu, 27 Oct 2022 23:50:32 +1100 Subject: [Keymap] Update Miryoku (#18773) * [miryoku] Revert "[Keymap] manna-harbour_miryoku RESET to QK_BOOT (#18755)" This reverts commit 89dbc181617e69a5b4d91d9d772724daa2d387bb. * [miryoku] Add keyboardio/model01 * [miryoku] Add handwired/dactyl_manuform/4x6 * [miryoku] Update BT keycodes - Update BT keycodes on Media inner index: - Move OUT_AUTO to bottom row - Move RGB_TOG in vi to pinkie column to match other TOG keycodes, and rotate row * [miryoku] Add Extra and Tap layers * [miryoku] Rename config workflow option to custom_config * [miryoku] Update custom_config.h and custom_rules.mk behaviour * [miryoku] Make mapping macro customisable globally and per layer * [miryoku] Add layer lock * [miryoku] Update RGB order in media-l-invertedt * [miryoku] Change mouse button order * [miryoku] Change to X macros for layer list - Supports adding and removing layers from custom_config.h - Add "U_" prefix to layer names - Add layer name strings - Populate keymaps array from X macro - Populate layers enum from X macro - Move layers enum to manna-harbour_miryoku.h - Rename miryoku_alternatives.h to miryoku_layer_alternatives.h - Rename miryoku_layer.h to miryoku_layer_selection.h - Remove miryoku_layer_names.h - Add miryoku_layer_list.h * [miryoku] Reformat split_3x6_3 mapping * [miryoku] Add merge field to workflows * [miryoku] Update thumb combos with new layer names * [miryoku] Update cover image * [miryoku] Add satt/vision * [miryoku] Update Branches and Building docs * [miryoku] Update reset keycode * [miryoku] Add xmk * [miryoku] Add boardsource/lulu * [miryoku] Fix keyboardio/model01 --- .../lulu/keymaps/manna-harbour_miryoku/config.h | 22 ++++++++++++++++++++++ .../lulu/keymaps/manna-harbour_miryoku/keymap.c | 4 ++++ 2 files changed, 26 insertions(+) create mode 100644 keyboards/boardsource/lulu/keymaps/manna-harbour_miryoku/config.h create mode 100644 keyboards/boardsource/lulu/keymaps/manna-harbour_miryoku/keymap.c (limited to 'keyboards/boardsource') diff --git a/keyboards/boardsource/lulu/keymaps/manna-harbour_miryoku/config.h b/keyboards/boardsource/lulu/keymaps/manna-harbour_miryoku/config.h new file mode 100644 index 0000000000..b4249396da --- /dev/null +++ b/keyboards/boardsource/lulu/keymaps/manna-harbour_miryoku/config.h @@ -0,0 +1,22 @@ +// Copyright 2019 Manna Harbour +// https://github.com/manna-harbour/miryoku + +// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . + +#pragma once + +#define XXX KC_NO + +#define LAYOUT_miryoku(\ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09,\ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19,\ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29,\ + N30, N31, K32, K33, K34, K35, K36, K37, N38, N39\ +)\ +LAYOUT(\ +XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX,\ +XXX, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, XXX,\ +XXX, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, XXX,\ +XXX, K20, K21, K22, K23, K24, XXX, XXX, K25, K26, K27, K28, K29, XXX,\ + XXX, K32, K33, K34, K35, K36, K37, XXX\ +) diff --git a/keyboards/boardsource/lulu/keymaps/manna-harbour_miryoku/keymap.c b/keyboards/boardsource/lulu/keymaps/manna-harbour_miryoku/keymap.c new file mode 100644 index 0000000000..dbab7f9820 --- /dev/null +++ b/keyboards/boardsource/lulu/keymaps/manna-harbour_miryoku/keymap.c @@ -0,0 +1,4 @@ +// Copyright 2019 Manna Harbour +// https://github.com/manna-harbour/miryoku + +// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -- cgit v1.2.3 From 317b800bbb28c5ae91f413cfd17471a06de76c2f Mon Sep 17 00:00:00 2001 From: Rocco Meli Date: Sun, 13 Nov 2022 02:00:13 +0100 Subject: [Keymap] Update/refactor userspace and add keymaps for rmeli (#18398) Co-authored-by: Drashna Jaelre Co-authored-by: Ryan Co-authored-by: Elliot Powell --- keyboards/boardsource/lulu/keymaps/rmeli/config.h | 45 +++++++++ keyboards/boardsource/lulu/keymaps/rmeli/keymap.c | 108 ++++++++++++++++++++++ keyboards/boardsource/lulu/keymaps/rmeli/rules.mk | 9 ++ 3 files changed, 162 insertions(+) create mode 100644 keyboards/boardsource/lulu/keymaps/rmeli/config.h create mode 100644 keyboards/boardsource/lulu/keymaps/rmeli/keymap.c create mode 100644 keyboards/boardsource/lulu/keymaps/rmeli/rules.mk (limited to 'keyboards/boardsource') diff --git a/keyboards/boardsource/lulu/keymaps/rmeli/config.h b/keyboards/boardsource/lulu/keymaps/rmeli/config.h new file mode 100644 index 0000000000..4d8823d785 --- /dev/null +++ b/keyboards/boardsource/lulu/keymaps/rmeli/config.h @@ -0,0 +1,45 @@ +/* +Copyright 2022 Rocco Meli <@RMeli> + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#pragma once + +#define MASTER_LEFT // Left side is the master +#define SPLIT_LED_STATE_ENABLE + +#ifdef RGB_MATRIX_ENABLE +// Configure RGB Matrix +# define RGB_MATRIX_KEYPRESSES // enable keypress effects +# define RGB_MATRIX_LED_FLUSH_LIMIT 16 +# define RGB_DISABLE_WHEN_USB_SUSPENDED +# define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR +# define RGB_MATRIX_STARTUP_HUE 10 +# define RGB_MATRIX_STARTUP_SAT 255 +# define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS +// Disable RGB Matrix effects (from lulu/config.h) +# undef ENABLE_RGB_MATRIX_ALPHAS_MODS +# undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN +# undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +# undef ENABLE_RGB_MATRIX_BREATHING +# undef ENABLE_RGB_MATRIX_BAND_SAT +# undef ENABLE_RGB_MATRIX_BAND_VAL +// Enable RGB Matrix effects +# define ENABLE_RGB_MATRIX_BREATHING +# define ENABLE_RGB_MATRIX_TYPING_HEATMAP +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +# define ENABLE_RGB_MATRIX_SOLID_COLOR +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +#endif diff --git a/keyboards/boardsource/lulu/keymaps/rmeli/keymap.c b/keyboards/boardsource/lulu/keymaps/rmeli/keymap.c new file mode 100644 index 0000000000..f9be18ee2d --- /dev/null +++ b/keyboards/boardsource/lulu/keymaps/rmeli/keymap.c @@ -0,0 +1,108 @@ +/* +Copyright 2022 Cole Smith +Copyright 2022 Rocco Meli <@RMeli> + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include QMK_KEYBOARD_H + +#include "rmeli.h" + +enum layers { + _QWERTY, + _COLEMAK_DH, + _RAISE, + _LOWER, + _ADJUST, +}; + +#define RAISE MO(_RAISE) +#define LOWER MO(_LOWER) + +#define QWY_DF DF(_QWERTY) +#define CMK_DF DF(_COLEMAK_DH) + +// clang-format off +#define __________THUMB_LEFT_x4___________ KC_LALT, KC_LGUI, LOWER, KC_SPC +#define __________THUMB_RIGHT_x4__________ KC_ENT, RAISE, KC_LCTL, KC_RGUI +// clang-format on + +/* LAYOUT + * + * ,-----------------------------. ,-----------------------------. + * | | | | | | | | | | | | | | + * |----+----+----+----+----+----| |----+----+----+----+----+----| + * | | | | | | | | | | | | | | + * |----+----+----+----+----+----| |----+----+----+----+----+----| + * | | | | | | |-----. ,-----| | | | | | | + * |----+----+----+----+----+----| | | |----+----+----+----+----+----| + * | | | | | | |-----| |-----| | | | | | | + * `----------------------------/ / \ \----------------------------' + * | | | | / / \ \ | | | | + * | | | |/ / \ \ | | | | + * `--------------''-----' '------''--------------' + */ + +// Define wrapper for standard LULU layout +#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__) + +// clang-format off +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [_QWERTY] = LAYOUT_wrapper( + ___________________NUMBER_LEFT_x6___________________, ___________________NUMBER_RIGHT_x6__________________, + ___________________QWERTY_L1_x6_____________________, ___________________QWERTY_R1_x6_____________________, + ___________________QWERTY_L2_x6_____________________, ___________________QWERTY_R2_x6_____________________, + ___________________QWERTY_L3_x6_____________________, KC_LBRC, KC_RBRC, ___________________QWERTY_R3_x6_____________________, + __________THUMB_LEFT_x4___________, __________THUMB_RIGHT_x4__________ + ), + + [_COLEMAK_DH] = LAYOUT_wrapper( + ___________________NUMBER_LEFT_x6___________________, ___________________NUMBER_RIGHT_x6__________________, + ________________COLEMAK_MOD_DH_L1_x6________________, ________________COLEMAK_MOD_DH_R1_x6________________, + ________________COLEMAK_MOD_DH_L2_x6________________, ________________COLEMAK_MOD_DH_R2_x6________________, + ________________COLEMAK_MOD_DH_L3_x6________________, KC_LBRC, KC_RBRC, ________________COLEMAK_MOD_DH_R3_x6________________, + __________THUMB_LEFT_x4___________, __________THUMB_RIGHT_x4__________ + ), + + [_LOWER] = LAYOUT_wrapper( + ____________________FUNC_LEFT_x6____________________, ____________________FUNC_RIGHT_x6___________________, + _______, ______________NUMBER_LEFT_x5_______________, ______________NUMBER_RIGHT_x5______________, _______, + _______, ______________UNICODE_L2_x5________________, ________________NAV_R2_x5__________________, XXXXXXX, + _______, ______________UNICODE_L3_x5________________, _______, _______, ________________NAV_R3_x5__________________, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ), + + [_RAISE] = LAYOUT_wrapper( + ___________________NUMBER_LEFT_x6___________________, ___________________NUMBER_RIGHT_x6__________________, + ___________________SYMBOL_LEFT_x6___________________, ___________________SYMBOL_RIGHT_x6__________________, + _______, ____________NAV_VIM_x4____________, XXXXXXX, ____________________SYMBOL_R2_x6____________________, + _______, _________________NONE_5x___________________, _______, _______, ____________________SYMBOL_R3_x6____________________, + _______, _______, _______, _______, _______, _______, _______, _______ + ), + + [_ADJUST] = LAYOUT_wrapper( + QK_BOOT, _________________NONE_5x___________________, ______________________NONE_6x_______________________, + XXXXXXX, _________________NONE_5x___________________, _______________CONFIG_R1_x5________________, QWY_DF, + RGB_TOG, ________________RGB_L2_x5__________________, _______________CONFIG_R2_x5________________, XXXXXXX, + XXXXXXX, ________________RGB_L3_x5__________________, _______, _______, _______________CONFIG_R3_x5________________, CMK_DF, + _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; +// clang-format on + +layer_state_t layer_state_set_user(layer_state_t state) { + return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); +} diff --git a/keyboards/boardsource/lulu/keymaps/rmeli/rules.mk b/keyboards/boardsource/lulu/keymaps/rmeli/rules.mk new file mode 100644 index 0000000000..035e9814e2 --- /dev/null +++ b/keyboards/boardsource/lulu/keymaps/rmeli/rules.mk @@ -0,0 +1,9 @@ +TAP_DANCE_ENABLE = yes +AUTO_SHIFT_ENABLE = no // disable auto-shift with home row mods + +UNICODEMAP_ENABLE = yes +NKRO_ENABLE = yes +MAGIC_ENABLE = yes + +RGBLIGHT_ENABLE = no +RGB_MATRIX_ENABLE = yes \ No newline at end of file -- cgit v1.2.3 From e12ca14af8fc1799357bbfffd156d53b4a51001c Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 27 Nov 2022 04:18:24 +1100 Subject: Change `RGB_MATRIX_STARTUP_*` defines to `RGB_MATRIX_DEFAULT_*` (#19079) --- keyboards/boardsource/lulu/keymaps/rmeli/config.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'keyboards/boardsource') diff --git a/keyboards/boardsource/lulu/keymaps/rmeli/config.h b/keyboards/boardsource/lulu/keymaps/rmeli/config.h index 4d8823d785..171eaed0db 100644 --- a/keyboards/boardsource/lulu/keymaps/rmeli/config.h +++ b/keyboards/boardsource/lulu/keymaps/rmeli/config.h @@ -25,10 +25,10 @@ along with this program. If not, see . # define RGB_MATRIX_KEYPRESSES // enable keypress effects # define RGB_MATRIX_LED_FLUSH_LIMIT 16 # define RGB_DISABLE_WHEN_USB_SUSPENDED -# define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR -# define RGB_MATRIX_STARTUP_HUE 10 -# define RGB_MATRIX_STARTUP_SAT 255 -# define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS +# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR +# define RGB_MATRIX_DEFAULT_HUE 10 +# define RGB_MATRIX_DEFAULT_SAT 255 +# define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS // Disable RGB Matrix effects (from lulu/config.h) # undef ENABLE_RGB_MATRIX_ALPHAS_MODS # undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN -- cgit v1.2.3