X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=keyboard%2Fergodox%2Fkeymap_cub.h;h=0813ca87b730ec9623282ee097e3d08ccd4b81d2;hb=f3f7f0e1e2d5faf8a23c60f65df09e6f87d7029e;hp=95ffd109541a5cc633b14336135e822f463d4f51;hpb=7a3ad79b0a5662354c37b8552bde53eb4487c684;p=max%2Ftmk_keyboard.git

diff --git a/keyboard/ergodox/keymap_cub.h b/keyboard/ergodox/keymap_cub.h
index 95ffd109..0813ca87 100644
--- a/keyboard/ergodox/keymap_cub.h
+++ b/keyboard/ergodox/keymap_cub.h
@@ -51,18 +51,18 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * ,--------------------------------------------------.           ,--------------------------------------------------.
      * |  ~     |   ;  |   !  |   #  |   {  |   }  |   '  |           |   ^  |   [  |   ]  |   *  |   (  |   )  |   =    |
      * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
-     * | Tab    |   Q  |   D  |   R  |   W  |   B  | ~L5  |           | ~L6  |   J  |   F  |   U  |   P  |   $  |   :    |
+     * | Tab    |   Q  |   D  |   R  |   W  |   B  |  NO  |           | ~L7  |   J  |   F  |   U  |   P  |   $  |   :    |
      * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
      * | Tab/Shf|   A  |   S  |   H  |   T  |   G  |------|           |------|   Y  |   N  |   E  |   O  |   I  |   -    |
-     * |--------+------+------+------+------+------|  L0  |           | ~L7  |------+------+------+------+------+--------|
+     * |--------+------+------+------+------+------| Home |           | End  |------+------+------+------+------+--------|
      * | LCtrl  |   Z  |   X  |   M  |   C  |   V  |      |           |      |   K  |   L  |   ,  |   .  |   /  |   |    |
      * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
      *   | ~L5  | ~L2  | Caps | LAlt | LGui |                                       |  Lft |  Up  |  Dn  | Rght | ~L6  |
      *   `----------------------------------'                                       `----------------------------------'
      *                                        ,-------------.       ,-------------.
-     *                                        | +L2  | Home |       | PgUp | Del  |
+     *                                        |  L0  |  +L2 |       | PgUp | Del  |
      *                                 ,------|------|------|       |------+------+------.
-     *                                 |      |      |  End |       | PgDn |      |      |
+     *                                 |      |      |  NO  |       | PgDn |      |      |
      *                                 | BkSp |  ESC |------|       |------| Enter| Space|
      *                                 |      |      |  Spc |       | Ins  |      |      |
      *                                 `--------------------'       `--------------------'
@@ -70,20 +70,20 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * Keymap: Default Layer in Workman / with Shift
      *
      * ,--------------------------------------------------.           ,--------------------------------------------------.
-     * |  ~     |   1  |   2  |   3  |   4  |   5  |   "  |           |   \  |   6  |   7  |   8  |   9  |   0  |   +    |
+     * |  `     |   1  |   2  |   3  |   4  |   5  |   "  |           |   \  |   6  |   7  |   8  |   9  |   0  |   +    |
      * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
-     * | Tab    |   Q  |   D  |   R  |   W  |   B  | ~L5  |           | ~L6  |   J  |   F  |   U  |   P  |   @  |   %    |
+     * | Tab    |   Q  |   D  |   R  |   W  |   B  |  NO  |           | ~L7  |   J  |   F  |   U  |   P  |   @  |   %    |
      * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
      * | Tab/Shf|   A  |   S  |   H  |   T  |   G  |------|           |------|   Y  |   N  |   E  |   O  |   I  |   _    |
-     * |--------+------+------+------+------+------|  L0  |           | ~L7  |------+------+------+------+------+--------|
+     * |--------+------+------+------+------+------| Home |           | End  |------+------+------+------+------+--------|
      * | LCtrl  |   Z  |   X  |   M  |   C  |   V  |      |           |      |   K  |   L  |   ,  |   .  |   /  |   &    |
      * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
      *   | ~L5  | ~L2  | Caps | LAlt | LGui |                                       |  Lft |  Up  |  Dn  | Rght | ~L6  |
      *   `----------------------------------'                                       `----------------------------------'
      *                                        ,-------------.       ,-------------.
-     *                                        | +L2  | Home |       | PgUp | Del  |
+     *                                        |  L0  |  +L2 |       | PgUp | Del  |
      *                                 ,------|------|------|       |------+------+------.
-     *                                 |      |      |  End |       | PgDn |      |      |
+     *                                 |      |      |  NO  |       | PgDn |      |      |
      *                                 | BkSp |  ESC |------|       |------| Enter| Space|
      *                                 |      |      |  Spc |       | Ins  |      |      |
      *                                 `--------------------'       `--------------------'
@@ -93,18 +93,18 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KEYMAP(  // Layer0: default, leftled:none
         // left hand
         GRV, 1,   2,   3,   4,   5,   BSLS,
-        TAB, Q,   W,   E,   R,   T,   FN21,
+        TAB, Q,   W,   E,   R,   T,   NO,
         FN11,FN28,FN29,FN30,FN31,G,
-        FN12,FN24,FN25,FN26,FN27,B,   FN17,
+        FN12,FN24,FN25,FN26,FN27,B,   HOME,
         FN21,FN20,CAPS,FN13,FN14,
-                                      FN19,HOME,
-                                           END,
+                                      FN17,FN19,
+                                           NO,
                                  FN5, FN6, FN7,
         // right hand
              MINS,6,   7,   8,   9,   0,   EQL,
-             FN22,Y,   U,   I,   O,   P,   LBRC,
+             FN23,Y,   U,   I,   O,   P,   LBRC,
                   H,   J,   K,   L,   SCLN,FN15,
-             FN23,N,   M,   COMM,DOT, SLSH,FN16,
+             END, N,   M,   COMM,DOT, SLSH,FN16,
                        LEFT,UP,  DOWN,RGHT,FN22,
         PGUP,DEL,
         PGDN,
@@ -144,8 +144,8 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                  TRNS,TRNS,TRNS,
         // right hand
              SLCK,NLCK,PSLS,PAST,PAST,PMNS,BSPC,
-             TRNS,NO,  P7,  P8,  P9,  PMNS,BSPC,
-                  TRNS,P4,  P5,  P6,  PPLS,PENT,
+             TRNS,NO,  P7,  P8,  P9,  PMNS,PGUP,
+                  TRNS,P4,  P5,  P6,  PPLS,PGDN,
              TRNS,NO,  P1,  P2,  P3,  PPLS,PENT,
                        P0,  PDOT,SLSH,PENT,PENT,
         TRNS,TRNS,
@@ -167,7 +167,7 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
              NO,  NO,  NO,  NO,  NO,  NO,  TRNS,
              TRNS,NO,  F1,  F2,  F3,  F4,  PGUP,
                   NO,  F5,  F6,  F7,  F8,  PGDN,
-             TRNS,NO,  F9,  F10, F11, F12, NO,
+             TRNS,NO,  F9,  F10, F11, F12, APP,
                        RGUI,RALT,TRNS,TRNS,TRNS,
         TRNS,TRNS,
         TRNS,
@@ -186,17 +186,17 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                  TRNS,TRNS,TRNS,
 
         // in Workman right hand will be:
-        //              =
-        //    ^ { } ( ) +
+        //              +
+        //    ^ { } ( ) =
         //    ' ! $ " ; \
-        //    # [ < > ] AppMenu
+        //    # [ < > ] \
         //
 
         // right hand
-             NO,  NO,  NO,  NO,  NO,  NO,  TRNS,
-             TRNS,MINS,4,   5,   9,   0,   PPLS,
+             NO,  NO,  NO,  NO,  NO,  NO,  PPLS,
+             TRNS,MINS,4,   5,   9,   0,   EQL,
                   BSLS,2,   P,   FN1, 1,   FN2,
-             TRNS,3,   6,   FN3, FN4, 7,   APP,
+             TRNS,3,   6,   FN3, FN4, 7,   FN2,
                        TRNS,TRNS,TRNS,TRNS,TRNS,
         TRNS,TRNS,
         TRNS,