From 1aa067e5414873559f59e310f38bb43e8803a45f Mon Sep 17 00:00:00 2001 From: tmk Date: Tue, 5 Mar 2013 02:42:28 +0900 Subject: Clean action.h and add keymap doc --- keyboard/gh60/keymap.c | 18 +++++++++--------- keyboard/gh60/keymap_poker.h | 12 ++++++------ keyboard/gh60/keymap_poker_set.h | 16 ++++++++-------- 3 files changed, 23 insertions(+), 23 deletions(-) (limited to 'keyboard') diff --git a/keyboard/gh60/keymap.c b/keyboard/gh60/keymap.c index af7af64d15..1f5344d4c6 100644 --- a/keyboard/gh60/keymap.c +++ b/keyboard/gh60/keymap.c @@ -204,15 +204,15 @@ static const uint8_t PROGMEM overlays[][MATRIX_ROWS][MATRIX_COLS] = {}; * Fn action definition */ static const uint16_t PROGMEM fn_actions[] = { - [0] = ACTION_KEYMAP(4), // FN0 - [1] = ACTION_KEYMAP_TAP_KEY(5, KC_SLASH), // FN1 - [2] = ACTION_KEYMAP_TAP_KEY(6, KC_SCLN), // FN2 - [3] = ACTION_KEYMAP(6), // FN3 - [4] = ACTION_KEYMAP(7), // to Layout selector - [5] = ACTION_SET_DEFAULT_LAYER(0), // set qwerty layout - [6] = ACTION_SET_DEFAULT_LAYER(1), // set colemak layout - [7] = ACTION_SET_DEFAULT_LAYER(2), // set dvorak layout - [8] = ACTION_SET_DEFAULT_LAYER(3), // set workman layout + [0] = ACTION_KEYMAP_MOMENTARY(4), + [1] = ACTION_KEYMAP_TAP_KEY(5, KC_SLASH), + [2] = ACTION_KEYMAP_TAP_KEY(6, KC_SCLN), + [3] = ACTION_KEYMAP_MOMENTARY(6), + [4] = ACTION_KEYMAP_MOMENTARY(7), // to Layout selector + [5] = ACTION_DEFAULT_LAYER_SET(0), // set qwerty layout + [6] = ACTION_DEFAULT_LAYER_SET(1), // set colemak layout + [7] = ACTION_DEFAULT_LAYER_SET(2), // set dvorak layout + [8] = ACTION_DEFAULT_LAYER_SET(3), // set workman layout }; #endif diff --git a/keyboard/gh60/keymap_poker.h b/keyboard/gh60/keymap_poker.h index 2bbda61064..3e0921ad93 100644 --- a/keyboard/gh60/keymap_poker.h +++ b/keyboard/gh60/keymap_poker.h @@ -92,13 +92,13 @@ static const uint8_t PROGMEM overlays[][MATRIX_ROWS][MATRIX_COLS] = { }; static const uint16_t PROGMEM fn_actions[] = { /* Poker Layout */ - [0] = ACTION_OVERLAY(2), // to Fn overlay + [0] = ACTION_OVERLAY_MOMENTARY(2), // to Fn overlay [1] = ACTION_OVERLAY_TOGGLE(0), // toggle arrow overlay [2] = ACTION_OVERLAY_TOGGLE(1), // toggle Esc overlay [3] = ACTION_RMODS_KEY(MOD_BIT(KC_RCTL)|MOD_BIT(KC_RSFT), KC_ESC), // Task(RControl,RShift+Esc) - [4] = ACTION_OVERLAY(3), // to Layout selector - [5] = ACTION_SET_DEFAULT_LAYER(0), // set qwerty layout - [6] = ACTION_SET_DEFAULT_LAYER(1), // set colemak layout - [7] = ACTION_SET_DEFAULT_LAYER(2), // set dvorak layout - [8] = ACTION_SET_DEFAULT_LAYER(3), // set workman layout + [4] = ACTION_OVERLAY_MOMENTARY(3), // to Layout selector + [5] = ACTION_DEFAULT_LAYER_SET(0), // set qwerty layout + [6] = ACTION_DEFAULT_LAYER_SET(1), // set colemak layout + [7] = ACTION_DEFAULT_LAYER_SET(2), // set dvorak layout + [8] = ACTION_DEFAULT_LAYER_SET(3), // set workman layout }; diff --git a/keyboard/gh60/keymap_poker_set.h b/keyboard/gh60/keymap_poker_set.h index bf4d8959f1..eaaf3159db 100644 --- a/keyboard/gh60/keymap_poker_set.h +++ b/keyboard/gh60/keymap_poker_set.h @@ -67,15 +67,15 @@ static const uint8_t PROGMEM overlays[][MATRIX_ROWS][MATRIX_COLS] = { */ static const uint16_t PROGMEM fn_actions[] = { /* Poker Layout */ - [0] = ACTION_OVERLAY_SET_P(3), // FN0 move to Fn'd when press - [1] = ACTION_OVERLAY_SET_P(4), // FN1 move to Fn'd arrow when press - [2] = ACTION_OVERLAY_SET_P(5), // FN2 move to Fn'd Esc when press - [3] = ACTION_OVERLAY_SET_P(6), // FN3 move to Fn'd arrow + Esc when press + [0] = ACTION_OVERLAY_SET(3, ON_PRESS), // FN0 move to Fn'd when press + [1] = ACTION_OVERLAY_SET(4, ON_PRESS), // FN1 move to Fn'd arrow when press + [2] = ACTION_OVERLAY_SET(5, ON_PRESS), // FN2 move to Fn'd Esc when press + [3] = ACTION_OVERLAY_SET(6, ON_PRESS), // FN3 move to Fn'd arrow + Esc when press - [4] = ACTION_OVERLAY_CLEAR, // FN4 clear overlay when release - [5] = ACTION_OVERLAY_SET_R(0), // FN5 move to arrow when release - [6] = ACTION_OVERLAY_SET_R(1), // FN6 move to Esc when release - [7] = ACTION_OVERLAY_SET_R(2), // FN7 move to arrow + Esc when release + [4] = ACTION_OVERLAY_CLEAR(ON_RELEASE), // FN4 clear overlay when release + [5] = ACTION_OVERLAY_SET(0, ON_RELEASE), // FN5 move to arrow when release + [6] = ACTION_OVERLAY_SET(1, ON_RELEASE), // FN6 move to Esc when release + [7] = ACTION_OVERLAY_SET(2, ON_RELEASE), // 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) }; -- cgit v1.2.3