From 05225dd9d8b666fec75ff5f1824f82fdfe7c0a77 Mon Sep 17 00:00:00 2001 From: tmk Date: Wed, 24 Jul 2013 00:41:28 +0900 Subject: Add bootmagic salt key to avoid accidental configuration --- common/bootmagic.c | 10 +++++++++- common/bootmagic.h | 6 ++++++ 2 files changed, 15 insertions(+), 1 deletion(-) (limited to 'common') diff --git a/common/bootmagic.c b/common/bootmagic.c index 11eef3c3c..410dc6836 100644 --- a/common/bootmagic.c +++ b/common/bootmagic.c @@ -5,6 +5,7 @@ #include "bootloader.h" #include "debug.h" #include "keymap.h" +#include "action_layer.h" #include "eeconfig.h" #include "bootmagic.h" @@ -94,7 +95,7 @@ void bootmagic(void) } } -bool bootmagic_scan_keycode(uint8_t keycode) +static bool scan_keycode(uint8_t keycode) { for (uint8_t r = 0; r < MATRIX_ROWS; r++) { matrix_row_t matrix_row = matrix_get_row(r); @@ -108,3 +109,10 @@ bool bootmagic_scan_keycode(uint8_t keycode) } return false; } + +bool bootmagic_scan_keycode(uint8_t keycode) +{ + if (!scan_keycode(BOOTMAGIC_KEY_SALT)) return false; + + return scan_keycode(keycode); +} diff --git a/common/bootmagic.h b/common/bootmagic.h index 68935e970..2d14b3e76 100644 --- a/common/bootmagic.h +++ b/common/bootmagic.h @@ -2,6 +2,12 @@ #define BOOTMAGIC_H +/* bootmagic salt key */ +#ifndef BOOTMAGIC_KEY_SALT +#define BOOTMAGIC_KEY_SALT KC_SPACE +#endif + +/* skip bootmagic and eeconfig */ #ifndef BOOTMAGIC_KEY_SKIP #define BOOTMAGIC_KEY_SKIP KC_ESC #endif -- cgit v1.2.3