diff options
| author | tmk <nobody@nowhere> | 2013-07-24 00:43:40 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2013-07-24 00:43:55 +0900 |
| commit | c7d309e34bf5d05f245811389bea495d814e2111 (patch) | |
| tree | 5812fd31a0c58c74d252bb638a736ee133cfa7c0 /common/bootmagic.h | |
| parent | 7e5081b5a8f2c6e0c3c8d2dc73717c0b3597ef84 (diff) | |
| parent | 05225dd9d8b666fec75ff5f1824f82fdfe7c0a77 (diff) | |
| download | qmk_firmware-c7d309e34bf5d05f245811389bea495d814e2111.tar.gz qmk_firmware-c7d309e34bf5d05f245811389bea495d814e2111.zip | |
Merge branch 'bootmagic_salt'(Fix issue #41)
Diffstat (limited to 'common/bootmagic.h')
| -rw-r--r-- | common/bootmagic.h | 6 |
1 files changed, 6 insertions, 0 deletions
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 @@ | |||
| 2 | #define BOOTMAGIC_H | 2 | #define BOOTMAGIC_H |
| 3 | 3 | ||
| 4 | 4 | ||
| 5 | /* bootmagic salt key */ | ||
| 6 | #ifndef BOOTMAGIC_KEY_SALT | ||
| 7 | #define BOOTMAGIC_KEY_SALT KC_SPACE | ||
| 8 | #endif | ||
| 9 | |||
| 10 | /* skip bootmagic and eeconfig */ | ||
| 5 | #ifndef BOOTMAGIC_KEY_SKIP | 11 | #ifndef BOOTMAGIC_KEY_SKIP |
| 6 | #define BOOTMAGIC_KEY_SKIP KC_ESC | 12 | #define BOOTMAGIC_KEY_SKIP KC_ESC |
| 7 | #endif | 13 | #endif |