Merge branch 'bootmagic_salt'(Fix issue #41)

[tmk_firmware.git] / keyboard / hhkb / config.h

diff --git a/keyboard/hhkb/config.h b/keyboard/hhkb/config.h
index e34d9a6ba13384d2362526c8a4ac9a94ec8a6090..8c93f97da512eb2c0f88b8272faab024d6bdd2d1 100644 (file)
--- a/keyboard/hhkb/config.h
+++ b/keyboard/hhkb/config.h
@@ -18,9 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef CONFIG_H
 #define CONFIG_H
 
-/* controller configuration */
-#include "controller_teensy.h"
-
 
 #define VENDOR_ID       0xFEED
 #define PRODUCT_ID      0xCAFE
@@ -30,16 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DESCRIPTION     t.m.k. keyboard firmware for HHKB mod
 
 
-/* Boot Section Size in *BYTEs*
- *   Teensy   halfKay    512
- *   Teensy++ halfKay    1024
- *   Atmel DFU loader    4096
- *   LUFA bootloader     4096
- *   USBaspLoader        2048
- */
-#define BOOTLOADER_SIZE 1024
-
-
 /* matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 8
@@ -67,11 +54,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 /* period of tapping(ms) */
-#define TAPPING_TERM    200
+#define TAPPING_TERM    300
 /* tap count needed for toggling a feature */
 #define TAPPING_TOGGLE  5
 
 
+/* Boot Magic salt key: Space */
+#define BOOTMAGIC_KEY_SALT      KC_FN6
+
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
@@ -84,8 +74,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_PRINT
 
 /* disable action features */
-//#define NO_ACTION_KEYMAP
-//#define NO_ACTION_OVERLAY
+//#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 //#define NO_ACTION_MACRO