diff options
| author |  Ryan <fauxpark@gmail.com> | 2020-03-21 16:17:43 +1100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2020-03-21 16:17:43 +1100 |
| commit | e967471c4f955cee02c9d459e92e6ffd7844b481 (patch) | |
| tree | 9e91989f7e4ada4c484854362ebe9a6cdb1a3491 /tmk_core/common | |
| parent | eca3f9d9352bea960673bc6f52ff09e4b0766346 (diff) | |
| download | qmk_firmware-e967471c4f955cee02c9d459e92e6ffd7844b481.tar.gz | |
Remove ACT_COMMAND (#8487)
* Remove ACT_COMMAND
* And from action_t as well
Diffstat (limited to 'tmk_core/common')
| -rw-r--r-- | tmk_core/common/action.c | 5 | ||||
| -rw-r--r-- | tmk_core/common/action_code.h | 12 |
2 files changed, 1 insertions, 16 deletions
diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c index 555a71ebc..174faf856 100644 --- a/tmk_core/common/action.c +++ b/tmk_core/common/action.c @@ -562,8 +562,6 @@ void process_action(keyrecord_t *record, action_t action) { action_macro_play(action_get_macro(record, action.func.id, action.func.opt)); break; #endif - case ACT_COMMAND: - break; #ifdef SWAP_HANDS_ENABLE case ACT_SWAP_HANDS: switch (action.swap.code) { @@ -1041,9 +1039,6 @@ void debug_action(action_t action) { case ACT_MACRO: dprint("ACT_MACRO"); break; - case ACT_COMMAND: - dprint("ACT_COMMAND"); - break; case ACT_FUNCTION: dprint("ACT_FUNCTION"); break; diff --git a/tmk_core/common/action_code.h b/tmk_core/common/action_code.h index 6c005b76d..f80b7a782 100644 --- a/tmk_core/common/action_code.h +++ b/tmk_core/common/action_code.h @@ -87,9 +87,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. * 1100|1111| id(8) Macro record? * * 1101|xxxx xxxx xxxx (reserved) - * - * ACT_COMMAND(1110): - * 1110|opt | id(8) Built-in Command exec + * 1110|xxxx xxxx xxxx (reserved) * * ACT_FUNCTION(1111): * 1111| address(12) Function? @@ -115,7 +113,6 @@ enum action_kind_id { ACT_LAYER_TAP_EXT = 0b1011, /* Layer 16-31 */ /* Extensions */ ACT_MACRO = 0b1100, - ACT_COMMAND = 0b1110, ACT_FUNCTION = 0b1111 }; @@ -167,11 +164,6 @@ typedef union { uint8_t page : 2; uint8_t kind : 4; } usage; - struct action_command { - uint8_t id : 8; - uint8_t opt : 4; - uint8_t kind : 4; - } command; struct action_function { uint8_t id : 8; uint8_t opt : 4; @@ -287,8 +279,6 @@ enum layer_param_tap_op { #define ACTION_MACRO(id) ACTION(ACT_MACRO, (id)) #define ACTION_MACRO_TAP(id) ACTION(ACT_MACRO, FUNC_TAP << 8 | (id)) #define ACTION_MACRO_OPT(id, opt) ACTION(ACT_MACRO, (opt) << 8 | (id)) -/* Command */ -#define ACTION_COMMAND(id, opt) ACTION(ACT_COMMAND, (opt) << 8 | (id)) /* Function */ enum function_opts { FUNC_TAP = 0x8, /* indciates function is tappable */ |