From d1f59a7d0323cb0360726259c75528f6787bae01 Mon Sep 17 00:00:00 2001 From: Ciaanh Date: Sun, 21 May 2023 21:09:06 +0200 Subject: [PATCH] fix encoder feature delaration --- keyboards/ciaanh/kanagawa/ansi/info.json | 24 +++- .../kanagawa/ansi/keymaps/ciaanh/keymap.c | 13 +- .../kanagawa/ansi/keymaps/ciaanh/rules.mk | 1 + .../kanagawa/ansi/keymaps/default/keymap.c | 42 +------ .../kanagawa/ansi/keymaps/default/rules.mk | 1 + .../ciaanh/kanagawa/ansi/keymaps/via/keymap.c | 8 +- keyboards/ciaanh/kanagawa/config.h | 94 +++++++------- keyboards/ciaanh/kanagawa/iso/info.json | 24 +++- .../kanagawa/iso/keymaps/default/keymap.c | 8 +- .../kanagawa/iso/keymaps/default/rules.mk | 1 + .../ciaanh/kanagawa/iso/keymaps/via/keymap.c | 119 ++++++++++++++++++ .../ciaanh/kanagawa/iso/keymaps/via/rules.mk | 2 + keyboards/ciaanh/kanagawa/rules.mk | 2 + 13 files changed, 237 insertions(+), 102 deletions(-) create mode 100644 keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/rules.mk create mode 100644 keyboards/ciaanh/kanagawa/ansi/keymaps/default/rules.mk create mode 100644 keyboards/ciaanh/kanagawa/iso/keymaps/default/rules.mk create mode 100644 keyboards/ciaanh/kanagawa/iso/keymaps/via/keymap.c create mode 100644 keyboards/ciaanh/kanagawa/iso/keymaps/via/rules.mk diff --git a/keyboards/ciaanh/kanagawa/ansi/info.json b/keyboards/ciaanh/kanagawa/ansi/info.json index 6dc940f8a54..10e34263b02 100644 --- a/keyboards/ciaanh/kanagawa/ansi/info.json +++ b/keyboards/ciaanh/kanagawa/ansi/info.json @@ -29,7 +29,8 @@ "mousekey": false, "nkro": false, "rgb_matrix": true, - "rgblight": false + "rgblight": false, + "encoder": true }, "encoder": { "rotary": [ @@ -145,6 +146,27 @@ "rgb_matrix": { "driver": "WS2812", "center_point": [ 90, 28], + "animations": { + "breathing": true, + "band_val": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "rainbow_moving_chevron": true, + "cycle_out_in_dual": true, + "cycle_spiral": true, + "rainbow_beacon": true, + "rainbow_pinwheels": true, + "raindrops": true, + "pixel_flow": true, + "solid_reactive": true, + "solid_reactive_multiwide": true, + "solid_reactive_cross": true, + "solid_reactive_nexus": true, + "splash": true + }, "layout": [ { "flags": 4,"matrix": [0,12],"x": 189, "y": 0 }, { "flags": 4,"matrix": [0,11],"x": 175, "y": 0 }, diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/keymap.c index 773ecb92564..99821a8a970 100644 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/keymap.c +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/keymap.c @@ -31,8 +31,8 @@ enum custom_keycodes }; #define TO_BASE TO(_BASE) -#define TG_LOW TG(_LOWER) -#define TG_UP TG(_RAISE) +#define TG_LOW TG(_LOWER) +#define TG_UP TG(_RAISE) #define _SCRNSHOT LSFT(LGUI(KC_S)) @@ -157,9 +157,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [_CODE] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, - [_FUNC] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, - [_TOP] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_LOWER] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, + [_RAISE] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, + [_ADJUST] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, }; #endif +layer_state_t layer_state_set_user(layer_state_t state) { + return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); +} diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/rules.mk b/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/rules.mk new file mode 100644 index 00000000000..a40474b4d5c --- /dev/null +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c index 880ad3c1ad7..f7cd42d5131 100644 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c @@ -105,45 +105,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /*****************************************************************************************************/ -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case CUSTOMKEY: - if (record->event.pressed) { - if (get_mods() & MOD_MASK_SHIFT) { - tap_code16(G(A(KC_K))); - } else { - tap_code(KC_MPLY); - } - } - break; - case LT(0,KC_X): - if (!record->tap.count && record->event.pressed) { - tap_code16(C(KC_X)); // Intercept hold function to send Ctrl-X - return false; - } - return true; - case LT(0,KC_C): - if (!record->tap.count && record->event.pressed) { - tap_code16(C(KC_C)); // Intercept hold function to send Ctrl-C - return false; - } - return true; - case LT(0,KC_V): - if (!record->tap.count && record->event.pressed) { - tap_code16(C(KC_V)); // Intercept hold function to send Ctrl-V - return false; - } - return true; - case LT(0,KC_S): - if (!record->tap.count && record->event.pressed) { - tap_code16(C(KC_S)); // Intercept hold function to send Ctrl-S - return false; - } - return true; - } - return true; -} - #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, @@ -153,3 +114,6 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { }; #endif +layer_state_t layer_state_set_user(layer_state_t state) { + return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); +} diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/default/rules.mk b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/rules.mk new file mode 100644 index 00000000000..a40474b4d5c --- /dev/null +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c index 2d849c44e42..fd6d2cb6ca1 100644 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c @@ -104,10 +104,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /*****************************************************************************************************/ -layer_state_t layer_state_set_user(layer_state_t state) { - return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); -} - #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, @@ -116,3 +112,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [_ADJUST] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, }; #endif + +layer_state_t layer_state_set_user(layer_state_t state) { + return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); +} diff --git a/keyboards/ciaanh/kanagawa/config.h b/keyboards/ciaanh/kanagawa/config.h index 2e746967b84..19497e9860f 100644 --- a/keyboards/ciaanh/kanagawa/config.h +++ b/keyboards/ciaanh/kanagawa/config.h @@ -30,55 +30,53 @@ # define RGB_DI_PIN GP4 # define WS2812_DI_PIN GP4 -# define RGB_MATRIX_CENTER { 90, 28 } +// /* Enable Framebuffer and keypress effects */ +// # define RGB_MATRIX_FRAMEBUFFER_EFFECTS +// # define RGB_MATRIX_KEYPRESSES - /* Enable Framebuffer and keypress effects */ -# define RGB_MATRIX_FRAMEBUFFER_EFFECTS -# define RGB_MATRIX_KEYPRESSES - -# define ENABLE_RGB_MATRIX_ALPHAS_MODS -# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN -# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT -# define ENABLE_RGB_MATRIX_BREATHING -# define ENABLE_RGB_MATRIX_BAND_SAT -# define ENABLE_RGB_MATRIX_BAND_VAL -# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT -# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL -# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT -# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL -# define ENABLE_RGB_MATRIX_CYCLE_ALL -# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT -# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN -# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON -# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN -# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL -# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL -# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL -# define ENABLE_RGB_MATRIX_DUAL_BEACON -# define ENABLE_RGB_MATRIX_RAINBOW_BEACON -# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS -# define ENABLE_RGB_MATRIX_RAINDROPS -# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS -# define ENABLE_RGB_MATRIX_HUE_BREATHING -# define ENABLE_RGB_MATRIX_HUE_PENDULUM -# define ENABLE_RGB_MATRIX_HUE_WAVE -# define ENABLE_RGB_MATRIX_PIXEL_RAIN -# define ENABLE_RGB_MATRIX_PIXEL_FLOW -# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL -# define ENABLE_RGB_MATRIX_TYPING_HEATMAP -# define ENABLE_RGB_MATRIX_DIGITAL_RAIN -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS -# define ENABLE_RGB_MATRIX_SPLASH -# define ENABLE_RGB_MATRIX_MULTISPLASH -# define ENABLE_RGB_MATRIX_SOLID_SPLASH -# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH +// # define ENABLE_RGB_MATRIX_ALPHAS_MODS +// # define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN +// # define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +// # define ENABLE_RGB_MATRIX_BREATHING +// # define ENABLE_RGB_MATRIX_BAND_SAT +// # define ENABLE_RGB_MATRIX_BAND_VAL +// # define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT +// # define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL +// # define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT +// # define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL +// # define ENABLE_RGB_MATRIX_CYCLE_ALL +// # define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT +// # define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN +// # define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +// # define ENABLE_RGB_MATRIX_CYCLE_OUT_IN +// # define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +// # define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL +// # define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +// # define ENABLE_RGB_MATRIX_DUAL_BEACON +// # define ENABLE_RGB_MATRIX_RAINBOW_BEACON +// # define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS +// # define ENABLE_RGB_MATRIX_RAINDROPS +// # define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +// # define ENABLE_RGB_MATRIX_HUE_BREATHING +// # define ENABLE_RGB_MATRIX_HUE_PENDULUM +// # define ENABLE_RGB_MATRIX_HUE_WAVE +// # define ENABLE_RGB_MATRIX_PIXEL_RAIN +// # define ENABLE_RGB_MATRIX_PIXEL_FLOW +// # define ENABLE_RGB_MATRIX_PIXEL_FRACTAL +// # define ENABLE_RGB_MATRIX_TYPING_HEATMAP +// # define ENABLE_RGB_MATRIX_DIGITAL_RAIN +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +// # define ENABLE_RGB_MATRIX_SPLASH +// # define ENABLE_RGB_MATRIX_MULTISPLASH +// # define ENABLE_RGB_MATRIX_SOLID_SPLASH +// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH #endif diff --git a/keyboards/ciaanh/kanagawa/iso/info.json b/keyboards/ciaanh/kanagawa/iso/info.json index 0bd73b55fd6..5ff912f507a 100644 --- a/keyboards/ciaanh/kanagawa/iso/info.json +++ b/keyboards/ciaanh/kanagawa/iso/info.json @@ -29,7 +29,8 @@ "mousekey": false, "nkro": false, "rgb_matrix": true, - "rgblight": false + "rgblight": false, + "encoder": true }, "encoder": { "rotary": [ @@ -144,6 +145,27 @@ "rgb_matrix": { "driver": "WS2812", "center_point": [ 90, 28], + "animations": { + "breathing": true, + "band_val": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "rainbow_moving_chevron": true, + "cycle_out_in_dual": true, + "cycle_spiral": true, + "rainbow_beacon": true, + "rainbow_pinwheels": true, + "raindrops": true, + "pixel_flow": true, + "solid_reactive": true, + "solid_reactive_multiwide": true, + "solid_reactive_cross": true, + "solid_reactive_nexus": true, + "splash": true + }, "layout": [ { "flags": 4,"matrix": [0,12],"x": 189, "y": 0 }, { "flags": 4,"matrix": [0,11],"x": 175, "y": 0 }, diff --git a/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c index 36708f6b799..d9104664657 100644 --- a/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c +++ b/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c @@ -104,10 +104,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /*****************************************************************************************************/ -layer_state_t layer_state_set_user(layer_state_t state) { - return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); -} - #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, @@ -116,3 +112,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [_ADJUST] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, }; #endif + +layer_state_t layer_state_set_user(layer_state_t state) { + return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); +} diff --git a/keyboards/ciaanh/kanagawa/iso/keymaps/default/rules.mk b/keyboards/ciaanh/kanagawa/iso/keymaps/default/rules.mk new file mode 100644 index 00000000000..a40474b4d5c --- /dev/null +++ b/keyboards/ciaanh/kanagawa/iso/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/iso/keymaps/via/keymap.c b/keyboards/ciaanh/kanagawa/iso/keymaps/via/keymap.c new file mode 100644 index 00000000000..94e72df1652 --- /dev/null +++ b/keyboards/ciaanh/kanagawa/iso/keymaps/via/keymap.c @@ -0,0 +1,119 @@ +/* Copyright 2023 Ciaanh (@ciaanh) + * + * 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 + +#define ___ KC_NO + +enum layers +{ + _BASE, + _LOWER, + _RAISE, + _ADJUST +}; + +/* Keyboard layout +* ,---------. ,---------------------------------------. ,---------------------------------------. ,---------------------------------------. ,---------. +* | ka0 | | ka1 | ka2 | ka3 | ka4 | | ka5 | ka6 | ka7 | ka8 | | ka9 | ka10 | ka11 | ka12 | | sw99 | +* `---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------' +* ,-------------------------------------------------------------------------------------------------------------------------------------------. ,---------. +* | kb0 | kb1 | kb2 | kb3 | kb4 | kb5 | kb6 | kb7 | kb8 | kb9 | kb10 | kb11 | kb12 | kb13 | | kd13 | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| |---------| +* | kc0 | kc1 | kc2 | kc3 | kc4 | kc5 | kc6 | kc7 | kc8 | kc9 | kc10 | kc11 | kc12 | kc13 | | ke13 | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' |---------| +* | kd0 | kd1 | kd2 | kd3 | kd4 | kd5 | kd6 | kd7 | kd8 | kd9 | kd10 | kd11 | kd12 | | kf13 | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'---------' `---------' +* | ke0 | --- | ke2 | ke3 | ke4 | ke5 | ke6 | ke7 | ke8 | ke9 | ke10 | ke11 | ke12 | ,---------. +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' | kf12 | +* | kf0 | kf1 | kf2 | kf3 | ,---------. ,---------. | kf6 | kf7 | kf8 | ,---------|---------|---------. +* `---------+---------+---------+---------+ | kf4 | | kf5 | +---------+---------+---------' | kf9 | kf10 | kf11 | +* `---------' `---------' `---------+---------+---------' +*/ +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* Keymap: BASE +* ,---------. ,---------------------------------------. ,---------------------------------------. ,---------------------------------------. ,---------. +* | ESC | | F1 | F2 | F3 | F4 | | F5 | F6 | F7 | F8 | | F9 | F10 | F11 | F12 | | ENCODER | +* `---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------' +* ,-------------------------------------------------------------------------------------------------------------------------------------------. ,---------. +* | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = |Backspace| | Delete | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| |---------| +* | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | | | HOME | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+ ENTER | |---------| +* | CapsL | A | S | D | F | G | H | J | K | L | ; | ' | NUHS * | | | END | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'---------' `---------' +* | LShift | NUBS < | Z | X | C | V | B | N | M | , | . | / | RShift | ,---------. +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' | UP | +* | LCtrl | LGUI | LAlt | LOWER | ,---------. ,---------. | RAlt | RAISE | RCtrl | ,---------|---------|---------. +* |---------+---------+---------+---------+ | Space | | Space | +---------+---------+---------' | LEFT | DOWN | RIGHT | +* `---------' `---------' `---------+---------+---------' +*/ + [_BASE] = LAYOUT( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MPLY, \ + + KC_GRV, 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_DEL, \ + 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_ENT, KC_HOME, \ + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_END, \ + KC_LSFT, KC_NUBS, 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, MO(_LOWER), KC_SPC, KC_SPC, KC_RALT,MO(_RAISE), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \ + ), + + + [_LOWER] = LAYOUT( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + ), + + [_RAISE] = LAYOUT( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + ), + + [_ADJUST] = LAYOUT( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, \ + + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, RGB_SPD, RGB_SPI, XXXXXXX, _______, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI \ + ) +}; + +/*****************************************************************************************************/ + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_LOWER] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, + [_RAISE] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, + [_ADJUST] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, +}; +#endif + +layer_state_t layer_state_set_user(layer_state_t state) { + return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); +} diff --git a/keyboards/ciaanh/kanagawa/iso/keymaps/via/rules.mk b/keyboards/ciaanh/kanagawa/iso/keymaps/via/rules.mk new file mode 100644 index 00000000000..4253f570f0b --- /dev/null +++ b/keyboards/ciaanh/kanagawa/iso/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/rules.mk b/keyboards/ciaanh/kanagawa/rules.mk index 8db6d04ea5f..592ec0e7ae8 100644 --- a/keyboards/ciaanh/kanagawa/rules.mk +++ b/keyboards/ciaanh/kanagawa/rules.mk @@ -1,4 +1,6 @@ OLED_ENABLE = yes OLED_DRIVER = SSD1306 +WS2812_DRIVER = vendor + DEFAULT_FOLDER = ciaanh/kanagawa/ansi