diff options
| author | Drashna Jaelre <drashna@live.com> | 2021-08-21 18:34:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-21 18:34:16 -0700 |
| commit | f4a2f2bb7e0d745c6f126db15b94955eebc64884 (patch) | |
| tree | 7cc6cc0f4948399fd541dc138db2810bd17b683a | |
| parent | e08d6a33fc1c119e4632bdaa37e75aebbd895dbd (diff) | |
| download | qmk_firmware-f4a2f2bb7e0d745c6f126db15b94955eebc64884.tar.gz qmk_firmware-f4a2f2bb7e0d745c6f126db15b94955eebc64884.zip | |
[Keyboard] Fix compile issues for Tractyl Manuform (#14105)
4 files changed, 3 insertions, 7 deletions
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/config.h b/keyboards/handwired/tractyl_manuform/4x6_right/config.h index 0d2f1ff5a..913a9f0aa 100644 --- a/keyboards/handwired/tractyl_manuform/4x6_right/config.h +++ b/keyboards/handwired/tractyl_manuform/4x6_right/config.h | |||
| @@ -87,8 +87,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 87 | #define NO_ACTION_MACRO | 87 | #define NO_ACTION_MACRO |
| 88 | #define NO_ACTION_FUNCTION | 88 | #define NO_ACTION_FUNCTION |
| 89 | 89 | ||
| 90 | #define SERIAL_USE_MULTI_TRANSACTION | ||
| 91 | #define SPLIT_TRANSACTION_IDS_KB RPC_ID_STATE_SYNC, RPC_ID_SLAVE_STATE | ||
| 92 | |||
| 93 | /* PMW3360 Settings */ | 90 | /* PMW3360 Settings */ |
| 94 | #define PMW3360_CS_PIN B0 | 91 | #define PMW3360_CS_PIN B0 |
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/keymap.c b/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/keymap.c index 28683cef3..55a5a285c 100644 --- a/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/keymap.c +++ b/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/keymap.c | |||
| @@ -122,7 +122,7 @@ static uint16_t mouse_debounce_timer = 0; | |||
| 122 | static uint8_t mouse_keycode_tracker = 0; | 122 | static uint8_t mouse_keycode_tracker = 0; |
| 123 | bool tap_toggling = false; | 123 | bool tap_toggling = false; |
| 124 | 124 | ||
| 125 | void process_mouse_user(report_mouse_t* mouse_report, int16_t x, int16_t y) { | 125 | void process_mouse_user(report_mouse_t* mouse_report, int8_t x, int8_t y) { |
| 126 | if ((x || y) && timer_elapsed(mouse_timer) > 125) { | 126 | if ((x || y) && timer_elapsed(mouse_timer) > 125) { |
| 127 | mouse_timer = timer_read(); | 127 | mouse_timer = timer_read(); |
| 128 | if (!layer_state_is(_MOUSE) && !(layer_state_is(_GAMEPAD) || layer_state_is(_DIABLO)) && timer_elapsed(mouse_debounce_timer) > 125) { | 128 | if (!layer_state_is(_MOUSE) && !(layer_state_is(_GAMEPAD) || layer_state_is(_DIABLO)) && timer_elapsed(mouse_debounce_timer) > 125) { |
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/config.h index 6b357f133..5d75432ae 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/config.h | |||
| @@ -51,8 +51,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 51 | #define NO_ACTION_MACRO | 51 | #define NO_ACTION_MACRO |
| 52 | #define NO_ACTION_FUNCTION | 52 | #define NO_ACTION_FUNCTION |
| 53 | 53 | ||
| 54 | #define SERIAL_USE_MULTI_TRANSACTION | ||
| 55 | #define SPLIT_TRANSACTION_IDS_KB RPC_ID_KB_CONFIG_SYNC, RPC_ID_POINTER_STATE_SYNC | ||
| 56 | |||
| 57 | /* PMW3360 Settings */ | 54 | /* PMW3360 Settings */ |
| 58 | #define PMW3360_CS_PIN B0 | 55 | #define PMW3360_CS_PIN B0 |
diff --git a/keyboards/handwired/tractyl_manuform/config.h b/keyboards/handwired/tractyl_manuform/config.h index e6ab57da9..ec67cff1a 100644 --- a/keyboards/handwired/tractyl_manuform/config.h +++ b/keyboards/handwired/tractyl_manuform/config.h | |||
| @@ -41,3 +41,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 41 | //#define NO_ACTION_ONESHOT | 41 | //#define NO_ACTION_ONESHOT |
| 42 | #define NO_ACTION_MACRO | 42 | #define NO_ACTION_MACRO |
| 43 | #define NO_ACTION_FUNCTION | 43 | #define NO_ACTION_FUNCTION |
| 44 | |||
| 45 | #define SPLIT_TRANSACTION_IDS_KB RPC_ID_KB_CONFIG_SYNC, RPC_ID_POINTER_STATE_SYNC | ||
