diff --git a/Makefile b/Makefile index 7fc1d857..bd2a9710 100644 --- a/Makefile +++ b/Makefile @@ -52,9 +52,10 @@ vial-qmk-clean: vial-qmk-init: $(eval KB := ${kb}) - rm -f src/vial-kb/vial-qmk/keyboards/tmp/${KB} - mkdir -p src/vial-kb/vial-qmk/keyboards/tmp - ln -s $(shell pwd)/keyboards/${KB}/vial-kb/vial-qmk src/vial-kb/vial-qmk/keyboards/tmp/${KB} + rm -rf src/vial-kb/vial-qmk/keyboards/tmp/${KB} + mkdir -p src/vial-kb/vial-qmk/keyboards/tmp/${KB} + cp -r $(shell pwd)/keyboards/${KB}/qmk/qmk_firmware/ src/vial-kb/vial-qmk/keyboards/tmp/${KB} + cp -r $(shell pwd)/keyboards/${KB}/vial-kb/vial-qmk/keymaps/* src/vial-kb/vial-qmk/keyboards/tmp/${KB}/keymaps vial-qmk-compile: $(eval KB := ${kb}) @@ -77,5 +78,7 @@ vial-qmk-init-all: kb=lskbd make qmk-init vial-qmk-compile-all: + kb=crkbd kr=rev4/standard km=vial make vial-qmk-compile + kb=crkbd kr=rev4/mini km=vial_mini make vial-qmk-compile kb=lskbd kr=rev1 km=vial make qmk-compile diff --git a/keyboards/crkbd/qmk/qmk_firmware/rev4/info.json b/keyboards/crkbd/qmk/qmk_firmware/rev4/info.json index a06325d4..7f801e95 100644 --- a/keyboards/crkbd/qmk/qmk_firmware/rev4/info.json +++ b/keyboards/crkbd/qmk/qmk_firmware/rev4/info.json @@ -310,7 +310,6 @@ "rgb_matrix": { "driver": "ws2812", "max_brightness": 50, - "split_count": [23, 23], "animations": { "alphas_mods": true, "gradient_up_down": true, diff --git a/keyboards/crkbd/qmk/qmk_firmware/rev4/mini/info.json b/keyboards/crkbd/qmk/qmk_firmware/rev4/mini/info.json index e4df30ff..a455b1ba 100644 --- a/keyboards/crkbd/qmk/qmk_firmware/rev4/mini/info.json +++ b/keyboards/crkbd/qmk/qmk_firmware/rev4/mini/info.json @@ -4,6 +4,7 @@ "pid": "0x0104" }, "rgb_matrix": { + "split_count": [20, 20], "layout": [ {"matrix": [3, 5], "x": 95, "y": 63, "flags": 4}, {"matrix": [2, 5], "x": 85, "y": 39, "flags": 4}, diff --git a/keyboards/crkbd/qmk/qmk_firmware/rev4/standard/info.json b/keyboards/crkbd/qmk/qmk_firmware/rev4/standard/info.json index e1adc121..ba90a9e5 100644 --- a/keyboards/crkbd/qmk/qmk_firmware/rev4/standard/info.json +++ b/keyboards/crkbd/qmk/qmk_firmware/rev4/standard/info.json @@ -4,6 +4,7 @@ "pid": "0x0004" }, "rgb_matrix": { + "split_count": [23, 23], "layout": [ {"matrix": [3, 5], "x": 95, "y": 63, "flags": 4}, {"matrix": [2, 5], "x": 85, "y": 39, "flags": 4}, diff --git a/keyboards/crkbd/vial-kb/vial-qmk/.build/crkbd_rev4_mini_vial_mini.uf2 b/keyboards/crkbd/vial-kb/vial-qmk/.build/crkbd_rev4_mini_vial_mini.uf2 new file mode 100644 index 00000000..b8605cab Binary files /dev/null and b/keyboards/crkbd/vial-kb/vial-qmk/.build/crkbd_rev4_mini_vial_mini.uf2 differ diff --git a/keyboards/crkbd/vial-kb/vial-qmk/.build/crkbd_rev4_standard_vial.uf2 b/keyboards/crkbd/vial-kb/vial-qmk/.build/crkbd_rev4_standard_vial.uf2 new file mode 100644 index 00000000..7217a89f Binary files /dev/null and b/keyboards/crkbd/vial-kb/vial-qmk/.build/crkbd_rev4_standard_vial.uf2 differ diff --git a/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial/config.h b/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial/config.h new file mode 100644 index 00000000..75d57936 --- /dev/null +++ b/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial/config.h @@ -0,0 +1,5 @@ +#pragma once + +#define VIAL_KEYBOARD_UID {0x89, 0x36, 0x2A, 0xC7, 0xFA, 0xD8, 0x89, 0x45} +#define VIAL_UNLOCK_COMBO_ROWS {0, 0} +#define VIAL_UNLOCK_COMBO_COLS {0, 1} diff --git a/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial/keymap.c b/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial/keymap.c new file mode 100644 index 00000000..2faaff26 --- /dev/null +++ b/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial/keymap.c @@ -0,0 +1,115 @@ +#include QMK_KEYBOARD_H + + +#ifdef LAYOUT_split_3x6_3_ex2 +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_split_3x6_3_ex2( + //,--------------------------------------------------------------. ,--------------------------------------------------------------. + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LCTL, KC_RCTL, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LALT, KC_RALT, 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_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ESC, + //|--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------| + KC_LGUI, TL_LOWR, KC_SPC, KC_ENT, TL_UPPR, KC_RGUI + //`--------------------------' `--------------------------' + + ), + + [1] = LAYOUT_split_3x6_3_ex2( + //,--------------------------------------------------------------. ,--------------------------------------------------------------. + KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LCTL, KC_RCTL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LALT, KC_RALT, KC_LEFT, KC_DOWN, KC_UP,KC_RIGHT, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+--------+--------' `--------+--------+--------+--------+--------+--------+--------| + KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------| + KC_LGUI, _______, KC_SPC, KC_ENT, _______, KC_RGUI + //`--------------------------' `--------------------------' + ), + + [2] = LAYOUT_split_3x6_3_ex2( + //,--------------------------------------------------------------. ,--------------------------------------------------------------. + KC_TAB, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_LCTL, KC_RCTL, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LALT, KC_RALT, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, KC_GRV, + //|--------+--------+--------+--------+--------+--------+--------' `--------+--------+--------+--------+--------+--------+--------| + KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TILD, + //|--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------| + KC_LGUI, _______, KC_SPC, KC_ENT, _______, KC_RGUI + //`--------------------------' `--------------------------' + ), + + [3] = LAYOUT_split_3x6_3_ex2( + //,--------------------------------------------------------------. ,--------------------------------------------------------------. + QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+--------+--------' `--------+--------+--------+--------+--------+--------+--------| + RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------| + KC_LGUI, _______, KC_SPC, KC_ENT, _______, KC_RGUI + //`--------------------------' `--------------------------' + ) +}; +#else +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_split_3x6_3( + //,-----------------------------------------------------. ,-----------------------------------------------------. + 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_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_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ESC, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_LGUI, TL_LOWR, KC_SPC, KC_ENT, TL_UPPR, KC_RALT + //`--------------------------' `--------------------------' + + ), + + [1] = LAYOUT_split_3x6_3( + //,-----------------------------------------------------. ,-----------------------------------------------------. + KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,KC_RIGHT, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_LGUI, _______, KC_SPC, KC_ENT, _______, KC_RALT + //`--------------------------' `--------------------------' + ), + + [2] = LAYOUT_split_3x6_3( + //,-----------------------------------------------------. ,-----------------------------------------------------. + KC_TAB, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, KC_GRV, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TILD, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_LGUI, _______, KC_SPC, KC_ENT, _______, KC_RALT + //`--------------------------' `--------------------------' + ), + + [3] = LAYOUT_split_3x6_3( + //,-----------------------------------------------------. ,-----------------------------------------------------. + QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_LGUI, _______, KC_SPC, KC_ENT, _______, KC_RALT + //`--------------------------' `--------------------------' + ) +}; +#endif + +#ifdef ENCODER_MAP_ENABLE +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD), ENCODER_CCW_CW(RGB_HUI, RGB_HUD), ENCODER_CCW_CW(RGB_VAI, RGB_VAD), ENCODER_CCW_CW(RGB_SAI, RGB_SAD), }, + [1] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD), ENCODER_CCW_CW(RGB_HUI, RGB_HUD), ENCODER_CCW_CW(RGB_VAI, RGB_VAD), ENCODER_CCW_CW(RGB_SAI, RGB_SAD), }, + [2] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD), ENCODER_CCW_CW(RGB_HUI, RGB_HUD), ENCODER_CCW_CW(RGB_VAI, RGB_VAD), ENCODER_CCW_CW(RGB_SAI, RGB_SAD), }, + [3] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD), ENCODER_CCW_CW(RGB_HUI, RGB_HUD), ENCODER_CCW_CW(RGB_VAI, RGB_VAD), ENCODER_CCW_CW(RGB_SAI, RGB_SAD), }, +}; +#endif diff --git a/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial/rules.mk b/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial/rules.mk new file mode 100644 index 00000000..32136f98 --- /dev/null +++ b/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial/rules.mk @@ -0,0 +1,6 @@ +VIA_ENABLE = yes +VIAL_ENABLE = yes +LTO_ENABLE = yes +VIALRGB_ENABLE = yes +QMK_SETTINGS = no +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial/vial.json b/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial/vial.json new file mode 100644 index 00000000..82123c30 --- /dev/null +++ b/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial/vial.json @@ -0,0 +1,36 @@ +{ + "name": "Corne v4", + "vendorId": "0x4653", + "productId": "0x0004", + "matrix": {"rows": 8, "cols": 7}, + "lighting": "vialrgb", + "layouts": { + "labels": [ + ["Left EX1", "Key", "Encoder", "None"], + ["Left EX2", "Key", "Encoder", "None"], + ["Right EX1", "Key", "Encoder", "None"], + ["Right EX2", "Key", "Encoder", "None"] + ], + "keymap": [ + [{"y": 1, "x": 3.5}, "0,3", {"x": 7.5}, "4,3"], + [{"y": -0.875, "x": 2.5}, "0,2", {"x": 1}, "0,4", {"x": 5.5}, "4,4", {"x": 1}, "4,2"], + [{"y": -0.875, "x": 5.5}, "0,5", {"x": 3.5}, "4,5"], + [{"y": -0.875, "x": 0.5}, "0,0", "0,1", {"x": 11.5}, "4,1", "4,0"], + [{"y": -0.625, "x": 6.5}, "0,6\n\n\n0,0","0,6\n\n\n0,1\n\n\n\n\n\ne0", {"x": 0.5}, "4,6\n\n\n2,0","4,6\n\n\n2,1\n\n\n\n\n\ne2"], + [{"y": -0.75, "x": 3.5}, "1,3", {"x": 7.5}, "5,3"], + [{"y": -0.875, "x": 2.5}, "1,2", {"x": 1}, "1,4", {"x": 5.5}, "5,4", {"x": 1}, "5,2"], + [{"y": -0.875, "x": 5.5}, "1,5", {"x": 3.5}, "5,5"], + [{"y": -0.875, "x": 0.5}, "1,0", "1,1", {"x": 11.5}, "5,1", "5,0"], + [{"y": -0.625, "x": 6.5}, "1,6\n\n\n1,0","1,6\n\n\n1,1\n\n\n\n\n\ne1", {"x": 0.5}, "5,6\n\n\n3,0","5,6\n\n\n3,1\n\n\n\n\n\ne3"], + [{"y": -0.75, "x": 3.5}, "2,3", {"x": 7.5}, "6,3"], + [{"y": -0.875, "x": 2.5}, "2,2", {"x": 1}, "2,4", {"x": 5.5}, "6,4", {"x": 1}, "6,2"], + [{"y": -0.875, "x": 5.5}, "2,5", {"x": 3.5}, "6,5"], + [{"y": -0.875, "x": 0.5}, "2,0", "2,1", {"x": 11.5}, "6,1", "6,0"], + [{"y": -0.125, "x": 4}, "3,3", {"x": 6.5}, "7,3"], + [{"r": 15, "rx": 4.5, "ry": 9.1, "y": -4.85, "x": -0.5}, "3,4"], + [{"r": 30, "rx": 5.4, "ry": 9.3, "y": -5.05, "x": -1.4, "h": 1.5}, "3,5"], + [{"r": -30, "rx": 11.1, "y": -5.05, "x": 0.4, "h": 1.5}, "7,5"], + [{"r": -15, "rx": 12, "ry": 9.1, "y": -4.85, "x": -0.5}, "7,4"] + ] + } +} diff --git a/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial_mini/config.h b/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial_mini/config.h new file mode 100644 index 00000000..75d57936 --- /dev/null +++ b/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial_mini/config.h @@ -0,0 +1,5 @@ +#pragma once + +#define VIAL_KEYBOARD_UID {0x89, 0x36, 0x2A, 0xC7, 0xFA, 0xD8, 0x89, 0x45} +#define VIAL_UNLOCK_COMBO_ROWS {0, 0} +#define VIAL_UNLOCK_COMBO_COLS {0, 1} diff --git a/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial_mini/keymap.c b/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial_mini/keymap.c new file mode 100644 index 00000000..2faaff26 --- /dev/null +++ b/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial_mini/keymap.c @@ -0,0 +1,115 @@ +#include QMK_KEYBOARD_H + + +#ifdef LAYOUT_split_3x6_3_ex2 +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_split_3x6_3_ex2( + //,--------------------------------------------------------------. ,--------------------------------------------------------------. + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LCTL, KC_RCTL, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LALT, KC_RALT, 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_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ESC, + //|--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------| + KC_LGUI, TL_LOWR, KC_SPC, KC_ENT, TL_UPPR, KC_RGUI + //`--------------------------' `--------------------------' + + ), + + [1] = LAYOUT_split_3x6_3_ex2( + //,--------------------------------------------------------------. ,--------------------------------------------------------------. + KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LCTL, KC_RCTL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LALT, KC_RALT, KC_LEFT, KC_DOWN, KC_UP,KC_RIGHT, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+--------+--------' `--------+--------+--------+--------+--------+--------+--------| + KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------| + KC_LGUI, _______, KC_SPC, KC_ENT, _______, KC_RGUI + //`--------------------------' `--------------------------' + ), + + [2] = LAYOUT_split_3x6_3_ex2( + //,--------------------------------------------------------------. ,--------------------------------------------------------------. + KC_TAB, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_LCTL, KC_RCTL, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LALT, KC_RALT, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, KC_GRV, + //|--------+--------+--------+--------+--------+--------+--------' `--------+--------+--------+--------+--------+--------+--------| + KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TILD, + //|--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------| + KC_LGUI, _______, KC_SPC, KC_ENT, _______, KC_RGUI + //`--------------------------' `--------------------------' + ), + + [3] = LAYOUT_split_3x6_3_ex2( + //,--------------------------------------------------------------. ,--------------------------------------------------------------. + QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+--------+--------' `--------+--------+--------+--------+--------+--------+--------| + RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------| + KC_LGUI, _______, KC_SPC, KC_ENT, _______, KC_RGUI + //`--------------------------' `--------------------------' + ) +}; +#else +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_split_3x6_3( + //,-----------------------------------------------------. ,-----------------------------------------------------. + 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_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_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ESC, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_LGUI, TL_LOWR, KC_SPC, KC_ENT, TL_UPPR, KC_RALT + //`--------------------------' `--------------------------' + + ), + + [1] = LAYOUT_split_3x6_3( + //,-----------------------------------------------------. ,-----------------------------------------------------. + KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,KC_RIGHT, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_LGUI, _______, KC_SPC, KC_ENT, _______, KC_RALT + //`--------------------------' `--------------------------' + ), + + [2] = LAYOUT_split_3x6_3( + //,-----------------------------------------------------. ,-----------------------------------------------------. + KC_TAB, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, KC_GRV, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TILD, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_LGUI, _______, KC_SPC, KC_ENT, _______, KC_RALT + //`--------------------------' `--------------------------' + ), + + [3] = LAYOUT_split_3x6_3( + //,-----------------------------------------------------. ,-----------------------------------------------------. + QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_LGUI, _______, KC_SPC, KC_ENT, _______, KC_RALT + //`--------------------------' `--------------------------' + ) +}; +#endif + +#ifdef ENCODER_MAP_ENABLE +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD), ENCODER_CCW_CW(RGB_HUI, RGB_HUD), ENCODER_CCW_CW(RGB_VAI, RGB_VAD), ENCODER_CCW_CW(RGB_SAI, RGB_SAD), }, + [1] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD), ENCODER_CCW_CW(RGB_HUI, RGB_HUD), ENCODER_CCW_CW(RGB_VAI, RGB_VAD), ENCODER_CCW_CW(RGB_SAI, RGB_SAD), }, + [2] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD), ENCODER_CCW_CW(RGB_HUI, RGB_HUD), ENCODER_CCW_CW(RGB_VAI, RGB_VAD), ENCODER_CCW_CW(RGB_SAI, RGB_SAD), }, + [3] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD), ENCODER_CCW_CW(RGB_HUI, RGB_HUD), ENCODER_CCW_CW(RGB_VAI, RGB_VAD), ENCODER_CCW_CW(RGB_SAI, RGB_SAD), }, +}; +#endif diff --git a/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial_mini/rules.mk b/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial_mini/rules.mk new file mode 100644 index 00000000..32136f98 --- /dev/null +++ b/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial_mini/rules.mk @@ -0,0 +1,6 @@ +VIA_ENABLE = yes +VIAL_ENABLE = yes +LTO_ENABLE = yes +VIALRGB_ENABLE = yes +QMK_SETTINGS = no +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial_mini/vial.json b/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial_mini/vial.json new file mode 100644 index 00000000..1c3606d2 --- /dev/null +++ b/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial_mini/vial.json @@ -0,0 +1,36 @@ +{ + "name": "Corne v4 mini", + "vendorId": "0x4653", + "productId": "0x0104", + "matrix": {"rows": 8, "cols": 7}, + "lighting": "vialrgb", + "layouts": { + "labels": [ + ["Left EX1", "Key", "Encoder", "None"], + ["Left EX2", "Key", "Encoder", "None"], + ["Right EX1", "Key", "Encoder", "None"], + ["Right EX2", "Key", "Encoder", "None"] + ], + "keymap": [ + [{"y": 1, "x": 2.5}, "0,3", {"x": 7.5}, "4,3"], + [{"y": -0.875, "x": 1.5}, "0,2", {"x": 1}, "0,4", {"x": 5.5}, "4,4", {"x": 1}, "4,2"], + [{"y": -0.875, "x": 4.5}, "0,5", {"x": 3.5}, "4,5"], + [{"y": -0.875, "x": 0.5}, "0,1", {"x": 11.5}, "4,1"], + [{"y": -0.625, "x": 5.5}, "0,6\n\n\n0,0","0,6\n\n\n0,1\n\n\n\n\n\ne0", {"x": 0.5}, "4,6\n\n\n2,0","4,6\n\n\n2,1\n\n\n\n\n\ne2"], + [{"y": -0.75, "x": 2.5}, "1,3", {"x": 7.5}, "5,3"], + [{"y": -0.875, "x": 1.5}, "1,2", {"x": 1}, "1,4", {"x": 5.5}, "5,4", {"x": 1}, "5,2"], + [{"y": -0.875, "x": 4.5}, "1,5", {"x": 3.5}, "5,5"], + [{"y": -0.875, "x": 0.5}, "1,1", {"x": 11.5}, "5,1"], + [{"y": -0.625, "x": 5.5}, "1,6\n\n\n1,0","1,6\n\n\n1,1\n\n\n\n\n\ne1", {"x": 0.5}, "5,6\n\n\n3,0","5,6\n\n\n3,1\n\n\n\n\n\ne3"], + [{"y": -0.75, "x": 2.5}, "2,3", {"x": 7.5}, "6,3"], + [{"y": -0.875, "x": 1.5}, "2,2", {"x": 1}, "2,4", {"x": 5.5}, "6,4", {"x": 1}, "6,2"], + [{"y": -0.875, "x": 4.5}, "2,5", {"x": 3.5}, "6,5"], + [{"y": -0.875, "x": 0.5}, "2,1", {"x": 11.5}, "6,1"], + [{"y": -0.125, "x": 3}, "3,3", {"x": 6.5}, "7,3"], + [{"r": 15, "rx": 3.5, "ry": 9.1, "y": -4.85, "x": -0.5}, "3,4"], + [{"r": 30, "rx": 4.4, "ry": 9.3, "y": -5.05, "x": -1.4, "h": 1.5}, "3,5"], + [{"r": -30, "rx": 10.1, "y": -5.05, "x": 0.4, "h": 1.5}, "7,5"], + [{"r": -15, "rx": 11, "ry": 9.1, "y": -4.85, "x": -0.5}, "7,4"] + ] + } +}