Replace layer_stack with layer_switch

author: tmk <nobody@nowhere> 2013-02-15 18:48:36 +0900
committer: tmk <nobody@nowhere> 2013-02-15 18:48:36 +0900
commit: d9f287586635a401b8d6a80614bee6dbebe2f18c (patch)
tree: 19e9e3116127e6e966c23d499d7ea879de3b78e8 /keyboard/gh60
parent: f8d289e66965f99469292370c3b9200a03254f8e (diff)
download: qmk_firmware-d9f287586635a401b8d6a80614bee6dbebe2f18c.tar.gz
qmk_firmware-d9f287586635a401b8d6a80614bee6dbebe2f18c.zip
2 files changed, 27 insertions, 41 deletions
diff --git a/keyboard/gh60/keymap_poker.h b/keyboard/gh60/keymap_poker.h
index 7dc4efe01..08c24f926 100644
--- a/keyboard/gh60/keymap_poker.h
+++ b/keyboard/gh60/keymap_poker.h
@@ -20,59 +20,44 @@ 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,                     FN2, RGUI,APP, RCTL),
+        LCTL,LGUI,LALT,          SPC,                     FN3, RGUI,APP, RCTL),
-    /* Layer x001: Poker with Arrow */
+    /* 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,                    FN2, LEFT,DOWN,RGHT),
+        TRNS,TRNS,TRNS,          TRNS,                    FN4, LEFT,DOWN,RGHT),
-    /* Layer x010: Poker with Esc */
+    /* 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,                    FN2, TRNS,TRNS,TRNS),
+        TRNS,TRNS,TRNS,          TRNS,                    FN5, TRNS,TRNS,TRNS),
-    /* Layer x011: Poker with Arrow and Esc */
+    /* Layer 3: Poker Default + Fn'd */
-    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,FN3, END,      TRNS, \
+        TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,PSCR,SLCK,PAUS,TRNS,FN0, END,      TRNS, \
-        TRNS,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL,           TRNS, \
+        TRNS,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL,           UP,   \
-        TRNS,TRNS,TRNS,          FN0,                     FN2, TRNS,TRNS,TRNS),
+        TRNS,TRNS,TRNS,          FN0,                     FN3, LEFT,DOWN,RGHT),
-    /* Layer x101: Poker with Arrow + Fn'd */
+    /* Layer 4: Poker Default + Fn'd */
    KEYMAP_ANSI(
-        ESC, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, TRNS, \
+        TRNS 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,FN3, END,      TRNS, \
+        TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,PSCR,SLCK,PAUS,TRNS,FN0, END,      TRNS, \
-        TRNS,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL,           PGUP, \
+        TRNS,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL,           UP,   \
-        TRNS,TRNS,TRNS,          FN0,                     FN2, HOME,PGDN,END),
+        TRNS,TRNS,TRNS,          FN0,                     FN4, HOME,PGDN,END),
-    /* Layer x110: Poker with Esc + Fn'd */
+    /* Layer 5: Poker Default + 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,FN3, END,      TRNS, \
+        TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,PSCR,SLCK,PAUS,TRNS,FN0, END,      TRNS, \
        TRNS,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL,           TRNS, \
-        TRNS,TRNS,TRNS,          FN0,                     FN2, TRNS,TRNS,TRNS),
+        TRNS,TRNS,TRNS,          FN0,                     FN5, 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, \
@@ -101,9 +86,10 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
 static const uint16_t PROGMEM fn_actions[] = {
    /* Poker Layout */
-    [0] = ACTION_LAYER_BIT_TOGGLE(1),              // FN0 Poker Arrow toggle(Space)
+    [0] = ACTION_RMODS_KEY(MOD_BIT(KC_RCTL)|MOD_BIT(KC_RSFT), KC_ESC), // FN0 Task(RControl,RShift+Esc)
-    [1] = ACTION_LAYER_BIT_TOGGLE(2),              // FN1 Poker Esc toggle(Q)
+    [0] = ACTION_LAYER_BIT_TOGGLE(1),              // FN1 Poker Arrow toggle(Space)
-    [2] = ACTION_LAYER_BIT(4),                     // FN2 Poker Fn
+    [1] = ACTION_LAYER_BIT_TOGGLE(2),              // FN2 Poker Esc toggle(Q)
-    [3] = ACTION_RMODS_KEY(MOD_BIT(KC_RCTL)|MOD_BIT(KC_RSFT), KC_ESC), // FN3 Task(RControl,RShift+Esc)
+    [2] = ACTION_LAYER_BIT(3),                     // FN3 Poker Fn
+    [3] = ACTION_LAYER_BIT(4),                     // FN4 Poker Fn
 };
diff --git a/keyboard/gh60/keymap_poker_stack.h b/keyboard/gh60/keymap_poker_stack.h
index 4c1019352..b074abaa5 100644
--- a/keyboard/gh60/keymap_poker_stack.h
+++ b/keyboard/gh60/keymap_poker_stack.h
@@ -70,8 +70,8 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
 static const uint16_t PROGMEM fn_actions[] = {
    /* Poker Layout */
-    [0] = ACTION_LAYER_STACK_TOGGLE(1),              // FN0 Poker Arrow toggle(Space)
+    [0] = ACTION_LAYER_SWITCH_TOGGLE(1),              // FN0 Poker Arrow toggle(Space)
-    [1] = ACTION_LAYER_STACK_TOGGLE(2),              // FN1 Poker Esc toggle(Q)
+    [1] = ACTION_LAYER_SWITCH_TOGGLE(2),              // FN1 Poker Esc toggle(Q)
-    [2] = ACTION_LAYER_STACK(3),                     // FN2 Poker Fn
+    [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)
 };
author	tmk <nobody@nowhere>	2013-02-15 18:48:36 +0900
committer	tmk <nobody@nowhere>	2013-02-15 18:48:36 +0900
commit	d9f287586635a401b8d6a80614bee6dbebe2f18c (patch)
tree	19e9e3116127e6e966c23d499d7ea879de3b78e8 /keyboard/gh60
parent	f8d289e66965f99469292370c3b9200a03254f8e (diff)
download	qmk_firmware-d9f287586635a401b8d6a80614bee6dbebe2f18c.tar.gz qmk_firmware-d9f287586635a401b8d6a80614bee6dbebe2f18c.zip

diff --git a/keyboard/gh60/keymap_poker.h b/keyboard/gh60/keymap_poker.h index 7dc4efe01..08c24f926 100644 --- a/keyboard/gh60/keymap_poker.h +++ b/keyboard/gh60/keymap_poker.h
@@ -20,59 +20,44 @@ 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, FN2, RGUI,APP, RCTL),	23	LCTL,LGUI,LALT, SPC, FN3, RGUI,APP, RCTL),
24	/* Layer x001: Poker with Arrow */	24	/* Layer 1: 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, FN2, LEFT,DOWN,RGHT),	30	TRNS,TRNS,TRNS, TRNS, FN4, LEFT,DOWN,RGHT),
31	/* Layer x010: Poker with Esc */	31	/* Layer 2: 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, FN2, TRNS,TRNS,TRNS),	37	TRNS,TRNS,TRNS, TRNS, FN5, TRNS,TRNS,TRNS),
38	/* Layer x011: Poker with Arrow and Esc */	38	/* Layer 3: Poker Default + Fn'd */
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 */
49	KEYMAP_ANSI(	39	KEYMAP_ANSI(
50	ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS, \	40	ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS, \
51	CAPS,FN1, UP, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,CALC,TRNS,HOME,INS, TRNS, \	41	CAPS,FN1, UP, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,CALC,TRNS,HOME,INS, TRNS, \
52	TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,PSCR,SLCK,PAUS,TRNS,FN3, END, TRNS, \	42	TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,PSCR,SLCK,PAUS,TRNS,FN0, END, TRNS, \
53	TRNS,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL, TRNS, \	43	TRNS,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL, UP, \
54	TRNS,TRNS,TRNS, FN0, FN2, TRNS,TRNS,TRNS),	44	TRNS,TRNS,TRNS, FN0, FN3, LEFT,DOWN,RGHT),
55	/* Layer x101: Poker with Arrow + Fn'd */	45
		46	/* Layer 4: Poker Default + Fn'd */
56	KEYMAP_ANSI(	47	KEYMAP_ANSI(
57	ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS, \	48	TRNS F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS, \
58	CAPS,FN1, UP, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,CALC,TRNS,HOME,INS, TRNS, \	49	CAPS,FN1, UP, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,CALC,TRNS,HOME,INS, TRNS, \
59	TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,PSCR,SLCK,PAUS,TRNS,FN3, END, TRNS, \	50	TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,PSCR,SLCK,PAUS,TRNS,FN0, END, TRNS, \
60	TRNS,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL, PGUP, \	51	TRNS,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL, UP, \
61	TRNS,TRNS,TRNS, FN0, FN2, HOME,PGDN,END),	52	TRNS,TRNS,TRNS, FN0, FN4, HOME,PGDN,END),
62	/* Layer x110: Poker with Esc + Fn'd */	53	/* Layer 5: Poker Default + Fn'd */
63	KEYMAP_ANSI(	54	KEYMAP_ANSI(
64	GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS, \	55	GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS, \
65	CAPS,FN1, UP, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,CALC,TRNS,HOME,INS, TRNS, \	56	CAPS,FN1, UP, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,CALC,TRNS,HOME,INS, TRNS, \
66	TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,PSCR,SLCK,PAUS,TRNS,FN3, END, TRNS, \	57	TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,PSCR,SLCK,PAUS,TRNS,FN0, END, TRNS, \
67	TRNS,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL, TRNS, \	58	TRNS,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL, TRNS, \
68	TRNS,TRNS,TRNS, FN0, FN2, TRNS,TRNS,TRNS),	59	TRNS,TRNS,TRNS, FN0, FN5, TRNS,TRNS,TRNS),
69	/* Layer x111: Poker with Arrow and Esc + Fn'd */	60
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),
76	/* colemak */	61	/* colemak */
77	[8] = KEYMAP_ANSI(	62	[8] = KEYMAP_ANSI(
78	GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, \	63	GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, \
@@ -101,9 +86,10 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
101	*/	86	*/
102	static const uint16_t PROGMEM fn_actions[] = {	87	static const uint16_t PROGMEM fn_actions[] = {
103	/* Poker Layout */	88	/* Poker Layout */
104	[0] = ACTION_LAYER_BIT_TOGGLE(1), // FN0 Poker Arrow toggle(Space)	89	[0] = ACTION_RMODS_KEY(MOD_BIT(KC_RCTL)\|MOD_BIT(KC_RSFT), KC_ESC), // FN0 Task(RControl,RShift+Esc)
105	[1] = ACTION_LAYER_BIT_TOGGLE(2), // FN1 Poker Esc toggle(Q)	90	[0] = ACTION_LAYER_BIT_TOGGLE(1), // FN1 Poker Arrow toggle(Space)
106	[2] = ACTION_LAYER_BIT(4), // FN2 Poker Fn	91	[1] = ACTION_LAYER_BIT_TOGGLE(2), // FN2 Poker Esc toggle(Q)
107	[3] = ACTION_RMODS_KEY(MOD_BIT(KC_RCTL)\|MOD_BIT(KC_RSFT), KC_ESC), // FN3 Task(RControl,RShift+Esc)	92	[2] = ACTION_LAYER_BIT(3), // FN3 Poker Fn
		93	[3] = ACTION_LAYER_BIT(4), // FN4 Poker Fn
108	};	94	};
109		95


diff --git a/keyboard/gh60/keymap_poker_stack.h b/keyboard/gh60/keymap_poker_stack.h index 4c1019352..b074abaa5 100644 --- a/keyboard/gh60/keymap_poker_stack.h +++ b/keyboard/gh60/keymap_poker_stack.h
@@ -70,8 +70,8 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
70	*/	70	*/
71	static const uint16_t PROGMEM fn_actions[] = {	71	static const uint16_t PROGMEM fn_actions[] = {
72	/* Poker Layout */	72	/* Poker Layout */
73	[0] = ACTION_LAYER_STACK_TOGGLE(1), // FN0 Poker Arrow toggle(Space)	73	[0] = ACTION_LAYER_SWITCH_TOGGLE(1), // FN0 Poker Arrow toggle(Space)
74	[1] = ACTION_LAYER_STACK_TOGGLE(2), // FN1 Poker Esc toggle(Q)	74	[1] = ACTION_LAYER_SWITCH_TOGGLE(2), // FN1 Poker Esc toggle(Q)
75	[2] = ACTION_LAYER_STACK(3), // FN2 Poker Fn	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)	76	[3] = ACTION_RMODS_KEY(MOD_BIT(KC_RCTL)\|MOD_BIT(KC_RSFT), KC_ESC), // FN3 Task(RControl,RShift+Esc)
77	};	77	};