diff options
| author | Konstantin Đorđević <vomindoraan@gmail.com> | 2018-11-16 17:55:37 +0100 |
|---|---|---|
| committer | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2018-11-16 08:55:37 -0800 |
| commit | defcfb4953d49a0fc72ecf49faeac0534aafc190 (patch) | |
| tree | c5f7a3383dc131b46aced01a3211793b33d8846f /keyboards/whitefox | |
| parent | b49f37dce97b1f84659146e7bbe4a55804407072 (diff) | |
| download | qmk_firmware-defcfb4953d49a0fc72ecf49faeac0534aafc190.tar.gz qmk_firmware-defcfb4953d49a0fc72ecf49faeac0534aafc190.zip | |
Update whitefox/konstantin keymap (#4436)
* Add more spacing in keymaps
* Enable link-time optimization
* Disable deprecated TMK actions, change spacing in config.h
* Remove unrelated rules.mk options
Diffstat (limited to 'keyboards/whitefox')
| -rw-r--r-- | keyboards/whitefox/keymaps/konstantin/config.h | 19 | ||||
| -rw-r--r-- | keyboards/whitefox/keymaps/konstantin/keymap.c | 30 | ||||
| -rw-r--r-- | keyboards/whitefox/keymaps/konstantin/rules.mk | 6 |
3 files changed, 28 insertions, 27 deletions
diff --git a/keyboards/whitefox/keymaps/konstantin/config.h b/keyboards/whitefox/keymaps/konstantin/config.h index d1c3002d2..ee30dbece 100644 --- a/keyboards/whitefox/keymaps/konstantin/config.h +++ b/keyboards/whitefox/keymaps/konstantin/config.h | |||
| @@ -5,15 +5,18 @@ | |||
| 5 | #undef IS_COMMAND | 5 | #undef IS_COMMAND |
| 6 | #define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RCTL))) | 6 | #define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RCTL))) |
| 7 | 7 | ||
| 8 | #define MAGIC_KEY_LAYER0_ALT1 BSLS | 8 | #define MAGIC_KEY_LAYER0_ALT1 BSLS |
| 9 | #define MAGIC_KEY_BOOTLOADER ESC | 9 | #define MAGIC_KEY_BOOTLOADER ESC |
| 10 | 10 | ||
| 11 | #define MOUSEKEY_DELAY 50 | 11 | #define MOUSEKEY_DELAY 50 |
| 12 | #define MOUSEKEY_INTERVAL 15 | 12 | #define MOUSEKEY_INTERVAL 15 |
| 13 | #define MOUSEKEY_MAX_SPEED 4 | 13 | #define MOUSEKEY_MAX_SPEED 4 |
| 14 | #define MOUSEKEY_TIME_TO_MAX 50 | 14 | #define MOUSEKEY_TIME_TO_MAX 50 |
| 15 | #define MOUSEKEY_WHEEL_MAX_SPEED 1 | 15 | #define MOUSEKEY_WHEEL_MAX_SPEED 1 |
| 16 | #define MOUSEKEY_WHEEL_TIME_TO_MAX 50 | 16 | #define MOUSEKEY_WHEEL_TIME_TO_MAX 50 |
| 17 | |||
| 18 | #define NO_ACTION_FUNCTION | ||
| 19 | #define NO_ACTION_MACRO | ||
| 17 | 20 | ||
| 18 | #define PERMISSIVE_HOLD | 21 | #define PERMISSIVE_HOLD |
| 19 | #define TAPPING_TERM 200 | 22 | #define TAPPING_TERM 200 |
diff --git a/keyboards/whitefox/keymaps/konstantin/keymap.c b/keyboards/whitefox/keymaps/konstantin/keymap.c index 6732d9a01..55db5ca6b 100644 --- a/keyboards/whitefox/keymaps/konstantin/keymap.c +++ b/keyboards/whitefox/keymaps/konstantin/keymap.c | |||
| @@ -151,11 +151,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 151 | * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ | 151 | * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ |
| 152 | */ | 152 | */ |
| 153 | [L_BASE] = LAYOUT_truefox( \ | 153 | [L_BASE] = LAYOUT_truefox( \ |
| 154 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSLS,KC_GRV, KC_PSCR, \ | 154 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, KC_PSCR, \ |
| 155 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,KC_RBRC,KC_BSPC, KC_DEL, \ | 155 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_DEL, \ |
| 156 | FN_CAPS,KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT, KC_ENT, KC_PGUP, \ | 156 | FN_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, \ |
| 157 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH,RCT_RSF, KC_UP, KC_PGDN, \ | 157 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RCT_RSF, KC_UP, KC_PGDN, \ |
| 158 | KC_LCTL,KC_LGUI,KC_LALT, KC_SPC, RAL_RGU,FN_FNLK, KC_LEFT,KC_DOWN,KC_RGHT \ | 158 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, RAL_RGU, FN_FNLK, KC_LEFT, KC_DOWN, KC_RGHT \ |
| 159 | ), | 159 | ), |
| 160 | 160 | ||
| 161 | /* Function layer | 161 | /* Function layer |
| @@ -172,11 +172,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 172 | * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ | 172 | * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ |
| 173 | */ | 173 | */ |
| 174 | [L_FN] = LAYOUT_truefox( \ | 174 | [L_FN] = LAYOUT_truefox( \ |
| 175 | _______,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, NUMPAD, KC_SLCK,KC_PAUS, \ | 175 | _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, NUMPAD, KC_SLCK, KC_PAUS, \ |
| 176 | KC_BTN4,KC_BTN2,KC_MS_U,KC_BTN1,KC_BTN3,KC_BTN5,_______,_______,_______,KC_MSTP,KC_MPLY,KC_MPRV,KC_MNXT,CLEAR, KC_INS, \ | 176 | KC_BTN4, KC_BTN2, KC_MS_U, KC_BTN1, KC_BTN3, KC_BTN5, _______, _______, _______, KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT, CLEAR, KC_INS, \ |
| 177 | _______,KC_MS_L,KC_MS_D,KC_MS_R,KC_WH_U,_______,_______,_______,_______,_______,_______,_______, _______, TOP, \ | 177 | _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_U, _______, _______, _______, _______, _______, _______, _______, _______, TOP, \ |
| 178 | _______, KC_ACL0,KC_ACL2,KC_WH_L,KC_WH_R,_______,_______,_______,KC_VOLD,KC_VOLU,KC_MUTE,KC_APP, KC_PGUP,BOTTOM, \ | 178 | _______, KC_ACL0, KC_ACL2, KC_WH_L, KC_WH_R, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_APP, KC_PGUP, BOTTOM, \ |
| 179 | _______,DESKTOP,DSKTP_L, KC_WH_D, DSKTP_R,_______, KC_HOME,KC_PGDN,KC_END \ | 179 | _______, DESKTOP, DSKTP_L, KC_WH_D, DSKTP_R, _______, KC_HOME, KC_PGDN, KC_END \ |
| 180 | ), | 180 | ), |
| 181 | 181 | ||
| 182 | /* Numpad layer | 182 | /* Numpad layer |
| @@ -193,10 +193,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 193 | * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ | 193 | * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ |
| 194 | */ | 194 | */ |
| 195 | [L_NUMPAD] = LAYOUT_truefox( \ | 195 | [L_NUMPAD] = LAYOUT_truefox( \ |
| 196 | NUMPAD, _______,_______,_______,_______,_______,_______,KC_P7, KC_P8, KC_P9, KC_PMNS,MINUS, EQUALS, NUMPAD, _______,_______, \ | 196 | NUMPAD, _______, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, MINUS, EQUALS, NUMPAD, _______, _______, \ |
| 197 | _______,_______,_______,_______,_______,_______,_______,KC_P4, KC_P5, KC_P6, KC_PPLS,L_PAREN,R_PAREN,_______, _______, \ | 197 | _______, _______, _______, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, L_PAREN, R_PAREN, _______, _______, \ |
| 198 | _______,_______,_______,_______,_______,_______,_______,KC_P1, KC_P2, KC_P3, KC_PAST,TIMES, KC_PENT, _______, \ | 198 | _______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_PAST, TIMES, KC_PENT, _______, \ |
| 199 | _______, _______,_______,_______,_______,_______,KC_P0, KC_P0, COMMA, KC_PDOT,KC_PSLS,DIVIDE, _______,_______, \ | 199 | _______, _______, _______, _______, _______, _______, KC_P0, KC_P0, COMMA, KC_PDOT, KC_PSLS, DIVIDE, _______, _______, \ |
| 200 | _______,_______,_______, _______, _______,_______, _______,_______,_______ \ | 200 | _______, _______, _______, _______, _______, _______, _______, _______, _______ \ |
| 201 | ), | 201 | ), |
| 202 | }; | 202 | }; |
diff --git a/keyboards/whitefox/keymaps/konstantin/rules.mk b/keyboards/whitefox/keymaps/konstantin/rules.mk index 8fbc1f3af..96722d1d5 100644 --- a/keyboards/whitefox/keymaps/konstantin/rules.mk +++ b/keyboards/whitefox/keymaps/konstantin/rules.mk | |||
| @@ -1,15 +1,13 @@ | |||
| 1 | AUDIO_ENABLE = no | ||
| 2 | BACKLIGHT_ENABLE = no | 1 | BACKLIGHT_ENABLE = no |
| 3 | BLUETOOTH_ENABLE = no | ||
| 4 | BOOTMAGIC_ENABLE = no | 2 | BOOTMAGIC_ENABLE = no |
| 5 | COMMAND_ENABLE = yes | 3 | COMMAND_ENABLE = yes |
| 6 | CONSOLE_ENABLE = yes | 4 | CONSOLE_ENABLE = yes |
| 7 | EXTRAKEY_ENABLE = yes | 5 | EXTRAKEY_ENABLE = yes |
| 8 | MIDI_ENABLE = no | ||
| 9 | MOUSEKEY_ENABLE = yes | 6 | MOUSEKEY_ENABLE = yes |
| 10 | NKRO_ENABLE = yes | 7 | NKRO_ENABLE = yes |
| 11 | RGBLIGHT_ENABLE = no | ||
| 12 | SLEEP_LED_ENABLE = no | 8 | SLEEP_LED_ENABLE = no |
| 13 | TAP_DANCE_ENABLE = yes | 9 | TAP_DANCE_ENABLE = yes |
| 14 | UNICODE_ENABLE = yes | 10 | UNICODE_ENABLE = yes |
| 15 | VISUALIZER_ENABLE = no | 11 | VISUALIZER_ENABLE = no |
| 12 | |||
| 13 | EXTRAFLAGS += -flto | ||
