aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2020-03-21 16:17:43 +1100
committerGitHub <noreply@github.com>2020-03-21 16:17:43 +1100
commite967471c4f955cee02c9d459e92e6ffd7844b481 (patch)
tree9e91989f7e4ada4c484854362ebe9a6cdb1a3491
parenteca3f9d9352bea960673bc6f52ff09e4b0766346 (diff)
downloadqmk_firmware-e967471c4f955cee02c9d459e92e6ffd7844b481.tar.gz
qmk_firmware-e967471c4f955cee02c9d459e92e6ffd7844b481.zip
Remove ACT_COMMAND (#8487)
* Remove ACT_COMMAND * And from action_t as well
-rw-r--r--tmk_core/common/action.c5
-rw-r--r--tmk_core/common/action_code.h12
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) {
562 action_macro_play(action_get_macro(record, action.func.id, action.func.opt)); 562 action_macro_play(action_get_macro(record, action.func.id, action.func.opt));
563 break; 563 break;
564#endif 564#endif
565 case ACT_COMMAND:
566 break;
567#ifdef SWAP_HANDS_ENABLE 565#ifdef SWAP_HANDS_ENABLE
568 case ACT_SWAP_HANDS: 566 case ACT_SWAP_HANDS:
569 switch (action.swap.code) { 567 switch (action.swap.code) {
@@ -1041,9 +1039,6 @@ void debug_action(action_t action) {
1041 case ACT_MACRO: 1039 case ACT_MACRO:
1042 dprint("ACT_MACRO"); 1040 dprint("ACT_MACRO");
1043 break; 1041 break;
1044 case ACT_COMMAND:
1045 dprint("ACT_COMMAND");
1046 break;
1047 case ACT_FUNCTION: 1042 case ACT_FUNCTION:
1048 dprint("ACT_FUNCTION"); 1043 dprint("ACT_FUNCTION");
1049 break; 1044 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/>.
87 * 1100|1111| id(8) Macro record? 87 * 1100|1111| id(8) Macro record?
88 * 88 *
89 * 1101|xxxx xxxx xxxx (reserved) 89 * 1101|xxxx xxxx xxxx (reserved)
90 * 90 * 1110|xxxx xxxx xxxx (reserved)
91 * ACT_COMMAND(1110):
92 * 1110|opt | id(8) Built-in Command exec
93 * 91 *
94 * ACT_FUNCTION(1111): 92 * ACT_FUNCTION(1111):
95 * 1111| address(12) Function? 93 * 1111| address(12) Function?
@@ -115,7 +113,6 @@ enum action_kind_id {
115 ACT_LAYER_TAP_EXT = 0b1011, /* Layer 16-31 */ 113 ACT_LAYER_TAP_EXT = 0b1011, /* Layer 16-31 */
116 /* Extensions */ 114 /* Extensions */
117 ACT_MACRO = 0b1100, 115 ACT_MACRO = 0b1100,
118 ACT_COMMAND = 0b1110,
119 ACT_FUNCTION = 0b1111 116 ACT_FUNCTION = 0b1111
120}; 117};
121 118
@@ -167,11 +164,6 @@ typedef union {
167 uint8_t page : 2; 164 uint8_t page : 2;
168 uint8_t kind : 4; 165 uint8_t kind : 4;
169 } usage; 166 } usage;
170 struct action_command {
171 uint8_t id : 8;
172 uint8_t opt : 4;
173 uint8_t kind : 4;
174 } command;
175 struct action_function { 167 struct action_function {
176 uint8_t id : 8; 168 uint8_t id : 8;
177 uint8_t opt : 4; 169 uint8_t opt : 4;
@@ -287,8 +279,6 @@ enum layer_param_tap_op {
287#define ACTION_MACRO(id) ACTION(ACT_MACRO, (id)) 279#define ACTION_MACRO(id) ACTION(ACT_MACRO, (id))
288#define ACTION_MACRO_TAP(id) ACTION(ACT_MACRO, FUNC_TAP << 8 | (id)) 280#define ACTION_MACRO_TAP(id) ACTION(ACT_MACRO, FUNC_TAP << 8 | (id))
289#define ACTION_MACRO_OPT(id, opt) ACTION(ACT_MACRO, (opt) << 8 | (id)) 281#define ACTION_MACRO_OPT(id, opt) ACTION(ACT_MACRO, (opt) << 8 | (id))
290/* Command */
291#define ACTION_COMMAND(id, opt) ACTION(ACT_COMMAND, (opt) << 8 | (id))
292/* Function */ 282/* Function */
293enum function_opts { 283enum function_opts {
294 FUNC_TAP = 0x8, /* indciates function is tappable */ 284 FUNC_TAP = 0x8, /* indciates function is tappable */