ADD: keymap macro for human to read easier

ADD: controller.h for controller board definition(teensy)
ADD: debug toggle

4 files changed, 181 insertions, 167 deletions

diff --git a/hhkb/Makefile b/hhkb/Makefile
index 980980cfe8..1c6eb3db57 100644
--- a/hhkb/Makefile
+++ b/hhkb/Makefile
@@ -39,6 +39,7 @@
 # To rebuild project do "make clean" then "make all".
 #----------------------------------------------------------------------------
 
+DESCRIPTION = 't.m.k. firmware for HHKB pro\n'
 
 # Target file name (without extension).
 TARGET = tmk_hhkb
diff --git a/hhkb/controller.h b/hhkb/controller.h
new file mode 100644
index 0000000000..aa862cdc1c
--- /dev/null
+++ b/hhkb/controller.h
@@ -0,0 +1,6 @@
+#ifndef CONTROLLER_H
+#define CONTROLLER_H 1
+
+#include "controller_teensy.h"
+
+#endif
diff --git a/hhkb/keymap.c b/hhkb/keymap.c
index 57f20c31f4..f5386b7223 100644
--- a/hhkb/keymap.c
+++ b/hhkb/keymap.c
@@ -1,173 +1,156 @@
 /* 
- * keymap for HHKB pro
+ * Keymap for PFU HHKB Pro
  */
 #include <stdbool.h>
 #include <avr/pgmspace.h>
 #include "usb_keyboard.h"
+#include "usb_keycodes.h"
 #include "matrix.h"
 #include "keymap.h"
 #include "print.h"
+#include "debug.h"
+
 
 #define FN_KEYCODE(fn) (pgm_read_byte(&fn_keycode[(fn)]))
 #define FN_LAYER(fn)   (pgm_read_byte(&fn_layer[(fn)]))
-#define KEYMAPS(layer, row, col) (pgm_read_byte(&keymaps[(layer)][(row)][(col)]))
+#define KEYCODE(layer, row, col) (pgm_read_byte(&keymaps[(layer)][(row)][(col)]))
+#define KEYMAP( \
+    R3C1, R3C0, R0C0, R1C0, R1C1, R2C0, R2C1, R4C0, R4C1, R6C0, R6C1, R7C0, R7C1, R5C0, R5C1, \
+    R3C2, R0C1, R0C2, R1C3, R1C2, R2C3, R2C2, R4C2, R4C3, R6C2, R6C3, R7C3, R7C2, R5C2, \
+    R3C3, R0C4, R0C3, R1C4, R1C5, R2C4, R2C5, R4C5, R4C4, R6C5, R6C4, R7C4, R5C3, \
+    R3C4, R0C5, R0C6, R0C7, R1C6, R1C7, R2C6, R4C6, R6C6, R7C6, R7C5, R5C5, R5C4, \
+    R3C5, R3C6, R3C7, R5C7, R5C6 \
+) \
+{ \
+    { R0C0, R0C1, R0C2, R0C3, R0C4, R0C5, R0C6, R0C7 }, \
+    { R1C0, R1C1, R1C2, R1C3, R1C4, R1C5, R1C6, R1C7 }, \
+    { R2C0, R2C1, R2C2, R2C3, R2C4, R2C5, R2C6, KB_NO }, \
+    { R3C0, R3C1, R3C2, R3C3, R3C4, R3C5, R3C6, R3C7 }, \
+    { R4C0, R4C1, R4C2, R4C3, R4C4, R4C5, R4C6, KB_NO }, \
+    { R5C0, R5C1, R5C2, R5C3, R5C4, R5C5, R5C6, R5C7 }, \
+    { R6C0, R6C1, R6C2, R6C3, R6C4, R6C5, R6C6, KB_NO }, \
+    { R7C0, R7C1, R7C2, R7C3, R7C4, R7C5, R7C6, KB_NO } \
+}
+
+
+static int onbit(uint8_t bits);
+
 
 static int current_layer = 0;
 static bool layer_used = false;
-static int onbit(uint8_t bits);
 
-/*
- * Layer0(Default Layer)
- * ,-----------------------------------------------------------.
- * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|  \|  `|
- * |-----------------------------------------------------------|
- * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|Backs|
- * |-----------------------------------------------------------|
- * |Contro|  A|  S|  D|  F|  G|  H|  J|  K|  L|Fn3|Fn2|Return  |
- * |-----------------------------------------------------------|
- * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift |Fn1|
- * `-----------------------------------------------------------'
- *       |Gui|Alt  |Space                  |Alt  |Fn7|
- *       `-------------------------------------------'
- * 
- * Layer1(HHKB Fn) HHKB mode
- * ,-----------------------------------------------------------.
- * |Pow| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|Del|
- * |-----------------------------------------------------------|
- * |Caps |   |   |   |   |   |   |   |Psc|Slk|Pus|Up |   |Backs|
- * |-----------------------------------------------------------|
- * |Contro|VoD|VoU|Mut|   |   |  *|  /|Hom|PgU|Lef|Rig|Enter   |
- * |-----------------------------------------------------------|
- * |Shift   |   |   |   |   |   |  +|  -|End|PgD|Dow|Shift |xxx|
- * `-----------------------------------------------------------'
- *      |Gui |Alt  |Space                  |Alt  |Gui|
- *      `--------------------------------------------'
- * 
- * Layer2(Quote/Rmeta) vi mode
- * ,-----------------------------------------------------------.
- * |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|Del|
- * |-----------------------------------------------------------|
- * |Tab  |   |   |   |   |   |Hom|PgD|PgUlEnd|   |   |   |Backs|
- * |-----------------------------------------------------------|
- * |Contro|   |   |   |   |   |Lef|Dow|Up |Rig|   |xxx|Return  |
- * |-----------------------------------------------------------|
- * |Shift   |   |   |   |   |   |   |   |   |   |   |Shift |   |
- * `-----------------------------------------------------------'
- *       |Gui|Alt  |Sapce                  |Alt  |xxx|
- *       `-------------------------------------------'
- *
- * Layer3(Semicolon) mouse mode
- * ,-----------------------------------------------------------.
- * |Esc|   |   |   |   |   |   |   |   |   |   |   |   |   |   |
- * |-----------------------------------------------------------|
- * |Tab  |   |   |   |   |   |MwL|MwD|MwU|MwR|   |   |   |Backs|
- * |-----------------------------------------------------------|
- * |Contro|   |   |   |   |   |McL|McD|McU|McR|xxx|   |Return  |
- * |-----------------------------------------------------------|
- * |Shift   |   |   |   |   |   |   |Mb1|Mb2|Mb3|   |Shift |   |
- * `-----------------------------------------------------------'
- *      |Gui |Alt  |Mb1                    |Alt  |Gui|
- *      `--------------------------------------------'
- *
- * Layer4(Space)  Matias half keyboard style
- * ,-----------------------------------------------------------.
- * |  -|  0|  9|  8|  7|  6|  5|  4|  3|  2|  1|   |   |   |Esc|
- * |-----------------------------------------------------------|
- * |Backs|  P|  O|  I|  U|  Y|  T|  R|  E|  W|  Q|   |   |Tab  |
- * |-----------------------------------------------------------|
- * |Contro|  ;|  L|  K|  J|  H|  G|  F|  D|  S|  A|Con|Control |
- * |-----------------------------------------------------------|
- * |Shift   |  /|  .|  ,|  M|  N|  B|  V|  C|  X|  Z|Shift |   |
- * `-----------------------------------------------------------'
- *      |Gui |Alt  |xxxxxxxxxxxxxxxxxxxxxxx|Alt  |Gui|
- *      `--------------------------------------------'
- * 
- * Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel 
- */
 
 /* layer to change into while Fn key pressed */ 
-static const int PROGMEM fn_layer[] = { 0, 1, 2, 3, 4, 0, 0, 2 };
+static const int PROGMEM fn_layer[] = { 0, 1, 2, 3, 4, 0, 0, 0 };
 
 /* keycode to sent when Fn key released without using layer keys. */
 static const uint8_t PROGMEM fn_keycode[] = {
     KB_NO,          // FN_0 [NOT USED]
     KB_NO,          // FN_1 layer 1
-    KB_NO,          // FN_2 layer 2
+    KB_QUOTE,       // FN_2 layer 2
     KB_SCOLON,      // FN_3 layer 3
     KB_SPACE,       // FN_4 layer 4 [NOT USED]
     KB_NO,          // FN_5 [NOT USED]
     KB_NO,          // FN_6 [NOT USED]
-    KB_QUOTE,       // FN_7 layer 2
+    KB_NO           // FN_7 [NOT USED]
 };
 
 static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*  plain keymap
-    {
-        { KB_2,       KB_Q,       KB_W,       KB_S,       KB_A,       KB_Z,       KB_X,       KB_C        },
-        { KB_3,       KB_4,       KB_R,       KB_E,       KB_D,       KB_F,       KB_V,       KB_B        },
-        { KB_5,       KB_6,       KB_Y,       KB_T,       KB_G,       KB_H,       KB_N,       KB_NO       },
-        { KB_1,       KB_ESCAPE,  KB_TAB,     KB_LCTRL,   KB_LSHIFT,  KB_LGUI,    KB_LALT,    KB_SPACE    },
-        { KB_7,       KB_8,       KB_U,       KB_I,       KB_K,       KB_J,       KB_M,       KB_NO       },
-        { KB_BSLASH,  KB_GRAVE,   KB_BSPACE,  KB_ENTER,   FN_1,       KB_RSHIFT,  KB_RGUI,    KB_RALT     },
-        { KB_9,       KB_0,       KB_O,       KB_P,       KB_SCOLON,  KB_L,       KB_COMMA,   KB_NO       },
-        { KB_MINUS,   KB_EQUAL,   KB_RBRACKET,KB_LBRACKET,KB_QUOTE,   KB_SLASH,   KB_DOT,     KB_NO       },
-    },
-*/
-    // 0: default
-    {
-        { KB_2,       KB_Q,       KB_W,       KB_S,       KB_A,       KB_Z,       KB_X,       KB_C        },
-        { KB_3,       KB_4,       KB_R,       KB_E,       KB_D,       KB_F,       KB_V,       KB_B        },
-        { KB_5,       KB_6,       KB_Y,       KB_T,       KB_G,       KB_H,       KB_N,       KB_NO       },
-        { KB_1,       KB_ESCAPE,  KB_TAB,     KB_LCTRL,   KB_LSHIFT,  KB_LGUI,    KB_LALT,    KB_SPACE    },
-        { KB_7,       KB_8,       KB_U,       KB_I,       KB_K,       KB_J,       KB_M,       KB_NO       },
-        { KB_BSLASH,  KB_GRAVE,   KB_BSPACE,  KB_ENTER,   FN_1,       KB_RSHIFT,  FN_2,       KB_RALT     },
-        { KB_9,       KB_0,       KB_O,       KB_P,       FN_3,       KB_L,       KB_COMMA,   KB_NO       },
-        { KB_MINUS,   KB_EQUAL,   KB_RBRACKET,KB_LBRACKET,FN_7,       KB_SLASH,   KB_DOT,     KB_NO       },
-    },
-    // 1: HHKB mode(HHKB Fn)
-    {
-        { KB_F2,      KB_NO,      KB_NO,      KB_NO,      KB_NO,      KB_NO,      KB_NO,      KB_NO       },
-        { KB_F3,      KB_F4,      KB_NO,      KB_NO,      KB_MUTE,    KB_F20,     KB_NO,      KB_NO       },
-        { KB_F5,      KB_F6,      KB_NO,      KB_NO,      KB_NO,      KP_ASTERISK,KP_PLUS,    KB_NO       },
-        { KB_F1,      KB_POWER,   KB_CAPSLOCK,KB_LCTRL,   KB_LSHIFT,  KB_LGUI,    KB_LALT,    KB_SPACE    },
-        { KB_F7,      KB_F8,      KB_NO,      KB_PSCREEN, KB_HOME,    KP_SLASH,   KB_MINUS,   KB_NO       },
-        { KB_INSERT,  KB_DELETE,  KB_BSPACE,  KP_ENTER,   KB_NO,      KB_RSHIFT,  KB_RGUI,    KB_RALT     },
-        { KB_F9,      KB_F10,     KB_SCKLOCK, KB_BREAK,   KB_LEFT,    KB_PGUP,    KB_END,     KB_NO       },
-        { KB_F11,     KB_F12,     KB_NO,      KB_UP,      KB_RIGHT,   KB_DOWN,    KB_PGDOWN,  KB_NO       },
-    },
-    // 2: vi mode(Quote/Rmeta)
-    {
-        { KB_F2,      KB_NO,      KB_NO,      KB_NO,      KB_NO,      KB_NO,      KB_NO,      KB_NO       },
-        { KB_F3,      KB_F4,      KB_NO,      KB_NO,      KB_NO,      KB_NO,      KB_NO,      KB_NO       },
-        { KB_F5,      KB_F6,      KB_HOME,    KB_NO,      KB_NO,      KB_LEFT,    KB_NO,      KB_NO       },
-        { KB_F1,      KB_ESCAPE,  KB_TAB,     KB_LCTRL,   KB_LSHIFT,  KB_LGUI,    KB_LALT,    KB_SPACE    },
-        { KB_F7,      KB_F8,      KB_PGDOWN,  KB_PGUP,    KB_UP,      KB_DOWN,    KB_NO,      KB_NO       },
-        { KB_INSERT,  KB_DELETE,  KB_BSPACE,  KB_ENTER,   KB_NO,      KB_RSHIFT,  KB_NO,      KB_RALT     },
-        { KB_F9,      KB_F10,     KB_END,     KB_NO,      KB_NO,      KB_RIGHT,   KB_NO,      KB_NO       },
-        { KB_F11,     KB_F12,     KB_NO,      KB_NO,      KB_NO,      KB_NO,      KB_NO,      KB_NO       },
-    },
-    // 3: vi mouse mode(Semicolon)
-    {
-        { KB_F2,      KB_NO,      KB_NO,      KB_NO,      KB_NO,      KB_NO,      KB_NO,      KB_NO       },
-        { KB_F3,      KB_F4,      KB_NO,      KB_NO,      KB_NO,      KB_NO,      KB_NO,      KB_NO       },
-        { KB_F5,      KB_F6,      MS_WH_LEFT, KB_NO,      KB_NO,      MS_LEFT,    MS_BTN2,    KB_NO       },
-        { KB_F1,      KB_ESCAPE,  KB_TAB,     KB_LCTRL,   KB_LSHIFT,  KB_LGUI,    KB_LALT,    MS_BTN1     },
-        { KB_F7,      KB_F8,      MS_WH_DOWN, MS_WH_UP,   MS_UP,      MS_DOWN,    MS_BTN1,    KB_NO       },
-        { KB_NO,      KB_NO,      KB_BSPACE,  KB_ENTER,   KB_NO,      KB_RSHIFT,  KB_RGUI,    KB_RALT     },
-        { KB_F9,      KB_F10,     MS_WH_RIGHT,KB_NO,      KB_NO,      MS_RIGHT,   MS_BTN2,    KB_NO       },
-        { KB_F11,     KB_F12,     KB_NO,      KB_NO,      KB_NO,      KB_NO,      MS_BTN3,    KB_NO       },
-    },
-    // 4: Matias half keyboard style(Space)
-    {
-        { KB_9,       KB_P,       KB_O,       KB_L,       KB_SCOLON,  KB_SLASH,   KB_DOT,     KB_COMMA    },
-        { KB_8,       KB_7,       KB_U,       KB_I,       KB_K,       KB_J,       KB_M,       KB_N        },
-        { KB_6,       KB_5,       KB_T,       KB_Y,       KB_H,       KB_G,       KB_B,       KB_NO       },
-        { KB_0,       KB_MINUS,   KB_BSPACE,  KB_LCTRL,   KB_LSHIFT,  KB_LGUI,    KB_LALT,    KB_NO       },
-        { KB_4,       KB_3,       KB_R,       KB_E,       KB_D,       KB_F,       KB_V,       KB_NO       },
-        { KB_NO,      KB_ESCAPE,  KB_TAB,     KB_RCTRL,   FN_1,       KB_RSHIFT,  KB_RGUI,    KB_RALT     },
-        { KB_2,       KB_1,       KB_W,       KB_Q,       KB_A,       KB_S,       KB_C,       KB_NO       },
-        { KB_NO,      KB_NO,      KB_RBRACKET,KB_LBRACKET,KB_QUOTE,   KB_Z,       KB_X,       KB_NO       },
-    },
+    /* Layer 0: Default Layer
+     * ,-----------------------------------------------------------.
+     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|  \|  `|
+     * |-----------------------------------------------------------|
+     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|Backs|
+     * |-----------------------------------------------------------|
+     * |Contro|  A|  S|  D|  F|  G|  H|  J|  K|  L|Fn3|Fn2|Return  |
+     * |-----------------------------------------------------------|
+     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift |Fn1|
+     * `-----------------------------------------------------------'
+     *       |Gui|Alt  |Space                  |Alt  |Gui|
+     *       `-------------------------------------------'
+     */
+    KEYMAP(KB_ESC, KB_1,   KB_2,   KB_3,   KB_4,   KB_5,   KB_6,   KB_7,   KB_8,   KB_9,   KB_0,   KB_MINS,KB_EQL, KB_BSLS,KB_GRV, \
+           KB_TAB, KB_Q,   KB_W,   KB_E,   KB_R,   KB_T,   KB_Y,   KB_U,   KB_I,   KB_O,   KB_P,   KB_LBRC,KB_RBRC,KB_BSPC, \
+           KB_LCTL,KB_A,   KB_S,   KB_D,   KB_F,   KB_G,   KB_H,   KB_J,   KB_K,   KB_L,   FN_3,   FN_2,   KB_ENT, \
+           KB_LSFT,KB_Z,   KB_X,   KB_C,   KB_V,   KB_B,   KB_N,   KB_M,   KB_COMM,KB_DOT, KB_SLSH,KB_RSFT,FN_1, \
+           KB_LGUI,KB_LALT,KB_SPC, KB_RALT,KB_RGUI),
+
+    /* Layer 1: HHKB mode (HHKB Fn)
+     * ,-----------------------------------------------------------.
+     * |Pow| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|Del|
+     * |-----------------------------------------------------------|
+     * |Caps |   |   |   |   |   |   |   |Psc|Slk|Pus|Up |   |Backs|
+     * |-----------------------------------------------------------|
+     * |Contro|   |   |   |   |   |  *|  /|Hom|PgU|Lef|Rig|Enter   |
+     * |-----------------------------------------------------------|
+     * |Shift   |   |   |   |   |   |  +|  -|End|PgD|Dow|Shift |xxx|
+     * `-----------------------------------------------------------'
+     *      |Gui |Alt  |Space                  |Alt  |Gui|
+     *      `--------------------------------------------'
+     */ 
+    KEYMAP(KB_PWR, KB_F1,  KB_F2,  KB_F3,  KB_F4,  KB_F5,  KB_F6,  KB_F7,  KB_F8,  KB_F9,  KB_F10, KB_F11, KB_F12, KB_INS, KB_DEL, \
+           KB_CAPS,KB_NO,  KB_NO,  KB_NO,  KB_NO,  KB_NO,  KB_NO,  KB_NO,  KB_PSCR,KB_SLCK,KB_BRK, KB_UP,  KB_NO,  KB_BSPC, \
+           KB_LCTL,KB_NO,  KB_NO,  KB_NO,  KB_NO,  KB_NO,  KP_ASTR,KP_SLSH,KB_HOME,KB_PGUP,KB_LEFT,KB_RGHT,KB_ENT, \
+           KB_LSFT,KB_NO,  KB_NO,  KB_NO,  KB_NO,  KB_NO,  KP_PLUS,KP_MINS,KB_END, KB_PGDN,KB_DOWN,KB_RSFT,FN_1, \
+           KB_LGUI,KB_LALT,KB_SPC, KB_RALT,KB_RGUI),
+
+    /* Layer 2: Vi mode (Quote/Rmeta)
+     * ,-----------------------------------------------------------.
+     * |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|Del|
+     * |-----------------------------------------------------------|
+     * |Tab  |Hom|PgD|Up |PgU|End|Hom|PgD|PgUlEnd|   |   |   |Backs|
+     * |-----------------------------------------------------------|
+     * |Contro|   |Lef|Dow|Rig|   |Lef|Dow|Up |Rig|   |xxx|Return  |
+     * |-----------------------------------------------------------|
+     * |Shift   |   |   |   |   |   |   |   |   |   |   |Shift |   |
+     * `-----------------------------------------------------------'
+     *       |Gui|Alt  |Sapce                  |Alt  |Gui|
+     *       `-------------------------------------------'
+     */
+    KEYMAP(KB_ESC, KB_F1,  KB_F2,  KB_F3,  KB_F4,  KB_F5,  KB_F6,  KB_F7,  KB_F8,  KB_F9,  KB_F10, KB_F11, KB_F12, KB_INS, KB_DEL, \
+           KB_TAB, KB_HOME,KB_PGDN,KB_UP,  KB_PGUP,KB_END, KB_HOME,KB_PGDN,KB_PGUP,KB_END, KB_NO,  KB_NO,  KB_NO,  KB_BSPC, \
+           KB_LCTL,KB_NO,  KB_LEFT,KB_DOWN,KB_RGHT,KB_NO,  KB_LEFT,KB_DOWN,KB_UP,  KB_RGHT,KB_NO,  FN_2,   KB_ENT, \
+           KB_LSFT,KB_NO,  KB_NO,  KB_NO,  KB_NO,  KB_NO,  KB_NO,  KB_NO,  KB_NO,  KB_NO,  KB_NO,  KB_RSFT,KB_NO, \
+           KB_LGUI,KB_LALT,KB_SPC, KB_RALT,KB_RGUI),
+
+    /* Layer 3: Mouse mode (Semicolon)
+     * ,-----------------------------------------------------------.
+     * |Esc|   |   |   |   |   |   |   |   |   |   |   |   |   |   |
+     * |-----------------------------------------------------------|
+     * |Tab  |MwL|MwU|McU|MwD|MwL|MwR|MwD|MwU|MwR|   |   |   |Backs|
+     * |-----------------------------------------------------------|
+     * |Contro|   |McL|McD|McR|   |McL|McD|McU|McR|xxx|   |Return  |
+     * |-----------------------------------------------------------|
+     * |Shift   |   |   |   |   |   |Mb2|Mb1|Mb2|Mb3|   |Shift |   |
+     * `-----------------------------------------------------------'
+     *      |Gui |Alt  |Mb1                    |Alt  |Gui|
+     *      `--------------------------------------------'
+     * Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel 
+     */
+    KEYMAP(KB_ESC, KB_F1,  KB_F2,  KB_F3,  KB_F4,  KB_F5,  KB_F6,  KB_F7,  KB_F8,  KB_F9,  KB_F10, KB_F11, KB_F12, KB_INS, KB_DEL, \
+           KB_TAB, MS_WH_L,MS_WH_U,MS_UP,  MS_WH_D,MS_WH_R,MS_WH_L,MS_WH_D,MS_WH_U,MS_WH_R,KB_NO,  KB_NO,  KB_NO,  KB_BSPC, \
+           KB_LCTL,KB_NO,  MS_LEFT,MS_DOWN,MS_RGHT,KB_NO,  MS_LEFT,MS_DOWN,MS_UP,  MS_RGHT,FN_3,   KB_NO,  KB_ENT, \
+           KB_LSFT,KB_NO,  MS_DOWN,KB_NO,  KB_NO,  KB_NO,  MS_BTN2,MS_BTN1,MS_BTN2,MS_BTN3,KB_NO,  KB_RSFT,KB_NO, \
+           KB_LGUI,KB_LALT,MS_BTN1,KB_RALT,KB_RGUI),
+
+    /* Layer 4: Matias half keyboard style (Space)
+     * ,-----------------------------------------------------------.
+     * |  -|  0|  9|  8|  7|  6|  5|  4|  3|  2|  1|   |   |   |Esc|
+     * |-----------------------------------------------------------|
+     * |Backs|  P|  O|  I|  U|  Y|  T|  R|  E|  W|  Q|   |   |Tab  |
+     * |-----------------------------------------------------------|
+     * |Contro|  ;|  L|  K|  J|  H|  G|  F|  D|  S|  A|Con|Control |
+     * |-----------------------------------------------------------|
+     * |Shift   |  /|  .|  ,|  M|  N|  B|  V|  C|  X|  Z|Shift |   |
+     * `-----------------------------------------------------------'
+     *      |Gui |Alt  |xxxxxxxxxxxxxxxxxxxxxxx|Alt  |Gui|
+     *      `--------------------------------------------'
+     */
+    KEYMAP(KB_MINS,KB_0,   KB_9,   KB_8,   KB_7,   KB_6,   KB_5,   KB_4,   KB_3,   KB_2,   KB_1,   KB_NO,  KB_NO,  KB_NO,  KB_ESC, \
+           KB_BSPC,KB_P,   KB_O,   KB_I,   KB_U,   KB_Y,   KB_T,   KB_R,   KB_E,   KB_W,   KB_Q,   KB_NO,  KB_NO,  KB_TAB, \
+           KB_LCTL,KB_SCLN,KB_L,   KB_K,   KB_J,   KB_H,   KB_G,   KB_F,   KB_D,   KB_S,   KB_A,   KB_RCTL,KB_RCTL, \
+           KB_LSFT,KB_SLSH,KB_DOT, KB_COMM,KB_M,   KB_N,   KB_B,   KB_V,   KB_C,   KB_X,   KB_Z,   KB_RSFT,KB_NO, \
+           KB_LGUI,KB_LALT,FN_4,   KB_RALT,KB_RGUI)
 };
 
 
@@ -178,26 +161,34 @@ uint8_t keymap_get_keycode(int row, int col)
 
 uint8_t keymap_get_keycodel(int layer, int row, int col)
 {
-    uint8_t code = KEYMAPS(layer, row, col);
+    uint8_t code = KEYCODE(layer, row, col);
     // normal key or mouse key
-    if ((KB_A <= code && code <= KP_HEXADECIMAL) ||
-        (MS_UP <= code && code <= MS_WH_RIGHT))
+    if (IS_KEY(code) || IS_MOUSE(code))
         layer_used = true;
     return code;
 }
 
 inline
-int keymap_get_layer(void) {
+int keymap_get_layer(void)
+{
     return current_layer;
 }
 
 inline
-int keymap_set_layer(int layer) {
+int keymap_set_layer(int layer)
+{
     current_layer = layer;
     return current_layer;
 }
 
-void keymap_fn_proc(int fn_bits) {
+inline
+bool keymap_is_special_mode(int fn_bits)
+{
+    return (keyboard_modifier_keys == (BIT_LCTRL | BIT_LSHIFT | BIT_LALT | BIT_LGUI));
+}
+
+void keymap_fn_proc(int fn_bits)
+{
     // layer switching
     static int last_bits = 0;
     static uint8_t last_mod = 0;
@@ -210,7 +201,7 @@ void keymap_fn_proc(int fn_bits) {
         if (!layer_used) {
             uint8_t code = FN_KEYCODE(onbit(last_bits));
             if (code != KB_NO) {
-                if (KB_LCTRL <= code  && code <= KB_RGUI) {
+                if (IS_MOD(code)) {
                     keyboard_modifier_keys = last_mod | 1<<(code & 0x07);
                 } else {
                     keyboard_keys[0] = code;
@@ -225,20 +216,20 @@ void keymap_fn_proc(int fn_bits) {
         last_mod = 0;
         layer_used = false;
         keymap_set_layer(0); // default layer
-        print("layer default: "); phex(current_layer); print("\n");
     } else if ((fn_bits & (fn_bits - 1)) == 0) {
         // switch layer when just one Fn Key is pressed
         last_bits = fn_bits;
         last_mod = keyboard_modifier_keys;
         layer_used = false;
         keymap_set_layer(FN_LAYER(onbit(fn_bits)));
-        print("layer: "); phex(current_layer); print("\n");
-        print("last_bits: "); phex(last_bits); print("\n");
-        print("last_mod: "); phex(last_mod); print("\n");
+        debug("layer: "); phex(current_layer); debug("(");
+        debug_bin(last_bits); debug(")\n");
+        debug("last_mod: "); debug_hex(last_mod); debug("\n");
     }
 }
 
-static int onbit(uint8_t bits) {
+static int onbit(uint8_t bits)
+{
     int n = 0;
     if (bits >> 4) { bits >>= 4; n += 4;}
     if (bits >> 2) { bits >>= 2; n += 2;}
diff --git a/hhkb/matrix.c b/hhkb/matrix.c
index a640655602..d8dc9a7f8c 100644
--- a/hhkb/matrix.c
+++ b/hhkb/matrix.c
@@ -35,12 +35,14 @@ static int bit_pop(uint8_t bits);
 
 
 inline
-int matrix_rows(void) {
+int matrix_rows(void)
+{
     return MATRIX_ROWS;
 }
 
 inline
-int matrix_cols(void) {
+int matrix_cols(void)
+{
     return MATRIX_COLS;
 }
 
@@ -55,8 +57,8 @@ void matrix_init(void)
     PORTE = 0xC0;
 
     // initialize matrix state: all keys off
-    for (int i=0; i < MATRIX_ROWS; i++) _matrix0[i] = 0xFF;
-    for (int i=0; i < MATRIX_ROWS; i++) _matrix1[i] = 0xFF;
+    for (int i=0; i < MATRIX_ROWS; i++) _matrix0[i] = 0x00;
+    for (int i=0; i < MATRIX_ROWS; i++) _matrix1[i] = 0x00;
     matrix = _matrix0;
     matrix_prev = _matrix1;
 }
@@ -76,9 +78,9 @@ int matrix_scan(void)
             KEY_ENABLE;
             _delay_us(10);  // from logic analyzer chart
             if (KEY_ON) {
-                matrix[row] &= ~(1<<col);
-            } else {
                 matrix[row] |= (1<<col);
+            } else {
+                matrix[row] &= ~(1<<col);
             }
             KEY_UNABLE;
             _delay_us(150);  // from logic analyzer chart
@@ -87,7 +89,8 @@ int matrix_scan(void)
     return 1;
 }
 
-bool matrix_is_modified(void) {
+bool matrix_is_modified(void)
+{
     for (int i = 0; i < MATRIX_ROWS; i++) {
         if (matrix[i] != matrix_prev[i])
             return true;
@@ -96,16 +99,25 @@ bool matrix_is_modified(void) {
 }
 
 inline
-bool matrix_has_ghost(void) {
+bool matrix_has_ghost(void)
+{
     return false;
 }
 
 inline
-uint16_t matrix_get_row(int row) {
+bool matrix_is_on(int row, int col)
+{
+    return (matrix[row] & (1<<col));
+}
+
+inline
+uint16_t matrix_get_row(int row)
+{
     return matrix[row];
 }
 
-void matrix_print(void) {
+void matrix_print(void)
+{
     print("\nr/c 01234567\n");
     for (int row = 0; row < matrix_rows(); row++) {
         phex(row); print(": ");
@@ -117,20 +129,24 @@ void matrix_print(void) {
     }
 }
 
-int matrix_key_count(void) {
+int matrix_key_count(void)
+{
     int count = 0;
     for (int i = 0; i < MATRIX_ROWS; i++) {
-        count += bit_pop(~matrix[i]);
+        count += bit_pop(matrix[i]);
     }
     return count;
 }
 
 inline
-static bool matrix_has_ghost_in_row(int row) {
+static bool matrix_has_ghost_in_row(int row)
+{
     return false;
 }
 
-static int bit_pop(uint8_t bits) {
+inline
+static int bit_pop(uint8_t bits)
+{
     int c;
     for (c = 0; bits; c++)
         bits &= bits -1;