From 2f6929eae105377aa47fb48ea38b21ec96513e36 Mon Sep 17 00:00:00 2001 From: Victor Date: Tue, 25 Jun 2024 16:50:10 -0500 Subject: [PATCH] Finishing removing automouse - Testing out the toggle mouse layer instead, so far it's okay --- .../charybdis/3x5/keymaps/t4corun/rules.mk | 1 - .../trackball_nano/keymaps/t4corun/config.h | 5 +--- .../trackball_nano/keymaps/t4corun/keymap.c | 27 ------------------- .../trackball_nano/keymaps/t4corun/rules.mk | 1 - users/t4corun/features/hoststateautomouse.c | 15 ----------- users/t4corun/features/hoststateautomouse.h | 3 --- users/t4corun/rules.mk | 10 ++----- users/t4corun/t4corun.c | 6 ++--- 8 files changed, 5 insertions(+), 63 deletions(-) delete mode 100644 users/t4corun/features/hoststateautomouse.c delete mode 100644 users/t4corun/features/hoststateautomouse.h diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/t4corun/rules.mk b/keyboards/bastardkb/charybdis/3x5/keymaps/t4corun/rules.mk index ac272acc..050ffde9 100644 --- a/keyboards/bastardkb/charybdis/3x5/keymaps/t4corun/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/keymaps/t4corun/rules.mk @@ -1,5 +1,4 @@ # override userspace defaults -HOST_STATE_AUTO_MOUSE = no # override keyboard defaults # keyboards\bastardkb\info.json diff --git a/keyboards/ploopyco/trackball_nano/keymaps/t4corun/config.h b/keyboards/ploopyco/trackball_nano/keymaps/t4corun/config.h index 32baad24..0c243781 100644 --- a/keyboards/ploopyco/trackball_nano/keymaps/t4corun/config.h +++ b/keyboards/ploopyco/trackball_nano/keymaps/t4corun/config.h @@ -22,7 +22,4 @@ along with this program. If not, see . #define PLOOPY_DRAGSCROLL_DIVISOR_V 20.0 #define PLOOPY_DPI_OPTIONS { 300, 550, 800, 1200 } -#define PLOOPY_DPI_DEFAULT 2 - -//#define POINTING_DEVICE_AUTO_MOUSE_ENABLE -//#define AUTO_MOUSE_DEFAULT_LAYER 1 \ No newline at end of file +#define PLOOPY_DPI_DEFAULT 2 \ No newline at end of file diff --git a/keyboards/ploopyco/trackball_nano/keymaps/t4corun/keymap.c b/keyboards/ploopyco/trackball_nano/keymaps/t4corun/keymap.c index 32504dd7..259319b2 100644 --- a/keyboards/ploopyco/trackball_nano/keymaps/t4corun/keymap.c +++ b/keyboards/ploopyco/trackball_nano/keymaps/t4corun/keymap.c @@ -18,7 +18,6 @@ along with this program. If not, see . const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( KC_NO ) - //, [1] = LAYOUT( KC_NO ) }; @@ -32,37 +31,11 @@ void keyboard_post_init_user(void) { } -/* -void pointing_device_init_user(void) { - set_auto_mouse_enable(true); -} -*/ - -/* -layer_state_t layer_state_set_user(layer_state_t state) { - switch(get_highest_layer(state)) { - case 1: - if(!host_keyboard_led_state().num_lock) { - tap_code16(KC_NUM); - } - break; - default: - if(host_keyboard_led_state().num_lock) { - tap_code16(KC_NUM); - } - break; - } - - return state; -} -*/ - bool led_update_user(led_t led_state) { // when scroll lock is pressed, toggle drag scroll state if ( scroll_lock_state != led_state.scroll_lock ) { toggle_drag_scroll(); - auto_mouse_reset_trigger(true); scroll_lock_state = led_state.scroll_lock; } diff --git a/keyboards/ploopyco/trackball_nano/keymaps/t4corun/rules.mk b/keyboards/ploopyco/trackball_nano/keymaps/t4corun/rules.mk index eafa4ad4..715f60c3 100644 --- a/keyboards/ploopyco/trackball_nano/keymaps/t4corun/rules.mk +++ b/keyboards/ploopyco/trackball_nano/keymaps/t4corun/rules.mk @@ -7,7 +7,6 @@ CAPS_WORD_ENABLE = no MOUSEKEY_ENABLE = no COMBO_ENABLE = no KEY_OVERRIDE_ENABLE = no -HOST_STATE_AUTO_MOUSE = no # override keyboard defaults # keyboards\ploopyco\trackball_nano\info.json diff --git a/users/t4corun/features/hoststateautomouse.c b/users/t4corun/features/hoststateautomouse.c deleted file mode 100644 index 1ef6048c..00000000 --- a/users/t4corun/features/hoststateautomouse.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "hoststateautomouse.h" - - -// keyboard side code to simulate auto mouse between ploopy nano and qmk keyboard -// nano pointer movement activates auto mouse layer, which toggles numlock -// when num lock is enabled, keyboard turns on mouse layer -bool led_update_user(led_t led_state) { - if(host_keyboard_led_state().num_lock) { - layer_on(_MOUSE); - } else if (!host_keyboard_led_state().num_lock) { - layer_off(_MOUSE); - } - - return true; -} \ No newline at end of file diff --git a/users/t4corun/features/hoststateautomouse.h b/users/t4corun/features/hoststateautomouse.h deleted file mode 100644 index 8d56cfb9..00000000 --- a/users/t4corun/features/hoststateautomouse.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "t4corun.h" \ No newline at end of file diff --git a/users/t4corun/rules.mk b/users/t4corun/rules.mk index 56a71d18..7bd7acc9 100644 --- a/users/t4corun/rules.mk +++ b/users/t4corun/rules.mk @@ -37,8 +37,6 @@ MOUSEKEY_ENABLE ?= yes COMBO_ENABLE ?= yes KEY_OVERRIDE_ENABLE ?= yes -# custom features -HOST_STATE_AUTO_MOUSE ?= yes #allows kb to enable mouse layer on Ploopy Nano movement # --------------------------------------------------------- # include my code that will be common across all my keyboards @@ -64,12 +62,8 @@ endif ifeq ($(strip $(OLED_ENABLE)), yes) SRC += features/oled.c -endifs +endif ifeq ($(strip $(AUDIO_ENABLE)), yes) MUSIC_MODE = no -endif - -#ifeq ($(strip $(HOST_STATE_AUTO_MOUSE)), yes) -# SRC += features/hoststateautomouse.c -#endif \ No newline at end of file +endif \ No newline at end of file diff --git a/users/t4corun/t4corun.c b/users/t4corun/t4corun.c index 2e8a003b..1b181454 100644 --- a/users/t4corun/t4corun.c +++ b/users/t4corun/t4corun.c @@ -18,11 +18,9 @@ void setLunaJumped(void) { showedJump = true;} // Hold Navigation and Number to get Symbol -#if !defined(KEYBOARD_ploopyco) layer_state_t layer_state_set_user(layer_state_t state) { return update_tri_layer_state(state, _NAVIGATION, _NUMBER, _SYMBOL); } -#endif // Customize behavior for existing keycodes or create new ones bool process_record_user(uint16_t keycode, keyrecord_t *record) { @@ -53,7 +51,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return false; -/* + // makes num lock a hold instead of toggle // prevents accidental ploopy nano going into bootloader case KC_NUM: @@ -63,7 +61,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { tap_code(KC_NUM); } return false; -*/ + case KC_SPC: if (record->event.pressed) { isJumping = true;