From 37a69de0a590da213d511651bad6cc6b6c72ea91 Mon Sep 17 00:00:00 2001 From: Takeshi Nishio Date: Sun, 9 Feb 2020 22:25:59 +0900 Subject: [PATCH] =?UTF-8?q?Update=20=E3=82=B9=E3=83=97=E3=83=AA=E3=83=83?= =?UTF-8?q?=E3=83=88=E3=82=AD=E3=83=BC=E3=83=9C=E3=83=BC=E3=83=89=E5=AF=BE?= =?UTF-8?q?=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- keyboards/colice/colice.h | 25 +++++---- keyboards/colice/config.h | 4 +- keyboards/colice/keymaps/default/keymap.c | 64 +++++++++++------------ keyboards/colice/rules.mk | 2 + 4 files changed, 51 insertions(+), 44 deletions(-) diff --git a/keyboards/colice/colice.h b/keyboards/colice/colice.h index a0ec146f138..ab103943939 100644 --- a/keyboards/colice/colice.h +++ b/keyboards/colice/colice.h @@ -29,18 +29,23 @@ #define LAYOUT( \ - L40, L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, \ - L41, L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, \ - L42, L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, \ - L43, L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, \ - L44, L45, L46, L47, L48, L49 \ + L40, L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, R07, R06, R05, R04, R03, R02, R01, \ + L41, L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, R17, R16, R15, R14, R13, R12, R11, R10, \ + L42, L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, R27, R26, R25, R24, R23, R22, R21, \ + L43, L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, R38, R37, R36, R35, R34, R33, R32, R31, \ + L44, L45, L46, L47, L48, L49, R47, R46, R45, R44, R43, R42, R41 \ ) \ { \ - { L00, L01, L02, L03, L04, L05, L06, L07, L08, L09 }, \ - { L10, L11, L12, L13, L14, L15, L16, L17, L18, L19 }, \ - { L20, L21, L22, L23, L24, L25, L26, L27, L28, L29 }, \ - { L30, L31, L32, L33, L34, L35, L36, L37, L38, L39 }, \ - { L40, L41, L42, L43, L44, L45, L46, L47, L48, L49 } \ + { L00, L01, L02, L03, L04, L05, L06, L07, L08, L09 }, \ + { L10, L11, L12, L13, L14, L15, L16, L17, L18, L19 }, \ + { L20, L21, L22, L23, L24, L25, L26, L27, L28, L29 }, \ + { L30, L31, L32, L33, L34, L35, L36, L37, L38, L39 }, \ + { L40, L41, L42, L43, L44, L45, L46, L47, L48, L49 }, \ + { KC_NO, R01, R02, R03, R04, R05, R06, R07, KC_NO, KC_NO }, \ + { R10, R11, R12, R13, R14, R15, R16, R17, KC_NO, KC_NO }, \ + { KC_NO, R21, R22, R23, R24, R25, R26, R27, KC_NO, KC_NO }, \ + { KC_NO, R31, R32, R33, R34, R35, R36, R37, R38, KC_NO }, \ + { KC_NO, R41, R42, R43, R44, R45, R46, R47, KC_NO, KC_NO } \ } diff --git a/keyboards/colice/config.h b/keyboards/colice/config.h index f9fcc80ec1e..6d6cb961792 100644 --- a/keyboards/colice/config.h +++ b/keyboards/colice/config.h @@ -28,7 +28,7 @@ along with this program. If not, see . #define DESCRIPTION A custom keyboard /* key matrix size */ -#define MATRIX_ROWS 5 +#define MATRIX_ROWS 5*2 // Doubled for split keyboard #define MATRIX_COLS 10 /* @@ -51,7 +51,7 @@ along with this program. If not, see . /* * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. */ -#define SOFT_SERIAL_PIN D1 // or D1, D2, D3, E6 +#define SOFT_SERIAL_PIN D2 // or D1, D2, D3, E6 // #define BACKLIGHT_PIN B7 // #define BACKLIGHT_BREATHING diff --git a/keyboards/colice/keymaps/default/keymap.c b/keyboards/colice/keymaps/default/keymap.c index 20d129874ab..4bc556e740f 100644 --- a/keyboards/colice/keymaps/default/keymap.c +++ b/keyboards/colice/keymaps/default/keymap.c @@ -29,45 +29,37 @@ enum custom_keycodes { RAISE, ADJUST, STR_LOWER, - STR_RAISE + STR_RAISE, + STR_ADJUST }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Base */ - /* 動作確認済み [_QWERTY] = LAYOUT( - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_PSLS,KC_PAST,KC_PMNS, \ - KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_P7, KC_P8, KC_P9, KC_PMNS, \ - KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_P4, KC_P5, KC_P6, KC_PPLS, \ - KC_Z, KC_X, KC_C, KC_V, KC_B, KC_GRV, KC_P1, KC_P2, KC_P3, KC_PENT, \ - KC_ESC, KC_TAB, KC_LCTL,KC_LSFT,LOWER, KC_LALT,KC_LGUI,KC_SPC, KC_P0, KC_PDOT \ + KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_MUTE,KC_VOLU,KC_VOLD, 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_MRWD,KC_MPLY,KC_MFFD, 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, RAISE, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH,KC_UP, KC_RSFT, \ + RAISE, KC_LALT,KC_LGUI,KC_SPC, KC_P0, KC_PDOT, LOWER, KC_SPC, KC_LGUI,KC_LALT,KC_LEFT,KC_DOWN,KC_RGHT \ ), [_LOWER] = LAYOUT( - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_PSLS,KC_PAST,KC_PMNS, \ - KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_P7, KC_P8, KC_P9, KC_PMNS, \ - KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_P4, KC_P5, KC_P6, KC_PPLS, \ - KC_Z, KC_X, KC_C, KC_V, KC_B, KC_GRV, KC_P1, KC_P2, KC_P3, KC_PENT, \ - KC_ESC, KC_TAB, KC_LCTL,KC_LSFT,_______, KC_LALT,KC_LGUI,KC_SPC, KC_P0, KC_PDOT \ - )*/ - [_QWERTY] = LAYOUT( - KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_PSLS,KC_PAST,KC_PMNS, \ - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_P7, KC_P8, KC_P9, KC_PMNS, \ - KC_LCTL,KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_P4, KC_P5, KC_P6, KC_PPLS, \ - KC_LSFT,KC_Z, KC_X, KC_C, KC_V, KC_B, RAISE, KC_P1, KC_P2, KC_P3, KC_PENT, \ - LOWER, KC_LALT,KC_LGUI,KC_SPC, KC_P0, KC_PDOT \ - ), - [_LOWER] = LAYOUT( - STR_LOWER, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_PSLS,KC_PAST,KC_PMNS, \ - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_P7, KC_P8, KC_P9, KC_PMNS, \ - KC_LCTL,KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_P4, KC_P5, KC_P6, KC_PPLS, \ - KC_LSFT,KC_Z, KC_X, KC_C, KC_V, KC_B, RAISE, KC_P1, KC_P2, KC_P3, KC_PENT, \ - _______, KC_LALT,KC_LGUI,KC_SPC, KC_P0, KC_PDOT \ + STR_LOWER,_______,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, \ + _______,_______,_______,LCTL(KC_E),_______,_______,_______, _______,_______,_______,_______, _______,_______,_______,_______,KC_UP, _______,_______,_______, \ + _______,LCTL(KC_A),_______,KC_DEL, KC_RGHT,KC_ESC, KC_BSPC, _______,_______,_______,_______, KC_LEFT,KC_DOWN,KC_UP, KC_RGHT,_______,_______,_______, \ + _______,_______,_______,_______,_______,KC_LEFT,_______, _______,_______,_______,_______, _______,KC_DOWN,KC_LEFT,KC_DOWN,KC_RGHT,_______,_______,_______, \ + _______, _______,_______,_______, _______, _______, _______,_______,_______,_______,_______,_______,_______ \ ), [_RAISE] = LAYOUT( - STR_RAISE, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_PSLS,KC_PAST,KC_PMNS, \ - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_P7, KC_P8, KC_P9, KC_PMNS, \ - KC_LCTL,KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_P4, KC_P5, KC_P6, KC_PPLS, \ - KC_LSFT,KC_Z, KC_X, KC_C, KC_V, KC_B, RAISE, KC_P1, KC_P2, KC_P3, KC_PENT, \ - _______, KC_LALT,KC_LGUI,KC_SPC, KC_P0, KC_PDOT \ + STR_RAISE, 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_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_SPC, KC_LGUI,KC_LALT,KC_LEFT,KC_DOWN,KC_RGHT \ + ), + [_ADJUST] = LAYOUT( + STR_ADJUST, 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_TAB, KC_Q, KC_W, KC_E, RESET, 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_SPC, KC_LGUI,KC_LALT,KC_LEFT,KC_DOWN,KC_RGHT \ ) }; @@ -95,6 +87,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { // when keycode QMKBEST is released } break; + case STR_ADJUST: + if (record->event.pressed) { + // when keycode QMKBEST is pressed + SEND_STRING("Adjust"); + } else { + // when keycode QMKBEST is released + } + break; case LOWER: if (record->event.pressed) { lower_pressed = true; diff --git a/keyboards/colice/rules.mk b/keyboards/colice/rules.mk index 746a934180a..0710484ecaa 100644 --- a/keyboards/colice/rules.mk +++ b/keyboards/colice/rules.mk @@ -24,6 +24,8 @@ BOOTLOADER = atmel-dfu # Build Options # change yes to no to disable # +SPLIT_KEYBOARD = yes + BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration MOUSEKEY_ENABLE = no # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control