From 2b39de1b4ba2fcbf42d34494f8741dc64cd4d2e0 Mon Sep 17 00:00:00 2001 From: M47CH4N Date: Sun, 1 Sep 2019 19:56:19 +0900 Subject: [PATCH 1/9] Add m47ch4n's keymap --- .../ergodash/rev1/keymaps/m47ch4n/config.h | 33 +++ .../ergodash/rev1/keymaps/m47ch4n/keymap.c | 273 ++++++++++++++++++ .../ergodash/rev1/keymaps/m47ch4n/rules.mk | 3 + 3 files changed, 309 insertions(+) create mode 100644 keyboards/ergodash/rev1/keymaps/m47ch4n/config.h create mode 100644 keyboards/ergodash/rev1/keymaps/m47ch4n/keymap.c create mode 100644 keyboards/ergodash/rev1/keymaps/m47ch4n/rules.mk diff --git a/keyboards/ergodash/rev1/keymaps/m47ch4n/config.h b/keyboards/ergodash/rev1/keymaps/m47ch4n/config.h new file mode 100644 index 000000000000..df04873a97ec --- /dev/null +++ b/keyboards/ergodash/rev1/keymaps/m47ch4n/config.h @@ -0,0 +1,33 @@ +/* +This is the c configuration file for the keymap + +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#pragma once + + +/* Use I2C or Serial, not both */ + +#define USE_SERIAL +// #define USE_I2C + +/* Select hand configuration */ + +#define MASTER_LEFT +// #define MASTER_RIGHT +// #define EE_HANDS diff --git a/keyboards/ergodash/rev1/keymaps/m47ch4n/keymap.c b/keyboards/ergodash/rev1/keymaps/m47ch4n/keymap.c new file mode 100644 index 000000000000..e185cf9ae6ca --- /dev/null +++ b/keyboards/ergodash/rev1/keymaps/m47ch4n/keymap.c @@ -0,0 +1,273 @@ +#include QMK_KEYBOARD_H +#include "keymap_jp.h" + +extern keymap_config_t keymap_config; + +#define _QWERTY 0 +#define _LOWER 1 +#define _RAISE 2 +#define _ADJUST 16 + +enum custom_keycodes { + JP = SAFE_RANGE, + US, + SHIFT, + QWERTY, + LOWER, + RAISE, + ADJUST, + Z_0, + Z_1, + Z_2, + Z_3, + Z_4, + Z_5, + Z_6, + Z_7, + Z_8, + Z_9, + CIRC, + AT, + LBRC, + RBRC, + BSLS, + AMPR, + QUOT, + LPRN, + RPRN, + EQL, + TILD, + PIPE, + GRV, + LCBR, + PLUS, + ASTR, + RCBR, + UNDS, + MINS, + SCLN, + COMM, + DOT, + SLSH, + EXLM, + HASH, + DLR, + PERC, + DEL +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* Qwerty + * ,----------------------------------------------------------------------------------------------------------------------. + * | ESC | 1 | 2 | 3 | 4 | 5 | [ | | ] | 6 | 7 | 8 | 9 | 0 | ` | + * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| + * | Tab | Q | W | E | R | T | - | | = | Y | U | I | O | P | \ | + * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| + * | Ctrl | A | S | D | F | G | Bksp | | Bksp | H | J | K | L | ; | ' | + * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| + * | Shift| Z | X | C | V | B | Shift| | Shift| N | M | , | . | / | Shift| + * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| + * | Shift|Adjust| ALt | GUI |||||||| Lower| Space| |||||||| | Enter| Raise|||||||| GUI | ALt |Adjust| Shift| + * ,----------------------------------------------------------------------------------------------------------------------. + */ + [_QWERTY] = LAYOUT( \ + KC_ESC, Z_1, Z_2, Z_3, Z_4, Z_5, LBRC , RBRC, Z_6, Z_7, Z_8, Z_9, Z_0, GRV , \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, MINS , EQL, KC_Y, KC_U, KC_I, KC_O, KC_P, BSLS , \ + KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, KC_BSPC, KC_BSPC, KC_H, KC_J, KC_K, KC_L, SCLN, QUOT , \ + SHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, SHIFT , SHIFT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SHIFT , \ + SHIFT, ADJUST, KC_LALT, KC_LCTL, LOWER, KC_SPC ,XXXXXXX, XXXXXXX,KC_ENT , RAISE, KC_LCTL, KC_LALT, ADJUST, SHIFT \ + ), + + /* Lower + * ,----------------------------------------------------------------------------------------------------------------------. + * | F11 | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F12 | + * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| + * | ~ | ! | @ | # | $ | % | | | | ^ | & | * | ( | ) | | | + * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| + * | Tab | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | Enter| + * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| + * | | | | | - | [ | | | | ] | = | | | | | + * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| + * | | | | |||||||| | Bksp | |||||||| | Bksp | |||||||| | | | | + * ,----------------------------------------------------------------------------------------------------------------------. + */ + [_LOWER] = LAYOUT( + KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12 , \ + TILD, EXLM, AT, HASH, DLR, PERC, _______, _______, CIRC, AMPR, ASTR, LPRN, RPRN, PIPE , \ + KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, _______, _______, KC_6, KC_7, KC_8, KC_9, KC_0 , KC_ENT , \ + _______, _______, _______, _______, KC_MINS, LBRC, _______, _______, RBRC, EQL, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, KC_BSPC,_______, _______,KC_BSPC, _______, _______, _______, _______, _______ \ + ), + + /* Raise + * ,----------------------------------------------------------------------------------------------------------------------. + * | F11 | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F12 | + * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| + * | ~ | ! | @ | # | $ | % | | | | ^ | & | * | ( | ) | | | + * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| + * | Tab | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | Enter| + * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| + * | | | | | - | [ | | | | ] | = | | | | | + * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| + * | | | | |||||||| | Bksp | |||||||| | Bksp | |||||||| | | | | + * ,----------------------------------------------------------------------------------------------------------------------. + */ + [_RAISE] = LAYOUT( + KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12 , \ + TILD, EXLM, AT, HASH, DLR, PERC, _______, _______, CIRC, AMPR, ASTR, LPRN, RPRN, PIPE , \ + KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, _______, _______, KC_6, KC_7, KC_8, KC_9, KC_0 , KC_ENT , \ + _______, _______, _______, _______, KC_MINS, LBRC, _______, _______, RBRC, EQL, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, KC_BSPC,_______, _______,KC_BSPC, _______, _______, _______, _______, _______ \ + ), + + /* Adjust + * ,----------------------------------------------------------------------------------------------------------------------. + * | F11 | F1 | F2 | F3 | F4 | F5 | US | | JP | F6 | F7 | F8 | F9 | F10 | F12 | + * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| + * | ~ | ! | @ | # | $ | % | | | | ^ | & | * | ( | ) | | | + * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| + * | | Home |PageDn|PageUp| End |||||||| | | | Left | Down | Up | Right|||||||| | + * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| + * | | | | | _ | { | | | | } | + | | | | | + * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| + * | | | | |||||||| | Bksp | |||||||| | Bksp | |||||||| | | | | + * ,----------------------------------------------------------------------------------------------------------------------. + */ + [_ADJUST] = LAYOUT( + KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, US , JP, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12 , \ + TILD, EXLM, AT, HASH, DLR, PERC, _______, _______, CIRC, AMPR, ASTR, LPRN, RPRN, PIPE , \ + _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, _______, \ + _______, _______, _______, _______, UNDS, LCBR, _______, _______, RCBR, PLUS, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, KC_BSPC,_______, _______,KC_BSPC, _______, _______, _______, _______, _______ \ + ) +}; + +#ifdef AUDIO_ENABLE +float tone_qwerty[][2] = SONG(QWERTY_SOUND); +#endif + +#define JP_LAYOUT true +#define US_LAYOUT false + +#ifdef MASTER_LEFT +bool LAYOUT_STATUS = US_LAYOUT; +#else +bool LAYOUT_STATUS = JP_LAYOUT; +#endif + +bool SHIFT_PRESSED = false; + +void persistent_default_layer_set(uint16_t default_layer) { + eeconfig_update_default_layer(default_layer); + default_layer_set(default_layer); +} + +#define SEND_STRING_RESTORE(STR) \ + (SHIFT_PRESSED ? SEND_STRING(STR SS_DOWN(X_LSHIFT)) : SEND_STRING(STR SS_UP(X_LSHIFT))) + +#define KEY(CODE) \ + (record->event.pressed ? SEND_STRING_RESTORE(SS_DOWN(X_ ## CODE)) : SEND_STRING_RESTORE(SS_UP(X_ ## CODE))) + +#define KEY_SHIFT(CODE) \ + (record->event.pressed ? SEND_STRING_RESTORE(SS_DOWN(X_LSHIFT) SS_DOWN(X_ ## CODE)) : SEND_STRING_RESTORE(SS_UP(X_ ## CODE))) + +#define KEY_UPSHIFT(CODE) \ + (record->event.pressed ? SEND_STRING_RESTORE(SS_UP(X_LSHIFT) SS_DOWN(X_ ## CODE)) : SEND_STRING_RESTORE(SS_UP(X_ ## CODE))) + +#define SHIFT_DU(CODE_DOWN, CODE_UP) (SHIFT_PRESSED ? CODE_DOWN : CODE_UP) +#define CASE_US(CODE, US, JP) case CODE: (LAYOUT_STATUS == JP_LAYOUT ? JP : US); return false; + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + CASE_US(Z_0, KEY(0), SHIFT_DU(KEY_SHIFT(9), KEY(0))); + CASE_US(Z_1, KEY(1), KEY(1)); + CASE_US(Z_2, KEY(2), SHIFT_DU(KEY_UPSHIFT(LBRACKET), KEY(2))); + CASE_US(Z_3, KEY(3), KEY(3)); + CASE_US(Z_4, KEY(4), KEY(4)); + CASE_US(Z_5, KEY(5), KEY(5)); + CASE_US(Z_6, KEY(6), SHIFT_DU(KEY_UPSHIFT(EQUAL), KEY(6))); + CASE_US(Z_7, KEY(7), SHIFT_DU(KEY_SHIFT(6), KEY(7))); + CASE_US(Z_8, KEY(8), SHIFT_DU(KEY_SHIFT(QUOTE), KEY(8))); + CASE_US(Z_9, KEY(9), SHIFT_DU(KEY_SHIFT(8), KEY(9))); + CASE_US(DEL, KEY(DELETE), KEY_UPSHIFT(BSPACE)); + CASE_US(TILD, KEY_SHIFT(GRAVE), KEY_SHIFT(EQUAL)); + CASE_US(EXLM, KEY_SHIFT(1), KEY_SHIFT(1)); + CASE_US(AT, KEY_SHIFT(2), KEY(LBRACKET)); + CASE_US(HASH, KEY_SHIFT(3), KEY_SHIFT(3)); + CASE_US(DLR, KEY_SHIFT(4), KEY_SHIFT(4)); + CASE_US(PERC, KEY_SHIFT(5), KEY_SHIFT(5)); + CASE_US(CIRC, KEY_SHIFT(6), KEY(EQUAL)); + CASE_US(AMPR, KEY_SHIFT(7), KEY_SHIFT(6)); + CASE_US(ASTR, KEY_SHIFT(8), KEY_SHIFT(QUOTE)); + CASE_US(LPRN, KEY_SHIFT(9), KEY_SHIFT(8)); + CASE_US(RPRN, KEY_SHIFT(0), KEY_SHIFT(9)); + CASE_US(LBRC, KEY(LBRACKET), SHIFT_DU(KEY_SHIFT(RBRACKET), KEY(RBRACKET))); + CASE_US(RBRC, KEY(RBRACKET), SHIFT_DU(KEY_SHIFT(NONUS_HASH), KEY(NONUS_HASH))); + CASE_US(LCBR, KEY_SHIFT(LBRACKET), KEY_SHIFT(RBRACKET)); + CASE_US(RCBR, KEY_SHIFT(RBRACKET), KEY_SHIFT(NONUS_HASH)); + CASE_US(GRV, KEY(GRAVE), SHIFT_DU(KEY_SHIFT(EQUAL), KEY_SHIFT(LBRACKET))); + CASE_US(BSLS, KEY(BSLASH), SHIFT_DU(KEY_SHIFT(INT3), KEY(INT3))); + CASE_US(PIPE, KEY_SHIFT(BSLASH), KEY_SHIFT(INT3)); + CASE_US(MINS, KEY(MINUS), SHIFT_DU(KEY_SHIFT(INT1), KEY(MINUS))); + CASE_US(UNDS, KEY_SHIFT(MINUS), KEY_SHIFT(INT1)); + CASE_US(EQL, KEY(EQUAL), SHIFT_DU(KEY_SHIFT(SCOLON), KEY_SHIFT(MINUS))); + CASE_US(PLUS, KEY_SHIFT(EQUAL), KEY_SHIFT(SCOLON)); + CASE_US(SCLN, KEY(SCOLON), SHIFT_DU(KEY_UPSHIFT(QUOTE), KEY(SCOLON))); + CASE_US(QUOT, KEY(QUOTE), SHIFT_DU(KEY_SHIFT(2), KEY_SHIFT(7))); + case JP: + if (record->event.pressed) + LAYOUT_STATUS = JP_LAYOUT; + return false; + break; + case US: + if (record->event.pressed) + LAYOUT_STATUS = US_LAYOUT; + return false; + break; + case SHIFT: + if (record->event.pressed) { + SEND_STRING(SS_DOWN(X_LSHIFT)); + SHIFT_PRESSED = true; + } else { + SEND_STRING(SS_UP(X_LSHIFT)); + SHIFT_PRESSED = false; + } + return false; + break; + case QWERTY: + if (record->event.pressed) + set_single_persistent_default_layer(_QWERTY); + return false; + break; + case LOWER: + if (record->event.pressed) { + layer_on(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + return false; + break; + case RAISE: + if (record->event.pressed) { + layer_on(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + return false; + break; + case ADJUST: + if (record->event.pressed) + layer_on(_ADJUST); + else + layer_off(_ADJUST); + return false; + break; + } + return true; +} + diff --git a/keyboards/ergodash/rev1/keymaps/m47ch4n/rules.mk b/keyboards/ergodash/rev1/keymaps/m47ch4n/rules.mk new file mode 100644 index 000000000000..bb9e33b08297 --- /dev/null +++ b/keyboards/ergodash/rev1/keymaps/m47ch4n/rules.mk @@ -0,0 +1,3 @@ +BACKLIGHT_ENABLE = no +RGBLIGHT_ENABLE = no +AUDIO_ENABLE = no From b0c959aa844f19f8923c3a8afe1266cef23fc84d Mon Sep 17 00:00:00 2001 From: M47CH4N Date: Sun, 1 Sep 2019 21:20:49 +0900 Subject: [PATCH 2/9] Modify keymap --- .../ergodash/rev1/keymaps/m47ch4n/keymap.c | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/keyboards/ergodash/rev1/keymaps/m47ch4n/keymap.c b/keyboards/ergodash/rev1/keymaps/m47ch4n/keymap.c index e185cf9ae6ca..1ea678671f65 100644 --- a/keyboards/ergodash/rev1/keymaps/m47ch4n/keymap.c +++ b/keyboards/ergodash/rev1/keymaps/m47ch4n/keymap.c @@ -60,11 +60,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Qwerty * ,----------------------------------------------------------------------------------------------------------------------. - * | ESC | 1 | 2 | 3 | 4 | 5 | [ | | ] | 6 | 7 | 8 | 9 | 0 | ` | + * | ESC | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | ` | * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| - * | Tab | Q | W | E | R | T | - | | = | Y | U | I | O | P | \ | + * | Tab | Q | W | E | R | T | | | | Y | U | I | O | P | \ | * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| - * | Ctrl | A | S | D | F | G | Bksp | | Bksp | H | J | K | L | ; | ' | + * | Ctrl | A | S | D | F | G | | | | H | J | K | L | ; | ' | * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| * | Shift| Z | X | C | V | B | Shift| | Shift| N | M | , | . | / | Shift| * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| @@ -72,9 +72,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,----------------------------------------------------------------------------------------------------------------------. */ [_QWERTY] = LAYOUT( \ - KC_ESC, Z_1, Z_2, Z_3, Z_4, Z_5, LBRC , RBRC, Z_6, Z_7, Z_8, Z_9, Z_0, GRV , \ - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, MINS , EQL, KC_Y, KC_U, KC_I, KC_O, KC_P, BSLS , \ - KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, KC_BSPC, KC_BSPC, KC_H, KC_J, KC_K, KC_L, SCLN, QUOT , \ + KC_ESC, Z_1, Z_2, Z_3, Z_4, Z_5, XXXXXXX, XXXXXXX, Z_6, Z_7, Z_8, Z_9, Z_0, GRV , \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, XXXXXXX, XXXXXXX, KC_Y, KC_U, KC_I, KC_O, KC_P, BSLS , \ + KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, XXXXXXX, XXXXXXX, KC_H, KC_J, KC_K, KC_L, SCLN, QUOT , \ SHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, SHIFT , SHIFT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SHIFT , \ SHIFT, ADJUST, KC_LALT, KC_LCTL, LOWER, KC_SPC ,XXXXXXX, XXXXXXX,KC_ENT , RAISE, KC_LCTL, KC_LALT, ADJUST, SHIFT \ ), @@ -85,9 +85,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| * | ~ | ! | @ | # | $ | % | | | | ^ | & | * | ( | ) | | | * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| - * | Tab | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | Enter| + * | | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | | * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| - * | | | | | - | [ | | | | ] | = | | | | | + * | | | [ | ] | - | _ | | | | + | = | { | } | | | * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| * | | | | |||||||| | Bksp | |||||||| | Bksp | |||||||| | | | | * ,----------------------------------------------------------------------------------------------------------------------. @@ -95,8 +95,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LOWER] = LAYOUT( KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12 , \ TILD, EXLM, AT, HASH, DLR, PERC, _______, _______, CIRC, AMPR, ASTR, LPRN, RPRN, PIPE , \ - KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, _______, _______, KC_6, KC_7, KC_8, KC_9, KC_0 , KC_ENT , \ - _______, _______, _______, _______, KC_MINS, LBRC, _______, _______, RBRC, EQL, _______, _______, _______, _______, \ + _______, KC_1, KC_2, KC_3, KC_4, KC_5, _______, _______, KC_6, KC_7, KC_8, KC_9, KC_0 , _______, \ + _______, _______, LBRC, RBRC, MINS, UNDS, _______, _______, PLUS, EQL, LCBR, RCBR, _______, _______, \ _______, _______, _______, _______, _______, KC_BSPC,_______, _______,KC_BSPC, _______, _______, _______, _______, _______ \ ), @@ -106,9 +106,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| * | ~ | ! | @ | # | $ | % | | | | ^ | & | * | ( | ) | | | * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| - * | Tab | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | Enter| + * | | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | | * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| - * | | | | | - | [ | | | | ] | = | | | | | + * | | | [ | ] | - | _ | | | | + | = | { | } | | | * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| * | | | | |||||||| | Bksp | |||||||| | Bksp | |||||||| | | | | * ,----------------------------------------------------------------------------------------------------------------------. @@ -116,8 +116,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_RAISE] = LAYOUT( KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12 , \ TILD, EXLM, AT, HASH, DLR, PERC, _______, _______, CIRC, AMPR, ASTR, LPRN, RPRN, PIPE , \ - KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, _______, _______, KC_6, KC_7, KC_8, KC_9, KC_0 , KC_ENT , \ - _______, _______, _______, _______, KC_MINS, LBRC, _______, _______, RBRC, EQL, _______, _______, _______, _______, \ + _______, KC_1, KC_2, KC_3, KC_4, KC_5, _______, _______, KC_6, KC_7, KC_8, KC_9, KC_0 , _______, \ + _______, _______, LBRC, RBRC, MINS, UNDS, _______, _______, PLUS, EQL, LCBR, RCBR, _______, _______, \ _______, _______, _______, _______, _______, KC_BSPC,_______, _______,KC_BSPC, _______, _______, _______, _______, _______ \ ), @@ -129,7 +129,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| * | | Home |PageDn|PageUp| End |||||||| | | | Left | Down | Up | Right|||||||| | * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| - * | | | | | _ | { | | | | } | + | | | | | + * | | | [ | ] | - | _ | | | | + | = | { | } | | | * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| * | | | | |||||||| | Bksp | |||||||| | Bksp | |||||||| | | | | * ,----------------------------------------------------------------------------------------------------------------------. @@ -138,7 +138,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, US , JP, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12 , \ TILD, EXLM, AT, HASH, DLR, PERC, _______, _______, CIRC, AMPR, ASTR, LPRN, RPRN, PIPE , \ _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, _______, \ - _______, _______, _______, _______, UNDS, LCBR, _______, _______, RCBR, PLUS, _______, _______, _______, _______, \ + _______, _______, LBRC, RBRC, MINS, UNDS, _______, _______, PLUS, EQL, LCBR, RCBR, _______, _______, \ _______, _______, _______, _______, _______, KC_BSPC,_______, _______,KC_BSPC, _______, _______, _______, _______, _______ \ ) }; From 3cc0677b1c1810c28f344999987631671e043cb4 Mon Sep 17 00:00:00 2001 From: M47CH4N Date: Wed, 4 Sep 2019 21:03:58 +0900 Subject: [PATCH 3/9] Format m47ch4n keymap.c using clang-format --- .../ergodash/rev1/keymaps/m47ch4n/keymap.c | 431 ++++++++---------- 1 file changed, 192 insertions(+), 239 deletions(-) diff --git a/keyboards/ergodash/rev1/keymaps/m47ch4n/keymap.c b/keyboards/ergodash/rev1/keymaps/m47ch4n/keymap.c index 1ea678671f65..db42443bf357 100644 --- a/keyboards/ergodash/rev1/keymaps/m47ch4n/keymap.c +++ b/keyboards/ergodash/rev1/keymaps/m47ch4n/keymap.c @@ -3,148 +3,81 @@ extern keymap_config_t keymap_config; -#define _QWERTY 0 -#define _LOWER 1 -#define _RAISE 2 -#define _ADJUST 16 +// clang-format off +enum layers { _QWERTY, _LOWER, _ADJUST }; -enum custom_keycodes { - JP = SAFE_RANGE, - US, - SHIFT, - QWERTY, - LOWER, - RAISE, - ADJUST, - Z_0, - Z_1, - Z_2, - Z_3, - Z_4, - Z_5, - Z_6, - Z_7, - Z_8, - Z_9, - CIRC, - AT, - LBRC, - RBRC, - BSLS, - AMPR, - QUOT, - LPRN, - RPRN, - EQL, - TILD, - PIPE, - GRV, - LCBR, - PLUS, - ASTR, - RCBR, - UNDS, - MINS, - SCLN, - COMM, - DOT, - SLSH, - EXLM, - HASH, - DLR, - PERC, - DEL -}; +enum custom_keycodes { JP = SAFE_RANGE, US, SHIFT, QWERTY, LOWER_L, LOWER_R, ADJUST, + CSTM_0, CSTM_1, CSTM_2, CSTM_3, CSTM_4, CSTM_5, CSTM_6, CSTM_7, CSTM_8, CSTM_9, + CIRC, AT, LBRC, RBRC, BSLS, AMPR, QUOT, LPRN, RPRN, EQL, TILD, PIPE, GRV, LCBR, + PLUS, ASTR, RCBR, UNDS, MINS, SCLN, COMM, DOT, SLSH, EXLM, HASH, DLR, PERC, DEL }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - /* Qwerty - * ,----------------------------------------------------------------------------------------------------------------------. - * | ESC | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | ` | - * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| - * | Tab | Q | W | E | R | T | | | | Y | U | I | O | P | \ | - * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| - * | Ctrl | A | S | D | F | G | | | | H | J | K | L | ; | ' | - * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| - * | Shift| Z | X | C | V | B | Shift| | Shift| N | M | , | . | / | Shift| - * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| - * | Shift|Adjust| ALt | GUI |||||||| Lower| Space| |||||||| | Enter| Raise|||||||| GUI | ALt |Adjust| Shift| - * ,----------------------------------------------------------------------------------------------------------------------. - */ - [_QWERTY] = LAYOUT( \ - KC_ESC, Z_1, Z_2, Z_3, Z_4, Z_5, XXXXXXX, XXXXXXX, Z_6, Z_7, Z_8, Z_9, Z_0, GRV , \ - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, XXXXXXX, XXXXXXX, KC_Y, KC_U, KC_I, KC_O, KC_P, BSLS , \ - KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, XXXXXXX, XXXXXXX, KC_H, KC_J, KC_K, KC_L, SCLN, QUOT , \ - SHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, SHIFT , SHIFT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SHIFT , \ - SHIFT, ADJUST, KC_LALT, KC_LCTL, LOWER, KC_SPC ,XXXXXXX, XXXXXXX,KC_ENT , RAISE, KC_LCTL, KC_LALT, ADJUST, SHIFT \ - ), - - /* Lower - * ,----------------------------------------------------------------------------------------------------------------------. - * | F11 | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F12 | - * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| - * | ~ | ! | @ | # | $ | % | | | | ^ | & | * | ( | ) | | | - * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| - * | | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | | - * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| - * | | | [ | ] | - | _ | | | | + | = | { | } | | | - * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| - * | | | | |||||||| | Bksp | |||||||| | Bksp | |||||||| | | | | - * ,----------------------------------------------------------------------------------------------------------------------. - */ - [_LOWER] = LAYOUT( - KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12 , \ - TILD, EXLM, AT, HASH, DLR, PERC, _______, _______, CIRC, AMPR, ASTR, LPRN, RPRN, PIPE , \ - _______, KC_1, KC_2, KC_3, KC_4, KC_5, _______, _______, KC_6, KC_7, KC_8, KC_9, KC_0 , _______, \ - _______, _______, LBRC, RBRC, MINS, UNDS, _______, _______, PLUS, EQL, LCBR, RCBR, _______, _______, \ - _______, _______, _______, _______, _______, KC_BSPC,_______, _______,KC_BSPC, _______, _______, _______, _______, _______ \ - ), - - /* Raise - * ,----------------------------------------------------------------------------------------------------------------------. - * | F11 | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F12 | - * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| - * | ~ | ! | @ | # | $ | % | | | | ^ | & | * | ( | ) | | | - * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| - * | | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | | - * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| - * | | | [ | ] | - | _ | | | | + | = | { | } | | | - * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| - * | | | | |||||||| | Bksp | |||||||| | Bksp | |||||||| | | | | - * ,----------------------------------------------------------------------------------------------------------------------. - */ - [_RAISE] = LAYOUT( - KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12 , \ - TILD, EXLM, AT, HASH, DLR, PERC, _______, _______, CIRC, AMPR, ASTR, LPRN, RPRN, PIPE , \ - _______, KC_1, KC_2, KC_3, KC_4, KC_5, _______, _______, KC_6, KC_7, KC_8, KC_9, KC_0 , _______, \ - _______, _______, LBRC, RBRC, MINS, UNDS, _______, _______, PLUS, EQL, LCBR, RCBR, _______, _______, \ - _______, _______, _______, _______, _______, KC_BSPC,_______, _______,KC_BSPC, _______, _______, _______, _______, _______ \ - ), - - /* Adjust - * ,----------------------------------------------------------------------------------------------------------------------. - * | F11 | F1 | F2 | F3 | F4 | F5 | US | | JP | F6 | F7 | F8 | F9 | F10 | F12 | - * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| - * | ~ | ! | @ | # | $ | % | | | | ^ | & | * | ( | ) | | | - * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| - * | | Home |PageDn|PageUp| End |||||||| | | | Left | Down | Up | Right|||||||| | - * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| - * | | | [ | ] | - | _ | | | | + | = | { | } | | | - * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| - * | | | | |||||||| | Bksp | |||||||| | Bksp | |||||||| | | | | - * ,----------------------------------------------------------------------------------------------------------------------. - */ - [_ADJUST] = LAYOUT( - KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, US , JP, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12 , \ - TILD, EXLM, AT, HASH, DLR, PERC, _______, _______, CIRC, AMPR, ASTR, LPRN, RPRN, PIPE , \ - _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, _______, \ - _______, _______, LBRC, RBRC, MINS, UNDS, _______, _______, PLUS, EQL, LCBR, RCBR, _______, _______, \ - _______, _______, _______, _______, _______, KC_BSPC,_______, _______,KC_BSPC, _______, _______, _______, _______, _______ \ - ) -}; + /* Qwerty + * ,----------------------------------------------------------------------------------------------------------------------. + * | ESC | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | ` | + * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| + * | Tab | Q | W | E | R | T | | | | Y | U | I | O | P | \ | + * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| + * | Ctrl | A | S | D | F | G | | | | H | J | K | L | ; | ' | + * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| + * | Shift| Z | X | C | V | B | Shift| | Shift| N | M | , | . | / | Shift| + * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| + * | Shift|Adjust| ALt | GUI |||||||| Lower| Space| |||||||| | Enter| Lower|||||||| GUI | ALt |Adjust| Shift| + * ,----------------------------------------------------------------------------------------------------------------------. + */ + [_QWERTY] = LAYOUT( \ + KC_ESC, CSTM_1, CSTM_2, CSTM_3, CSTM_4, CSTM_5, XXXXXXX, XXXXXXX, CSTM_6, CSTM_7, CSTM_8, CSTM_9, CSTM_0, GRV , \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, XXXXXXX, XXXXXXX, KC_Y, KC_U, KC_I, KC_O, KC_P, BSLS , \ + KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, XXXXXXX, XXXXXXX, KC_H, KC_J, KC_K, KC_L, SCLN, QUOT , \ + SHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, SHIFT , SHIFT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SHIFT , \ + SHIFT, ADJUST, KC_LALT, KC_LCTL, LOWER_L, KC_SPC ,XXXXXXX, XXXXXXX,KC_ENT , LOWER_R, KC_LCTL, KC_LALT, ADJUST, SHIFT \ + ), + + /* Lower + * ,----------------------------------------------------------------------------------------------------------------------. + * | F11 | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F12 | + * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| + * | ~ | ! | @ | # | $ | % | | | | ^ | & | * | ( | ) | | | + * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| + * | | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | | + * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| + * | | | | | - | _ | | | | + | = | [ | ] | | | + * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| + * | | | | |||||||| | ESC | |||||||| | Bksp | |||||||| | | | | + * ,----------------------------------------------------------------------------------------------------------------------. + */ + [_LOWER] = LAYOUT( + KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12 , \ + TILD, EXLM, AT, HASH, DLR, PERC, _______, _______, CIRC, AMPR, ASTR, LPRN, RPRN, PIPE , \ + _______, KC_1, KC_2, KC_3, KC_4, KC_5, _______, _______, KC_6, KC_7, KC_8, KC_9, KC_0 , _______, \ + _______, _______, LBRC, RBRC, MINS, UNDS, _______, _______, PLUS, EQL, LCBR, RCBR, _______, _______, \ + _______, _______, _______, _______, _______, KC_ESC ,_______, _______,KC_BSPC, _______, _______, _______, _______, _______ \ + ), + + /* Adjust + * ,----------------------------------------------------------------------------------------------------------------------. + * | F11 | F1 | F2 | F3 | F4 | F5 | US | | JP | F6 | F7 | F8 | F9 | F10 | F12 | + * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| + * | ~ | ! | @ | # | $ | % | | | | ^ | & | * | ( | ) | | | + * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| + * | | Home |PageDn|PageUp| End |||||||| | | | Left | Down | Up | Right|||||||| | + * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| + * | | | | | - | _ | | | | + | = | { | } | | | + * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| + * | | | | |||||||| | ESC | |||||||| | Bksp | |||||||| | | | | + * ,----------------------------------------------------------------------------------------------------------------------. + */ + [_ADJUST] = LAYOUT( + KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, US , JP, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12 , \ + TILD, EXLM, AT, HASH, DLR, PERC, _______, _______, CIRC, AMPR, ASTR, LPRN, RPRN, PIPE , \ + _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, _______, \ + _______, _______, LBRC, RBRC, MINS, UNDS, _______, _______, PLUS, EQL, LCBR, RCBR, _______, _______, \ + _______, _______, _______, _______, _______, KC_ESC ,_______, _______,KC_BSPC, _______, _______, _______, _______, _______ \ + )}; +// clang-format on #ifdef AUDIO_ENABLE -float tone_qwerty[][2] = SONG(QWERTY_SOUND); +float tone_qwerty[][2] = SONG(QWERTY_SOUND); #endif #define JP_LAYOUT true @@ -159,115 +92,135 @@ bool LAYOUT_STATUS = JP_LAYOUT; bool SHIFT_PRESSED = false; void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); + eeconfig_update_default_layer(default_layer); + default_layer_set(default_layer); } -#define SEND_STRING_RESTORE(STR) \ - (SHIFT_PRESSED ? SEND_STRING(STR SS_DOWN(X_LSHIFT)) : SEND_STRING(STR SS_UP(X_LSHIFT))) +#define SEND_STRING_RESTORE(STR) (SHIFT_PRESSED ? SEND_STRING(STR SS_DOWN(X_LSHIFT)) : SEND_STRING(STR SS_UP(X_LSHIFT))) -#define KEY(CODE) \ - (record->event.pressed ? SEND_STRING_RESTORE(SS_DOWN(X_ ## CODE)) : SEND_STRING_RESTORE(SS_UP(X_ ## CODE))) +#define KEY(CODE) (record->event.pressed ? SEND_STRING_RESTORE(SS_DOWN(X_##CODE)) : SEND_STRING_RESTORE(SS_UP(X_##CODE))) -#define KEY_SHIFT(CODE) \ - (record->event.pressed ? SEND_STRING_RESTORE(SS_DOWN(X_LSHIFT) SS_DOWN(X_ ## CODE)) : SEND_STRING_RESTORE(SS_UP(X_ ## CODE))) +#define KEY_SHIFT(CODE) (record->event.pressed ? SEND_STRING_RESTORE(SS_DOWN(X_LSHIFT) SS_DOWN(X_##CODE)) : SEND_STRING_RESTORE(SS_UP(X_##CODE))) -#define KEY_UPSHIFT(CODE) \ - (record->event.pressed ? SEND_STRING_RESTORE(SS_UP(X_LSHIFT) SS_DOWN(X_ ## CODE)) : SEND_STRING_RESTORE(SS_UP(X_ ## CODE))) +#define KEY_UPSHIFT(CODE) (record->event.pressed ? SEND_STRING_RESTORE(SS_UP(X_LSHIFT) SS_DOWN(X_##CODE)) : SEND_STRING_RESTORE(SS_UP(X_##CODE))) #define SHIFT_DU(CODE_DOWN, CODE_UP) (SHIFT_PRESSED ? CODE_DOWN : CODE_UP) -#define CASE_US(CODE, US, JP) case CODE: (LAYOUT_STATUS == JP_LAYOUT ? JP : US); return false; +#define CASE_US(CODE, US, JP) \ + case CODE: \ + (LAYOUT_STATUS == JP_LAYOUT ? JP : US); \ + return false; + +bool pushed_lower_l = false; +bool pushed_lower_r = false; + +void update_layer(void) { + switch ((int)pushed_lower_l + (int)pushed_lower_r) { + case 2: + layer_on(_ADJUST); + break; + case 1: + layer_off(_ADJUST); + layer_on(_LOWER); + break; + case 0: + layer_off(_ADJUST); + layer_off(_LOWER); + break; + } + return; +} bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - CASE_US(Z_0, KEY(0), SHIFT_DU(KEY_SHIFT(9), KEY(0))); - CASE_US(Z_1, KEY(1), KEY(1)); - CASE_US(Z_2, KEY(2), SHIFT_DU(KEY_UPSHIFT(LBRACKET), KEY(2))); - CASE_US(Z_3, KEY(3), KEY(3)); - CASE_US(Z_4, KEY(4), KEY(4)); - CASE_US(Z_5, KEY(5), KEY(5)); - CASE_US(Z_6, KEY(6), SHIFT_DU(KEY_UPSHIFT(EQUAL), KEY(6))); - CASE_US(Z_7, KEY(7), SHIFT_DU(KEY_SHIFT(6), KEY(7))); - CASE_US(Z_8, KEY(8), SHIFT_DU(KEY_SHIFT(QUOTE), KEY(8))); - CASE_US(Z_9, KEY(9), SHIFT_DU(KEY_SHIFT(8), KEY(9))); - CASE_US(DEL, KEY(DELETE), KEY_UPSHIFT(BSPACE)); - CASE_US(TILD, KEY_SHIFT(GRAVE), KEY_SHIFT(EQUAL)); - CASE_US(EXLM, KEY_SHIFT(1), KEY_SHIFT(1)); - CASE_US(AT, KEY_SHIFT(2), KEY(LBRACKET)); - CASE_US(HASH, KEY_SHIFT(3), KEY_SHIFT(3)); - CASE_US(DLR, KEY_SHIFT(4), KEY_SHIFT(4)); - CASE_US(PERC, KEY_SHIFT(5), KEY_SHIFT(5)); - CASE_US(CIRC, KEY_SHIFT(6), KEY(EQUAL)); - CASE_US(AMPR, KEY_SHIFT(7), KEY_SHIFT(6)); - CASE_US(ASTR, KEY_SHIFT(8), KEY_SHIFT(QUOTE)); - CASE_US(LPRN, KEY_SHIFT(9), KEY_SHIFT(8)); - CASE_US(RPRN, KEY_SHIFT(0), KEY_SHIFT(9)); - CASE_US(LBRC, KEY(LBRACKET), SHIFT_DU(KEY_SHIFT(RBRACKET), KEY(RBRACKET))); - CASE_US(RBRC, KEY(RBRACKET), SHIFT_DU(KEY_SHIFT(NONUS_HASH), KEY(NONUS_HASH))); - CASE_US(LCBR, KEY_SHIFT(LBRACKET), KEY_SHIFT(RBRACKET)); - CASE_US(RCBR, KEY_SHIFT(RBRACKET), KEY_SHIFT(NONUS_HASH)); - CASE_US(GRV, KEY(GRAVE), SHIFT_DU(KEY_SHIFT(EQUAL), KEY_SHIFT(LBRACKET))); - CASE_US(BSLS, KEY(BSLASH), SHIFT_DU(KEY_SHIFT(INT3), KEY(INT3))); - CASE_US(PIPE, KEY_SHIFT(BSLASH), KEY_SHIFT(INT3)); - CASE_US(MINS, KEY(MINUS), SHIFT_DU(KEY_SHIFT(INT1), KEY(MINUS))); - CASE_US(UNDS, KEY_SHIFT(MINUS), KEY_SHIFT(INT1)); - CASE_US(EQL, KEY(EQUAL), SHIFT_DU(KEY_SHIFT(SCOLON), KEY_SHIFT(MINUS))); - CASE_US(PLUS, KEY_SHIFT(EQUAL), KEY_SHIFT(SCOLON)); - CASE_US(SCLN, KEY(SCOLON), SHIFT_DU(KEY_UPSHIFT(QUOTE), KEY(SCOLON))); - CASE_US(QUOT, KEY(QUOTE), SHIFT_DU(KEY_SHIFT(2), KEY_SHIFT(7))); - case JP: - if (record->event.pressed) - LAYOUT_STATUS = JP_LAYOUT; - return false; - break; - case US: - if (record->event.pressed) - LAYOUT_STATUS = US_LAYOUT; - return false; - break; - case SHIFT: - if (record->event.pressed) { - SEND_STRING(SS_DOWN(X_LSHIFT)); - SHIFT_PRESSED = true; - } else { - SEND_STRING(SS_UP(X_LSHIFT)); - SHIFT_PRESSED = false; - } - return false; - break; - case QWERTY: - if (record->event.pressed) - set_single_persistent_default_layer(_QWERTY); - return false; - break; - case LOWER: - if (record->event.pressed) { - layer_on(_LOWER); - update_tri_layer(_LOWER, _RAISE, _ADJUST); - } else { - layer_off(_LOWER); - update_tri_layer(_LOWER, _RAISE, _ADJUST); - } - return false; - break; - case RAISE: - if (record->event.pressed) { - layer_on(_RAISE); - update_tri_layer(_LOWER, _RAISE, _ADJUST); - } else { - layer_off(_RAISE); - update_tri_layer(_LOWER, _RAISE, _ADJUST); - } - return false; - break; - case ADJUST: - if (record->event.pressed) - layer_on(_ADJUST); - else - layer_off(_ADJUST); - return false; - break; - } - return true; + switch (keycode) { + CASE_US(CSTM_0, KEY(0), SHIFT_DU(KEY_SHIFT(9), KEY(0))); + CASE_US(CSTM_1, KEY(1), KEY(1)); + CASE_US(CSTM_2, KEY(2), SHIFT_DU(KEY_UPSHIFT(LBRACKET), KEY(2))); + CASE_US(CSTM_3, KEY(3), KEY(3)); + CASE_US(CSTM_4, KEY(4), KEY(4)); + CASE_US(CSTM_5, KEY(5), KEY(5)); + CASE_US(CSTM_6, KEY(6), SHIFT_DU(KEY_UPSHIFT(EQUAL), KEY(6))); + CASE_US(CSTM_7, KEY(7), SHIFT_DU(KEY_SHIFT(6), KEY(7))); + CASE_US(CSTM_8, KEY(8), SHIFT_DU(KEY_SHIFT(QUOTE), KEY(8))); + CASE_US(CSTM_9, KEY(9), SHIFT_DU(KEY_SHIFT(8), KEY(9))); + CASE_US(DEL, KEY(DELETE), KEY_UPSHIFT(BSPACE)); + CASE_US(TILD, KEY_SHIFT(GRAVE), KEY_SHIFT(EQUAL)); + CASE_US(EXLM, KEY_SHIFT(1), KEY_SHIFT(1)); + CASE_US(AT, KEY_SHIFT(2), KEY(LBRACKET)); + CASE_US(HASH, KEY_SHIFT(3), KEY_SHIFT(3)); + CASE_US(DLR, KEY_SHIFT(4), KEY_SHIFT(4)); + CASE_US(PERC, KEY_SHIFT(5), KEY_SHIFT(5)); + CASE_US(CIRC, KEY_SHIFT(6), KEY(EQUAL)); + CASE_US(AMPR, KEY_SHIFT(7), KEY_SHIFT(6)); + CASE_US(ASTR, KEY_SHIFT(8), KEY_SHIFT(QUOTE)); + CASE_US(LPRN, KEY_SHIFT(9), KEY_SHIFT(8)); + CASE_US(RPRN, KEY_SHIFT(0), KEY_SHIFT(9)); + CASE_US(LBRC, KEY(LBRACKET), SHIFT_DU(KEY_SHIFT(RBRACKET), KEY(RBRACKET))); + CASE_US(RBRC, KEY(RBRACKET), SHIFT_DU(KEY_SHIFT(NONUS_HASH), KEY(NONUS_HASH))); + CASE_US(LCBR, KEY_SHIFT(LBRACKET), KEY_SHIFT(RBRACKET)); + CASE_US(RCBR, KEY_SHIFT(RBRACKET), KEY_SHIFT(NONUS_HASH)); + CASE_US(GRV, KEY(GRAVE), SHIFT_DU(KEY_SHIFT(EQUAL), KEY_SHIFT(LBRACKET))); + CASE_US(BSLS, KEY(BSLASH), SHIFT_DU(KEY_SHIFT(INT3), KEY(INT3))); + CASE_US(PIPE, KEY_SHIFT(BSLASH), KEY_SHIFT(INT3)); + CASE_US(MINS, KEY(MINUS), SHIFT_DU(KEY_SHIFT(INT1), KEY(MINUS))); + CASE_US(UNDS, KEY_SHIFT(MINUS), KEY_SHIFT(INT1)); + CASE_US(EQL, KEY(EQUAL), SHIFT_DU(KEY_SHIFT(SCOLON), KEY_SHIFT(MINUS))); + CASE_US(PLUS, KEY_SHIFT(EQUAL), KEY_SHIFT(SCOLON)); + CASE_US(SCLN, KEY(SCOLON), SHIFT_DU(KEY_UPSHIFT(QUOTE), KEY(SCOLON))); + CASE_US(QUOT, KEY(QUOTE), SHIFT_DU(KEY_SHIFT(2), KEY_SHIFT(7))); + case JP: + if (record->event.pressed) { + LAYOUT_STATUS = JP_LAYOUT; + } + return false; + break; + case US: + if (record->event.pressed) { + LAYOUT_STATUS = US_LAYOUT; + } + return false; + break; + case SHIFT: + if (record->event.pressed) { + SEND_STRING(SS_DOWN(X_LSHIFT)); + SHIFT_PRESSED = true; + } else { + SEND_STRING(SS_UP(X_LSHIFT)); + SHIFT_PRESSED = false; + } + return false; + break; + case QWERTY: + if (record->event.pressed) { + set_single_persistent_default_layer(_QWERTY); + } + return false; + break; + case LOWER_L: + if (record->event.pressed) { + pushed_lower_l = true; + } else { + pushed_lower_l = false; + } + update_layer(); + return false; + break; + case LOWER_R: + if (record->event.pressed) { + pushed_lower_r = true; + } else { + pushed_lower_r = false; + } + update_layer(); + return false; + break; + case ADJUST: + if (record->event.pressed) { + layer_on(_ADJUST); + } else { + layer_off(_ADJUST); + } + return false; + break; + } + return true; } - From ab4cc88862519f7d1332a920bc2d5151a69eaa21 Mon Sep 17 00:00:00 2001 From: M47CH4N Date: Wed, 4 Sep 2019 22:43:25 +0900 Subject: [PATCH 4/9] Modify layer updater --- .../ergodash/rev1/keymaps/m47ch4n/keymap.c | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/keyboards/ergodash/rev1/keymaps/m47ch4n/keymap.c b/keyboards/ergodash/rev1/keymaps/m47ch4n/keymap.c index db42443bf357..dec70e92ab2b 100644 --- a/keyboards/ergodash/rev1/keymaps/m47ch4n/keymap.c +++ b/keyboards/ergodash/rev1/keymaps/m47ch4n/keymap.c @@ -6,7 +6,7 @@ extern keymap_config_t keymap_config; // clang-format off enum layers { _QWERTY, _LOWER, _ADJUST }; -enum custom_keycodes { JP = SAFE_RANGE, US, SHIFT, QWERTY, LOWER_L, LOWER_R, ADJUST, +enum custom_keycodes { JP = SAFE_RANGE, US, SHIFT, LOWER_L, LOWER_R, ADJUST, CSTM_0, CSTM_1, CSTM_2, CSTM_3, CSTM_4, CSTM_5, CSTM_6, CSTM_7, CSTM_8, CSTM_9, CIRC, AT, LBRC, RBRC, BSLS, AMPR, QUOT, LPRN, RPRN, EQL, TILD, PIPE, GRV, LCBR, PLUS, ASTR, RCBR, UNDS, MINS, SCLN, COMM, DOT, SLSH, EXLM, HASH, DLR, PERC, DEL }; @@ -50,29 +50,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12 , \ TILD, EXLM, AT, HASH, DLR, PERC, _______, _______, CIRC, AMPR, ASTR, LPRN, RPRN, PIPE , \ _______, KC_1, KC_2, KC_3, KC_4, KC_5, _______, _______, KC_6, KC_7, KC_8, KC_9, KC_0 , _______, \ - _______, _______, LBRC, RBRC, MINS, UNDS, _______, _______, PLUS, EQL, LCBR, RCBR, _______, _______, \ + _______, _______, LBRC, RBRC, MINS, UNDS, _______, _______, PLUS, EQL, LBRC, RBRC, _______, _______, \ _______, _______, _______, _______, _______, KC_ESC ,_______, _______,KC_BSPC, _______, _______, _______, _______, _______ \ ), /* Adjust * ,----------------------------------------------------------------------------------------------------------------------. - * | F11 | F1 | F2 | F3 | F4 | F5 | US | | JP | F6 | F7 | F8 | F9 | F10 | F12 | + * | | | | | | | US | | JP | | | | | | | * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| - * | ~ | ! | @ | # | $ | % | | | | ^ | & | * | ( | ) | | | + * | | | | | | | | | | | | | | | | * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| * | | Home |PageDn|PageUp| End |||||||| | | | Left | Down | Up | Right|||||||| | * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| - * | | | | | - | _ | | | | + | = | { | } | | | + * | | | | | | | | | | | | { | } | | | * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| - * | | | | |||||||| | ESC | |||||||| | Bksp | |||||||| | | | | + * | | | | |||||||| | | |||||||| | | |||||||| | | | | * ,----------------------------------------------------------------------------------------------------------------------. */ [_ADJUST] = LAYOUT( - KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, US , JP, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12 , \ - TILD, EXLM, AT, HASH, DLR, PERC, _______, _______, CIRC, AMPR, ASTR, LPRN, RPRN, PIPE , \ + _______, _______, _______, _______, _______, _______, US , JP, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, _______, \ - _______, _______, LBRC, RBRC, MINS, UNDS, _______, _______, PLUS, EQL, LCBR, RCBR, _______, _______, \ - _______, _______, _______, _______, _______, KC_ESC ,_______, _______,KC_BSPC, _______, _______, _______, _______, _______ \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, LCBR, RCBR, _______, _______, \ + _______, _______, _______, _______, _______, _______,_______, _______,_______, _______, _______, _______, _______, _______ \ )}; // clang-format on @@ -112,19 +112,24 @@ void persistent_default_layer_set(uint16_t default_layer) { bool pushed_lower_l = false; bool pushed_lower_r = false; +bool pushed_adjust = false; void update_layer(void) { - switch ((int)pushed_lower_l + (int)pushed_lower_r) { + int code = (pushed_adjust<<2) + (pushed_lower_r<<1) + (pushed_lower_l<<0); + + layer_off(_ADJUST); + layer_off(_LOWER); + switch (code) { + case 7: + case 6: + case 5: + case 4: + case 3: case 2: layer_on(_ADJUST); - break; case 1: - layer_off(_ADJUST); layer_on(_LOWER); - break; case 0: - layer_off(_ADJUST); - layer_off(_LOWER); break; } return; @@ -189,12 +194,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return false; break; - case QWERTY: - if (record->event.pressed) { - set_single_persistent_default_layer(_QWERTY); - } - return false; - break; case LOWER_L: if (record->event.pressed) { pushed_lower_l = true; @@ -215,10 +214,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { break; case ADJUST: if (record->event.pressed) { - layer_on(_ADJUST); + pushed_adjust = true; } else { - layer_off(_ADJUST); + pushed_adjust = false; } + update_layer(); return false; break; } From 10ad99799eb038eeb905f47d94b51eeaa20a4932 Mon Sep 17 00:00:00 2001 From: M47CH4N Date: Wed, 4 Sep 2019 23:53:48 +0900 Subject: [PATCH 5/9] Fix wrong key repeating bug --- keyboards/ergodash/rev1/keymaps/m47ch4n/keymap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/ergodash/rev1/keymaps/m47ch4n/keymap.c b/keyboards/ergodash/rev1/keymaps/m47ch4n/keymap.c index dec70e92ab2b..c1d7df5766d4 100644 --- a/keyboards/ergodash/rev1/keymaps/m47ch4n/keymap.c +++ b/keyboards/ergodash/rev1/keymaps/m47ch4n/keymap.c @@ -98,11 +98,11 @@ void persistent_default_layer_set(uint16_t default_layer) { #define SEND_STRING_RESTORE(STR) (SHIFT_PRESSED ? SEND_STRING(STR SS_DOWN(X_LSHIFT)) : SEND_STRING(STR SS_UP(X_LSHIFT))) -#define KEY(CODE) (record->event.pressed ? SEND_STRING_RESTORE(SS_DOWN(X_##CODE)) : SEND_STRING_RESTORE(SS_UP(X_##CODE))) +#define KEY(CODE) (record->event.pressed ? SEND_STRING(SS_DOWN(X_##CODE)) : SEND_STRING_RESTORE(SS_UP(X_##CODE))) -#define KEY_SHIFT(CODE) (record->event.pressed ? SEND_STRING_RESTORE(SS_DOWN(X_LSHIFT) SS_DOWN(X_##CODE)) : SEND_STRING_RESTORE(SS_UP(X_##CODE))) +#define KEY_SHIFT(CODE) (record->event.pressed ? SEND_STRING(SS_DOWN(X_LSHIFT) SS_DOWN(X_##CODE)) : SEND_STRING_RESTORE(SS_UP(X_##CODE))) -#define KEY_UPSHIFT(CODE) (record->event.pressed ? SEND_STRING_RESTORE(SS_UP(X_LSHIFT) SS_DOWN(X_##CODE)) : SEND_STRING_RESTORE(SS_UP(X_##CODE))) +#define KEY_UPSHIFT(CODE) (record->event.pressed ? SEND_STRING(SS_UP(X_LSHIFT) SS_DOWN(X_##CODE)) : SEND_STRING_RESTORE(SS_UP(X_##CODE))) #define SHIFT_DU(CODE_DOWN, CODE_UP) (SHIFT_PRESSED ? CODE_DOWN : CODE_UP) #define CASE_US(CODE, US, JP) \ From ecf02e6c301e94d5db9649dfc61c3f0e80834eb5 Mon Sep 17 00:00:00 2001 From: M47CH4N Date: Thu, 5 Sep 2019 00:07:04 +0900 Subject: [PATCH 6/9] Add readme and QMK Configurator json --- .../rev1/keymaps/m47ch4n/m47ch4ns_keymap.json | 1 + .../ergodash/rev1/keymaps/m47ch4n/readme.md | 59 +++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 keyboards/ergodash/rev1/keymaps/m47ch4n/m47ch4ns_keymap.json create mode 100644 keyboards/ergodash/rev1/keymaps/m47ch4n/readme.md diff --git a/keyboards/ergodash/rev1/keymaps/m47ch4n/m47ch4ns_keymap.json b/keyboards/ergodash/rev1/keymaps/m47ch4n/m47ch4ns_keymap.json new file mode 100644 index 000000000000..ad9a183200f0 --- /dev/null +++ b/keyboards/ergodash/rev1/keymaps/m47ch4n/m47ch4ns_keymap.json @@ -0,0 +1 @@ +{"keyboard":"ergodash/rev1","keymap":"m47ch4ns_keymap","layout":"LAYOUT_3key_1us","layers":[["KC_ESC","KC_1","KC_2","KC_3","KC_4","KC_5","KC_NO","KC_NO","KC_6","KC_7","KC_8","KC_9","KC_0","KC_GRV","KC_TAB","KC_Q","KC_W","KC_E","KC_R","KC_T","KC_NO","KC_NO","KC_Y","KC_U","KC_I","KC_O","KC_P","KC_BSLS","KC_LCTL","KC_A","KC_S","KC_D","KC_F","KC_G","KC_NO","KC_NO","KC_H","KC_J","KC_K","KC_L","KC_SCLN","KC_QUOT","KC_LSFT","KC_Z","KC_X","KC_C","KC_V","KC_B","KC_LSFT","KC_RSFT","KC_N","KC_M","KC_COMM","KC_DOT","KC_SLSH","KC_RSFT","KC_LSFT","ANY(ADJUST)","KC_LALT","KC_LGUI","ANY(LOWER)","KC_SPC","KC_ENT","ANY(LOWER)","KC_RGUI","KC_RALT","ANY(ADJUST)","KC_RSFT"],["KC_F11","KC_F1","KC_F2","KC_F3","KC_F4","KC_F5","KC_TRNS","KC_TRNS","KC_F6","KC_F7","KC_F8","KC_F9","KC_F10","KC_F12","KC_TRNS","KC_EXLM","KC_AT","KC_HASH","KC_DLR","KC_PERC","KC_TRNS","KC_TRNS","KC_CIRC","KC_AMPR","KC_ASTR","KC_LPRN","KC_RPRN","KC_PIPE","KC_TRNS","KC_1","KC_2","KC_3","KC_4","KC_5","KC_TRNS","KC_TRNS","KC_6","KC_7","KC_8","KC_9","KC_0","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_MINS","KC_UNDS","KC_TRNS","KC_TRNS","KC_PLUS","KC_EQL","KC_LBRC","KC_RBRC","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_ESC","KC_BSPC","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"],["KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","ANY(US)","ANY(JP)","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_HOME","KC_PGDN","KC_PGUP","KC_END","KC_TRNS","KC_TRNS","KC_TRNS","KC_LEFT","KC_DOWN","KC_UP","KC_RGHT","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_LCBR","KC_RCBR","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"]],"author":"","notes":""} \ No newline at end of file diff --git a/keyboards/ergodash/rev1/keymaps/m47ch4n/readme.md b/keyboards/ergodash/rev1/keymaps/m47ch4n/readme.md new file mode 100644 index 000000000000..59e860140650 --- /dev/null +++ b/keyboards/ergodash/rev1/keymaps/m47ch4n/readme.md @@ -0,0 +1,59 @@ +# m47ch4n's keymap for Ergodash rev1 + +This is the m47ch4n's keymap configuration for Ergodash rev1. +There are three layers, QWERTY(default), LOWER and ADJSUT. + +## Layers + +### Qwerty + +``` +,----------------------------------------------------------------------------------------------------------------------. +| ESC | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | ` | +|------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| +| Tab | Q | W | E | R | T | | | | Y | U | I | O | P | \ | +|------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| +| Ctrl | A | S | D | F | G | | | | H | J | K | L | ; | ' | +|------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| +| Shift| Z | X | C | V | B | Shift| | Shift| N | M | , | . | / | Shift| +|-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| +| Shift|Adjust| ALt | GUI |||||||| Lower| Space| |||||||| | Enter| Lower|||||||| GUI | ALt |Adjust| Shift| +,----------------------------------------------------------------------------------------------------------------------. + +``` + +### Lower + +``` +,----------------------------------------------------------------------------------------------------------------------. +| F11 | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F12 | +|------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| +| ~ | ! | @ | # | $ | % | | | | ^ | & | * | ( | ) | | | +|------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| +| | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | | +|------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| +| | | | | - | _ | | | | + | = | [ | ] | | | +|-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| +| | | | |||||||| | ESC | |||||||| | Bksp | |||||||| | | | | +,----------------------------------------------------------------------------------------------------------------------. +``` + +### Adjust + +``` +,----------------------------------------------------------------------------------------------------------------------. +| | | | | | | US | | JP | | | | | | | +|------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| +| | | | | | | | | | | | | | | | +|------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| +| | Home |PageDn|PageUp| End |||||||| | | | Left | Down | Up | Right|||||||| | +|------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| +| | | | | | | | | | | | { | } | | | +|-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| +| | | | |||||||| | | |||||||| | | |||||||| | | | | +,----------------------------------------------------------------------------------------------------------------------. +``` + +You can switch to ADJUST layer by pressing a ADJUST key or pressing two LOWER keys. +If your pc connect this keyboard with JIS(JP) layout, you should press JP MODE key. + From 6f0e5f6d00a7fc58a44e5c119acd0cf7dee1cb4d Mon Sep 17 00:00:00 2001 From: M47CH4N Date: Thu, 5 Sep 2019 23:23:52 +0900 Subject: [PATCH 7/9] Fix layer updateter --- keyboards/ergodash/rev1/keymaps/m47ch4n/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ergodash/rev1/keymaps/m47ch4n/keymap.c b/keyboards/ergodash/rev1/keymaps/m47ch4n/keymap.c index c1d7df5766d4..55c02fdfa038 100644 --- a/keyboards/ergodash/rev1/keymaps/m47ch4n/keymap.c +++ b/keyboards/ergodash/rev1/keymaps/m47ch4n/keymap.c @@ -125,8 +125,8 @@ void update_layer(void) { case 5: case 4: case 3: - case 2: layer_on(_ADJUST); + case 2: case 1: layer_on(_LOWER); case 0: From ba9fc0ee6c5b34f922e018f8860296ac288d467a Mon Sep 17 00:00:00 2001 From: M47CH4N Date: Sun, 8 Sep 2019 21:28:56 +0900 Subject: [PATCH 8/9] Add Raise layer --- .../ergodash/rev1/keymaps/m47ch4n/keymap.c | 86 +++++++++---------- .../rev1/keymaps/m47ch4n/m47ch4ns_keymap.json | 2 +- .../ergodash/rev1/keymaps/m47ch4n/readme.md | 26 ++++-- 3 files changed, 60 insertions(+), 54 deletions(-) diff --git a/keyboards/ergodash/rev1/keymaps/m47ch4n/keymap.c b/keyboards/ergodash/rev1/keymaps/m47ch4n/keymap.c index 55c02fdfa038..097f905f0f33 100644 --- a/keyboards/ergodash/rev1/keymaps/m47ch4n/keymap.c +++ b/keyboards/ergodash/rev1/keymaps/m47ch4n/keymap.c @@ -1,12 +1,9 @@ #include QMK_KEYBOARD_H -#include "keymap_jp.h" - -extern keymap_config_t keymap_config; // clang-format off -enum layers { _QWERTY, _LOWER, _ADJUST }; +enum layers { _QWERTY, _LOWER, _RAISE, _ADJUST }; -enum custom_keycodes { JP = SAFE_RANGE, US, SHIFT, LOWER_L, LOWER_R, ADJUST, +enum custom_keycodes { JP = SAFE_RANGE, US, SHIFT, LOWER, RAISE, ADJUST, CSTM_0, CSTM_1, CSTM_2, CSTM_3, CSTM_4, CSTM_5, CSTM_6, CSTM_7, CSTM_8, CSTM_9, CIRC, AT, LBRC, RBRC, BSLS, AMPR, QUOT, LPRN, RPRN, EQL, TILD, PIPE, GRV, LCBR, PLUS, ASTR, RCBR, UNDS, MINS, SCLN, COMM, DOT, SLSH, EXLM, HASH, DLR, PERC, DEL }; @@ -22,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| * | Shift| Z | X | C | V | B | Shift| | Shift| N | M | , | . | / | Shift| * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| - * | Shift|Adjust| ALt | GUI |||||||| Lower| Space| |||||||| | Enter| Lower|||||||| GUI | ALt |Adjust| Shift| + * | Shift|Adjust| ALt | GUI |||||||| Lower| Space| |||||||| | Enter| Raise|||||||| GUI | ALt |Adjust| Shift| * ,----------------------------------------------------------------------------------------------------------------------. */ [_QWERTY] = LAYOUT( \ @@ -30,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, XXXXXXX, XXXXXXX, KC_Y, KC_U, KC_I, KC_O, KC_P, BSLS , \ KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, XXXXXXX, XXXXXXX, KC_H, KC_J, KC_K, KC_L, SCLN, QUOT , \ SHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, SHIFT , SHIFT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SHIFT , \ - SHIFT, ADJUST, KC_LALT, KC_LCTL, LOWER_L, KC_SPC ,XXXXXXX, XXXXXXX,KC_ENT , LOWER_R, KC_LCTL, KC_LALT, ADJUST, SHIFT \ + SHIFT, ADJUST, KC_LALT, KC_LCTL, LOWER, KC_SPC ,XXXXXXX, XXXXXXX,KC_ENT , RAISE, KC_LCTL, KC_LALT, ADJUST, SHIFT \ ), /* Lower @@ -41,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| * | | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | | * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| - * | | | | | - | _ | | | | + | = | [ | ] | | | + * | |||||||||||||||||||||| - | _ | | | | + | = | [ | ] |||||||| | * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| * | | | | |||||||| | ESC | |||||||| | Bksp | |||||||| | | | | * ,----------------------------------------------------------------------------------------------------------------------. @@ -50,7 +47,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12 , \ TILD, EXLM, AT, HASH, DLR, PERC, _______, _______, CIRC, AMPR, ASTR, LPRN, RPRN, PIPE , \ _______, KC_1, KC_2, KC_3, KC_4, KC_5, _______, _______, KC_6, KC_7, KC_8, KC_9, KC_0 , _______, \ - _______, _______, LBRC, RBRC, MINS, UNDS, _______, _______, PLUS, EQL, LBRC, RBRC, _______, _______, \ + _______, XXXXXXX, XXXXXXX, XXXXXXX, MINS, UNDS, _______, _______, PLUS, EQL, LBRC, RBRC, XXXXXXX, _______, \ + _______, _______, _______, _______, _______, KC_ESC ,_______, _______,KC_BSPC, _______, _______, _______, _______, _______ \ + ), + + /* Raise + * ,----------------------------------------------------------------------------------------------------------------------. + * | F11 | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F12 | + * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| + * | ~ | ! | @ | # | $ | % | | | | ^ | & | * | ( | ) | | | + * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| + * | | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | | + * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| + * | |||||||| [ | ] | - | _ | | | | + | = |||||||||||||||||||||| | + * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| + * | | | | |||||||| | ESC | |||||||| | Bksp | |||||||| | | | | + * ,----------------------------------------------------------------------------------------------------------------------. + */ + [_RAISE] = LAYOUT( + KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12 , \ + TILD, EXLM, AT, HASH, DLR, PERC, _______, _______, CIRC, AMPR, ASTR, LPRN, RPRN, PIPE , \ + _______, KC_1, KC_2, KC_3, KC_4, KC_5, _______, _______, KC_6, KC_7, KC_8, KC_9, KC_0 , _______, \ + _______, XXXXXXX, LBRC, RBRC, MINS, UNDS, _______, _______, PLUS, EQL, XXXXXXX, XXXXXXX, XXXXXXX, _______, \ _______, _______, _______, _______, _______, KC_ESC ,_______, _______,KC_BSPC, _______, _______, _______, _______, _______ \ ), @@ -62,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| * | | Home |PageDn|PageUp| End |||||||| | | | Left | Down | Up | Right|||||||| | * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | { | } | | | + * | | | { | } | | | | | | | | { | } | | | * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| * | | | | |||||||| | | |||||||| | | |||||||| | | | | * ,----------------------------------------------------------------------------------------------------------------------. @@ -71,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, US , JP, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, LCBR, RCBR, _______, _______, \ + _______, _______, LCBR, RCBR, _______, _______, _______, _______, _______, _______, LCBR, RCBR, _______, _______, \ _______, _______, _______, _______, _______, _______,_______, _______,_______, _______, _______, _______, _______, _______ \ )}; // clang-format on @@ -110,31 +128,6 @@ void persistent_default_layer_set(uint16_t default_layer) { (LAYOUT_STATUS == JP_LAYOUT ? JP : US); \ return false; -bool pushed_lower_l = false; -bool pushed_lower_r = false; -bool pushed_adjust = false; - -void update_layer(void) { - int code = (pushed_adjust<<2) + (pushed_lower_r<<1) + (pushed_lower_l<<0); - - layer_off(_ADJUST); - layer_off(_LOWER); - switch (code) { - case 7: - case 6: - case 5: - case 4: - case 3: - layer_on(_ADJUST); - case 2: - case 1: - layer_on(_LOWER); - case 0: - break; - } - return; -} - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { CASE_US(CSTM_0, KEY(0), SHIFT_DU(KEY_SHIFT(9), KEY(0))); @@ -194,31 +187,30 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return false; break; - case LOWER_L: + case LOWER: if (record->event.pressed) { - pushed_lower_l = true; + layer_on(_LOWER); } else { - pushed_lower_l = false; + layer_off(_LOWER); } - update_layer(); + update_tri_layer(_LOWER, _RAISE, _ADJUST); return false; break; - case LOWER_R: + case RAISE: if (record->event.pressed) { - pushed_lower_r = true; + layer_on(_RAISE); } else { - pushed_lower_r = false; + layer_off(_RAISE); } - update_layer(); + update_tri_layer(_LOWER, _RAISE, _ADJUST); return false; break; case ADJUST: if (record->event.pressed) { - pushed_adjust = true; + layer_on(_ADJUST); } else { - pushed_adjust = false; + layer_off(_ADJUST); } - update_layer(); return false; break; } diff --git a/keyboards/ergodash/rev1/keymaps/m47ch4n/m47ch4ns_keymap.json b/keyboards/ergodash/rev1/keymaps/m47ch4n/m47ch4ns_keymap.json index ad9a183200f0..1f5eee601462 100644 --- a/keyboards/ergodash/rev1/keymaps/m47ch4n/m47ch4ns_keymap.json +++ b/keyboards/ergodash/rev1/keymaps/m47ch4n/m47ch4ns_keymap.json @@ -1 +1 @@ -{"keyboard":"ergodash/rev1","keymap":"m47ch4ns_keymap","layout":"LAYOUT_3key_1us","layers":[["KC_ESC","KC_1","KC_2","KC_3","KC_4","KC_5","KC_NO","KC_NO","KC_6","KC_7","KC_8","KC_9","KC_0","KC_GRV","KC_TAB","KC_Q","KC_W","KC_E","KC_R","KC_T","KC_NO","KC_NO","KC_Y","KC_U","KC_I","KC_O","KC_P","KC_BSLS","KC_LCTL","KC_A","KC_S","KC_D","KC_F","KC_G","KC_NO","KC_NO","KC_H","KC_J","KC_K","KC_L","KC_SCLN","KC_QUOT","KC_LSFT","KC_Z","KC_X","KC_C","KC_V","KC_B","KC_LSFT","KC_RSFT","KC_N","KC_M","KC_COMM","KC_DOT","KC_SLSH","KC_RSFT","KC_LSFT","ANY(ADJUST)","KC_LALT","KC_LGUI","ANY(LOWER)","KC_SPC","KC_ENT","ANY(LOWER)","KC_RGUI","KC_RALT","ANY(ADJUST)","KC_RSFT"],["KC_F11","KC_F1","KC_F2","KC_F3","KC_F4","KC_F5","KC_TRNS","KC_TRNS","KC_F6","KC_F7","KC_F8","KC_F9","KC_F10","KC_F12","KC_TRNS","KC_EXLM","KC_AT","KC_HASH","KC_DLR","KC_PERC","KC_TRNS","KC_TRNS","KC_CIRC","KC_AMPR","KC_ASTR","KC_LPRN","KC_RPRN","KC_PIPE","KC_TRNS","KC_1","KC_2","KC_3","KC_4","KC_5","KC_TRNS","KC_TRNS","KC_6","KC_7","KC_8","KC_9","KC_0","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_MINS","KC_UNDS","KC_TRNS","KC_TRNS","KC_PLUS","KC_EQL","KC_LBRC","KC_RBRC","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_ESC","KC_BSPC","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"],["KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","ANY(US)","ANY(JP)","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_HOME","KC_PGDN","KC_PGUP","KC_END","KC_TRNS","KC_TRNS","KC_TRNS","KC_LEFT","KC_DOWN","KC_UP","KC_RGHT","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_LCBR","KC_RCBR","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"]],"author":"","notes":""} \ No newline at end of file +{"keyboard":"ergodash/rev1","keymap":"m47ch4ns_keymap","layout":"LAYOUT_3key_1us","layers":[["KC_ESC","KC_1","KC_2","KC_3","KC_4","KC_5","KC_NO","KC_NO","KC_6","KC_7","KC_8","KC_9","KC_0","KC_GRV","KC_TAB","KC_Q","KC_W","KC_E","KC_R","KC_T","KC_NO","KC_NO","KC_Y","KC_U","KC_I","KC_O","KC_P","KC_BSLS","KC_LCTL","KC_A","KC_S","KC_D","KC_F","KC_G","KC_NO","KC_NO","KC_H","KC_J","KC_K","KC_L","KC_SCLN","KC_QUOT","KC_LSFT","KC_Z","KC_X","KC_C","KC_V","KC_B","KC_LSFT","KC_RSFT","KC_N","KC_M","KC_COMM","KC_DOT","KC_SLSH","KC_RSFT","KC_LSFT","ANY(ADJUST)","KC_LALT","KC_LGUI","ANY(LOWER)","KC_SPC","KC_ENT","ANY(RAISE)","KC_RGUI","KC_RALT","ANY(ADJUST)","KC_RSFT"],["KC_F11","KC_F1","KC_F2","KC_F3","KC_F4","KC_F5","KC_TRNS","KC_TRNS","KC_F6","KC_F7","KC_F8","KC_F9","KC_F10","KC_F12","KC_TRNS","KC_EXLM","KC_AT","KC_HASH","KC_DLR","KC_PERC","KC_TRNS","KC_TRNS","KC_CIRC","KC_AMPR","KC_ASTR","KC_LPRN","KC_RPRN","KC_PIPE","KC_TRNS","KC_1","KC_2","KC_3","KC_4","KC_5","KC_TRNS","KC_TRNS","KC_6","KC_7","KC_8","KC_9","KC_0","KC_TRNS","KC_TRNS","KC_NO","KC_NO","KC_NO","KC_MINS","KC_UNDS","KC_TRNS","KC_TRNS","KC_PLUS","KC_EQL","KC_LBRC","KC_RBRC","KC_NO","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_ESC","KC_BSPC","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"],["KC_F11","KC_F1","KC_F2","KC_F3","KC_F4","KC_F5","KC_TRNS","KC_TRNS","KC_F6","KC_F7","KC_F8","KC_F9","KC_F10","KC_F12","KC_TRNS","KC_EXLM","KC_AT","KC_HASH","KC_DLR","KC_PERC","KC_TRNS","KC_TRNS","KC_CIRC","KC_AMPR","KC_ASTR","KC_LPRN","KC_RPRN","KC_PIPE","KC_TRNS","KC_1","KC_2","KC_3","KC_4","KC_5","KC_TRNS","KC_TRNS","KC_6","KC_7","KC_8","KC_9","KC_0","KC_TRNS","KC_TRNS","KC_NO","KC_LBRC","KC_RBRC","KC_MINS","KC_UNDS","KC_TRNS","KC_TRNS","KC_PLUS","KC_EQL","KC_NO","KC_NO","KC_NO","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_ESC","KC_BSPC","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"],["KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_HOME","KC_PGDN","KC_PGUP","KC_END","KC_TRNS","KC_TRNS","KC_TRNS","KC_LEFT","KC_DOWN","KC_UP","KC_RGHT","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_LCBR","KC_RCBR","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"]],"author":"","notes":""} \ No newline at end of file diff --git a/keyboards/ergodash/rev1/keymaps/m47ch4n/readme.md b/keyboards/ergodash/rev1/keymaps/m47ch4n/readme.md index 59e860140650..330dbb6b9fff 100644 --- a/keyboards/ergodash/rev1/keymaps/m47ch4n/readme.md +++ b/keyboards/ergodash/rev1/keymaps/m47ch4n/readme.md @@ -1,7 +1,7 @@ # m47ch4n's keymap for Ergodash rev1 This is the m47ch4n's keymap configuration for Ergodash rev1. -There are three layers, QWERTY(default), LOWER and ADJSUT. +There are four layers, QWERTY(default), LOWER, RAISE and ADJSUT. ## Layers @@ -17,9 +17,8 @@ There are three layers, QWERTY(default), LOWER and ADJSUT. |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| | Shift| Z | X | C | V | B | Shift| | Shift| N | M | , | . | / | Shift| |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| -| Shift|Adjust| ALt | GUI |||||||| Lower| Space| |||||||| | Enter| Lower|||||||| GUI | ALt |Adjust| Shift| +| Shift|Adjust| ALt | GUI |||||||| Lower| Space| |||||||| | Enter| Raise|||||||| GUI | ALt |Adjust| Shift| ,----------------------------------------------------------------------------------------------------------------------. - ``` ### Lower @@ -32,7 +31,23 @@ There are three layers, QWERTY(default), LOWER and ADJSUT. |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| | | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | | |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| -| | | | | - | _ | | | | + | = | [ | ] | | | +| |||||||||||||||||||||| - | _ | | | | + | = | [ | ] |||||||| | +|-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| +| | | | |||||||| | ESC | |||||||| | Bksp | |||||||| | | | | +,----------------------------------------------------------------------------------------------------------------------. +``` + +### Raise + +``` +,----------------------------------------------------------------------------------------------------------------------. +| F11 | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F12 | +|------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| +| ~ | ! | @ | # | $ | % | | | | ^ | & | * | ( | ) | | | +|------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| +| | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | | +|------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| +| |||||||| [ | ] | - | _ | | | | + | = |||||||||||||||||||||| | |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| | | | | |||||||| | ESC | |||||||| | Bksp | |||||||| | | | | ,----------------------------------------------------------------------------------------------------------------------. @@ -48,12 +63,11 @@ There are three layers, QWERTY(default), LOWER and ADJSUT. |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| | | Home |PageDn|PageUp| End |||||||| | | | Left | Down | Up | Right|||||||| | |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| -| | | | | | | | | | | | { | } | | | +| | | { | } | | | | | | | | { | } | | | |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| | | | | |||||||| | | |||||||| | | |||||||| | | | | ,----------------------------------------------------------------------------------------------------------------------. ``` -You can switch to ADJUST layer by pressing a ADJUST key or pressing two LOWER keys. If your pc connect this keyboard with JIS(JP) layout, you should press JP MODE key. From b37a2b81ce7e0d3be4f0e3ea01bf7d1ab3a2f3a2 Mon Sep 17 00:00:00 2001 From: M47CH4N Date: Sat, 14 Sep 2019 00:25:03 +0900 Subject: [PATCH 9/9] Add kana keys --- .../ergodash/rev1/keymaps/m47ch4n/keymap.c | 23 ++++++++++--------- .../ergodash/rev1/keymaps/m47ch4n/readme.md | 16 ++++++------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/keyboards/ergodash/rev1/keymaps/m47ch4n/keymap.c b/keyboards/ergodash/rev1/keymaps/m47ch4n/keymap.c index 097f905f0f33..4d1d0131f58d 100644 --- a/keyboards/ergodash/rev1/keymaps/m47ch4n/keymap.c +++ b/keyboards/ergodash/rev1/keymaps/m47ch4n/keymap.c @@ -1,4 +1,5 @@ #include QMK_KEYBOARD_H +#include "keymap_jp.h" // clang-format off enum layers { _QWERTY, _LOWER, _RAISE, _ADJUST }; @@ -11,21 +12,21 @@ enum custom_keycodes { JP = SAFE_RANGE, US, SHIFT, LOWER, RAISE, ADJUST, const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Qwerty * ,----------------------------------------------------------------------------------------------------------------------. - * | ESC | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | ` | + * | ESC | 1 | 2 | 3 | 4 | 5 | ZKHK | | ZKHK | 6 | 7 | 8 | 9 | 0 | ` | * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| - * | Tab | Q | W | E | R | T | | | | Y | U | I | O | P | \ | + * | TAB | Q | W | E | R | T | MHEN | |HENKAN| Y | U | I | O | P | \ | * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| - * | Ctrl | A | S | D | F | G | | | | H | J | K | L | ; | ' | + * | CTRL | A | S | D | F | G | EISU | <- ONLY FOR MAC -> | KANA | H | J | K | L | ; | ' | * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| - * | Shift| Z | X | C | V | B | Shift| | Shift| N | M | , | . | / | Shift| + * | SHIFT| Z | X | C | V | B | SHIFT| | SHIFT| N | M | , | . | / | SHIFT| * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| - * | Shift|Adjust| ALt | GUI |||||||| Lower| Space| |||||||| | Enter| Raise|||||||| GUI | ALt |Adjust| Shift| + * | SHIFT|ADJUST| ALT | GUI |||||||| LOWER| SPACE| |||||||| | ENTER| RAISE|||||||| GUI | ALT |ADJUST| SHIFT| * ,----------------------------------------------------------------------------------------------------------------------. */ [_QWERTY] = LAYOUT( \ - KC_ESC, CSTM_1, CSTM_2, CSTM_3, CSTM_4, CSTM_5, XXXXXXX, XXXXXXX, CSTM_6, CSTM_7, CSTM_8, CSTM_9, CSTM_0, GRV , \ - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, XXXXXXX, XXXXXXX, KC_Y, KC_U, KC_I, KC_O, KC_P, BSLS , \ - KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, XXXXXXX, XXXXXXX, KC_H, KC_J, KC_K, KC_L, SCLN, QUOT , \ + KC_ESC, CSTM_1, CSTM_2, CSTM_3, CSTM_4, CSTM_5, JP_KANA, JP_KANA, CSTM_6, CSTM_7, CSTM_8, CSTM_9, CSTM_0, GRV , \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, JP_MHEN, JP_HENK, KC_Y, KC_U, KC_I, KC_O, KC_P, BSLS , \ + KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, JP_MEISU, JP_MKANA,KC_H, KC_J, KC_K, KC_L, SCLN, QUOT , \ SHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, SHIFT , SHIFT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SHIFT , \ SHIFT, ADJUST, KC_LALT, KC_LCTL, LOWER, KC_SPC ,XXXXXXX, XXXXXXX,KC_ENT , RAISE, KC_LCTL, KC_LALT, ADJUST, SHIFT \ ), @@ -40,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| * | |||||||||||||||||||||| - | _ | | | | + | = | [ | ] |||||||| | * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| - * | | | | |||||||| | ESC | |||||||| | Bksp | |||||||| | | | | + * | | | | |||||||| | ESC | |||||||| | BKSP | |||||||| | | | | * ,----------------------------------------------------------------------------------------------------------------------. */ [_LOWER] = LAYOUT( @@ -61,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| * | |||||||| [ | ] | - | _ | | | | + | = |||||||||||||||||||||| | * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| - * | | | | |||||||| | ESC | |||||||| | Bksp | |||||||| | | | | + * | | | | |||||||| | ESC | |||||||| | BKSP | |||||||| | | | | * ,----------------------------------------------------------------------------------------------------------------------. */ [_RAISE] = LAYOUT( @@ -78,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| * | | | | | | | | | | | | | | | | * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| - * | | Home |PageDn|PageUp| End |||||||| | | | Left | Down | Up | Right|||||||| | + * | | HOME |PAGEDN|PAGEUP| END |||||||| | | | LEFT | DOWN | UP | RIGHT|||||||| | * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| * | | | { | } | | | | | | | | { | } | | | * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| diff --git a/keyboards/ergodash/rev1/keymaps/m47ch4n/readme.md b/keyboards/ergodash/rev1/keymaps/m47ch4n/readme.md index 330dbb6b9fff..598f258e1c0c 100644 --- a/keyboards/ergodash/rev1/keymaps/m47ch4n/readme.md +++ b/keyboards/ergodash/rev1/keymaps/m47ch4n/readme.md @@ -9,15 +9,15 @@ There are four layers, QWERTY(default), LOWER, RAISE and ADJSUT. ``` ,----------------------------------------------------------------------------------------------------------------------. -| ESC | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | ` | +| ESC | 1 | 2 | 3 | 4 | 5 | ZKHK | | ZKHK | 6 | 7 | 8 | 9 | 0 | ` | |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| -| Tab | Q | W | E | R | T | | | | Y | U | I | O | P | \ | +| TAB | Q | W | E | R | T | MHEN | |HENKAN| Y | U | I | O | P | \ | |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| -| Ctrl | A | S | D | F | G | | | | H | J | K | L | ; | ' | +| CTRL | A | S | D | F | G | EISU |<-- ONLY FOR MAC -->| KANA | H | J | K | L | ; | ' | |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| -| Shift| Z | X | C | V | B | Shift| | Shift| N | M | , | . | / | Shift| +| SHIFT| Z | X | C | V | B | SHIFT| | SHIFT| N | M | , | . | / | SHIFT| |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| -| Shift|Adjust| ALt | GUI |||||||| Lower| Space| |||||||| | Enter| Raise|||||||| GUI | ALt |Adjust| Shift| +| SHIFT|ADJUST| ALT | GUI |||||||| LOWER| SPACE| |||||||| | ENTER| RAISE|||||||| GUI | ALT |ADJUST| SHIFT| ,----------------------------------------------------------------------------------------------------------------------. ``` @@ -33,7 +33,7 @@ There are four layers, QWERTY(default), LOWER, RAISE and ADJSUT. |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| | |||||||||||||||||||||| - | _ | | | | + | = | [ | ] |||||||| | |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| -| | | | |||||||| | ESC | |||||||| | Bksp | |||||||| | | | | +| | | | |||||||| | ESC | |||||||| | BKSP | |||||||| | | | | ,----------------------------------------------------------------------------------------------------------------------. ``` @@ -49,7 +49,7 @@ There are four layers, QWERTY(default), LOWER, RAISE and ADJSUT. |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| | |||||||| [ | ] | - | _ | | | | + | = |||||||||||||||||||||| | |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| -| | | | |||||||| | ESC | |||||||| | Bksp | |||||||| | | | | +| | | | |||||||| | ESC | |||||||| | BKSP | |||||||| | | | | ,----------------------------------------------------------------------------------------------------------------------. ``` @@ -61,7 +61,7 @@ There are four layers, QWERTY(default), LOWER, RAISE and ADJSUT. |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| | | | | | | | | | | | | | | | | |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| -| | Home |PageDn|PageUp| End |||||||| | | | Left | Down | Up | Right|||||||| | +| | HOME |PAGEDN|PAGEUP| END |||||||| | | | LEFT | DOWN | UP | RIGHT|||||||| | |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| | | | { | } | | | | | | | | { | } | | | |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|