]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
projects / qmk_firmware.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 791cdd6)
Keymap: Update Koba's keymap for Ergo42. (#5223)
authorKOBAYASHI Daisuke <daisuke.koba@gmail.com>
Sun, 24 Feb 2019 01:22:20 +0000 (10:22 +0900)
committerMechMerlin <30334081+mechmerlin@users.noreply.github.com>
Sun, 24 Feb 2019 01:22:20 +0000 (17:22 -0800)
keyboards/ergo42/keymaps/koba/keymap.c patch | blob | history
keyboards/ergo42/keymaps/koba/readme.md patch | blob | history
keyboards/ergo42/keymaps/koba/readme_ja.md patch | blob | history

diff --git a/keyboards/ergo42/keymaps/koba/keymap.c b/keyboards/ergo42/keymaps/koba/keymap.c
index f05f78b9e7c66037067e78e00b4ed2305b8b356d..9bc504207fb18f4ba21ea42dba566e9bcb07e56b 100644 (file)
--- a/keyboards/ergo42/keymaps/koba/keymap.c
+++ b/keyboards/ergo42/keymaps/koba/keymap.c
@@ -37,36 +37,36 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* WIN
    * ,------------------------------------------------.   ,------------------------------------------------.
-   * | Esc  | Tab  |   Q  |   W  |   E  |   R  |   T  |   |   Y  |   U  |   I  |   O  |   P  |  @ ` | Bksp |
-   * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
-   * | Del  | Ctrl |   A  |   S  |   D  |   F  |   G  |   |   H  |   J  |   K  |   L  |  ; + |  ; * |Enter |
-   * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
+   * | Esc  | Del  |   Q  |   W  |   E  |   R  |   T  |   |   Y  |   U  |   I  |   O  |   P  |  @ ` | Bksp |
+   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
+   * | Tab  | Ctrl |   A  |   S  |   D  |   F  |   G  |   |   H  |   J  |   K  |   L  |  ; + |  ; * |Enter |
+   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
    * | H/Z  |Shift |   Z  |   X  |   C  |   V  |   B  |   |   N  |   M  |  , < |  . > |  / ? |  Up  |Shift |
    * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
    * |  Fn  | Ctrl | Win  | Alt  | Mhen |LOWER |Space |   |Space |RAISE | Henk | Menu | Left | Down |Right |
    * `------------------------------------------------'   `------------------------------------------------'
    */
   [_WIN] = LAYOUT( \
-    KC_ESC,  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    JP_AT,   KC_BSPC, \
-    KC_DELT, KC_RCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, JP_COLN, KC_ENT,  \
+    KC_ESC,  KC_DELT, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    JP_AT,   KC_BSPC, \
+    KC_TAB,  KC_RCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, JP_COLN, KC_ENT,  \
     KC_ZKHK, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,     KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   KC_RSFT, \
     FN,      KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN, LOWER,   KC_SPC,   KC_SPC,  RAISE,   KC_HENK, KC_APP,  KC_LEFT, KC_DOWN, KC_RGHT  \
   ),
 
   /* MACOS
    * ,------------------------------------------------.   ,------------------------------------------------.
-   * | Esc  | Tab  |   Q  |   W  |   E  |   R  |   T  |   |   Y  |   U  |   I  |   O  |   P  |  @ ` | Bksp |
-   * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
-   * | Del  | Ctrl |   A  |   S  |   D  |   F  |   G  |   |   H  |   J  |   K  |   L  |  ; + |  ; * |Enter |
-   * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
+   * | Esc  | Del  |   Q  |   W  |   E  |   R  |   T  |   |   Y  |   U  |   I  |   O  |   P  |  @ ` | Bksp |
+   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
+   * | Tab  | Ctrl |   A  |   S  |   D  |   F  |   G  |   |   H  |   J  |   K  |   L  |  ; + |  ; * |Enter |
+   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
    * | Caps |Shift |   Z  |   X  |   C  |   V  |   B  |   |   N  |   M  |  , < |  . > |  / ? |  Up  |Shift |
    * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
    * |  Fn  | Ctrl | Opt  | Cmd  | Eisu |LOWER |Space |   |Space |RAISE | Kana | Cmd  | Left | Down |Right |
    * `------------------------------------------------'   `------------------------------------------------'
    */
   [_MACOS] = LAYOUT( \
-    KC_ESC,  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    JP_AT,   KC_BSPC, \
-    KC_DELT, KC_RCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, JP_COLN, KC_ENT,  \
+    KC_ESC,  KC_DELT, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    JP_AT,   KC_BSPC, \
+    KC_TAB,  KC_RCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, JP_COLN, KC_ENT,  \
     KC_CAPS, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,     KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   KC_RSFT, \
     FN,      KC_LCTL, KC_LALT, KC_LGUI, KC_EISU, LOWER,   KC_SPC,   KC_SPC,  RAISE,   KC_KNA,  KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT  \
   ),
@@ -74,9 +74,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* LOWER
    * ,------------------------------------------------.   ,------------------------------------------------.
    * |      |      |   !  |   "  |   #  |   $  |   %  |   |   &  |   '  |   (  |   )  |      |   =  |      |
-   * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
+   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
    * |      |      | XXXX | XXXX | XXXX |   {  |   (  |   |   )  |   }  | XXXX |   ~  |   |  |   _  |      |
-   * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
+   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
    * |      |      | XXXX | XXXX | XXXX | XXXX | XXXX |   | XXXX | XXXX | XXXX | XXXX | XXXX | PgUp |      |
    * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
    * |      |      |      |      |      |      |      |   |      |      |      |      | Home | PgDn | End  |
@@ -92,9 +92,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* RAISE
    * ,------------------------------------------------.   ,------------------------------------------------.
    * |      |      |   1  |   2  |   3  |   4  |   5  |   |   6  |   7  |   8  |   9  |   0  |   -  |      |
-   * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
+   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
    * |      |      | F11  | F12  | XXXX |   [  |   (  |   |   )  |   ]  | XXXX |   ^  |   \  |   \  |      |
-   * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
+   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
    * |      |      |  F1  |  F2  |  F3  |  F4  |  F5  |   |  F6  |  F7  |  F8  |  F9  | F10  |      |      |
    * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
    * |      |      |      |      |      |      |      |   |      |      |      |      |      |      |      |
@@ -109,20 +109,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* FUNC
    * ,------------------------------------------------.   ,------------------------------------------------.
-   * |Reset |      | XXXX | XXXX | XXXX | XXXX | XXXX |   |PrtSc |SLock |Pause | XXXX | XXXX | XXXX |      |
-   * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
-   * |      |      | XXXX | XXXX | XXXX | XXXX | >Win |   | Ins  | XXXX | XXXX | XXXX | XXXX | XXXX |      |
-   * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
-   * |      |      | XXXX | XXXX | XXXX | XXXX | >Mac |   | XXXX | XXXX | XXXX | XXXX | XXXX | Vol+ |      |
+   * |Reset | Ins  | XXXX | XXXX | XXXX | XXXX | XXXX |   | XXXX | XXXX |PrtSc |SrcLk |Pause | XXXX |      |
+   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
+   * |      |      | XXXX | XXXX | XXXX | XXXX | >Win |   |   *  |   /  | Home | PgUp | XXXX | XXXX |      |
+   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
+   * | Caps |      | XXXX | XXXX | XXXX | XXXX | >Mac |   |   +  |   -  | End  | PgDn | XXXX | Vol+ |      |
    * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |   |      |      |      |      |      | Vol- | Play |
+   * |      |      |      |      |      |      |      |   |      |      |      |      | Mute | Vol- | Play |
    * `------------------------------------------------'   `------------------------------------------------'
    */
   [_FUNC] = LAYOUT( \
-    RESET,   _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  KC_PSCR, KC_SLCK, KC_PAUS, XXXXXXX, XXXXXXX, XXXXXXX, _______, \
-    _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, WIN,      KC_INS,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, \
-    _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MACOS,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU, _______, \
-    _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, XXXXXXX, KC_VOLD, KC_MPLY  \
+    RESET,   KC_INS,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, KC_PSCR, KC_SLCK, KC_PAUS, XXXXXXX, _______, \
+    _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, WIN,      JP_ASTR, KC_SLSH, KC_HOME, KC_PGUP, XXXXXXX, XXXXXXX, _______, \
+    KC_CAPS, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MACOS,    JP_PLUS, KC_MINS, KC_END,  KC_PGDN, XXXXXXX, KC_VOLU, _______, \
+    _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_MPLY  \
   )
 };
 
diff --git a/keyboards/ergo42/keymaps/koba/readme.md b/keyboards/ergo42/keymaps/koba/readme.md
index 1fe0543902f405111d9ee84714101765fbf85a24..bbf9c1c4a6c9f891d2b5c6737c4017e1b99817be 100644 (file)
--- a/keyboards/ergo42/keymaps/koba/readme.md
+++ b/keyboards/ergo42/keymaps/koba/readme.md
@@ -6,12 +6,12 @@ This keymap is for Ergo42.
 
 - JIS layout.
 - Independent Windows layout/MacOS layout layers.
-- Bottom row keys arranged like a standard keyboard.
+- Bottom row keys are arranged like a standard keyboard.
 - Arrow keys are designed in the inverted-T.
 
 ## Layout
 
-![keyboard-layout](https://user-images.githubusercontent.com/1042121/45888288-aa35ed00-bdf8-11e8-8741-71fe9a0fadc6.png)
+![keyboard-layout](https://user-images.githubusercontent.com/1042121/52666273-32a45e00-2f51-11e9-9e15-c231155f3bed.png)
 
 ## Windows mode/MacOS mode
 
diff --git a/keyboards/ergo42/keymaps/koba/readme_ja.md b/keyboards/ergo42/keymaps/koba/readme_ja.md
index e1dbda821f026406e844e8fe962377c56d778f78..188fb48310e213ab9a9d2c862ffbe30313240240 100644 (file)
--- a/keyboards/ergo42/keymaps/koba/readme_ja.md
+++ b/keyboards/ergo42/keymaps/koba/readme_ja.md
@@ -11,7 +11,7 @@ Ergo42 用キーマップです。
 
 ## レイアウト
 
-![keyboard-layout](https://user-images.githubusercontent.com/1042121/45888288-aa35ed00-bdf8-11e8-8741-71fe9a0fadc6.png)
+![keyboard-layout](https://user-images.githubusercontent.com/1042121/52666273-32a45e00-2f51-11e9-9e15-c231155f3bed.png)
 
 ## Windows モード/MacOS モード
 
Unnamed repository; edit this file 'description' to name the repository.