tmk
11 years ago
2 changed files with 11 additions and 9 deletions
+ 2
- 1
common/action.c
View File
| @@ -358,6 +358,7 @@ static void process_action(keyrecord_t *record) | |||
| layer_switch(action.layer.val); | |||
| } | |||
| else { | |||
| // NOTE: This is needed by legacy keymap support | |||
| layer_switch(default_layer); | |||
| } | |||
| break; | |||
| @@ -421,7 +422,7 @@ static void process_action(keyrecord_t *record) | |||
| unregister_code(action.layer.code); | |||
| } else { | |||
| //debug("LAYER_PRESSED: No tap: NO ACTION\n"); | |||
| //TODO: this is ok? | |||
| // NOTE: This is needed by legacy keymap support | |||
| debug("LAYER_PRESSED: No tap: return to default layer\n"); | |||
| layer_switch(default_layer); | |||
| } | |||
+ 9
- 8
common/action.h
View File
| @@ -157,7 +157,7 @@ ACT_LAYER_BIT(1001): Bit-op layer | |||
| 1000|LLLL|0000 0001 set L to layer on press | |||
| 1000|LLLL|0000 0010 set L to layer on release | |||
| 1000|----|0000 0011 set default to layer on both(return to default layer) | |||
| 1000|LLLL|xxxx xxxx set L to layer while hold and send key on tap | |||
| 1000|LLLL| keycode set L to layer while hold and send key on tap | |||
| 1000|LLLL|1111 0000 set L to layer while hold and toggle on several taps | |||
| 1000|LLLL|1111 1111 set L to default and layer(on press) | |||
| @@ -165,7 +165,7 @@ ACT_LAYER_BIT(1001): Bit-op layer | |||
| 1001|BBBB|0000 0001 bit-xor layer with B on press | |||
| 1001|BBBB|0000 0010 bit-xor layer with B on release | |||
| 1001|BBBB|0000 0011 bit-xor layer with B on both(momentary) | |||
| 1001|BBBB|xxxx xxxx bit-xor layer with B while hold and send key on tap | |||
| 1001|BBBB| keycode bit-xor layer with B while hold and send key on tap | |||
| 1001|BBBB|1111 0000 bit-xor layer with B while hold and toggle on several taps | |||
| 1001|BBBB|1111 1111 bit-xor default with B and set layer(on press) | |||
| @@ -213,10 +213,10 @@ enum action_kind_id { | |||
| /* Key */ | |||
| #define ACTION_KEY(key) ACTION(ACT_LMODS, key) | |||
| /* Mods & key */ | |||
| #define ACTION_LMODS(mods) ACTION(ACT_LMODS, (mods)<<8 | 0x00) | |||
| #define ACTION_LMODS_KEY(mods, key) ACTION(ACT_LMODS, (mods)<<8 | (key)) | |||
| #define ACTION_RMODS(mods) ACTION(ACT_RMODS, (mods)<<8 | 0x00) | |||
| #define ACTION_RMODS_KEY(mods, key) ACTION(ACT_RMODS, (mods)<<8 | (key)) | |||
| #define ACTION_LMODS(mods) ACTION(ACT_LMODS, MODS4(mods)<<8 | 0x00) | |||
| #define ACTION_LMODS_KEY(mods, key) ACTION(ACT_LMODS, MODS4(mods)<<8 | (key)) | |||
| #define ACTION_RMODS(mods) ACTION(ACT_RMODS, MODS4(mods)<<8 | 0x00) | |||
| #define ACTION_RMODS_KEY(mods, key) ACTION(ACT_RMODS, MODS4(mods)<<8 | (key)) | |||
| /* Mod & key */ | |||
| #define ACTION_LMOD(mod) ACTION(ACT_LMODS, MODS4(MOD_BIT(mod))<<8 | 0x00) | |||
| #define ACTION_LMOD_KEY(mod, key) ACTION(ACT_LMODS, MODS4(MOD_BIT(mod))<<8 | (key)) | |||
| @@ -268,8 +268,9 @@ enum layer_vals_default { | |||
| /* | |||
| * Set layer | |||
| */ | |||
| /* set layer on press and set default on release */ | |||
| #define ACTION_LAYER_SET(layer) ACTION_LAYER_SET_MOMENTARY(layer) | |||
| /* set layer on press and none on release */ | |||
| #define ACTION_LAYER_SET(layer) ACTION_LAYER_SET_P(layer) | |||
| /* set layer on press and set default on release (This is needed by legacy keymap support.) */ | |||
| #define ACTION_LAYER_SET_MOMENTARY(layer) ACTION(ACT_LAYER, (layer)<<8 | LAYER_MOMENTARY) | |||
| /* set layer on press and none on release */ | |||
| #define ACTION_LAYER_SET_TOGGLE(layer) ACTION_LAYER_SET_R(layer) | |||
Loading…