From 9bda5b01bf9301df7e84e37232e0079e0b334d36 Mon Sep 17 00:00:00 2001 From: Karl Hallsby Date: Sun, 7 Jan 2024 12:13:14 -0600 Subject: Remove Virtuoso layer --- config.h | 4 ++- keymap.c | 88 ++++++++++++++++++++++++++++++++++++---------------------------- rules.mk | 2 +- 3 files changed, 53 insertions(+), 41 deletions(-) diff --git a/config.h b/config.h index b383bc3..8290d1e 100644 --- a/config.h +++ b/config.h @@ -5,8 +5,10 @@ #define ORYX_CONFIGURATOR #define USB_SUSPEND_WAKEUP_DELAY 0 #define IGNORE_MOD_TAP_INTERRUPT -#define FIRMWARE_VERSION u8"Mvg4r/QNWZp" +#define FIRMWARE_VERSION u8"R7Ov4/PNyDl" #define RAW_USAGE_PAGE 0xFF60 #define RAW_USAGE_ID 0x61 #define LAYER_STATE_8BIT + #define RGB_MATRIX_STARTUP_SPD 60 + diff --git a/keymap.c b/keymap.c index 74a904f..d0312d7 100644 --- a/keymap.c +++ b/keymap.c @@ -57,6 +57,7 @@ enum custom_keycodes { }; + enum tap_dance_codes { DANCE_0, DANCE_1, @@ -71,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRACKET, KC_RBRACKET, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLASH, KC_ESCAPE, KC_A, KC_S, KC_D, KC_F, KC_G, TG(1), TG(1), KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_QUOTE, KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, MT(MOD_RSFT, KC_EQUAL), - TG(4), WEBUSB_PAIR, KC_DELETE, KC_LEFT, KC_RIGHT, KC_HYPR, MT(MOD_LCTL, KC_ESCAPE),TD(DANCE_1), TD(DANCE_2), KC_MEH, KC_INSERT, TD(DANCE_3), + KC_TRANSPARENT, WEBUSB_PAIR, KC_DELETE, KC_LEFT, KC_RIGHT, KC_HYPR, MT(MOD_LCTL, KC_ESCAPE),TD(DANCE_1), TD(DANCE_2), KC_MEH, KC_INSERT, TD(DANCE_3), KC_LCTRL, KC_BSPACE, KC_LGUI, KC_LALT, KC_ENTER, MT(MOD_LCTL, KC_SPACE) ), [1] = LAYOUT_moonlander( @@ -98,22 +99,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_SPACE, KC_SPACE, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, TD(DANCE_4), KC_TRANSPARENT, KC_TRANSPARENT, KC_LALT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT ), - [4] = LAYOUT_moonlander( - KC_U, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_L, KC_I, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, - KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_W, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, - KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_P, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, - KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, - KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, - KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT - ), }; + + extern rgb_config_t rgb_matrix_config; void keyboard_post_init_user(void) { rgb_matrix_enable(); } + const uint8_t PROGMEM ledmap[][DRIVER_LED_TOTAL][3] = { [0] = { {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255}, {0,0,255} }, @@ -123,8 +119,6 @@ const uint8_t PROGMEM ledmap[][DRIVER_LED_TOTAL][3] = { [3] = { {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255} }, - [4] = { {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219}, {137,217,219} }, - }; void set_layer_color(int layer) { @@ -145,6 +139,9 @@ void set_layer_color(int layer) { } void rgb_matrix_indicators_user(void) { + if (rawhid_state.rgb_control) { + return; + } if (keyboard_config.disable_layer_led) { return; } switch (biton32(layer_state)) { case 0: @@ -159,9 +156,6 @@ void rgb_matrix_indicators_user(void) { case 3: set_layer_color(3); break; - case 4: - set_layer_color(4); - break; default: if (rgb_matrix_get_flags() == LED_FLAG_NONE) rgb_matrix_set_color_all(0, 0, 0); @@ -171,39 +165,56 @@ void rgb_matrix_indicators_user(void) { bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { + case RGB_SLD: - if (record->event.pressed) { - rgblight_mode(1); - } - return false; + if (rawhid_state.rgb_control) { + return false; + } + if (record->event.pressed) { + rgblight_mode(1); + } + return false; case HSV_0_0_255: - if (record->event.pressed) { - rgblight_mode(1); - rgblight_sethsv(0,0,255); - } - return false; + if (rawhid_state.rgb_control) { + return false; + } + if (record->event.pressed) { + rgblight_mode(1); + rgblight_sethsv(0,0,255); + } + return false; case HSV_0_255_255: - if (record->event.pressed) { - rgblight_mode(1); - rgblight_sethsv(0,255,255); - } - return false; + if (rawhid_state.rgb_control) { + return false; + } + if (record->event.pressed) { + rgblight_mode(1); + rgblight_sethsv(0,255,255); + } + return false; case HSV_86_255_128: - if (record->event.pressed) { - rgblight_mode(1); - rgblight_sethsv(86,255,128); - } - return false; + if (rawhid_state.rgb_control) { + return false; + } + if (record->event.pressed) { + rgblight_mode(1); + rgblight_sethsv(86,255,128); + } + return false; case HSV_172_255_255: - if (record->event.pressed) { - rgblight_mode(1); - rgblight_sethsv(172,255,255); - } - return false; + if (rawhid_state.rgb_control) { + return false; + } + if (record->event.pressed) { + rgblight_mode(1); + rgblight_sethsv(172,255,255); + } + return false; } return true; } + typedef struct { bool is_press_action; uint8_t step; @@ -376,4 +387,3 @@ qk_tap_dance_action_t tap_dance_actions[] = { [DANCE_3] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_3_finished, dance_3_reset), [DANCE_4] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_4_finished, dance_4_reset), }; - diff --git a/rules.mk b/rules.mk index ae6b17a..5043ed9 100644 --- a/rules.mk +++ b/rules.mk @@ -3,7 +3,7 @@ CONSOLE_ENABLE = no COMMAND_ENABLE = no ORYX_ENABLE = yes +RGB_MATRIX_CUSTOM_KB = yes TAP_DANCE_ENABLE = yes SPACE_CADET_ENABLE = no - SRC = matrix.c -- cgit v1.2.3