diff options
| author | noroadsleft <18669334+noroadsleft@users.noreply.github.com> | 2018-06-16 07:55:02 -0700 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2018-06-16 07:55:02 -0700 |
| commit | 4cf4009b2b92b4aea4e912baa392e35c4093a4ef (patch) | |
| tree | e0a84447ee2c8364347c71ded7620c36fdf08bf9 /keyboards/ergodash | |
| parent | 4e9fb1d0d93db07c9934f64f6c8fe7a0dce51464 (diff) | |
| download | qmk_firmware-4cf4009b2b92b4aea4e912baa392e35c4093a4ef.tar.gz qmk_firmware-4cf4009b2b92b4aea4e912baa392e35c4093a4ef.zip | |
Ergodash refactor (#3196)
* Deleted LAYOUTS = ortho_5x14 from rules.mk
* Refactor
* Configurator support
Diffstat (limited to 'keyboards/ergodash')
| -rw-r--r-- | keyboards/ergodash/ergodash.h | 2 | ||||
| -rw-r--r-- | keyboards/ergodash/info.json | 13 | ||||
| -rw-r--r-- | keyboards/ergodash/keymaps/default/keymap.c | 158 | ||||
| -rw-r--r-- | keyboards/ergodash/rev1/rev1.h | 40 | ||||
| -rw-r--r-- | keyboards/ergodash/rules.mk | 2 |
5 files changed, 110 insertions, 105 deletions
diff --git a/keyboards/ergodash/ergodash.h b/keyboards/ergodash/ergodash.h index 534486ba8..ebb6b614e 100644 --- a/keyboards/ergodash/ergodash.h +++ b/keyboards/ergodash/ergodash.h | |||
| @@ -24,6 +24,4 @@ | |||
| 24 | KC_##LT0, KC_##LT1, KC_##LT2, KC_##LT3, KC_##LT4, KC_##LT5, KC_##RT0, KC_##RT1, KC_##RT2, KC_##RT3, KC_##RT4, KC_##RT5 \ | 24 | KC_##LT0, KC_##LT1, KC_##LT2, KC_##LT3, KC_##LT4, KC_##LT5, KC_##RT0, KC_##RT1, KC_##RT2, KC_##RT3, KC_##RT4, KC_##RT5 \ |
| 25 | ) | 25 | ) |
| 26 | 26 | ||
| 27 | #define KC_LAYOUT_ortho_5x14 KC_KEYMAP | ||
| 28 | |||
| 29 | #endif | 27 | #endif |
diff --git a/keyboards/ergodash/info.json b/keyboards/ergodash/info.json new file mode 100644 index 000000000..dedef8679 --- /dev/null +++ b/keyboards/ergodash/info.json | |||
| @@ -0,0 +1,13 @@ | |||
| 1 | { | ||
| 2 | "keyboard_name": "ErgoDash", | ||
| 3 | "url": "", | ||
| 4 | "maintainer": "qmk", | ||
| 5 | "width": 16, | ||
| 6 | "height": 6.25, | ||
| 7 | "layouts": { | ||
| 8 | "LAYOUT": { | ||
| 9 | "key_count": 68, | ||
| 10 | "layout": [{"label":"L00", "x":0, "y":0.375}, {"label":"L01", "x":1, "y":0.375}, {"label":"L02", "x":2, "y":0.125}, {"label":"L03", "x":3, "y":0}, {"label":"L04", "x":4, "y":0.125}, {"label":"L05", "x":5, "y":0.25}, {"label":"L06", "x":6, "y":0.75}, {"label":"R00", "x":9, "y":0.75}, {"label":"R01", "x":10, "y":0.25}, {"label":"R02", "x":11, "y":0.125}, {"label":"R03", "x":12, "y":0}, {"label":"R04", "x":13, "y":0.125}, {"label":"R05", "x":14, "y":0.375}, {"label":"R06", "x":15, "y":0.375}, {"label":"L10", "x":0, "y":1.375}, {"label":"L11", "x":1, "y":1.375}, {"label":"L12", "x":2, "y":1.125}, {"label":"L13", "x":3, "y":1}, {"label":"L14", "x":4, "y":1.125}, {"label":"L15", "x":5, "y":1.25}, {"label":"L16", "x":6, "y":1.75}, {"label":"R10", "x":9, "y":1.75}, {"label":"R11", "x":10, "y":1.25}, {"label":"R12", "x":11, "y":1.125}, {"label":"R13", "x":12, "y":1}, {"label":"R14", "x":13, "y":1.125}, {"label":"R15", "x":14, "y":1.375}, {"label":"R16", "x":15, "y":1.375}, {"label":"L20", "x":0, "y":2.375}, {"label":"L21", "x":1, "y":2.375}, {"label":"L22", "x":2, "y":2.125}, {"label":"L23", "x":3, "y":2}, {"label":"L24", "x":4, "y":2.125}, {"label":"L25", "x":5, "y":2.25}, {"label":"L26", "x":6, "y":2.75}, {"label":"R20", "x":9, "y":2.75}, {"label":"R21", "x":10, "y":2.25}, {"label":"R22", "x":11, "y":2.125}, {"label":"R23", "x":12, "y":2}, {"label":"R24", "x":13, "y":2.125}, {"label":"R25", "x":14, "y":2.375}, {"label":"R26", "x":15, "y":2.375}, {"label":"L30", "x":0, "y":3.375}, {"label":"L31", "x":1, "y":3.375}, {"label":"L32", "x":2, "y":3.125}, {"label":"L33", "x":3, "y":3}, {"label":"L34", "x":4, "y":3.125}, {"label":"L35", "x":5, "y":3.25}, {"label":"L36", "x":6.5, "y":4.25}, {"label":"R30", "x":8.5, "y":4.25}, {"label":"R31", "x":10, "y":3.25}, {"label":"R32", "x":11, "y":3.125}, {"label":"R33", "x":12, "y":3}, {"label":"R34", "x":13, "y":3.125}, {"label":"R35", "x":14, "y":3.375}, {"label":"R36", "x":15, "y":3.375}, {"label":"LT0", "x":0, "y":4.375}, {"label":"LT1", "x":1, "y":4.375}, {"label":"LT2", "x":2, "y":4.125}, {"label":"LT3", "x":3, "y":4}, {"label":"LT4", "x":5.5, "y":5.25}, {"label":"LT5", "x":6.5, "y":5.25}, {"label":"RT0", "x":8.5, "y":5.25}, {"label":"RT1", "x":9.5, "y":5.25}, {"label":"RT2", "x":12, "y":4}, {"label":"RT3", "x":13, "y":4.125}, {"label":"RT4", "x":14, "y":4.375}, {"label":"RT5", "x":15, "y":4.375}] | ||
| 11 | } | ||
| 12 | } | ||
| 13 | } | ||
diff --git a/keyboards/ergodash/keymaps/default/keymap.c b/keyboards/ergodash/keymaps/default/keymap.c index 88f813223..1464fd20e 100644 --- a/keyboards/ergodash/keymaps/default/keymap.c +++ b/keyboards/ergodash/keymaps/default/keymap.c | |||
| @@ -17,98 +17,94 @@ enum custom_keycodes { | |||
| 17 | }; | 17 | }; |
| 18 | 18 | ||
| 19 | // Fillers to make layering more clear | 19 | // Fillers to make layering more clear |
| 20 | #define KC_ KC_TRNS | ||
| 21 | #define _______ KC_TRNS | 20 | #define _______ KC_TRNS |
| 22 | #define XXXXXXX KC_NO | 21 | #define XXXXXXX KC_NO |
| 23 | #define KC_AJST ADJUST | ||
| 24 | #define KC_LOWR LOWER | ||
| 25 | #define KC_RASE RAISE | ||
| 26 | #define KC_JPN LALT(KC_GRV) | 22 | #define KC_JPN LALT(KC_GRV) |
| 27 | 23 | ||
| 28 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 24 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 29 | 25 | ||
| 30 | /* Qwerty | 26 | /* Qwerty |
| 31 | * ,-------------------------------------------------------------------------------------------------. | 27 | * ,-------------------------------------------------------------------------------------------------. |
| 32 | * | ESC | 1 | 2 | 3 | 4 | 5 | [ | ] | 6 | 7 | 8 | 9 | 0 | Caps | | 28 | * | ESC | 1 | 2 | 3 | 4 | 5 | [ | ] | 6 | 7 | 8 | 9 | 0 | Caps | |
| 33 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| | 29 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| |
| 34 | * | ` | Q | W | E | R | T | - | = | Y | U | I | O | P | \ | | 30 | * | ` | Q | W | E | R | T | - | = | Y | U | I | O | P | \ | |
| 35 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| | 31 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| |
| 36 | * | Tab | A | S | D | F | G | Del | Bksp | H | J | K | L | ; | " | | 32 | * | Tab | A | S | D | F | G | Del | Bksp | H | J | K | L | ; | " | |
| 37 | * |------+------+------+------+------+------+-------------+------+------+------+------+------+------| | 33 | * |------+------+------+------+------+------+-------------+------+------+------+------+------+------| |
| 38 | * | Shift| Z | X | C | V | B | JPN | Enter| N | M | , | . | / | Shift| | 34 | * | Shift| Z | X | C | V | B | JPN | Enter| N | M | , | . | / | Shift| |
| 39 | * `-------------+------+------+------+------+------+------+------+------+------+------+-------------' | 35 | * `-------------+------+------+------+------+------+------+------+------+------+------+-------------' |
| 40 | * | Ctrl | GUI | ALt |Adjust| |Lower | Space |Enter |Raise| | Left| Down | Up | Right| | 36 | * | Ctrl | GUI | ALt |Adjust| |Lower | Space |Enter |Raise| | Left| Down | Up | Right| |
| 41 | * ,-------------------------------------------------------------------------------------------------. | 37 | * ,-------------------------------------------------------------------------------------------------. |
| 42 | */ | 38 | */ |
| 43 | [_QWERTY] = LAYOUT( \ | 39 | [_QWERTY] = LAYOUT( \ |
| 44 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LBRC, KC_RBRC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_CAPS, \ | 40 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LBRC, KC_RBRC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_CAPS, \ |
| 45 | KC_GRV, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_MINS, KC_EQL , KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, \ | 41 | KC_GRV, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_MINS, KC_EQL , KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, \ |
| 46 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_DEL , KC_BSPC, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ | 42 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_DEL , KC_BSPC, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ |
| 47 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_JPN , KC_ENT , KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ | 43 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_JPN , KC_ENT , KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ |
| 48 | KC_LCTL, KC_LGUI, KC_LALT, KC_AJST, KC_LOWR, KC_SPC , KC_ENT , KC_RASE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ | 44 | KC_LCTL, KC_LGUI, KC_LALT, ADJUST, LOWER, KC_SPC , KC_ENT , RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ |
| 49 | ), | 45 | ), |
| 50 | 46 | ||
| 51 | /* Lower | 47 | /* Lower |
| 52 | * ,-------------------------------------------------------------------------------------------------. | 48 | * ,-------------------------------------------------------------------------------------------------. |
| 53 | * | F11 | F1 | F2 | F3 | F4 | F5 | { | } | F6 | F7 | F8 | F9 | F10 | F12 | | 49 | * | F11 | F1 | F2 | F3 | F4 | F5 | { | } | F6 | F7 | F8 | F9 | F10 | F12 | |
| 54 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| | 50 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| |
| 55 | * | ~ | ! | @ | # | $ | % | _ | + | ^ | & | * | ( | ) | | | | 51 | * | ~ | ! | @ | # | $ | % | _ | + | ^ | & | * | ( | ) | | | |
| 56 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| | 52 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| |
| 57 | * | Tab | A | S | D | F | G | Del | Bksp | H | J | K | L | : | " | | 53 | * | Tab | 1 | 2 | 3 | 4 | 5 | Del | Bksp | H | J | K | L | : | " | |
| 58 | * |------+------+------+------+------+------+-------------+------+------+------+------+------+------| | 54 | * |------+------+------+------+------+------+-------------+------+------+------+------+------+------| |
| 59 | * | Shift| Z | X | C | V | B | JPN | Enter| N | M | < | > | ? | Shift| | 55 | * | Shift| 6 | 7 | 8 | 9 | 0 | JPN | Enter| N | M | < | > | ? | Shift| |
| 60 | * `-------------+------+------+------+------+------+------+------+------+------+------+-------------' | 56 | * `-------------+------+------+------+------+------+------+------+------+------+------+-------------' |
| 61 | * | Ctrl | GUI | ALt |Adjust| |Lower | Space |Enter |Raise| | Home |PageDn|PageUp| End | | 57 | * | Ctrl | GUI | ALt |Adjust| |Lower | Space |Enter |Raise| | Home |PageDn|PageUp| End | |
| 62 | * ,-------------------------------------------------------------------------------------------------. | 58 | * ,-------------------------------------------------------------------------------------------------. |
| 63 | */ | 59 | */ |
| 64 | [_LOWER] = LAYOUT( | 60 | [_LOWER] = LAYOUT( |
| 65 | KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_LCBR, KC_RCBR, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12, \ | 61 | KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_LCBR, KC_RCBR, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12, \ |
| 66 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_UNDS, KC_PLUS, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE, \ | 62 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_UNDS, KC_PLUS, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE, \ |
| 67 | KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_DEL , KC_BSPC, KC_H, KC_J, KC_K, KC_L, KC_COLN, KC_DQT , \ | 63 | KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_DEL , KC_BSPC, KC_H, KC_J, KC_K, KC_L, KC_COLN, KC_DQT , \ |
| 68 | KC_LSFT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_JPN , KC_ENT , KC_N, KC_M, KC_LT, KC_GT, KC_QUES, KC_RSFT, \ | 64 | KC_LSFT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_JPN , KC_ENT , KC_N, KC_M, KC_LT, KC_GT, KC_QUES, KC_RSFT, \ |
| 69 | KC_LCTL, KC_LGUI, KC_LALT, KC_AJST, KC_LOWR, KC_SPC , KC_ENT , KC_RASE, KC_HOME, KC_PGDN, KC_PGUP, KC_END \ | 65 | KC_LCTL, KC_LGUI, KC_LALT, ADJUST, LOWER, KC_SPC , KC_ENT , RAISE, KC_HOME, KC_PGDN, KC_PGUP, KC_END \ |
| 70 | ), | 66 | ), |
| 71 | 67 | ||
| 72 | /* Raise | 68 | /* Raise |
| 73 | * ,-------------------------------------------------------------------------------------------------. | 69 | * ,-------------------------------------------------------------------------------------------------. |
| 74 | * | F11 | F1 | F2 | F3 | F4 | F5 | { | } | F6 | F7 | F8 | F9 | F10 | F12 | | 70 | * | F11 | F1 | F2 | F3 | F4 | F5 | { | } | F6 | F7 | F8 | F9 | F10 | F12 | |
| 75 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| | 71 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| |
| 76 | * | ~ | ! | @ | # | $ | % | _ | + | ^ | & | * | ( | ) | | | | 72 | * | ~ | ! | @ | # | $ | % | _ | + | ^ | & | * | ( | ) | | | |
| 77 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| | 73 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| |
| 78 | * | Tab | A | S | D | F | G | Del | Bksp | H | J | K | L | : | " | | 74 | * | Tab | 1 | 2 | 3 | 4 | 5 | Del | Bksp | H | J | K | L | : | " | |
| 79 | * |------+------+------+------+------+------+-------------+------+------+------+------+------+------| | 75 | * |------+------+------+------+------+------+-------------+------+------+------+------+------+------| |
| 80 | * | Shift| Z | X | C | V | B | JPN | Enter| N | M | < | > | ? | Shift| | 76 | * | Shift| 6 | 7 | 8 | 9 | 0 | JPN | Enter| N | M | < | > | ? | Shift| |
| 81 | * `-------------+------+------+------+------+------+------+------+------+------+------+-------------' | 77 | * `-------------+------+------+------+------+------+------+------+------+------+------+-------------' |
| 82 | * | Ctrl | GUI | ALt |Adjust| |Lower | Space |Enter |Raise| | Home |PageDn|PageUp| End | | 78 | * | Ctrl | GUI | ALt |Adjust| |Lower | Space |Enter |Raise| | Home |PageDn|PageUp| End | |
| 83 | * ,-------------------------------------------------------------------------------------------------. | 79 | * ,-------------------------------------------------------------------------------------------------. |
| 84 | */ | 80 | */ |
| 85 | [_RAISE] = LAYOUT( | 81 | [_RAISE] = LAYOUT( |
| 86 | KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_LCBR, KC_RCBR, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12, \ | 82 | KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_LCBR, KC_RCBR, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12, \ |
| 87 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_UNDS, KC_PLUS, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE, \ | 83 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_UNDS, KC_PLUS, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE, \ |
| 88 | KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_DEL , KC_BSPC, KC_H, KC_J, KC_K, KC_L, KC_COLN, KC_DQT , \ | 84 | KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_DEL , KC_BSPC, KC_H, KC_J, KC_K, KC_L, KC_COLN, KC_DQT , \ |
| 89 | KC_LSFT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_JPN , KC_ENT , KC_N, KC_M, KC_LT, KC_GT, KC_QUES, KC_RSFT, \ | 85 | KC_LSFT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_JPN , KC_ENT , KC_N, KC_M, KC_LT, KC_GT, KC_QUES, KC_RSFT, \ |
| 90 | KC_LCTL, KC_LGUI, KC_LALT, KC_AJST, KC_LOWR, KC_SPC , KC_ENT , KC_RASE, KC_HOME, KC_PGDN, KC_PGUP, KC_END \ | 86 | KC_LCTL, KC_LGUI, KC_LALT, ADJUST, LOWER, KC_SPC , KC_ENT , RAISE, KC_HOME, KC_PGDN, KC_PGUP, KC_END \ |
| 91 | ), | 87 | ), |
| 92 | 88 | ||
| 93 | /* Adjust | 89 | /* Adjust |
| 94 | * ,-------------------------------------------------------------------------------------------------. | 90 | * ,-------------------------------------------------------------------------------------------------. |
| 95 | * | | | | | | | | | | | | | | | | 91 | * | | | | | | | | | | | | | | | |
| 96 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| | 92 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| |
| 97 | * | | Reset|RGB ON| MODE| HUE-| HUE+| | | SAT-| SAT+| VAL-| VAL+| | | | 93 | * | | Reset|RGB ON| MODE| HUE-| HUE+| | | SAT-| SAT+| VAL-| VAL+| | | |
| 98 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| | 94 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| |
| 99 | * | | | | | | | | | | | | | | | | 95 | * | | | | | | | | | | | | | | | |
| 100 | * |------+------+------+------+------+------+-------------+------+------+------+------+------+------| | 96 | * |------+------+------+------+------+------+-------------+------+------+------+------+------+------| |
| 101 | * | | | | | | | | | | | | | | | | 97 | * | | | | | | | | | | | | | | | |
| 102 | * `-------------+------+------+------+------+------+------+------+------+------+------+-------------' | 98 | * `-------------+------+------+------+------+------+------+------+------+------+------+-------------' |
| 103 | * | | | | | | | | | | | | | | | | 99 | * | | | | | | | | | | | | | | | |
| 104 | * ,-------------------------------------------------------------------------------------------------. | 100 | * ,-------------------------------------------------------------------------------------------------. |
| 105 | */ | 101 | */ |
| 106 | [_ADJUST] = LAYOUT( | 102 | [_ADJUST] = LAYOUT( |
| 107 | _______, _______, _______, _______, _______, _______,_______, _______, _______, _______, _______, _______, _______, _______, \ | 103 | _______, _______, _______, _______, _______, _______,_______, _______, _______, _______, _______, _______, _______, _______, \ |
| 108 | _______, RESET , RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,_______, _______, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, _______, \ | 104 | _______, RESET , RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,_______, _______, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, _______, \ |
| 109 | _______, _______, _______, _______, _______, _______,_______, _______, _______, _______, _______, _______, _______, _______, \ | 105 | _______, _______, _______, _______, _______, _______,_______, _______, _______, _______, _______, _______, _______, _______, \ |
| 110 | _______, _______, _______, _______, _______, _______,_______, _______, _______, _______, _______, _______, _______, _______, \ | 106 | _______, _______, _______, _______, _______, _______,_______, _______, _______, _______, _______, _______, _______, _______, \ |
| 111 | _______, _______, _______, _______, _______,_______, _______, _______, _______, _______, _______, _______ \ | 107 | _______, _______, _______, _______, _______,_______, _______, _______, _______, _______, _______, _______ \ |
| 112 | ) | 108 | ) |
| 113 | }; | 109 | }; |
| 114 | 110 | ||
diff --git a/keyboards/ergodash/rev1/rev1.h b/keyboards/ergodash/rev1/rev1.h index d27d22dca..952801916 100644 --- a/keyboards/ergodash/rev1/rev1.h +++ b/keyboards/ergodash/rev1/rev1.h | |||
| @@ -28,16 +28,16 @@ | |||
| 28 | LT0, LT1, LT2, LT3, LT4, LT5, RT0, RT1, RT2, RT3, RT4, RT5 \ | 28 | LT0, LT1, LT2, LT3, LT4, LT5, RT0, RT1, RT2, RT3, RT4, RT5 \ |
| 29 | ) \ | 29 | ) \ |
| 30 | { \ | 30 | { \ |
| 31 | { L00, L01, L02, L03, L04, L05, L06 }, \ | 31 | { L00, L01, L02, L03, L04, L05, L06 }, \ |
| 32 | { L10, L11, L12, L13, L14, L15, L16 }, \ | 32 | { L10, L11, L12, L13, L14, L15, L16 }, \ |
| 33 | { L20, L21, L22, L23, L24, L25, L26 }, \ | 33 | { L20, L21, L22, L23, L24, L25, L26 }, \ |
| 34 | { L30, L31, L32, L33, L34, L35, L36 }, \ | 34 | { L30, L31, L32, L33, L34, L35, L36 }, \ |
| 35 | { LT0, LT1, LT2, LT3, LT4, LT5, KC_NO}, \ | 35 | { LT0, LT1, LT2, LT3, LT4, LT5, KC_NO }, \ |
| 36 | { R06, R05, R04, R03, R02, R01, R00 }, \ | 36 | { R06, R05, R04, R03, R02, R01, R00 }, \ |
| 37 | { R16, R15, R14, R13, R12, R11, R10 }, \ | 37 | { R16, R15, R14, R13, R12, R11, R10 }, \ |
| 38 | { R26, R25, R24, R23, R22, R21, R20 }, \ | 38 | { R26, R25, R24, R23, R22, R21, R20 }, \ |
| 39 | { R36, R35, R34, R33, R32, R31, R30 }, \ | 39 | { R36, R35, R34, R33, R32, R31, R30 }, \ |
| 40 | { RT5, RT4, RT3, RT2, RT1, RT0, KC_NO} \ | 40 | { RT5, RT4, RT3, RT2, RT1, RT0, KC_NO } \ |
| 41 | } | 41 | } |
| 42 | #else | 42 | #else |
| 43 | // Keymap with right side flipped | 43 | // Keymap with right side flipped |
| @@ -50,16 +50,16 @@ | |||
| 50 | LT0, LT1, LT2, LT3, LT4, LT5, RT0, RT1, RT2, RT3, RT4, RT5 \ | 50 | LT0, LT1, LT2, LT3, LT4, LT5, RT0, RT1, RT2, RT3, RT4, RT5 \ |
| 51 | ) \ | 51 | ) \ |
| 52 | { \ | 52 | { \ |
| 53 | { L00, L01, L02, L03, L04, L05, L06 }, \ | 53 | { L00, L01, L02, L03, L04, L05, L06 }, \ |
| 54 | { L10, L11, L12, L13, L14, L15, L16 }, \ | 54 | { L10, L11, L12, L13, L14, L15, L16 }, \ |
| 55 | { L20, L21, L22, L23, L24, L25, L26 }, \ | 55 | { L20, L21, L22, L23, L24, L25, L26 }, \ |
| 56 | { L30, L31, L32, L33, L34, L35, L36 }, \ | 56 | { L30, L31, L32, L33, L34, L35, L36 }, \ |
| 57 | { LT0, LT1, LT2, LT3, LT4, LT, KC_NO}, \ | 57 | { LT0, LT1, LT2, LT3, LT4, LT5, KC_NO }, \ |
| 58 | { R00, R01, R02, R03, R04, R05, R06 }, \ | 58 | { R00, R01, R02, R03, R04, R05, R06 }, \ |
| 59 | { R10, R11, R12, R13, R14, R15, R16 }, \ | 59 | { R10, R11, R12, R13, R14, R15, R16 }, \ |
| 60 | { R20, R21, R22, R23, R24, R25, R26 }, \ | 60 | { R20, R21, R22, R23, R24, R25, R26 }, \ |
| 61 | { R30, R31, R32, R33, R34, R35, R36 }, \ | 61 | { R30, R31, R32, R33, R34, R35, R36 }, \ |
| 62 | { RT0, RT1, RT2, RT3, RT4, RT5, KC_NO} \ | 62 | { RT0, RT1, RT2, RT3, RT4, RT5, KC_NO } \ |
| 63 | } | 63 | } |
| 64 | #endif | 64 | #endif |
| 65 | 65 | ||
diff --git a/keyboards/ergodash/rules.mk b/keyboards/ergodash/rules.mk index 471f6b9cf..d81fa98a9 100644 --- a/keyboards/ergodash/rules.mk +++ b/keyboards/ergodash/rules.mk | |||
| @@ -72,6 +72,4 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | |||
| 72 | 72 | ||
| 73 | CUSTOM_MATRIX = yes | 73 | CUSTOM_MATRIX = yes |
| 74 | 74 | ||
| 75 | LAYOUTS = ortho_5x14 | ||
| 76 | |||
| 77 | DEFAULT_FOLDER = ergodash/rev1 | 75 | DEFAULT_FOLDER = ergodash/rev1 |
