7 files changed, 163 insertions, 108 deletions
diff --git a/keyboard/gh60/Makefile.lufa b/keyboard/gh60/Makefile.lufa
index 7548d4785..9adec24b1 100644
--- a/keyboard/gh60/Makefile.lufa
+++ b/keyboard/gh60/Makefile.lufa
@@ -125,5 +125,8 @@ plain: all
 poker: OPT_DEFS += -DKEYMAP_POKER
 poker: all
-poker_stack: OPT_DEFS += -DKEYMAP_POKER_STACK
+poker_bit: OPT_DEFS += -DKEYMAP_POKER_SET
-poker_stack: all
+poker_bit: all
+poker_bit: OPT_DEFS += -DKEYMAP_POKER_BIT
+poker_bit: all
diff --git a/keyboard/gh60/Makefile.pjrc b/keyboard/gh60/Makefile.pjrc
index 8bca1659b..4559ce32f 100644
--- a/keyboard/gh60/Makefile.pjrc
+++ b/keyboard/gh60/Makefile.pjrc
@@ -95,5 +95,8 @@ plain: all
 poker: OPT_DEFS += -DKEYMAP_POKER
 poker: all
-poker_stack: OPT_DEFS += -DKEYMAP_POKER_STACK
+poker_bit: OPT_DEFS += -DKEYMAP_POKER_SET
-poker_stack: all
+poker_bit: all
+poker_bit: OPT_DEFS += -DKEYMAP_POKER_BIT
+poker_bit: all
diff --git a/keyboard/gh60/README.md b/keyboard/gh60/README.md
index 405ab3dff..c11f2ae23 100644
--- a/keyboard/gh60/README.md
+++ b/keyboard/gh60/README.md
@@ -47,7 +47,7 @@ See [keymap_plain.h](keymap_plain.h) for detail.
    `-----------------------------------------------------------'
 ### 2  Poker keymap
-Poker layer emulation without Esc/grave bug :)
+Poker layer emulation
 See [keymap_poker.h](keymap_poker.h) for detail.
diff --git a/keyboard/gh60/keymap.c b/keyboard/gh60/keymap.c
index 9438782f2..8739aa163 100644
--- a/keyboard/gh60/keymap.c
+++ b/keyboard/gh60/keymap.c
@@ -64,8 +64,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #include "keymap_plain.h"
 #elif defined(KEYMAP_POKER)
    #include "keymap_poker.h"
-#elif defined(KEYMAP_POKER_STACK)
+#elif defined(KEYMAP_POKER_SET)
-    #include "keymap_poker_stack.h"
+    #include "keymap_poker_set.h"
+#elif defined(KEYMAP_POKER_BIT)
+    #include "keymap_poker_bit.h"
 #else
 static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    /*
diff --git a/keyboard/gh60/keymap_poker.h b/keyboard/gh60/keymap_poker_bit.h
index 08c24f926..7dc4efe01 100644
--- a/keyboard/gh60/keymap_poker.h
+++ b/keyboard/gh60/keymap_poker_bit.h
@@ -20,44 +20,59 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   LBRC,RBRC,BSLS, \
        LCTL,A,   S,   D,   F,   G,   H,   J,   K,   L,   SCLN,QUOT,     ENT,  \
        LSFT,Z,   X,   C,   V,   B,   N,   M,   COMM,DOT, SLSH,          RSFT, \
-        LCTL,LGUI,LALT,          SPC,                     FN3, RGUI,APP, RCTL),
+        LCTL,LGUI,LALT,          SPC,                     FN2, RGUI,APP, RCTL),
-    /* Layer 1: Poker with Arrow */
+    /* Layer x001: Poker with Arrow */
    KEYMAP_ANSI(
        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,     TRNS, \
        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,          UP,   \
-        TRNS,TRNS,TRNS,          TRNS,                    FN4, LEFT,DOWN,RGHT),
+        TRNS,TRNS,TRNS,          TRNS,                    FN2, LEFT,DOWN,RGHT),
-    /* Layer 2: Poker with Esc */
+    /* Layer x010: Poker with Esc */
    KEYMAP_ANSI(
        ESC, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,     TRNS, \
        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,          TRNS, \
-        TRNS,TRNS,TRNS,          TRNS,                    FN5, TRNS,TRNS,TRNS),
+        TRNS,TRNS,TRNS,          TRNS,                    FN2, TRNS,TRNS,TRNS),
-    /* Layer 3: Poker Default + Fn'd */
+    /* Layer x011: Poker with Arrow and Esc */
+    KEYMAP_ANSI(
+        ESC, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
+        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
+        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,     TRNS, \
+        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,          UP,   \
+        TRNS,TRNS,TRNS,          TRNS,                    FN2, LEFT,DOWN,RGHT),
+    /*
+     * Poker Momentary Fn Layer
+     */
+    /* Layer x100: Poker Default + Fn'd */
    KEYMAP_ANSI(
        ESC, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, TRNS, \
        CAPS,FN1, UP,  TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,CALC,TRNS,HOME,INS, TRNS, \
-        TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,PSCR,SLCK,PAUS,TRNS,FN0, END,      TRNS, \
+        TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,PSCR,SLCK,PAUS,TRNS,FN3, END,      TRNS, \
-        TRNS,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL,           UP,   \
+        TRNS,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL,           TRNS, \
-        TRNS,TRNS,TRNS,          FN0,                     FN3, LEFT,DOWN,RGHT),
+        TRNS,TRNS,TRNS,          FN0,                     FN2, TRNS,TRNS,TRNS),
+    /* Layer x101: Poker with Arrow + Fn'd */
-    /* Layer 4: Poker Default + Fn'd */
    KEYMAP_ANSI(
-        TRNS F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, TRNS, \
+        ESC, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, TRNS, \
        CAPS,FN1, UP,  TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,CALC,TRNS,HOME,INS, TRNS, \
-        TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,PSCR,SLCK,PAUS,TRNS,FN0, END,      TRNS, \
+        TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,PSCR,SLCK,PAUS,TRNS,FN3, END,      TRNS, \
-        TRNS,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL,           UP,   \
+        TRNS,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL,           PGUP, \
-        TRNS,TRNS,TRNS,          FN0,                     FN4, HOME,PGDN,END),
+        TRNS,TRNS,TRNS,          FN0,                     FN2, HOME,PGDN,END),
-    /* Layer 5: Poker Default + Fn'd */
+    /* Layer x110: Poker with Esc + Fn'd */
    KEYMAP_ANSI(
        GRV, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, TRNS, \
        CAPS,FN1, UP,  TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,CALC,TRNS,HOME,INS, TRNS, \
-        TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,PSCR,SLCK,PAUS,TRNS,FN0, END,      TRNS, \
+        TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,PSCR,SLCK,PAUS,TRNS,FN3, END,      TRNS, \
        TRNS,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL,           TRNS, \
-        TRNS,TRNS,TRNS,          FN0,                     FN5, TRNS,TRNS,TRNS),
+        TRNS,TRNS,TRNS,          FN0,                     FN2, TRNS,TRNS,TRNS),
+    /* Layer x111: Poker with Arrow and Esc + Fn'd */
+    KEYMAP_ANSI(
+        GRV, F9,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, TRNS, \
+        CAPS,FN1, UP,  TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,CALC,TRNS,HOME,INS, TRNS, \
+        TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,PSCR,SLCK,PAUS,TRNS,FN3, END,      TRNS, \
+        TRNS,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL,           PGUP, \
+        TRNS,TRNS,TRNS,          FN0,                     FN2, HOME,PGDN,END),
    /* colemak */
    [8] = KEYMAP_ANSI(
        GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, BSPC, \
@@ -86,10 +101,9 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
 static const uint16_t PROGMEM fn_actions[] = {
    /* Poker Layout */
-    [0] = ACTION_RMODS_KEY(MOD_BIT(KC_RCTL)|MOD_BIT(KC_RSFT), KC_ESC), // FN0 Task(RControl,RShift+Esc)
+    [0] = ACTION_LAYER_BIT_TOGGLE(1),              // FN0 Poker Arrow toggle(Space)
-    [0] = ACTION_LAYER_BIT_TOGGLE(1),              // FN1 Poker Arrow toggle(Space)
+    [1] = ACTION_LAYER_BIT_TOGGLE(2),              // FN1 Poker Esc toggle(Q)
-    [1] = ACTION_LAYER_BIT_TOGGLE(2),              // FN2 Poker Esc toggle(Q)
+    [2] = ACTION_LAYER_BIT(4),                     // FN2 Poker Fn
-    [2] = ACTION_LAYER_BIT(3),                     // FN3 Poker Fn
+    [3] = ACTION_RMODS_KEY(MOD_BIT(KC_RCTL)|MOD_BIT(KC_RSFT), KC_ESC), // FN3 Task(RControl,RShift+Esc)
-    [3] = ACTION_LAYER_BIT(4),                     // FN4 Poker Fn
 };
diff --git a/keyboard/gh60/keymap_poker_set.h b/keyboard/gh60/keymap_poker_set.h
new file mode 100644
index 000000000..9d7761798
--- /dev/null
+++ b/keyboard/gh60/keymap_poker_set.h
@@ -0,0 +1,110 @@
+static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Poker Default Layer
+     * ,-----------------------------------------------------------.
+     * |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |
+     * |-----------------------------------------------------------|
+     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|
+     * |-----------------------------------------------------------|
+     * |Caps  |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return  |
+     * |-----------------------------------------------------------|
+     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |
+     * |-----------------------------------------------------------|
+     * |Ctrl|Gui |Alt |      Space             |Fn  |Gui |App |Ctrl|
+     * `-----------------------------------------------------------'
+     */
+    /* Layer 0: qwerty */
+    KEYMAP_ANSI(
+        GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, BSPC, \
+        TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   LBRC,RBRC,BSLS, \
+        LCTL,A,   S,   D,   F,   G,   H,   J,   K,   L,   SCLN,QUOT,     ENT,  \
+        LSFT,Z,   X,   C,   V,   B,   N,   M,   COMM,DOT, SLSH,          RSFT, \
+        LCTL,LGUI,LALT,          SPC,                     FN0, RGUI,APP, RCTL),
+    /* Layer 1: colemak */
+    KEYMAP_ANSI(
+        GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, BSPC, \
+        TAB, Q,   W,   F,   P,   G,   J,   L,   U,   Y,   SCLN,LBRC,RBRC,BSLS, \
+        BSPC,A,   R,   S,   T,   D,   H,   N,   E,   I,   O,   QUOT,     ENT,  \
+        LSFT,Z,   X,   C,   V,   B,   K,   M,   COMM,DOT, SLSH,          RSFT, \
+        LCTL,LGUI,LALT,          SPC,                     FN0, RGUI,APP, RCTL),
+    /* Layer 2: dvorak */
+    KEYMAP_ANSI(
+        GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   LBRC,RBRC,BSPC, \
+        TAB, QUOT,COMM,DOT, P,   Y,   F,   G,   C,   R,   L,   SLSH,EQL, BSLS, \
+        CAPS,A,   O,   E,   U,   I,   D,   H,   T,   N,   S,   MINS,     ENT,  \
+        LSFT,SCLN,Q,   J,   K,   X,   B,   M,   W,   V,   Z,             RSFT, \
+        LCTL,LGUI,LALT,          SPC,                     FN0, RGUI,APP, RCTL),
+    /* Layer3: workman */
+    KEYMAP_ANSI(
+        GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, BSPC, \
+        TAB, Q,   D,   R,   W,   B,   J,   F,   U,   P,   SCLN,LBRC,RBRC,BSLS, \
+        BSPC,A,   S,   H,   T,   G,   Y,   N,   E,   O,   I,   QUOT,     ENT,  \
+        LSFT,Z,   X,   M,   C,   V,   K,   L,   COMM,DOT, SLSH,          RSFT, \
+        LCTL,LGUI,LALT,          SPC,                     FN0, RGUI,APP, RCTL),
+    /* Layer 4: Poker with Arrow */
+    KEYMAP_ANSI(
+        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
+        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
+        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,     TRNS, \
+        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,          UP,   \
+        TRNS,TRNS,TRNS,          TRNS,                    FN1, LEFT,DOWN,RGHT),
+    /* Layer 5: Poker with Esc */
+    KEYMAP_ANSI(
+        ESC, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
+        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
+        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,     TRNS, \
+        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,          TRNS, \
+        TRNS,TRNS,TRNS,          TRNS,                    FN2, TRNS,TRNS,TRNS),
+    /* Layer 6: Poker with Arrow and Esc */
+    KEYMAP_ANSI(
+        ESC, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
+        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
+        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,     TRNS, \
+        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,          UP,   \
+        TRNS,TRNS,TRNS,          TRNS,                    FN3, LEFT,DOWN,RGHT),
+    /* Layer 7: Poker Fn'd */
+    KEYMAP_ANSI(
+        ESC, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, TRNS, \
+        TRNS,FN6, UP,  TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,CALC,TRNS,HOME,INS, TRNS, \
+        TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,PSCR,SLCK,PAUS,TRNS,FN8, END,      TRNS, \
+        TRNS,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL,           TRNS, \
+        TRNS,TRNS,TRNS,          FN5,                     FN4, TRNS,TRNS,TRNS),
+    /* Layer 8: Poker Fn'd arrow */
+    KEYMAP_ANSI(
+        ESC, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, TRNS, \
+        TRNS,FN7, UP,  TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,CALC,TRNS,HOME,INS, TRNS, \
+        TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,PSCR,SLCK,PAUS,TRNS,FN8, END,      TRNS, \
+        TRNS,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL,           PGUP, \
+        TRNS,TRNS,TRNS,          FN4,                     FN5, HOME,PGDN,END),
+    /* Layer 9: Poker Fn'd Esc */
+    KEYMAP_ANSI(
+        GRV, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, TRNS, \
+        TRNS,FN4, UP,  TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,CALC,TRNS,HOME,INS, TRNS, \
+        TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,PSCR,SLCK,PAUS,TRNS,FN8, END,      TRNS, \
+        TRNS,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL,           TRNS, \
+        TRNS,TRNS,TRNS,          FN7,                     FN6, TRNS,TRNS,TRNS),
+    /* Layer 10: Poker Fn'd Arrow + Esc */
+    KEYMAP_ANSI(
+        GRV, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, TRNS, \
+        TRNS,FN5, UP,  TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,CALC,TRNS,HOME,INS, TRNS, \
+        TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,PSCR,SLCK,PAUS,TRNS,FN8, END,      TRNS, \
+        TRNS,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL,           PGUP, \
+        TRNS,TRNS,TRNS,          FN6,                     FN7, HOME,PGDN,END),
+};
+/*
+ * Fn action definition
+ */
+static const uint16_t PROGMEM fn_actions[] = {
+    /* Poker Layout */
+    [0] = ACTION_LAYER_SET_P(7),     // FN0 move to Fn'd             when press
+    [1] = ACTION_LAYER_SET_P(8),     // FN1 move to Fn'd arrow       when press
+    [2] = ACTION_LAYER_SET_P(9),     // FN2 move to Fn'd Esc         when press
+    [3] = ACTION_LAYER_SET_P(10),    // FN3 move to Fn'd arrow + Esc when press
+    [4] = ACTION_LAYER_SET_R(0),     // FN4 move to default          when release
+    [5] = ACTION_LAYER_SET_R(4),     // FN5 move to arrow            when release
+    [6] = ACTION_LAYER_SET_R(5),     // FN6 move to Esc              when release
+    [7] = ACTION_LAYER_SET_R(6),     // FN7 move to arrow + Esc      when release
+    [8] = ACTION_RMODS_KEY(MOD_BIT(KC_RCTL)|MOD_BIT(KC_RSFT), KC_ESC), // FN8 Task(RControl,RShift+Esc)
+};
diff --git a/keyboard/gh60/keymap_poker_stack.h b/keyboard/gh60/keymap_poker_stack.h
deleted file mode 100644
index b074abaa5..000000000
--- a/keyboard/gh60/keymap_poker_stack.h
+++ /dev/null
@@ -1,77 +0,0 @@
-static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /*
-     * Poker Layer
-     */
-    /* Layer x000: Poker Default Layer
-     * ,-----------------------------------------------------------.
-     * |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |
-     * |-----------------------------------------------------------|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|
-     * |-----------------------------------------------------------|
-     * |Caps  |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return  |
-     * |-----------------------------------------------------------|
-     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |
-     * |-----------------------------------------------------------|
-     * |Ctrl|Gui |Alt |      Space             |Fn  |Gui |App |Ctrl|
-     * `-----------------------------------------------------------'
-     */
-    KEYMAP_ANSI(
-        GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, BSPC, \
-        TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   LBRC,RBRC,BSLS, \
-        LCTL,A,   S,   D,   F,   G,   H,   J,   K,   L,   SCLN,QUOT,     ENT,  \
-        LSFT,Z,   X,   C,   V,   B,   N,   M,   COMM,DOT, SLSH,          RSFT, \
-        LCTL,LGUI,LALT,          SPC,                     FN2, RGUI,APP, RCTL),
-    /* Layer 1: Poker with Arrow */
-    KEYMAP_ANSI(
-        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
-        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
-        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,     TRNS, \
-        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,          UP,   \
-        TRNS,TRNS,TRNS,          TRNS,                    TRNS,LEFT,DOWN,RGHT),
-    /* Layer 2: Poker with Esc */
-    KEYMAP_ANSI(
-        ESC, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
-        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
-        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,     TRNS, \
-        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,          TRNS, \
-        TRNS,TRNS,TRNS,          TRNS,                    TRNS,TRNS,TRNS,TRNS),
-    /* Layer 3: Poker Fn'd */
-    KEYMAP_ANSI(
-        ESC, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, TRNS, \
-        TRNS,FN1, UP,  TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,CALC,TRNS,HOME,INS, TRNS, \
-        TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,PSCR,SLCK,PAUS,TRNS,FN3, END,      TRNS, \
-        TRNS,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL,           TRNS, \
-        TRNS,TRNS,TRNS,          FN0,                     TRNS,TRNS,TRNS,TRNS),
-    /* colemak */
-    [4] = KEYMAP_ANSI(
-        GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, BSPC, \
-        TAB, Q,   W,   F,   P,   G,   J,   L,   U,   Y,   SCLN,LBRC,RBRC,BSLS, \
-        BSPC,A,   R,   S,   T,   D,   H,   N,   E,   I,   O,   QUOT,     ENT,  \
-        LSFT,Z,   X,   C,   V,   B,   K,   M,   COMM,DOT, SLSH,          RSFT, \
-        LCTL,LGUI,LALT,          SPC,                     FN2, RGUI,APP, RCTL),
-    /* dvorak */
-    KEYMAP_ANSI(
-        GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   LBRC,RBRC,BSPC, \
-        TAB, QUOT,COMM,DOT, P,   Y,   F,   G,   C,   R,   L,   SLSH,EQL, BSLS, \
-        CAPS,A,   O,   E,   U,   I,   D,   H,   T,   N,   S,   MINS,     ENT,  \
-        LSFT,SCLN,Q,   J,   K,   X,   B,   M,   W,   V,   Z,             RSFT, \
-        LCTL,LGUI,LALT,          SPC,                     FN2, RGUI,APP, RCTL),
-    /* workman */
-    KEYMAP_ANSI(
-        GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, BSPC, \
-        TAB, Q,   D,   R,   W,   B,   J,   F,   U,   P,   SCLN,LBRC,RBRC,BSLS, \
-        BSPC,A,   S,   H,   T,   G,   Y,   N,   E,   O,   I,   QUOT,     ENT,  \
-        LSFT,Z,   X,   M,   C,   V,   K,   L,   COMM,DOT, SLSH,          RSFT, \
-        LCTL,LGUI,LALT,          SPC,                     FN2, RGUI,APP, RCTL),
-};
-/*
- * Fn action definition
- */
-static const uint16_t PROGMEM fn_actions[] = {
-    /* Poker Layout */
-    [0] = ACTION_LAYER_SWITCH_TOGGLE(1),              // FN0 Poker Arrow toggle(Space)
-    [1] = ACTION_LAYER_SWITCH_TOGGLE(2),              // FN1 Poker Esc toggle(Q)
-    [2] = ACTION_LAYER_SWITCH(3),                     // FN2 Poker Fn
-    [3] = ACTION_RMODS_KEY(MOD_BIT(KC_RCTL)|MOD_BIT(KC_RSFT), KC_ESC), // FN3 Task(RControl,RShift+Esc)
-};

diff --git a/keyboard/gh60/Makefile.lufa b/keyboard/gh60/Makefile.lufa index 7548d4785..9adec24b1 100644 --- a/keyboard/gh60/Makefile.lufa +++ b/keyboard/gh60/Makefile.lufa
@@ -125,5 +125,8 @@ plain: all
125	poker: OPT_DEFS += -DKEYMAP_POKER	125	poker: OPT_DEFS += -DKEYMAP_POKER
126	poker: all	126	poker: all
127		127
128	poker_stack: OPT_DEFS += -DKEYMAP_POKER_STACK	128	poker_bit: OPT_DEFS += -DKEYMAP_POKER_SET
129	poker_stack: all	129	poker_bit: all
		130
		131	poker_bit: OPT_DEFS += -DKEYMAP_POKER_BIT
		132	poker_bit: all


diff --git a/keyboard/gh60/Makefile.pjrc b/keyboard/gh60/Makefile.pjrc index 8bca1659b..4559ce32f 100644 --- a/keyboard/gh60/Makefile.pjrc +++ b/keyboard/gh60/Makefile.pjrc
@@ -95,5 +95,8 @@ plain: all
95	poker: OPT_DEFS += -DKEYMAP_POKER	95	poker: OPT_DEFS += -DKEYMAP_POKER
96	poker: all	96	poker: all
97		97
98	poker_stack: OPT_DEFS += -DKEYMAP_POKER_STACK	98	poker_bit: OPT_DEFS += -DKEYMAP_POKER_SET
99	poker_stack: all	99	poker_bit: all
		100
		101	poker_bit: OPT_DEFS += -DKEYMAP_POKER_BIT
		102	poker_bit: all


diff --git a/keyboard/gh60/README.md b/keyboard/gh60/README.md index 405ab3dff..c11f2ae23 100644 --- a/keyboard/gh60/README.md +++ b/keyboard/gh60/README.md
@@ -47,7 +47,7 @@ See [keymap_plain.h](keymap_plain.h) for detail.
47	`-----------------------------------------------------------'	47	`-----------------------------------------------------------'
48		48
49	### 2 Poker keymap	49	### 2 Poker keymap
50	Poker layer emulation without Esc/grave bug :)	50	Poker layer emulation
51		51
52	See [keymap_poker.h](keymap_poker.h) for detail.	52	See [keymap_poker.h](keymap_poker.h) for detail.
53		53


diff --git a/keyboard/gh60/keymap.c b/keyboard/gh60/keymap.c index 9438782f2..8739aa163 100644 --- a/keyboard/gh60/keymap.c +++ b/keyboard/gh60/keymap.c
@@ -64,8 +64,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
64	#include "keymap_plain.h"	64	#include "keymap_plain.h"
65	#elif defined(KEYMAP_POKER)	65	#elif defined(KEYMAP_POKER)
66	#include "keymap_poker.h"	66	#include "keymap_poker.h"
67	#elif defined(KEYMAP_POKER_STACK)	67	#elif defined(KEYMAP_POKER_SET)
68	#include "keymap_poker_stack.h"	68	#include "keymap_poker_set.h"
		69	#elif defined(KEYMAP_POKER_BIT)
		70	#include "keymap_poker_bit.h"
69	#else	71	#else
70	static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {	72	static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
71	/*	73	/*


diff --git a/keyboard/gh60/keymap_poker.h b/keyboard/gh60/keymap_poker_bit.h index 08c24f926..7dc4efe01 100644 --- a/keyboard/gh60/keymap_poker.h +++ b/keyboard/gh60/keymap_poker_bit.h
@@ -20,44 +20,59 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20	TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS, \	20	TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS, \
21	LCTL,A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, \	21	LCTL,A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, \
22	LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RSFT, \	22	LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RSFT, \
23	LCTL,LGUI,LALT, SPC, FN3, RGUI,APP, RCTL),	23	LCTL,LGUI,LALT, SPC, FN2, RGUI,APP, RCTL),
24	/* Layer 1: Poker with Arrow */	24	/* Layer x001: Poker with Arrow */
25	KEYMAP_ANSI(	25	KEYMAP_ANSI(
26	TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \	26	TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
27	TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \	27	TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
28	TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, \	28	TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, \
29	TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, UP, \	29	TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, UP, \
30	TRNS,TRNS,TRNS, TRNS, FN4, LEFT,DOWN,RGHT),	30	TRNS,TRNS,TRNS, TRNS, FN2, LEFT,DOWN,RGHT),
31	/* Layer 2: Poker with Esc */	31	/* Layer x010: Poker with Esc */
32	KEYMAP_ANSI(	32	KEYMAP_ANSI(
33	ESC, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \	33	ESC, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
34	TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \	34	TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
35	TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, \	35	TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, \
36	TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, \	36	TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, \
37	TRNS,TRNS,TRNS, TRNS, FN5, TRNS,TRNS,TRNS),	37	TRNS,TRNS,TRNS, TRNS, FN2, TRNS,TRNS,TRNS),
38	/* Layer 3: Poker Default + Fn'd */	38	/* Layer x011: Poker with Arrow and Esc */
		39	KEYMAP_ANSI(
		40	ESC, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
		41	TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
		42	TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, \
		43	TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, UP, \
		44	TRNS,TRNS,TRNS, TRNS, FN2, LEFT,DOWN,RGHT),
		45	/*
		46	* Poker Momentary Fn Layer
		47	*/
		48	/* Layer x100: Poker Default + Fn'd */
39	KEYMAP_ANSI(	49	KEYMAP_ANSI(
40	ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS, \	50	ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS, \
41	CAPS,FN1, UP, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,CALC,TRNS,HOME,INS, TRNS, \	51	CAPS,FN1, UP, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,CALC,TRNS,HOME,INS, TRNS, \
42	TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,PSCR,SLCK,PAUS,TRNS,FN0, END, TRNS, \	52	TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,PSCR,SLCK,PAUS,TRNS,FN3, END, TRNS, \
43	TRNS,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL, UP, \	53	TRNS,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL, TRNS, \
44	TRNS,TRNS,TRNS, FN0, FN3, LEFT,DOWN,RGHT),	54	TRNS,TRNS,TRNS, FN0, FN2, TRNS,TRNS,TRNS),
45		55	/* Layer x101: Poker with Arrow + Fn'd */
46	/* Layer 4: Poker Default + Fn'd */
47	KEYMAP_ANSI(	56	KEYMAP_ANSI(
48	TRNS F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS, \	57	ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS, \
49	CAPS,FN1, UP, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,CALC,TRNS,HOME,INS, TRNS, \	58	CAPS,FN1, UP, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,CALC,TRNS,HOME,INS, TRNS, \
50	TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,PSCR,SLCK,PAUS,TRNS,FN0, END, TRNS, \	59	TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,PSCR,SLCK,PAUS,TRNS,FN3, END, TRNS, \
51	TRNS,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL, UP, \	60	TRNS,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL, PGUP, \
52	TRNS,TRNS,TRNS, FN0, FN4, HOME,PGDN,END),	61	TRNS,TRNS,TRNS, FN0, FN2, HOME,PGDN,END),
53	/* Layer 5: Poker Default + Fn'd */	62	/* Layer x110: Poker with Esc + Fn'd */
54	KEYMAP_ANSI(	63	KEYMAP_ANSI(
55	GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS, \	64	GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS, \
56	CAPS,FN1, UP, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,CALC,TRNS,HOME,INS, TRNS, \	65	CAPS,FN1, UP, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,CALC,TRNS,HOME,INS, TRNS, \
57	TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,PSCR,SLCK,PAUS,TRNS,FN0, END, TRNS, \	66	TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,PSCR,SLCK,PAUS,TRNS,FN3, END, TRNS, \
58	TRNS,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL, TRNS, \	67	TRNS,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL, TRNS, \
59	TRNS,TRNS,TRNS, FN0, FN5, TRNS,TRNS,TRNS),	68	TRNS,TRNS,TRNS, FN0, FN2, TRNS,TRNS,TRNS),
60		69	/* Layer x111: Poker with Arrow and Esc + Fn'd */
		70	KEYMAP_ANSI(
		71	GRV, F9, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS, \
		72	CAPS,FN1, UP, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,CALC,TRNS,HOME,INS, TRNS, \
		73	TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,PSCR,SLCK,PAUS,TRNS,FN3, END, TRNS, \
		74	TRNS,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL, PGUP, \
		75	TRNS,TRNS,TRNS, FN0, FN2, HOME,PGDN,END),
61	/* colemak */	76	/* colemak */
62	[8] = KEYMAP_ANSI(	77	[8] = KEYMAP_ANSI(
63	GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, \	78	GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, \
@@ -86,10 +101,9 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
86	*/	101	*/
87	static const uint16_t PROGMEM fn_actions[] = {	102	static const uint16_t PROGMEM fn_actions[] = {
88	/* Poker Layout */	103	/* Poker Layout */
89	[0] = ACTION_RMODS_KEY(MOD_BIT(KC_RCTL)\|MOD_BIT(KC_RSFT), KC_ESC), // FN0 Task(RControl,RShift+Esc)	104	[0] = ACTION_LAYER_BIT_TOGGLE(1), // FN0 Poker Arrow toggle(Space)
90	[0] = ACTION_LAYER_BIT_TOGGLE(1), // FN1 Poker Arrow toggle(Space)	105	[1] = ACTION_LAYER_BIT_TOGGLE(2), // FN1 Poker Esc toggle(Q)
91	[1] = ACTION_LAYER_BIT_TOGGLE(2), // FN2 Poker Esc toggle(Q)	106	[2] = ACTION_LAYER_BIT(4), // FN2 Poker Fn
92	[2] = ACTION_LAYER_BIT(3), // FN3 Poker Fn	107	[3] = ACTION_RMODS_KEY(MOD_BIT(KC_RCTL)\|MOD_BIT(KC_RSFT), KC_ESC), // FN3 Task(RControl,RShift+Esc)
93	[3] = ACTION_LAYER_BIT(4), // FN4 Poker Fn
94	};	108	};
95		109


diff --git a/keyboard/gh60/keymap_poker_set.h b/keyboard/gh60/keymap_poker_set.h new file mode 100644 index 000000000..9d7761798 --- /dev/null +++ b/keyboard/gh60/keymap_poker_set.h
@@ -0,0 +1,110 @@
		1	static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
		2	/* Poker Default Layer
		3	* ,-----------------------------------------------------------.
		4	* \| `\| 1\| 2\| 3\| 4\| 5\| 6\| 7\| 8\| 9\| 0\| -\| =\|Backsp \|
		5	* \|-----------------------------------------------------------\|
		6	* \|Tab \| Q\| W\| E\| R\| T\| Y\| U\| I\| O\| P\| [\| ]\| \\|
		7	* \|-----------------------------------------------------------\|
		8	* \|Caps \| A\| S\| D\| F\| G\| H\| J\| K\| L\| ;\| '\|Return \|
		9	* \|-----------------------------------------------------------\|
		10	* \|Shift \| Z\| X\| C\| V\| B\| N\| M\| ,\| .\| /\|Shift \|
		11	* \|-----------------------------------------------------------\|
		12	* \|Ctrl\|Gui \|Alt \| Space \|Fn \|Gui \|App \|Ctrl\|
		13	* `-----------------------------------------------------------'
		14	*/
		15	/* Layer 0: qwerty */
		16	KEYMAP_ANSI(
		17	GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, \
		18	TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS, \
		19	LCTL,A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, \
		20	LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RSFT, \
		21	LCTL,LGUI,LALT, SPC, FN0, RGUI,APP, RCTL),
		22	/* Layer 1: colemak */
		23	KEYMAP_ANSI(
		24	GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, \
		25	TAB, Q, W, F, P, G, J, L, U, Y, SCLN,LBRC,RBRC,BSLS, \
		26	BSPC,A, R, S, T, D, H, N, E, I, O, QUOT, ENT, \
		27	LSFT,Z, X, C, V, B, K, M, COMM,DOT, SLSH, RSFT, \
		28	LCTL,LGUI,LALT, SPC, FN0, RGUI,APP, RCTL),
		29	/* Layer 2: dvorak */
		30	KEYMAP_ANSI(
		31	GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, LBRC,RBRC,BSPC, \
		32	TAB, QUOT,COMM,DOT, P, Y, F, G, C, R, L, SLSH,EQL, BSLS, \
		33	CAPS,A, O, E, U, I, D, H, T, N, S, MINS, ENT, \
		34	LSFT,SCLN,Q, J, K, X, B, M, W, V, Z, RSFT, \
		35	LCTL,LGUI,LALT, SPC, FN0, RGUI,APP, RCTL),
		36	/* Layer3: workman */
		37	KEYMAP_ANSI(
		38	GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, \
		39	TAB, Q, D, R, W, B, J, F, U, P, SCLN,LBRC,RBRC,BSLS, \
		40	BSPC,A, S, H, T, G, Y, N, E, O, I, QUOT, ENT, \
		41	LSFT,Z, X, M, C, V, K, L, COMM,DOT, SLSH, RSFT, \
		42	LCTL,LGUI,LALT, SPC, FN0, RGUI,APP, RCTL),
		43	/* Layer 4: Poker with Arrow */
		44	KEYMAP_ANSI(
		45	TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
		46	TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
		47	TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, \
		48	TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, UP, \
		49	TRNS,TRNS,TRNS, TRNS, FN1, LEFT,DOWN,RGHT),
		50	/* Layer 5: Poker with Esc */
		51	KEYMAP_ANSI(
		52	ESC, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
		53	TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
		54	TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, \
		55	TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, \
		56	TRNS,TRNS,TRNS, TRNS, FN2, TRNS,TRNS,TRNS),
		57	/* Layer 6: Poker with Arrow and Esc */
		58	KEYMAP_ANSI(
		59	ESC, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
		60	TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
		61	TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, \
		62	TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, UP, \
		63	TRNS,TRNS,TRNS, TRNS, FN3, LEFT,DOWN,RGHT),
		64	/* Layer 7: Poker Fn'd */
		65	KEYMAP_ANSI(
		66	ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS, \
		67	TRNS,FN6, UP, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,CALC,TRNS,HOME,INS, TRNS, \
		68	TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,PSCR,SLCK,PAUS,TRNS,FN8, END, TRNS, \
		69	TRNS,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL, TRNS, \
		70	TRNS,TRNS,TRNS, FN5, FN4, TRNS,TRNS,TRNS),
		71	/* Layer 8: Poker Fn'd arrow */
		72	KEYMAP_ANSI(
		73	ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS, \
		74	TRNS,FN7, UP, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,CALC,TRNS,HOME,INS, TRNS, \
		75	TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,PSCR,SLCK,PAUS,TRNS,FN8, END, TRNS, \
		76	TRNS,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL, PGUP, \
		77	TRNS,TRNS,TRNS, FN4, FN5, HOME,PGDN,END),
		78	/* Layer 9: Poker Fn'd Esc */
		79	KEYMAP_ANSI(
		80	GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS, \
		81	TRNS,FN4, UP, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,CALC,TRNS,HOME,INS, TRNS, \
		82	TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,PSCR,SLCK,PAUS,TRNS,FN8, END, TRNS, \
		83	TRNS,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL, TRNS, \
		84	TRNS,TRNS,TRNS, FN7, FN6, TRNS,TRNS,TRNS),
		85	/* Layer 10: Poker Fn'd Arrow + Esc */
		86	KEYMAP_ANSI(
		87	GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS, \
		88	TRNS,FN5, UP, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,CALC,TRNS,HOME,INS, TRNS, \
		89	TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,PSCR,SLCK,PAUS,TRNS,FN8, END, TRNS, \
		90	TRNS,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL, PGUP, \
		91	TRNS,TRNS,TRNS, FN6, FN7, HOME,PGDN,END),
		92	};
		93
		94	/*
		95	* Fn action definition
		96	*/
		97	static const uint16_t PROGMEM fn_actions[] = {
		98	/* Poker Layout */
		99	[0] = ACTION_LAYER_SET_P(7), // FN0 move to Fn'd when press
		100	[1] = ACTION_LAYER_SET_P(8), // FN1 move to Fn'd arrow when press
		101	[2] = ACTION_LAYER_SET_P(9), // FN2 move to Fn'd Esc when press
		102	[3] = ACTION_LAYER_SET_P(10), // FN3 move to Fn'd arrow + Esc when press
		103
		104	[4] = ACTION_LAYER_SET_R(0), // FN4 move to default when release
		105	[5] = ACTION_LAYER_SET_R(4), // FN5 move to arrow when release
		106	[6] = ACTION_LAYER_SET_R(5), // FN6 move to Esc when release
		107	[7] = ACTION_LAYER_SET_R(6), // FN7 move to arrow + Esc when release
		108
		109	[8] = ACTION_RMODS_KEY(MOD_BIT(KC_RCTL)\|MOD_BIT(KC_RSFT), KC_ESC), // FN8 Task(RControl,RShift+Esc)
		110	};


diff --git a/keyboard/gh60/keymap_poker_stack.h b/keyboard/gh60/keymap_poker_stack.h deleted file mode 100644 index b074abaa5..000000000 --- a/keyboard/gh60/keymap_poker_stack.h +++ /dev/null
@@ -1,77 +0,0 @@
1	static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
2	/*
3	* Poker Layer
4	*/
5	/* Layer x000: Poker Default Layer
6	* ,-----------------------------------------------------------.
7	* \| `\| 1\| 2\| 3\| 4\| 5\| 6\| 7\| 8\| 9\| 0\| -\| =\|Backsp \|
8	* \|-----------------------------------------------------------\|
9	* \|Tab \| Q\| W\| E\| R\| T\| Y\| U\| I\| O\| P\| [\| ]\| \\|
10	* \|-----------------------------------------------------------\|
11	* \|Caps \| A\| S\| D\| F\| G\| H\| J\| K\| L\| ;\| '\|Return \|
12	* \|-----------------------------------------------------------\|
13	* \|Shift \| Z\| X\| C\| V\| B\| N\| M\| ,\| .\| /\|Shift \|
14	* \|-----------------------------------------------------------\|
15	* \|Ctrl\|Gui \|Alt \| Space \|Fn \|Gui \|App \|Ctrl\|
16	* `-----------------------------------------------------------'
17	*/
18	KEYMAP_ANSI(
19	GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, \
20	TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS, \
21	LCTL,A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, \
22	LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RSFT, \
23	LCTL,LGUI,LALT, SPC, FN2, RGUI,APP, RCTL),
24	/* Layer 1: Poker with Arrow */
25	KEYMAP_ANSI(
26	TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
27	TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
28	TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, \
29	TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, UP, \
30	TRNS,TRNS,TRNS, TRNS, TRNS,LEFT,DOWN,RGHT),
31	/* Layer 2: Poker with Esc */
32	KEYMAP_ANSI(
33	ESC, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
34	TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
35	TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, \
36	TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, \
37	TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS),
38	/* Layer 3: Poker Fn'd */
39	KEYMAP_ANSI(
40	ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS, \
41	TRNS,FN1, UP, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,CALC,TRNS,HOME,INS, TRNS, \
42	TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,PSCR,SLCK,PAUS,TRNS,FN3, END, TRNS, \
43	TRNS,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL, TRNS, \
44	TRNS,TRNS,TRNS, FN0, TRNS,TRNS,TRNS,TRNS),
45	/* colemak */
46	[4] = KEYMAP_ANSI(
47	GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, \
48	TAB, Q, W, F, P, G, J, L, U, Y, SCLN,LBRC,RBRC,BSLS, \
49	BSPC,A, R, S, T, D, H, N, E, I, O, QUOT, ENT, \
50	LSFT,Z, X, C, V, B, K, M, COMM,DOT, SLSH, RSFT, \
51	LCTL,LGUI,LALT, SPC, FN2, RGUI,APP, RCTL),
52	/* dvorak */
53	KEYMAP_ANSI(
54	GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, LBRC,RBRC,BSPC, \
55	TAB, QUOT,COMM,DOT, P, Y, F, G, C, R, L, SLSH,EQL, BSLS, \
56	CAPS,A, O, E, U, I, D, H, T, N, S, MINS, ENT, \
57	LSFT,SCLN,Q, J, K, X, B, M, W, V, Z, RSFT, \
58	LCTL,LGUI,LALT, SPC, FN2, RGUI,APP, RCTL),
59	/* workman */
60	KEYMAP_ANSI(
61	GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, \
62	TAB, Q, D, R, W, B, J, F, U, P, SCLN,LBRC,RBRC,BSLS, \
63	BSPC,A, S, H, T, G, Y, N, E, O, I, QUOT, ENT, \
64	LSFT,Z, X, M, C, V, K, L, COMM,DOT, SLSH, RSFT, \
65	LCTL,LGUI,LALT, SPC, FN2, RGUI,APP, RCTL),
66	};
67
68	/*
69	* Fn action definition
70	*/
71	static const uint16_t PROGMEM fn_actions[] = {
72	/* Poker Layout */
73	[0] = ACTION_LAYER_SWITCH_TOGGLE(1), // FN0 Poker Arrow toggle(Space)
74	[1] = ACTION_LAYER_SWITCH_TOGGLE(2), // FN1 Poker Esc toggle(Q)
75	[2] = ACTION_LAYER_SWITCH(3), // FN2 Poker Fn
76	[3] = ACTION_RMODS_KEY(MOD_BIT(KC_RCTL)\|MOD_BIT(KC_RSFT), KC_ESC), // FN3 Task(RControl,RShift+Esc)
77	};