summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2013-04-05 03:27:10 +0900
committertmk <nobody@nowhere>2013-04-05 03:27:10 +0900
commitfbea2a3aae5d66ecb00fcd3473f76337d34688fa (patch)
tree9d74ea9c5062a53775ebe1d01b3067d89413e084
parent25d8de6e7b9b1570e87ea48b17f180ed9326304f (diff)
Fix keymap of hhkb for new actions
-rw-r--r--common/action.h18
-rw-r--r--keyboard/hhkb/keymap.c19
2 files changed, 18 insertions, 19 deletions
diff --git a/common/action.h b/common/action.h
index 5f659337f9..98c4ef81a6 100644
--- a/common/action.h
+++ b/common/action.h
@@ -25,18 +25,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "action_macro.h"
+/* tapping count and state */
+typedef struct {
+ bool interrupted :1;
+ bool reserved2 :1;
+ bool reserved1 :1;
+ bool reserved0 :1;
+ uint8_t count :4;
+} tap_t;
+
/* Key event container for recording */
typedef struct {
keyevent_t event;
#ifndef NO_ACTION_TAPPING
- /* tapping count and state */
- struct {
- bool interrupted :1;
- bool reserved2 :1;
- bool reserved1 :1;
- bool reserved0 :1;
- uint8_t count :4;
- } tap;
+ tap_t tap;
#endif
} keyrecord_t;
diff --git a/keyboard/hhkb/keymap.c b/keyboard/hhkb/keymap.c
index 094d33af11..7afbdbec2c 100644
--- a/keyboard/hhkb/keymap.c
+++ b/keyboard/hhkb/keymap.c
@@ -186,17 +186,14 @@ enum macro_id {
* Fn action definition
*/
static const uint16_t PROGMEM fn_actions[] = {
- [0] = ACTION_DEFAULT_LAYER, // Default layer(not used)
-// [1] = ACTION_KEYMAP(1), // HHKB layer
- [1] = ACTION_KEYMAP_TAP_TOGGLE(1), // HHKB layer(toggle with 5 taps)
- [2] = ACTION_KEYMAP_TAP_KEY(2, KC_SLASH), // Cursor layer with Slash*
- [3] = ACTION_KEYMAP_TAP_KEY(3, KC_SCLN), // Mousekey layer with Semicolon*
- [4] = ACTION_RMOD_TAP_KEY(KC_RCTL, KC_ENT), // RControl with tap Enter*
- [5] = ACTION_LMOD_ONESHOT(KC_LSFT), // Oneshot Shift*
-// [6] = ACTION_KEYMAP_TAP_KEY(4, KC_SPC), // Half-qwerty layer with Space
- [6] = ACTION_KEYMAP_TAP_KEY(5, KC_SPC), // Mousekey layer with Space
-// [7] = ACTION_KEYMAP(3), // Mousekey layer
- [7] = ACTION_KEYMAP_TOGGLE(3), // Mousekey layer(toggle)
+ [0] = ACTION_DEFAULT_LAYER_SET(0), // Default layer(not used)
+ [1] = ACTION_LAYER_TAP_TOGGLE(1), // HHKB layer(toggle with 5 taps)
+ [2] = ACTION_LAYER_TAP_KEY(2, KC_SLASH), // Cursor layer with Slash*
+ [3] = ACTION_LAYER_TAP_KEY(3, KC_SCLN), // Mousekey layer with Semicolon*
+ [4] = ACTION_MODS_TAP_KEY(MOD_RCTL, KC_ENT), // RControl with tap Enter*
+ [5] = ACTION_MODS_ONESHOT(MOD_LSFT), // Oneshot Shift*
+ [6] = ACTION_LAYER_TAP_KEY(5, KC_SPC), // Mousekey layer with Space
+ [7] = ACTION_LAYER_TOGGLE(3), // Mousekey layer(toggle)
// [8] = ACTION_LMOD_TAP_KEY(KC_LCTL, KC_BSPC), // LControl with tap Backspace
// [9] = ACTION_LMOD_TAP_KEY(KC_LCTL, KC_ESC), // LControl with tap Esc