]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Move keys and especially TAB more like on a TypeMatrix 2020 keyboard. Add a left...
authorOlivier <olivier@gid0.org>
Sat, 4 Jun 2016 18:14:34 +0000 (20:14 +0200)
committerOlivier <olivier@gid0.org>
Sat, 4 Jun 2016 18:14:34 +0000 (20:14 +0200)
keyboard/ergodox_ez/keymaps/bepo/bepo.hex
keyboard/ergodox_ez/keymaps/bepo/bepo.png
keyboard/ergodox_ez/keymaps/bepo/keymap.c

index 2e81cbb4c0bad14bfa953d75e6bbbf0b86beb56a..7399c0fd46efe501565571c6119e232be77399f3 100644 (file)
@@ -18,9 +18,9 @@
 :10011000E201E00002620001620262016200350059\r
 :100120002E0030006400015400001E001400040082\r
 :100130001D00000004521F001A0016001B00E300FF\r
-:100140002B002000080007000600E0002C00210022\r
+:10014000E1002000080007000600E0002C0021006C\r
 :10015000150009001900E2000552220017000A00EC\r
-:1001600005000000000029002A0000004C000000EB\r
+:100160000500000029004C002A0000002B000000C0\r
 :100170000652470039000000530000000000230031\r
 :100180001C000B00110000004900240018000D00A5\r
 :100190001000E600013025000C000E003600E400DF\r
 :1001B000130033003800460004522D002F00340095\r
 :1001C000310048000000210222021A00080001004C\r
 :1001D000000034020500040004000000045236024E\r
-:1001E000080018001C00E3002B00370213000C006D\r
+:1001E000080018001C00E3000252370213000C0044\r
 :1001F0001B00E0002C002602120008003700E2007D\r
-:1002000005522702080036000E00000000002900F9\r
-:100210002A0000004C000000065247003900000090\r
+:1002000005522702080036000E00000029004C00AD\r
+:100210002A0000002B0000000652470039000000B1\r
 :100220005300000000001F022302060034000000FB\r
 :1002300049002E02190017001400035201002D007E\r
 :10024000070016000A00E400280038000F0015001F\r
@@ -39,9 +39,9 @@
 :1002600004522E001D00100006004800000020026D\r
 :1002700035001A020802010000001E0005020402F7\r
 :100280000402010001001F00080218021C02E30220\r
-:100290002B02200013020C021B02E00201002100CD\r
+:100290000100200013020C021B02E00201002100F9\r
 :1002A000120208023302E2020100220008023300B7\r
-:1002B0000E0200000100010001000000010000002A\r
+:1002B0000E02000001000100010000002B020000FE\r
 :1002C0000100010001000000010000000100230006\r
 :1002D0001E02060238020000010024001902170263\r
 :1002E0001402E60201002500070216020A02E402D7\r
 :100300000D02110209020100010001001D0210028C\r
 :10031000060201000000210222021A00080001006A\r
 :1003200000003402310204003100000004523602A1\r
-:10033000080018002F02E3002B00370224020C00F3\r
+:10033000080018002F02E3000252370224020C00CA\r
 :100340003002E0002D022F00120022143700E200DC\r
-:100350000552300008003600350200000000290078\r
-:100360002A0000004C00000006524700390000003F\r
+:1003500005523000080036003502000029004C002C\r
+:100360002A0000002B000000065247003900000060\r
 :100370005300000000001F022302060034000000AA\r
 :1003800049002E02190017001400010001002D0081\r
 :10039000070016000A00E400280038000F001500CE\r
@@ -60,7 +60,7 @@
 :1003B00004522E001D00100006004800000000003E\r
 :1003C000000000000000000000003A0000000000F3\r
 :1003D0000000000001003B000000000000000100E0\r
-:1003E00000003C00000000000000010000003D0093\r
+:1003E00001003C00000000000000010000003D0092\r
 :1003F000000000000000010000003E0000000000BE\r
 :1004000000000000000000000000000000000000EC\r
 :1004100000000000000000000000000000003F009D\r
@@ -70,7 +70,7 @@
 :100450004400450000000000010000000000000012\r
 :10046000000000000000000000000000000000008C\r
 :10047000000000000000000000000000000000007C\r
-:10048000000000000000010000000000000000006B\r
+:10048000000000000000010001000000000000006A\r
 :10049000000001000000000000000000000001005A\r
 :1004A000010000000000000000000000000000004B\r
 :1004B000000000000000000000000000000000003C\r
@@ -81,7 +81,7 @@
 :1005000000000000000000000000000000000000EB\r
 :1005100000000000000000000000000000000000DB\r
 :1005200000000000000000000000000000000100CA\r
-:1005300000000000000000000000010000000000BA\r
+:1005300001000000000000000000010000000000B9\r
 :1005400000000000000001000000000000000000AA\r
 :10055000000000000000000000000000000000009B\r
 :10056000010000000000000000000000000000008A\r
index ccb2b5e6835a04969e8e7d3a0ddff0adbe815eb5..910dd252bc646f788a3c0599b35956c624f03baf 100644 (file)
Binary files a/keyboard/ergodox_ez/keymaps/bepo/bepo.png and b/keyboard/ergodox_ez/keymaps/bepo/bepo.png differ
index b95ae3dc5d2fb8481edd2fb4d729b2e28e4fe579..30f1de1255a62389773ab035bd28365caa456f3f 100644 (file)
@@ -18,31 +18,31 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap 0: Base layer
  *
  * ,--------------------------------------------------.                                  ,--------------------------------------------------.
- * |   $    |   "  |   <  |   >  |   (  |   )  |  Esc |                                  |ScroLo|   @  |   +  |   -  |   /  |   *  |   =    |
+ * |   $    |   "  |   <  |   >  |   (  |   )  |Delete|                                  |ScroLo|   @  |   +  |   -  |   /  |   *  |   =    |
  * |--------+------+------+------+------+-------------|                                  |------+------+------+------+------+------+--------|
  * |   %    |   B  |E_ACUT|   P  |   O  |E_GRAV|Backsp|                                  |CapsLo|   ^  |   V  |   D  |   L  |   J  |   Z    |
  * |--------+------+------+------+------+------|  ace |                                  |      |------+------+------+------+------+--------|
  * |   W    |   A  |   U  |   I  |   E  |   ,  |------|                                  |------|   C  |   T  |   S  |   R  |   N  |   M    |
- * |--------+------+------+------+------+------|Delete|                                  | NumLo|------+------+------+------+------+--------|
+ * |--------+------+------+------+------+------|  Tab |                                  | NumLo|------+------+------+------+------+--------|
  * | E_CIRC |A_GRAV|   Y  |   X  |   .  |   K  |      |                                  |      |   '  |   Q  |   G  |   H  |   F  | C_CEDIL|
  * `--------+------+------+------+------+-------------,-------------.      ,-------------`-------------+------+------+------+------+--------'
- *   |QWERTY|      |LSuper| LCtrl|  LAlt|             |      | L_Mse|      |      |Insert|             | AltGr| RCtrl|RSuper|PrntSc| Pause|
+ *   |QWERTY|      |LSuper| LCtrl|  LAlt|             |Escape| L_Mse|      |      |Insert|             | AltGr| RCtrl|RSuper|PrntSc| Pause|
  *   `----------------------------------'      ,------|------|------|      |------+------+------.      `----------------------------------'
  *                                             |      |      | L_Num|      | CA_Fx|      |      |
- *                                             | Space|  Tab |------|      |------|RShift|Enter |
+ *                                             | Space|LShift|------|      |------|RShift|Enter |
  *                                             |      |      |L_FNav|      |L_FNav|      |      |
  *                                             `--------------------'      `--------------------'
  */
 [BASE] = KEYMAP(
 // Left hand
-BP_DOLLAR,     BP_DQOT,        BP_LGIL,        BP_RGIL,        BP_LPRN,        BP_RPRN,        KC_ESC,
+BP_DOLLAR,     BP_DQOT,        BP_LGIL,        BP_RGIL,        BP_LPRN,        BP_RPRN,        KC_DEL,
 BP_PERCENT,    BP_B,           BP_E_ACUTE,     BP_P,           BP_O,           BP_E_GRAVE,     KC_BSPC,
 BP_W,          BP_A,           BP_U,           BP_I,           BP_E,           BP_COMMA,
-BP_ECRC,       BP_A_GRAVE,     BP_Y,           BP_X,           BP_DOT,         BP_K,           KC_DEL,
+BP_ECRC,       BP_A_GRAVE,     BP_Y,           BP_X,           BP_DOT,         BP_K,           KC_TAB,
 TG(QWER),      KC_NO,          KC_LGUI,        KC_LCTL,        KC_LALT,
-                                                                                                               KC_NO,          MO(MSE),
+                                                                                                               KC_ESC,         MO(MSE),
                                                                                                                                MO(NUM),
-                                                                                               KC_SPC,         KC_TAB,         MO(FNAV),
+                                                                                               KC_SPC,         KC_LSHIFT,      MO(FNAV),
 // Right hand
                                KC_SLCK,        BP_AT,          BP_PLUS,        BP_MINUS,       BP_SLASH,       BP_ASTR,        BP_EQUAL,
                                KC_CAPSLOCK,    BP_DCRC,        BP_V,           BP_D,           BP_L,           BP_J,           BP_Z,
@@ -55,31 +55,31 @@ MO(FNAV),   KC_RSHIFT,      KC_ENTER),
 /* Keymap 1: QWERTY system compatibility layer
  *
  * ,--------------------------------------------------.                                  ,--------------------------------------------------.
- * |   $    |   "  |   <  |   >  |   (  |   )  |  Esc |                                  |ScroLo|   @  |   +  |   -  |   /  |   *  |   =    |
+ * |   $    |   "  |   <  |   >  |   (  |   )  |Delete|                                  |ScroLo|   @  |   +  |   -  |   /  |   *  |   =    |
  * |--------+------+------+------+------+-------------|                                  |------+------+------+------+------+------+--------|
  * |   %    |   b  |   e  |   p  |   o  |   e  |Backsp|                                  |CapsLo|   ^  |   v  |   d  |   l  |   j  |   z    |
  * |--------+------+------+------+------+------|  ace |                                  |      |------+------+------+------+------+--------|
  * |   w    |   a  |   u  |   i  |   e  |   ,  |------|                                  |------|   c  |   t  |   s  |   r  |   n  |   m    |
- * |--------+------+------+------+------+------|Delete|                                  | NumLo|------+------+------+------+------+--------|
+ * |--------+------+------+------+------+------|  Tab |                                  | NumLo|------+------+------+------+------+--------|
  * |   e    |   a  |   y  |   x  |   .  |   k  |      |                                  |      |   '  |   q  |   g  |   h  |   f  |   c    |
  * `--------+------+------+------+------+-------------,-------------.      ,-------------`-------------+------+------+------+------+--------'
- *   | BEPO |      |LSuper| LCtrl|  LAlt|             |      | L_Mse|      |      |Insert|             | AltGr| RCtrl|RSuper|PrntSc| Pause|
+ *   | BEPO |      |LSuper| LCtrl|  LAlt|             |Escape| L_Mse|      |      |Insert|             | AltGr| RCtrl|RSuper|PrntSc| Pause|
  *   `----------------------------------'      ,------|------|------|      |------+------+------.      `----------------------------------'
  *                                             |      |      | L_Num|      |      |      |      |
- *                                             | Space|  Tab |------|      |------|RShift|Enter |
+ *                                             | Space|LShift|------|      |------|RShift|Enter |
  *                                             |      |      |L_FNav|      |L_FNav|      |      |
  *                                             `--------------------'      `--------------------'
  */
 [QWER] = KEYMAP(
 // Left hand
-KC_DOLLAR,     S(KC_QUOT),     S(KC_COMM),     S(KC_DOT),      KC_LPRN,        KC_RPRN,        KC_ESC,
+KC_DOLLAR,     S(KC_QUOT),     S(KC_COMM),     S(KC_DOT),      KC_LPRN,        KC_RPRN,        KC_DEL,
 KC_PERCENT,    KC_B,           KC_E,           KC_P,           KC_O,           KC_E,           KC_BSPC,
 KC_W,          KC_A,           KC_U,           KC_I,           KC_E,           KC_COMMA,
-KC_E,          KC_A,           KC_Y,           KC_X,           KC_DOT,         KC_K,           KC_DEL,
+KC_E,          KC_A,           KC_Y,           KC_X,           KC_DOT,         KC_K,           KC_TAB,
 KC_TRNS,       KC_NO,          KC_LGUI,        KC_LCTL,        KC_LALT,
-                                                                                                               KC_NO,          MO(MSE),
+                                                                                                               KC_ESC,         MO(MSE),
                                                                                                                                MO(NUM),
-                                                                                               KC_SPC,         KC_TAB,         MO(FNAV),
+                                                                                               KC_SPC,         MO(SQWER),      MO(FNAV),
 // Right hand
                                KC_SLCK,        KC_AT,          KC_PLUS,        KC_MINUS,       KC_SLASH,       KC_ASTR,        KC_EQUAL,
                                KC_CAPSLOCK,    KC_CIRC,        KC_V,           KC_D,           KC_L,           KC_J,           KC_Z,
@@ -92,18 +92,18 @@ MO(FNAV),   MO(SQWER),      KC_ENTER),
 /* Keymap 2: QWERTY shifted system compatibility layer
  *
  * ,--------------------------------------------------.                                  ,--------------------------------------------------.
- * |   #    |   1  |   2  |   3  |   4  |   5  |  Esc |                                  |ScroLo|   6  |   7  |   8  |   9  |   0  |   =    |
+ * |   #    |   1  |   2  |   3  |   4  |   5  |Delete|                                  |ScroLo|   6  |   7  |   8  |   9  |   0  |   =    |
  * |--------+------+------+------+------+-------------|                                  |------+------+------+------+------+------+--------|
  * |   `    |   B  |   E  |   P  |   O  |   E  |Backsp|                                  |CapsLo|   !  |   V  |   D  |   L  |   J  |   Z    |
  * |--------+------+------+------+------+------|  ace |                                  |      |------+------+------+------+------+--------|
  * |   W    |   A  |   U  |   I  |   E  |   ;  |------|                                  |------|   C  |   T  |   S  |   R  |   N  |   M    |
- * |--------+------+------+------+------+------|Delete|                                  | NumLo|------+------+------+------+------+--------|
+ * |--------+------+------+------+------+------|  Tab |                                  | NumLo|------+------+------+------+------+--------|
  * |   E    |   A  |   Y  |   X  |   :  |   K  |      |                                  |      |   ?  |   Q  |   G  |   H  |   F  |   C    |
  * `--------+------+------+------+------+-------------,-------------.      ,-------------`-------------+------+------+------+------+--------'
- *   | BEPO |      |LSuper| LCtrl|  LAlt|             |      | L_Mse|      |      |Insert|             | AltGr| RCtrl|RSuper|PrntSc| Pause|
+ *   | BEPO |      |LSuper| LCtrl|  LAlt|             |Escape| L_Mse|      |      |Insert|             | AltGr| RCtrl|RSuper|PrntSc| Pause|
  *   `----------------------------------'      ,------|------|------|      |------+------+------.      `----------------------------------'
  *                                             |      |      | L_Num|      |      |      |      |
- *                                             | Space|  Tab |------|      |------|RShift|Enter |
+ *                                             | Space|LShift|------|      |------|RShift|Enter |
  *                                             |      |      |L_FNav|      |L_FNav|      |      |
  *                                             `--------------------'      `--------------------'
  */
@@ -112,11 +112,11 @@ MO(FNAV), MO(SQWER),      KC_ENTER),
 KC_HASH,       KC_1,           KC_2,           KC_3,           KC_4,           KC_5,           KC_TRNS,
 KC_GRV,                S(KC_B),        S(KC_E),        S(KC_P),        S(KC_O),        S(KC_E),        KC_TRNS,
 S(KC_W),       S(KC_A),        S(KC_U),        S(KC_I),        S(KC_E),        KC_SCOLON,
-S(KC_E),       S(KC_A),        S(KC_Y),        S(KC_X),        KC_COLON,       S(KC_K),        KC_TRNS,
+S(KC_E),       S(KC_A),        S(KC_Y),        S(KC_X),        KC_COLON,       S(KC_K),        S(KC_TAB),
 KC_TRNS,       KC_TRNS,        S(KC_LGUI),     S(KC_LCTL),     S(KC_LALT),
                                                                                                                KC_TRNS,        KC_TRNS,
                                                                                                                                KC_TRNS,
-                                                                                               KC_TRNS,        S(KC_TAB),      KC_TRNS,
+                                                                                               KC_TRNS,        KC_TRNS,        KC_TRNS,
 // Right hand
                                KC_TRNS,        KC_6,           KC_7,           KC_8,           KC_9,           KC_0,           KC_TRNS,
                                KC_TRNS,        KC_EXLM,        S(KC_V),        S(KC_D),        S(KC_L),        S(KC_J),        S(KC_Z),
@@ -129,31 +129,31 @@ KC_TRNS,  KC_TRNS,        KC_TRNS),
 /* Keymap 3: QWERTY alted system compatibility layer
  *
  * ,--------------------------------------------------.                                  ,--------------------------------------------------.
- * |   $    |   "  |   <  |   >  |   [  |   ]  |  Esc |                                  |ScroLo|   @  |   +  |   -  |   /  |   *  |   =    |
+ * |   $    |   "  |   <  |   >  |   [  |   ]  |Delete|                                  |ScroLo|   @  |   +  |   -  |   /  |   *  |   =    |
  * |--------+------+------+------+------+-------------|                                  |------+------+------+------+------+------+--------|
  * |   %    |   |  |   e  |   &  |   o  |   e  |Backsp|                                  |CapsLo|   ^  |   v  |   d  |   l  |   j  |   z    |
  * |--------+------+------+------+------+------|  ace |                                  |      |------+------+------+------+------+--------|
  * |   w    |   a  |   u  |   i  |   €  |   ,  |------|                                  |------|   c  |   t  |   s  |   r  |   n  |   m    |
- * |--------+------+------+------+------+------|Delete|                                  | NumLo|------+------+------+------+------+--------|
+ * |--------+------+------+------+------+------|  Tab |                                  | NumLo|------+------+------+------+------+--------|
  * |   e    |   \  |   {  |   }  |   .  |   ~  |      |                                  |      |   '  |   q  |   g  |   h  |   f  |   c    |
  * `--------+------+------+------+------+-------------,-------------.      ,-------------`-------------+------+------+------+------+--------'
- *   | BEPO |      |LSuper| LCtrl|  LAlt|             |      | L_Mse|      |      |Insert|             | AltGr| RCtrl|RSuper|PrntSc| Pause|
+ *   | BEPO |      |LSuper| LCtrl|  LAlt|             |Escape| L_Mse|      |      |Insert|             | AltGr| RCtrl|RSuper|PrntSc| Pause|
  *   `----------------------------------'      ,------|------|------|      |------+------+------.      `----------------------------------'
  *                                             |      |      | L_Num|      |      |      |      |
- *                                             |   _  |  Tab |------|      |------|RShift|Enter |
+ *                                             |   _  |LShift|------|      |------|RShift|Enter |
  *                                             |      |      |L_FNav|      |L_FNav|      |      |
  *                                             `--------------------'      `--------------------'
  */
 [AQWER] = KEYMAP(
 // Left hand
-KC_DOLLAR,     S(KC_QUOT),     S(KC_COMM),     S(KC_DOT),      KC_LBRC,        KC_RBRC,        KC_ESC,
+KC_DOLLAR,     S(KC_QUOT),     S(KC_COMM),     S(KC_DOT),      KC_LBRC,        KC_RBRC,        KC_DEL,
 KC_PERCENT,    KC_PIPE,        KC_E,           KC_AMPR,        KC_O,           KC_E,           KC_BSPC,
 KC_W,          KC_A,           KC_U,           KC_I,           RALT(KC_5),     KC_COMMA,
-KC_E,          KC_BSLASH,      KC_LCBR,        KC_RCBR,        KC_DOT,         KC_TILDE,       KC_DEL,
+KC_E,          KC_BSLASH,      KC_LCBR,        KC_RCBR,        KC_DOT,         KC_TILDE,       KC_TAB,
 KC_TRNS,       KC_NO,          KC_LGUI,        KC_LCTL,        KC_LALT,
-                                                                                                               KC_NO,          MO(MSE),
+                                                                                                               KC_ESC,         MO(MSE),
                                                                                                                                MO(NUM),
-                                                                                               KC_UNDS,        KC_TAB,         MO(FNAV),
+                                                                                               KC_UNDS,        MO(SQWER),      MO(FNAV),
 // Right hand
                                KC_SLCK,        KC_AT,          KC_PLUS,        KC_MINUS,       KC_SLASH,       KC_ASTR,        KC_EQUAL,
                                KC_CAPSLOCK,    KC_CIRC,        KC_V,           KC_D,           KC_L,           KC_J,           KC_Z,
@@ -190,7 +190,7 @@ KC_NO,              KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,
 KC_NO,         KC_NO,          KC_TRNS,        KC_TRNS,        KC_TRNS,
                                                                                                                KC_NO,          KC_NO,
                                                                                                                                KC_NO,
-                                                                                               KC_NO,          KC_NO,          KC_TRNS,
+                                                                                               KC_NO,          KC_TRNS,        KC_TRNS,
 // Right hand
                                KC_NO,          KC_F6,          KC_F7,          KC_F8,          KC_F9,          KC_F10,         KC_NO,
                                KC_NO,          KC_PGUP,        KC_HOME,        KC_UP,          KC_END,         KC_F11,         KC_NO,
@@ -227,7 +227,7 @@ KC_NO,              KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,
 KC_NO,         KC_NO,          KC_TRNS,        KC_TRNS,        KC_TRNS,
                                                                                                                KC_NO,          KC_NO,
                                                                                                                                KC_TRNS,
-                                                                                               KC_NO,          KC_NO,          KC_NO,
+                                                                                               KC_NO,          KC_TRNS,        KC_NO,
 // Right hand
                                KC_NO,          KC_NO,          KC_KP_PLUS,     KC_KP_MINUS,    KC_KP_SLASH,    KC_KP_ASTERISK, KC_NO,
                                KC_NO,          KC_NO,          KC_KP_7,        KC_KP_8,        KC_KP_9,        KC_NO,          KC_NO,
@@ -264,7 +264,7 @@ KC_NO,              KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,
 KC_NO,         KC_NO,          KC_TRNS,        KC_TRNS,        KC_TRNS,
                                                                                                                KC_NO,          KC_TRNS,
                                                                                                                                KC_NO,
-                                                                                               KC_NO,          KC_NO,          KC_NO,
+                                                                                               KC_NO,          KC_TRNS,        KC_NO,
 // Right hand
                                KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,
                                KC_NO,          KC_NO,          KC_MS_BTN1,     KC_MS_UP,       KC_MS_BTN2,     KC_MS_WH_UP,    KC_NO,