Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Remove ACT_COMMAND (#8487)

Browse source 
* Remove ACT_COMMAND

* And from action_t as well
This commit is contained in:
Ryan 2020-03-21 16:17:43 +11:00 committed by GitHub
parent eca3f9d935
commit e967471c4f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tmk_core/common/action.c
View file

@ -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)); action_macro_play(action_get_macro(record, action.func.id, action.func.opt));
break; break;
#endif #endif
case ACT_COMMAND:
break;
#ifdef SWAP_HANDS_ENABLE #ifdef SWAP_HANDS_ENABLE
case ACT_SWAP_HANDS: case ACT_SWAP_HANDS:
switch (action.swap.code) { switch (action.swap.code) {
@ -1041,9 +1039,6 @@ void debug_action(action_t action) {
case ACT_MACRO: case ACT_MACRO:
dprint("ACT_MACRO"); dprint("ACT_MACRO");
break; break;
case ACT_COMMAND:
dprint("ACT_COMMAND");
break;
case ACT_FUNCTION: case ACT_FUNCTION:
dprint("ACT_FUNCTION"); dprint("ACT_FUNCTION");
break; break;

12
tmk_core/common/action_code.h
View file

@ -87,9 +87,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
* 1100|1111| id(8) Macro record? * 1100|1111| id(8) Macro record?
* *
* 1101|xxxx xxxx xxxx (reserved) * 1101|xxxx xxxx xxxx (reserved)
* * 1110|xxxx xxxx xxxx (reserved)
* ACT_COMMAND(1110):
* 1110|opt | id(8) Built-in Command exec
* *
* ACT_FUNCTION(1111): * ACT_FUNCTION(1111):
* 1111| address(12) Function? * 1111| address(12) Function?
@ -115,7 +113,6 @@ enum action_kind_id {
ACT_LAYER_TAP_EXT = 0b1011, /* Layer 16-31 */ ACT_LAYER_TAP_EXT = 0b1011, /* Layer 16-31 */
/* Extensions */ /* Extensions */
ACT_MACRO = 0b1100, ACT_MACRO = 0b1100,
ACT_COMMAND = 0b1110,
ACT_FUNCTION = 0b1111 ACT_FUNCTION = 0b1111
}; };
@ -167,11 +164,6 @@ typedef union {
uint8_t page : 2; uint8_t page : 2;
uint8_t kind : 4; uint8_t kind : 4;
} usage; } usage;
struct action_command {
uint8_t id : 8;
uint8_t opt : 4;
uint8_t kind : 4;
} command;
struct action_function { struct action_function {
uint8_t id : 8; uint8_t id : 8;
uint8_t opt : 4; uint8_t opt : 4;
@ -287,8 +279,6 @@ enum layer_param_tap_op {
#define ACTION_MACRO(id) ACTION(ACT_MACRO, (id)) #define ACTION_MACRO(id) ACTION(ACT_MACRO, (id))
#define ACTION_MACRO_TAP(id) ACTION(ACT_MACRO, FUNC_TAP << 8 | (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)) #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 */ /* Function */
enum function_opts { enum function_opts {
FUNC_TAP = 0x8, /* indciates function is tappable */ FUNC_TAP = 0x8, /* indciates function is tappable */