summaryrefslogtreecommitdiff
path: root/keyboard/gh60
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2013-02-15 18:48:36 +0900
committertmk <nobody@nowhere>2013-02-15 18:48:36 +0900
commitd9f287586635a401b8d6a80614bee6dbebe2f18c (patch)
tree19e9e3116127e6e966c23d499d7ea879de3b78e8 /keyboard/gh60
parentf8d289e66965f99469292370c3b9200a03254f8e (diff)
Replace layer_stack with layer_switch
Diffstat (limited to 'keyboard/gh60')
-rw-r--r--keyboard/gh60/keymap_poker.h62
-rw-r--r--keyboard/gh60/keymap_poker_stack.h6
2 files changed, 27 insertions, 41 deletions
diff --git a/keyboard/gh60/keymap_poker.h b/keyboard/gh60/keymap_poker.h
index 7dc4efe019..08c24f926c 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),
- /* Layer x001: Poker with Arrow */
+ LCTL,LGUI,LALT, SPC, FN3, 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, FN2, LEFT,DOWN,RGHT),
- /* Layer x010: Poker with Esc */
+ TRNS,TRNS,TRNS, TRNS, FN4, 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, FN2, TRNS,TRNS,TRNS),
- /* 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 */
+ TRNS,TRNS,TRNS, TRNS, FN5, TRNS,TRNS,TRNS),
+ /* Layer 3: 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,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL, TRNS, \
- TRNS,TRNS,TRNS, FN0, FN2, TRNS,TRNS,TRNS),
- /* Layer x101: Poker with Arrow + Fn'd */
+ TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,PSCR,SLCK,PAUS,TRNS,FN0, END, TRNS, \
+ TRNS,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL, UP, \
+ TRNS,TRNS,TRNS, FN0, FN3, LEFT,DOWN,RGHT),
+
+ /* 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,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL, PGUP, \
- TRNS,TRNS,TRNS, FN0, FN2, HOME,PGDN,END),
- /* Layer x110: Poker with Esc + Fn'd */
+ TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,PSCR,SLCK,PAUS,TRNS,FN0, END, TRNS, \
+ TRNS,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL, UP, \
+ TRNS,TRNS,TRNS, FN0, FN4, HOME,PGDN,END),
+ /* 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),
- /* 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),
+ TRNS,TRNS,TRNS, FN0, FN5, TRNS,TRNS,TRNS),
+
/* 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)
- [1] = ACTION_LAYER_BIT_TOGGLE(2), // FN1 Poker Esc toggle(Q)
- [2] = ACTION_LAYER_BIT(4), // FN2 Poker Fn
- [3] = ACTION_RMODS_KEY(MOD_BIT(KC_RCTL)|MOD_BIT(KC_RSFT), KC_ESC), // FN3 Task(RControl,RShift+Esc)
+ [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), // FN1 Poker Arrow toggle(Space)
+ [1] = ACTION_LAYER_BIT_TOGGLE(2), // FN2 Poker Esc toggle(Q)
+ [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 4c10193524..b074abaa5b 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)
- [1] = ACTION_LAYER_STACK_TOGGLE(2), // FN1 Poker Esc toggle(Q)
- [2] = ACTION_LAYER_STACK(3), // FN2 Poker Fn
+ [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)
};