From 587d5e22bb7043b77ca75b94e1d3cf114c7fb30b Mon Sep 17 00:00:00 2001 From: Takeshi Nishio Date: Sun, 16 Feb 2020 12:42:07 +0900 Subject: [PATCH] =?UTF-8?q?Change=20NumLock=E3=81=AE=E8=AA=A4=E7=88=86?= =?UTF-8?q?=E9=98=B2=E6=AD=A2=E3=81=AE=E3=81=9F=E3=82=81=E3=80=81=E4=BA=8C?= =?UTF-8?q?=E5=BA=A6=E6=8A=BC=E3=81=97=E3=81=A7=E3=83=AC=E3=82=A4=E3=83=A4?= =?UTF-8?q?=E3=83=BC=E3=83=88=E3=82=B0=E3=83=AB=E3=81=99=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- keyboards/colice/keymaps/default/config.h | 1 + keyboards/colice/keymaps/default/keymap.c | 15 ++++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/keyboards/colice/keymaps/default/config.h b/keyboards/colice/keymaps/default/config.h index b4139651f5f..9ae8d1fc236 100644 --- a/keyboards/colice/keymaps/default/config.h +++ b/keyboards/colice/keymaps/default/config.h @@ -17,3 +17,4 @@ #pragma once // place overrides here +#define TAPPING_TOGGLE 2 diff --git a/keyboards/colice/keymaps/default/keymap.c b/keyboards/colice/keymaps/default/keymap.c index 960f7697b51..1f5cbb5b8b5 100644 --- a/keyboards/colice/keymaps/default/keymap.c +++ b/keyboards/colice/keymaps/default/keymap.c @@ -37,24 +37,25 @@ enum custom_keycodes { ADJUST }; -#define TG_NUM TG(_NUM) +#define TG_NUM TT(_NUM) #define SP_LOW LT(_LOWER, KC_SPC) -#define SP_GUI MT(MOD_LALT, KC_SPC) +#define SP_GUI MT(MOD_LGUI, KC_SPC) +#define SP_SFT MT(MOD_LSFT, KC_SPC) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT( KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_PSLS,KC_PAST,TG_NUM, KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSPC, \ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,KC_RBRC,KC_BSLS, \ - KC_LCTL,KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_MRWD,KC_MPLY,KC_MFFD,KC_PPLS, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT,KC_ENT, \ + KC_LCTL,KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_MPRV,KC_MPLY,KC_MNXT,KC_PPLS, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT,KC_ENT, \ KC_LSFT,KC_Z, KC_X, KC_C, KC_V, KC_B, LOWER, KC_MUTE,KC_VOLD,KC_VOLU,KC_PENT, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,KC_UP, \ - RAISE, KC_LALT,KC_LGUI,KC_SPC, KC_P0, KC_PDOT, LOWER, SP_GUI, KC_LALT, RAISE,KC_LEFT,KC_DOWN,KC_RGHT \ + RAISE, KC_LALT,KC_LGUI,SP_SFT, KC_P0, KC_PDOT, LOWER, SP_GUI, KC_LALT, RAISE,KC_LEFT,KC_DOWN,KC_RGHT \ ), [_NUM] = LAYOUT( _______, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_PSLS,KC_PAST,TG_NUM, KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSPC, \ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,KC_RBRC,KC_BSLS, \ KC_LCTL,KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT,KC_ENT, \ KC_LSFT,KC_Z, KC_X, KC_C, KC_V, KC_B, LOWER, KC_P1, KC_P2, KC_P3, KC_PENT, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,KC_UP, \ - RAISE, KC_LALT,KC_LGUI,KC_SPC, KC_P0, KC_PDOT, _______,_______,_______, _______,KC_LEFT,KC_DOWN,KC_RGHT \ + RAISE, KC_LALT,KC_LGUI,_______, KC_P0, KC_PDOT, _______,_______,_______, _______,KC_LEFT,KC_DOWN,KC_RGHT \ ), [_LOWER] = LAYOUT( _______,_______,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______,_______,_______, KC_F7, KC_F8, KC_F9,KC_F10, KC_F11, KC_F12, KC_DEL, \ @@ -68,14 +69,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,KC_RBRC,KC_BSLS, \ KC_LCTL,KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT,KC_ENT, \ KC_LSFT,KC_Z, KC_X, KC_C, KC_V, KC_B, _______, KC_P1, KC_P2, KC_P3, KC_PENT, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH,KC_UP, KC_RSFT, \ - _______, KC_LALT,KC_LGUI,KC_SPC, KC_P0, KC_PDOT, _______,_______,_______, _______,KC_LEFT,KC_DOWN,KC_RGHT \ + _______, KC_LALT,KC_LGUI,_______, KC_P0, KC_PDOT, _______,_______,_______, _______,KC_LEFT,KC_DOWN,KC_RGHT \ ), [_ADJUST] = LAYOUT( _______, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_PSLS,KC_PAST,KC_PMNS, KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSPC, \ _______, KC_Q, KC_W, KC_E, RESET, KC_T, KC_Y, RGB_TOG,RGB_MOD,RGB_RMOD, KC_PMNS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,KC_RBRC,KC_BSLS, \ KC_LCTL,KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, RGB_HUI,RGB_SAI,RGB_VAI, KC_PPLS, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT,KC_ENT, \ KC_LSFT,KC_Z, KC_X, KC_C, KC_V, KC_B, _______, RGB_HUD,RGB_SAD,RGB_VAD, KC_PENT, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH,KC_UP, KC_RSFT, \ - _______, KC_LALT,KC_LGUI,KC_SPC, KC_P0, KC_PDOT, _______,_______,_______, _______,KC_LEFT,KC_DOWN,KC_RGHT \ + _______, KC_LALT,KC_LGUI,_______, KC_P0, KC_PDOT, _______,_______,_______, _______,KC_LEFT,KC_DOWN,KC_RGHT \ ) };