From dd165b1eabb5f361b04ac254976a008d80ddc9c2 Mon Sep 17 00:00:00 2001 From: Mark Date: Tue, 28 Jun 2022 12:32:31 -0700 Subject: [PATCH] Removed mouse features --- keymaps/default/keymap.c | 12 ---------- keymaps/default/layers.h | 1 - keymaps/default/layers/main.h | 2 +- keymaps/default/layers/navigate.h | 39 ------------------------------- rules.mk | 2 +- 5 files changed, 2 insertions(+), 54 deletions(-) delete mode 100644 keymaps/default/layers/navigate.h diff --git a/keymaps/default/keymap.c b/keymaps/default/keymap.c index b817c87..3fd19f0 100644 --- a/keymaps/default/keymap.c +++ b/keymaps/default/keymap.c @@ -112,7 +112,6 @@ enum layer_indices { LAYER_SYMBOLS_IDX, LAYER_ARROWS_IDX, LAYER_FKEYS_IDX, - LAYER_NAVIGATE_IDX, LAYER_DESKTOP_IDX, LAYER_KEYBOARD_IDX, @@ -133,7 +132,6 @@ enum led_indices { LAYER_SYMBOLS_LEDS_IDX, LAYER_ARROWS_LEDS_IDX, LAYER_FKEYS_LEDS_IDX, - LAYER_NAVIGATE_LEDS_IDX, LAYER_DESKTOP_LEDS_IDX }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -144,7 +142,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [LAYER_SYMBOLS_IDX] = LAYER_SYMBOLS, [LAYER_ARROWS_IDX] = LAYER_ARROWS, [LAYER_FKEYS_IDX] = LAYER_FKEYS, - [LAYER_NAVIGATE_IDX] = LAYER_NAVIGATE, [LAYER_DESKTOP_IDX] = LAYER_DESKTOP, [LAYER_KEYBOARD_IDX] = LAYER_KEYBOARD }; @@ -155,7 +152,6 @@ const uint8_t PROGMEM ledmap[][DRIVER_LED_TOTAL][3] = { [LAYER_SYMBOLS_LEDS_IDX] = LAYER_SYMBOLS_LEDS, [LAYER_ARROWS_LEDS_IDX] = LAYER_ARROWS_LEDS, [LAYER_FKEYS_LEDS_IDX] = LAYER_FKEYS_LEDS, - [LAYER_NAVIGATE_LEDS_IDX] = LAYER_NAVIGATE_LEDS, [LAYER_DESKTOP_LEDS_IDX] = LAYER_DESKTOP_LEDS }; @@ -209,9 +205,6 @@ void rgb_matrix_indicators_user(void) { case LAYER_FKEYS_IDX: set_layer_color(LAYER_FKEYS_LEDS_IDX); break; - case LAYER_NAVIGATE_IDX: - set_layer_color(LAYER_NAVIGATE_LEDS_IDX); - break; case LAYER_DESKTOP_IDX: set_layer_color(LAYER_DESKTOP_LEDS_IDX); break; @@ -335,11 +328,6 @@ uint32_t layer_state_set_user(uint32_t state) { set_lang(LANG_EN); break; - case LAYER_NAVIGATE_IDX: - set_lang(LANG_EN); - ergodox_right_led_3_on(); - break; - case LAYER_DESKTOP_IDX: set_lang(LANG_EN); break; diff --git a/keymaps/default/layers.h b/keymaps/default/layers.h index 5aba295..47073b7 100644 --- a/keymaps/default/layers.h +++ b/keymaps/default/layers.h @@ -6,7 +6,6 @@ #include "layers/symbols.h" #include "layers/arrows.h" #include "layers/fkeys.h" -#include "layers/navigate.h" #include "layers/desktop.h" #include "layers/keyboard.h" #include "layers/russian.h" diff --git a/keymaps/default/layers/main.h b/keymaps/default/layers/main.h index 07cca01..af2f683 100644 --- a/keymaps/default/layers/main.h +++ b/keymaps/default/layers/main.h @@ -14,7 +14,7 @@ \ \ LCTL(KC_LALT), KC_6, KC_7, KC_8, KC_9, KC_0, LGUI(KC_TAB),\ - KC_TRANSPARENT, KC_Y, KC_U, KC_I, KC_O, KC_TRANSPARENT, TG(LAYER_NAVIGATE_IDX),\ + KC_TRANSPARENT, KC_Y, KC_U, KC_I, KC_O, KC_TRANSPARENT, KC_TRANSPARENT,\ KC_H, KC_J, KC_K, MO(LAYER_SYMBOLS_IDX), KC_L, KC_TRANSPARENT,\ KC_TRANSPARENT, KC_N, KC_M, KC_P, KC_DOT, KC_COMMA, KC_TRANSPARENT,\ KC_RIGHT, KC_TRANSPARENT, KC_TRANSPARENT, TO(LAYER_KEYBOARD_IDX), KC_TRANSPARENT,\ diff --git a/keymaps/default/layers/navigate.h b/keymaps/default/layers/navigate.h deleted file mode 100644 index b1658f5..0000000 --- a/keymaps/default/layers/navigate.h +++ /dev/null @@ -1,39 +0,0 @@ -#pragma once -#include "keymap.h" - -#define LAYER_NAVIGATE LAYOUT_ergodox(\ - KC_TRANSPARENT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,\ - KC_TRANSPARENT, KC_NO, KC_MS_WH_UP, KC_MS_UP, KC_MS_WH_DOWN, KC_NO, KC_NO,\ - KC_TRANSPARENT, KC_NO, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_NO,\ - KC_TRANSPARENT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,\ - TO(LAYER_DESKTOP_IDX), KC_NO, KC_NO, KC_TRANSPARENT, KC_MS_BTN3,\ -\ - KC_TRANSPARENT, KC_NO,\ - KC_NO,\ - KC_MS_BTN1, KC_MS_BTN2, KC_NO,\ -\ -\ - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,\ - TO(LAYER_MAIN_IDX), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRANSPARENT,\ - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,\ - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,\ - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,\ -\ - KC_NO, KC_TRANSPARENT,\ - KC_TRANSPARENT,\ - KC_NO, KC_LGUI, KC_TRANSPARENT\ -) - -#define LAYER_NAVIGATE_LEDS LEDS_ergodox(\ - LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \ - LC_OFF, LC_OFF, LC_PINK, LC_OFF, LC_OFF, \ - LC_OFF, LC_PINK, LC_PINK, LC_PINK, LC_OFF, \ - LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \ - LC_OFF, LC_OFF, LC_OFF, LC_PINK, \ - \ - LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \ - LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \ - LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \ - LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \ - LC_OFF, LC_OFF, LC_OFF, LC_OFF \ -) diff --git a/rules.mk b/rules.mk index 8803813..96a02c9 100644 --- a/rules.mk +++ b/rules.mk @@ -18,7 +18,7 @@ BOOTLOADER = halfkay # comment out to disable the options. # BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration -MOUSEKEY_ENABLE = yes # Mouse keys +MOUSEKEY_ENABLE = no # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = yes # Commands for debug and configuration