diff --git a/keyboards/svalboard/keymaps/vial/config.h b/keyboards/svalboard/keymaps/vial/config.h index 1ccddc3b188..347c6b0be07 100644 --- a/keyboards/svalboard/keymaps/vial/config.h +++ b/keyboards/svalboard/keymaps/vial/config.h @@ -1,5 +1,23 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ - #pragma once #define VIAL_KEYBOARD_UID {0x1B, 0x18, 0x7D, 0xF2, 0x21, 0xF6, 0x29, 0x48} + +// Vial security combos, depending on which unit this is... +#ifdef INIT_EE_HANDS_RIGHT +// right thumb lock +#define VIAL_UNLOCK_COMBO_ROWS { 5, 5 } +#define VIAL_UNLOCK_COMBO_COLS { 0, 1 } +#elif INIT_EE_HANDS_LEFT +// left thumb lock +#define VIAL_UNLOCK_COMBO_ROWS { 0, 0 } +#define VIAL_UNLOCK_COMBO_COLS { 0, 1 } +#else +// both thumb locks +#define VIAL_UNLOCK_COMBO_ROWS { 0, 0, 5, 5 } +#define VIAL_UNLOCK_COMBO_COLS { 2, 5, 2, 5 } +#endif + +// Shorten the unlock timeout (needs mod in `quantum/vial.c`; without +// it the override doesn't work) +#define VIAL_UNLOCK_COUNTER_MAX 12 \ No newline at end of file diff --git a/keyboards/svalboard/keymaps/vial/rules.mk b/keyboards/svalboard/keymaps/vial/rules.mk index 4a215d24532..4f7618e9b21 100644 --- a/keyboards/svalboard/keymaps/vial/rules.mk +++ b/keyboards/svalboard/keymaps/vial/rules.mk @@ -1,4 +1,2 @@ VIA_ENABLE = yes VIAL_ENABLE = yes -VIAL_INSECURE = yes - diff --git a/quantum/vial.c b/quantum/vial.c index 056c023594c..3af57388409 100644 --- a/quantum/vial.c +++ b/quantum/vial.c @@ -24,7 +24,9 @@ #include "vial_ensure_keycode.h" +#ifndef VIAL_UNLOCK_COUNTER_MAX #define VIAL_UNLOCK_COUNTER_MAX 50 +#endif #ifdef VIAL_INSECURE #pragma message "Building Vial-enabled firmware in insecure mode."