Skip to content

Commit

Permalink
Remove tap toggle layers from all jp layouts
Browse files Browse the repository at this point in the history
  • Loading branch information
@jiexi
jiexi committed Dec 5, 2022
1 parent feddd93 commit 0c652fa
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 24 deletions.
18 changes: 12 additions & 6 deletions keyboard/hhkb/keymap_jp_jiexi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,16 @@ const action_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = {
#else
const action_t fn_actions[] PROGMEM = {
#endif
[0] = ACTION_LAYER_TAP_TOGGLE(1),
[1] = ACTION_LAYER_INVERT(1, ON_RELEASE),
[2] = ACTION_LAYER_TAP_TOGGLE(2),
[3] = ACTION_LAYER_INVERT(2, ON_RELEASE),
[4] = ACTION_LAYER_TAP_TOGGLE(3),
[5] = ACTION_LAYER_INVERT(3, ON_RELEASE)
// [0] = ACTION_LAYER_TAP_TOGGLE(1),
// [1] = ACTION_LAYER_INVERT(1, ON_RELEASE),
// [2] = ACTION_LAYER_TAP_TOGGLE(2),
// [3] = ACTION_LAYER_INVERT(2, ON_RELEASE),
// [4] = ACTION_LAYER_TAP_TOGGLE(3),
// [5] = ACTION_LAYER_INVERT(3, ON_RELEASE),
[0] = ACTION_LAYER_MOMENTARY(1),
[1] = ACTION_LAYER_MOMENTARY(1),
[2] = ACTION_LAYER_MOMENTARY(2),
[3] = ACTION_LAYER_MOMENTARY(2),
[4] = ACTION_LAYER_MOMENTARY(3),
[5] = ACTION_LAYER_MOMENTARY(3),
};
30 changes: 18 additions & 12 deletions keyboard/hhkb/keymap_jp_jiexi_kvm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,22 +38,22 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
* |-----------------------------------------------------------|
* | |BiD|BiU| | | | | | |Del|End|PgD|PgU| |
* |-----------------------------------------------------------|
* |Fn0|| | | | | | | | | ||Hom|PgD|End|
* |Fn1|| | | | | | | | | ||Hom|PgD|End|
* `-----------------------------------------------------------'
*/
KEYMAP_JP(PWR, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \
TRNS,MUTE,VOLD,VOLU, NO, NO, NO, NO, NO, NO,PSCR,SLCK,PAUS, \
CAPS,MPLY,MSTP,MPRV,MNXT, NO, NO, NO, NO, NO,INS,HOME,PGUP,TRNS, \
TRNS,BRTD,BRTI, NO, NO, NO, NO, NO, NO, DEL, END,PGDN,PGUP,TRNS, \
FN0 ,TRNS,TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS,HOME,PGDN, END),
FN1 ,TRNS,TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS,HOME,PGDN, END),

/* Layer 2: Movement mode (JIS BSLS)
* ,-----------------------------------------------------------.
* | |Fn6|Fn7|Fn8|Fn9| | | | | |Fn10|Fn11| | | |
* |-----------------------------------------------------------|
* | | | | |Fn12| | | | | | | | | |
* |------------------------------------------------------` |
* | |Fn14|Fn13| | | | | | | | | |Fn2| |
* | |Fn14|Fn13| | | | | | | | | |Fn3| |
* |-----------------------------------------------------------|
* | |Fn16|Fn15| | | | | | | | | | | |
* |-----------------------------------------------------------|
Expand All @@ -62,7 +62,7 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
*/
KEYMAP_JP(NO ,FN6, FN7, FN8, FN9, NO, NO, NO, NO, NO, FN10,FN11, NO, NO, NO, \
NO ,NO ,NO ,NO ,FN12, NO, NO, NO, NO, NO, NO, NO, NO, \
NO ,FN14,FN13,NO , NO, NO, NO, NO, NO, NO, NO, NO,FN2, NO, \
NO ,FN14,FN13,NO , NO, NO, NO, NO, NO, NO, NO, NO,FN3, NO, \
TRNS,FN16,FN15,NO , NO, NO, NO, NO, NO, NO, NO, NO, NO,TRNS, \
NO ,TRNS,TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS, NO, NO, NO),

Expand All @@ -74,15 +74,15 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
* |------------------------------------------------------`PENT|
* | | | | | | | * | / | | | | | | |
* |-----------------------------------------------------------|
* | | | | | | | + | - | , | . | |Fn4| Up| |
* | | | | | | | + | - | , | . | |Fn5| Up| |
* |-----------------------------------------------------------|
* | || | | | | | | | | ||Lft|Dwn|Rgt|
* `-----------------------------------------------------------'
*/
KEYMAP_JP(NO , P1, P2, P3, P4, P5, P6, P7, P8, P9, P0,PEQL,PEQL, NO,BSPC, \
NO , NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, \
NO , NO, NO, NO, NO, NO,PAST,PSLS, NO, NO, NO, NO, NO,PENT, \
TRNS, NO, NO, NO, NO, NO,PPLS,PMNS,PCMM,PDOT, NO, FN4, UP,TRNS, \
TRNS, NO, NO, NO, NO, NO,PPLS,PMNS,PCMM,PDOT, NO, FN5, UP,TRNS, \
NO ,TRNS,TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS,LEFT,DOWN,RGHT),
};

Expand All @@ -96,12 +96,18 @@ const action_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = {
#else
const action_t fn_actions[] PROGMEM = {
#endif
[0] = ACTION_LAYER_MOMENTARY(1), // ACTION_LAYER_TAP_TOGGLE
[1] = ACTION_LAYER_INVERT(1, ON_RELEASE), // replaced with Fn0
[2] = ACTION_LAYER_MOMENTARY(2), // ACTION_LAYER_TAP_TOGGLE
[3] = ACTION_LAYER_INVERT(2, ON_RELEASE), // replaced with Fn2
[4] = ACTION_LAYER_MOMENTARY(3), // ACTION_LAYER_TAP_TOGGLE
[5] = ACTION_LAYER_INVERT(3, ON_RELEASE), // replaced with Fn4
// [0] = ACTION_LAYER_TAP_TOGGLE(1),
// [1] = ACTION_LAYER_INVERT(1, ON_RELEASE),
// [2] = ACTION_LAYER_TAP_TOGGLE(2),
// [3] = ACTION_LAYER_INVERT(2, ON_RELEASE),
// [4] = ACTION_LAYER_TAP_TOGGLE(3),
// [5] = ACTION_LAYER_INVERT(3, ON_RELEASE),
[0] = ACTION_LAYER_MOMENTARY(1),
[1] = ACTION_LAYER_MOMENTARY(1),
[2] = ACTION_LAYER_MOMENTARY(2),
[3] = ACTION_LAYER_MOMENTARY(2),
[4] = ACTION_LAYER_MOMENTARY(3),
[5] = ACTION_LAYER_MOMENTARY(3),
[6] = ACTION_MACRO(0),
[7] = ACTION_MACRO(1),
[8] = ACTION_MACRO(2),
Expand Down
18 changes: 12 additions & 6 deletions keyboard/hhkb/keymap_jp_nissho_jiexi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,16 @@ const action_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = {
#else
const action_t fn_actions[] PROGMEM = {
#endif
[0] = ACTION_LAYER_TAP_TOGGLE(1),
[1] = ACTION_LAYER_INVERT(1, ON_RELEASE),
[2] = ACTION_LAYER_TAP_TOGGLE(2),
[3] = ACTION_LAYER_INVERT(2, ON_RELEASE),
[4] = ACTION_LAYER_TAP_TOGGLE(3),
[5] = ACTION_LAYER_INVERT(3, ON_RELEASE)
// [0] = ACTION_LAYER_TAP_TOGGLE(1),
// [1] = ACTION_LAYER_INVERT(1, ON_RELEASE),
// [2] = ACTION_LAYER_TAP_TOGGLE(2),
// [3] = ACTION_LAYER_INVERT(2, ON_RELEASE),
// [4] = ACTION_LAYER_TAP_TOGGLE(3),
// [5] = ACTION_LAYER_INVERT(3, ON_RELEASE),
[0] = ACTION_LAYER_MOMENTARY(1),
[1] = ACTION_LAYER_MOMENTARY(1),
[2] = ACTION_LAYER_MOMENTARY(2),
[3] = ACTION_LAYER_MOMENTARY(2),
[4] = ACTION_LAYER_MOMENTARY(3),
[5] = ACTION_LAYER_MOMENTARY(3),
};

0 comments on commit 0c652fa

Please sign in to comment.