diff --git a/img/test.jpg b/img/test.jpg index 0ae66e8..2e10092 100644 Binary files a/img/test.jpg and b/img/test.jpg differ diff --git a/img/test.kra b/img/test.kra index 2ff52fb..fcdafb4 100644 Binary files a/img/test.kra and b/img/test.kra differ diff --git a/vial/config.h b/vial/config.h index 79400d2..935c1fc 100644 --- a/vial/config.h +++ b/vial/config.h @@ -31,23 +31,4 @@ along with this program. If not, see . //#define TAPPING_FORCE_HOLD //#define TAPPING_TERM 100 -// #ifdef RGBLIGHT_ENABLE -// #define RGBLIGHT_EFFECT_BREATHING -// #define RGBLIGHT_EFFECT_RAINBOW_MOOD -// #define RGBLIGHT_EFFECT_RAINBOW_SWIRL -// #define RGBLIGHT_EFFECT_SNAKE -// #define RGBLIGHT_EFFECT_KNIGHT -// #define RGBLIGHT_EFFECT_CHRISTMAS -// #define RGBLIGHT_EFFECT_STATIC_GRADIENT -// #define RGBLIGHT_EFFECT_RGB_TEST -// #define RGBLIGHT_EFFECT_ALTERNATING -// #define RGBLIGHT_EFFECT_TWINKLE -// #define RGBLIGHT_LIMIT_VAL 120 -// #define RGBLIGHT_HUE_STEP 10 -// #define RGBLIGHT_SAT_STEP 17 -// #define RGBLIGHT_VAL_STEP 17 -// #endif - -// #define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c" - -#define DYNAMIC_KEYMAP_LAYER_COUNT 6 +#define DYNAMIC_KEYMAP_LAYER_COUNT 8 diff --git a/vial/keymap.c b/vial/keymap.c index 5607d8a..b404177 100644 --- a/vial/keymap.c +++ b/vial/keymap.c @@ -59,166 +59,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [3] = LAYOUT_split_3x6_3( //,-----------------------------------------------------. ,-----------------------------------------------------. - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 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, 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, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX - //`--------------------------' `--------------------------' - ), - - [4] = LAYOUT_split_3x6_3( - //,-----------------------------------------------------. ,-----------------------------------------------------. - 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 - //`--------------------------' `--------------------------' - ), - - [5] = LAYOUT_split_3x6_3( - //,-----------------------------------------------------. ,-----------------------------------------------------. - 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 - //`--------------------------' `--------------------------' - ), - - [6] = LAYOUT_split_3x6_3( - //,-----------------------------------------------------. ,-----------------------------------------------------. - 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 - //`--------------------------' `--------------------------' - ), - - [7] = LAYOUT_split_3x6_3( - //,-----------------------------------------------------. ,-----------------------------------------------------. - 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 + KC_LGUI, _______, KC_SPC, KC_ENT, _______, KC_RALT //`--------------------------' `--------------------------' ) }; -/* -#ifdef OLED_ENABLE -oled_rotation_t oled_init_user(oled_rotation_t rotation) { - if (!is_keyboard_master()) { - return OLED_ROTATION_180; // flips the display 180 degrees if offhand - } - return rotation; -} - -#define L_BASE 0 -#define L_LOWER 2 -#define L_RAISE 4 -#define L_ADJUST 8 - -void oled_render_layer_state(void) { - oled_write_P(PSTR("Layer: "), false); - switch (layer_state) { - case L_BASE: - oled_write_ln_P(PSTR("Default"), false); - break; - case L_LOWER: - oled_write_ln_P(PSTR("Lower"), false); - break; - case L_RAISE: - oled_write_ln_P(PSTR("Raise"), false); - break; - case L_ADJUST: - case L_ADJUST|L_LOWER: - case L_ADJUST|L_RAISE: - case L_ADJUST|L_LOWER|L_RAISE: - oled_write_ln_P(PSTR("Adjust"), false); - break; - } -} - - -char keylog_str[24] = {}; - -const char code_to_name[60] = { - ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f', - 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', - 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', - '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', - 'R', 'E', 'B', 'T', '_', '-', '=', '[', ']', '\\', - '#', ';', '\'', '`', ',', '.', '/', ' ', ' ', ' '}; - -void set_keylog(uint16_t keycode, keyrecord_t *record) { - char name = ' '; - if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) || - (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) { keycode = keycode & 0xFF; } - if (keycode < 60) { - name = code_to_name[keycode]; - } - - // update keylog - snprintf(keylog_str, sizeof(keylog_str), "%dx%d, k%2d : %c", - record->event.key.row, record->event.key.col, - keycode, name); -} - -void oled_render_keylog(void) { - oled_write(keylog_str, false); -} - -void render_bootmagic_status(bool status) { - // Show Ctrl-Gui Swap options - static const char PROGMEM logo[][2][3] = { - {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}}, - {{0x95, 0x96, 0}, {0xb5, 0xb6, 0}}, - }; - if (status) { - oled_write_ln_P(logo[0][0], false); - oled_write_ln_P(logo[0][1], false); - } else { - oled_write_ln_P(logo[1][0], false); - oled_write_ln_P(logo[1][1], false); - } -} - -void oled_render_logo(void) { - static const char PROGMEM crkbd_logo[] = { - 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, - 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, - 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, - 0}; - oled_write_P(crkbd_logo, false); -} - -bool oled_task_user(void) { - if (is_keyboard_master()) { - oled_render_layer_state(); - oled_render_keylog(); - } else { - oled_render_logo(); - } - return false; -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - if (record->event.pressed) { - set_keylog(keycode, record); - } - return true; -} -#endif // OLED_ENABLE*/ diff --git a/vial/rules.mk b/vial/rules.mk index e882c1b..0239641 100644 --- a/vial/rules.mk +++ b/vial/rules.mk @@ -1,11 +1,17 @@ -MOUSEKEY_ENABLE = no # Mouse keys -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. +LTO_ENABLE = yes +MOUSEKEY_ENABLE = yes +EXTRAKEY_ENABLE = yes # Audio control and System control +NKRO_ENABLE = yes +RGBLIGHT_ENABLE = yes +TAP_DANCE_ENABLE = yes + +BACKLIGHT_ENABLE = no +MUSIC_ENABLE = no +OLED_ENABLE = no +COMBO_ENABLE = no +KEY_OVERRIDE_ENABLE = no +QMK_SETTINGS = no + +VIAL_INSECURE = yes VIA_ENABLE = yes VIAL_ENABLE = yes -OLED_ENABLE = no -OLED_DRIVER = SSD1306 -EXTRAKEY_ENABLE = yes -LTO_ENABLE = yes -QMK_SETTINGS = yes -COMBO_ENABLE = yes -VIAL_INSECURE = yes diff --git a/vial/test.vil b/vial/test.vil new file mode 100644 index 0000000..88c00d0 --- /dev/null +++ b/vial/test.vil @@ -0,0 +1 @@ +{"version": 1, "uid": 14432598704426256590, "layout": [[["KC_ESCAPE", "KC_F", "KC_L", "KC_H", "KC_V", "KC_Z"], ["KC_NO", "KC_S", "KC_R", "KC_N", "KC_T", "KC_K"], ["KC_NO", "KC_X", "KC_NO", "KC_B", "KC_M", "KC_J"], [-1, -1, -1, "TD(0)", "TD(1)", "KC_LSHIFT"], ["KC_NO", "KC_Y", "KC_O", "KC_U", "KC_W", "KC_Q"], ["KC_NO", "KC_I", "KC_A", "KC_E", "KC_D", "KC_C"], ["DF(1)", "KC_NO", "KC_NO", "KC_NO", "KC_G", "KC_P"], [-1, -1, -1, "KC_TAB", "TD(3)", "TD(2)"]], [["KC_ESCAPE", "KC_LBRACKET", "KC_U", "KC_Z", "KC_S", "KC_E"], ["KC_A", "KC_Y", "KC_B", "KC_T", "KC_J", "KC_M"], ["DF(0)", "KC_I", "KC_COMMA", "KC_DOT", "KC_F", "KC_GRAVE"], [-1, -1, -1, "TD(0)", "TD(1)", "KC_LSHIFT"], ["KC_O", "KC_QUOTE", "KC_SCOLON", "KC_V", "KC_X", "KC_L"], ["KC_W", "KC_H", "KC_C", "KC_N", "KC_D", "KC_G"], ["KC_NO", "KC_Q", "KC_P", "KC_K", "KC_R", "KC_RBRACKET"], [-1, -1, -1, "KC_TAB", "TD(3)", "TD(2)"]], [["KC_NO", "KC_NO", "KC_1", "KC_2", "KC_3", "KC_NO"], ["KC_NO", "KC_0", "KC_4", "KC_5", "KC_6", "KC_PSCREEN"], ["KC_NO", "KC_LGUI", "KC_7", "KC_8", "KC_9", "KC_NO"], [-1, -1, -1, "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_F4", "KC_F3", "KC_F2", "KC_F1", "KC_NO"], ["KC_NO", "KC_F8", "KC_F7", "KC_F6", "KC_F5", "KC_NO"], ["KC_NO", "KC_F12", "KC_F11", "KC_F10", "KC_F9", "KC_NO"], [-1, -1, -1, "KC_NO", "KC_NO", "KC_NO"]], [["LSFT(KC_5)", "KC_QUOTE", "KC_MINUS", "KC_SLASH", "KC_EQUAL", "LSFT(KC_EQUAL)"], ["LSFT(KC_6)", "LSFT(KC_QUOTE)", "LSFT(KC_MINUS)", "KC_COMMA", "KC_DOT", "LSFT(KC_2)"], ["KC_NO", "LSFT(KC_4)", "KC_SCOLON", "LSFT(KC_8)", "LSFT(KC_SLASH)", "KC_TRNS"], [-1, -1, -1, "KC_NO", "KC_NO", "KC_NO"], ["LSFT(KC_GRAVE)", "LSFT(KC_DOT)", "KC_RBRACKET", "LSFT(KC_RBRACKET)", "LSFT(KC_0)", "LSFT(KC_BSLASH)"], ["KC_GRAVE", "LSFT(KC_COMMA)", "KC_LBRACKET", "LSFT(KC_LBRACKET)", "LSFT(KC_9)", "KC_BSLASH"], ["KC_NO", "LSFT(KC_7)", "LSFT(KC_SCOLON)", "LSFT(KC_3)", "LSFT(KC_1)", "KC_NO"], [-1, -1, -1, "KC_NO", "KC_NO", "KC_NO"]], [["KC_NO", "LCTL(KC_SLASH)", "LCTL(KC_R)", "LCTL(KC_Z)", "LCTL(KC_S)", "KC_NO"], ["KC_NO", "LCTL(KC_W)", "LCTL(KC_A)", "LCTL(KC_C)", "LCTL(KC_V)", "LCTL(KC_X)"], ["KC_NO", "C_S(KC_T)", "LCTL(KC_D)", "LCTL(KC_PGUP)", "LCTL(KC_PGDOWN)", "KC_NO"], [-1, -1, -1, "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "LCTL(KC_NO)", "C_S(KC_NO)", "LCTL(KC_NO)", "LCTL(KC_NO)", "KC_NO"], ["KC_NO", "LCTL(KC_NO)", "LCTL(KC_NO)", "LALT(KC_NO)", "LALT(KC_NO)", "KC_NO"], ["LGUI(KC_L)", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], [-1, -1, -1, "KC_NO", "KC_NO", "KC_NO"]], [["KC_HOME", "LCTL(KC_LEFT)", "LCTL(KC_UP)", "LCTL(KC_DOWN)", "LCTL(KC_RIGHT)", "KC_PGUP"], ["KC_END", "KC_LEFT", "KC_UP", "KC_DOWN", "KC_RIGHT", "KC_PGDOWN"], ["KC_LCTRL", "KC_WH_L", "KC_WH_U", "KC_WH_D", "KC_WH_R", "KC_DELETE"], [-1, -1, -1, "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_VOLU", "KC_MUTE", "KC_MPRV", "KC_MNXT", "KC_MPLY", "KC_VOLD"], ["KC_LALT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "DF(6)"], [-1, -1, -1, "KC_NO", "KC_NO", "KC_NO"]], [["KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T"], ["KC_LSHIFT", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G"], ["KC_LCTRL", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B"], [-1, -1, -1, "KC_LALT", "KC_SPACE", "TD(4)"], ["DF(1)", "KC_NO", "KC_NO", "KC_UP", "KC_NO", "KC_NO"], ["KC_NO", "KC_SCOLON", "KC_RIGHT", "KC_DOWN", "KC_LEFT", "KC_NO"], ["DF(0)", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], [-1, -1, -1, "KC_NO", "KC_SPACE", "KC_H"]], [["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], [-1, -1, -1, "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], [-1, -1, -1, "KC_NO", "KC_NO", "KC_NO"]]], "encoder_layout": [[], [], [], [], [], [], [], []], "layout_options": -1, "macro": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []], "vial_protocol": 5, "via_protocol": 9, "tap_dance": [["KC_PSCREEN", "MO(5)", "KC_NO", "KC_NO", 200], ["KC_BSPACE", "MO(4)", "LCTL(KC_BSPACE)", "KC_BSPACE", 200], ["KC_ENTER", "MO(2)", "KC_NO", "KC_NO", 200], ["KC_SPACE", "MO(3)", "KC_NO", "KC_SPACE", 200], ["KC_ESCAPE", "MO(2)", "KC_NO", "KC_NO", 200], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", 200], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", 200], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", 200]], "combo": [], "key_override": [], "settings": {}} \ No newline at end of file