From d78e64f54540e1ddc4d8bc1e8c41cb590e66c081 Mon Sep 17 00:00:00 2001 From: devilzmods <61511785+devilzmods@users.noreply.github.com> Date: Tue, 28 Dec 2021 19:12:33 +0100 Subject: [PATCH] 4x4 vial bug fix and keymap tweak (#100) * add via keymap for 4x4 from qmk master * add via and vial keymaps for 40percentclub 4x4 * fixed bug with vial.json that crashed the configurator when switching to a different layout and requiring a reset of the firmware /clearing the eeprom on the board --- keyboards/40percentclub/4x4/keymaps/vial/config.h | 2 +- keyboards/40percentclub/4x4/keymaps/vial/keymap.c | 12 ++++++------ keyboards/40percentclub/4x4/keymaps/vial/rules.mk | 1 + keyboards/40percentclub/4x4/keymaps/vial/vial.json | 6 +++--- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/keyboards/40percentclub/4x4/keymaps/vial/config.h b/keyboards/40percentclub/4x4/keymaps/vial/config.h index 04a9ce73a0..b68a11e07a 100644 --- a/keyboards/40percentclub/4x4/keymaps/vial/config.h +++ b/keyboards/40percentclub/4x4/keymaps/vial/config.h @@ -7,4 +7,4 @@ #define VIAL_UNLOCK_COMBO_ROWS { 0, 3 } //top left and bottom left corner #define VIAL_UNLOCK_COMBO_COLS { 0, 0 } -#define VIAL_COMBO_ENTRIES 4 +#define VIAL_COMBO_ENTRIES 8 diff --git a/keyboards/40percentclub/4x4/keymaps/vial/keymap.c b/keyboards/40percentclub/4x4/keymaps/vial/keymap.c index 3c39e98545..1ad00fadf1 100644 --- a/keyboards/40percentclub/4x4/keymaps/vial/keymap.c +++ b/keyboards/40percentclub/4x4/keymaps/vial/keymap.c @@ -37,11 +37,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * '-----------------------------------' */ - [PAD] = LAYOUT_ortho_4x4( - KC_KP_7, KC_KP_8, KC_KP_9, KC_PSLS, - KC_KP_4, KC_KP_5, KC_KP_6, KC_PAST, - KC_KP_1, KC_KP_2, KC_KP_3, KC_PMNS, - KC_KP_0, DF(_QW), KC_KP_DOT, KC_PPLS + [PAD] = LAYOUT_ortho_4x16( + KC_KP_7, KC_KP_8, KC_KP_9, KC_PSLS, DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), + KC_KP_4, KC_KP_5, KC_KP_6, KC_PAST, DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), + KC_KP_1, KC_KP_2, KC_KP_3, KC_PMNS, DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), + KC_KP_0, MO(DIR), KC_KP_DOT, KC_PPLS, DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW), DF(_QW) ), /* QWERTY @@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [NUM] = LAYOUT_ortho_4x16( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, _______, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, _______, _______, KC_PPLS, _______, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, _______, _______, KC_PPLS, _______, _______, KC_F11, KC_F12, _______, _______, _______, KC_ENT, KC_RSFT, KC_RGUI, ALT_T(KC_DOT), CTL_T(KC_BSPC), _______, _______, _______, KC_PENT, _______, _______, _______, _______, _______, _______, _______, KC_ENT, KC_RSFT, _______, _______, _______, _______, _______, _______, _______, _______ ), diff --git a/keyboards/40percentclub/4x4/keymaps/vial/rules.mk b/keyboards/40percentclub/4x4/keymaps/vial/rules.mk index 9c94f9816b..e5cf10e473 100644 --- a/keyboards/40percentclub/4x4/keymaps/vial/rules.mk +++ b/keyboards/40percentclub/4x4/keymaps/vial/rules.mk @@ -3,3 +3,4 @@ VIAL_ENABLE = yes LTO_ENABLE = yes TAP_DANCE_ENABLE = no +QMK_SETTINGS = no diff --git a/keyboards/40percentclub/4x4/keymaps/vial/vial.json b/keyboards/40percentclub/4x4/keymaps/vial/vial.json index 65d711a65f..70046f4204 100644 --- a/keyboards/40percentclub/4x4/keymaps/vial/vial.json +++ b/keyboards/40percentclub/4x4/keymaps/vial/vial.json @@ -6,15 +6,15 @@ "matrix": {"rows": 4, "cols": 16}, "layouts": { "keymap": [ - ["0,0","0,1","0,2","0,3",{"w": 12,"h": 4,"d": true},"\n\n\n0,0"], + ["0,0","0,1","0,2","0,3",{"w": 12,"h": 4,"d": true},"3,15\n\n\n0,0"], ["1,0","1,1","1,2","1,3"], ["2,0","2,1","2,2","2,3"], ["3,0","3,1","3,2","3,3"], - [{"y": 0.5,"x": 4},"0,4\n\n\n0,1","0,5\n\n\n0,1","0,6\n\n\n0,1","0,7\n\n\n0,1",{"w": 8,"h": 4,"d": true},"\n\n\n0,1"], + [{"y": 0.5,"x": 4},"0,4\n\n\n0,1","0,5\n\n\n0,1","0,6\n\n\n0,1","0,7\n\n\n0,1",{"w": 8,"h": 4,"d": true},"3,15\n\n\n0,1"], [{"x": 4},"1,4\n\n\n0,1","1,5\n\n\n0,1","1,6\n\n\n0,1","1,7\n\n\n0,1"], [{"x": 4},"2,4\n\n\n0,1","2,5\n\n\n0,1","2,6\n\n\n0,1","2,7\n\n\n0,1"], [{"x": 4},"3,4\n\n\n0,1","3,5\n\n\n0,1","3,6\n\n\n0,1","3,7\n\n\n0,1"], - [{"y": 0.5,"x": 4},"0,4\n\n\n0,2","0,5\n\n\n0,2","0,6\n\n\n0,2","0,7\n\n\n0,2","0,8\n\n\n0,2","0,9\n\n\n0,2","0,10\n\n\n0,2","0,11\n\n\n0,2",{"w": 4,"h": 4,"d": true},"\n\n\n0,2"], + [{"y": 0.5,"x": 4},"0,4\n\n\n0,2","0,5\n\n\n0,2","0,6\n\n\n0,2","0,7\n\n\n0,2","0,8\n\n\n0,2","0,9\n\n\n0,2","0,10\n\n\n0,2","0,11\n\n\n0,2",{"w": 4,"h": 4,"d": true},"3,15\n\n\n0,2"], [{"x": 4},"1,4\n\n\n0,2","1,5\n\n\n0,2","1,6\n\n\n0,2","1,7\n\n\n0,2","1,8\n\n\n0,2","1,9\n\n\n0,2","1,10\n\n\n0,2","1,11\n\n\n0,2"], [{"x": 4},"2,4\n\n\n0,2","2,5\n\n\n0,2","2,6\n\n\n0,2","2,7\n\n\n0,2","2,8\n\n\n0,2","2,9\n\n\n0,2","2,10\n\n\n0,2","2,11\n\n\n0,2"], [{"x": 4},"3,4\n\n\n0,2","3,5\n\n\n0,2","3,6\n\n\n0,2","3,7\n\n\n0,2","3,8\n\n\n0,2","3,9\n\n\n0,2","3,10\n\n\n0,2","3,11\n\n\n0,2"],