hhkb: fix for keymap editor

diff --git a/keyboard/hhkb/Makefile.keymap_editor b/keyboard/hhkb/Makefile.keymap_editor
new file mode 100644 (file)
index 0000000..77a13e6
--- /dev/null
+++ b/keyboard/hhkb/Makefile.keymap_editor
@@ -0,0 +1,5 @@
+# build firmware for keymap editor
+#
+KEYMAP_SECTION_ENABLE = yes    # fixed address keymap for keymap editor
+include Makefile
+

diff --git a/keyboard/hhkb/Makefile.rn42 b/keyboard/hhkb/Makefile.rn42
index cbb2b744c9652db6bb22f571b69c9ef7fa010fbe..8cb44352619ce26a7839483b19c964782ae785ee 100644 (file)
--- a/keyboard/hhkb/Makefile.rn42
+++ b/keyboard/hhkb/Makefile.rn42
@@ -108,12 +108,12 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
 # Build Options
 #   comment out to disable the options.
 #
 # Build Options
 #   comment out to disable the options.
 #

-#BOOTMAGIC_ENABLE = yes                # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = yes         # Virtual DIP switch configuration

 MOUSEKEY_ENABLE = yes          # Mouse keys
 EXTRAKEY_ENABLE = yes          # Audio control and System control
 CONSOLE_ENABLE = yes           # Console for debug
 COMMAND_ENABLE = yes           # Commands for debug and configuration
 MOUSEKEY_ENABLE = yes          # Mouse keys
 EXTRAKEY_ENABLE = yes          # Audio control and System control
 CONSOLE_ENABLE = yes           # Console for debug
 COMMAND_ENABLE = yes           # Commands for debug and configuration

-#NKRO_ENABLE = yes             # USB Nkey Rollover
+NKRO_ENABLE = yes              # USB Nkey Rollover

 #KEYMAP_SECTION_ENABLE = yes   # fixed address keymap for keymap editor
 #HHKB_JP = yes                 # HHKB JP support
 
 #KEYMAP_SECTION_ENABLE = yes   # fixed address keymap for keymap editor
 #HHKB_JP = yes                 # HHKB JP support
 

diff --git a/keyboard/hhkb/Makefile.rn42.keymap_editor b/keyboard/hhkb/Makefile.rn42.keymap_editor
new file mode 100644 (file)
index 0000000..6e55f69
--- /dev/null
+++ b/keyboard/hhkb/Makefile.rn42.keymap_editor
@@ -0,0 +1,5 @@
+# build firmware for keymap editor
+#
+KEYMAP_SECTION_ENABLE = yes    # fixed address keymap for keymap editor
+include Makefile.rn42
+

diff --git a/keyboard/hhkb/config_rn42.h b/keyboard/hhkb/config_rn42.h
index 21e73f1c5319fe76fc299564cb6d36925a824265..df75fba5a2f317e15e1ca6d51e72d904814b6175 100644 (file)
--- a/keyboard/hhkb/config_rn42.h
+++ b/keyboard/hhkb/config_rn42.h
@@ -48,7 +48,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ONESHOT_TIMEOUT 300
 
 /* Boot Magic salt key: Space */
 #define ONESHOT_TIMEOUT 300
 
 /* Boot Magic salt key: Space */

-#define BOOTMAGIC_KEY_SALT      KC_FN6
+#define BOOTMAGIC_KEY_SALT      KC_SPACE

 
 /* power control of key switch board */
 #define HHKB_POWER_SAVING
 
 /* power control of key switch board */
 #define HHKB_POWER_SAVING

diff --git a/keyboard/hhkb/keymap_hhkb.c b/keyboard/hhkb/keymap_hhkb.c
index 86ad0f5eee0370f586e96d8d4c6a27dc75166783..f0552a37413963ef4f7a5056c246331bfeb3f0ef 100644 (file)
--- a/keyboard/hhkb/keymap_hhkb.c
+++ b/keyboard/hhkb/keymap_hhkb.c
@@ -85,8 +85,8 @@ const uint16_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = {
     [27] = ACTION_MODS_TAP_KEY(MOD_LSFT, KC_ESC),
     [28] = ACTION_MODS_TAP_KEY(MOD_LSFT, KC_BSPACE),
     [29] = ACTION_MODS_ONESHOT(MOD_LSFT),
     [27] = ACTION_MODS_TAP_KEY(MOD_LSFT, KC_ESC),
     [28] = ACTION_MODS_TAP_KEY(MOD_LSFT, KC_BSPACE),
     [29] = ACTION_MODS_ONESHOT(MOD_LSFT),

-    [30] = ACTION_MODS_TAP_KEY(MOD_RSFT, KC_ESC),
-    [31] = ACTION_MODS_TAP_KEY(MOD_RSFT, KC_BSPACE),
+    [30] = ACTION_MODS_TAP_KEY(MOD_RSFT, KC_GRAVE),
+    [31] = ACTION_MODS_TAP_KEY(MOD_RSFT, KC_BSLASH),

 };
 #else
 const uint16_t fn_actions[] PROGMEM = {
 };
 #else
 const uint16_t fn_actions[] PROGMEM = {