diff options
| author | noroadsleft <18669334+noroadsleft@users.noreply.github.com> | 2018-06-07 08:26:46 -0700 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2018-06-07 08:26:46 -0700 |
| commit | 7004e934d041cf5b187cedb4ab15e649b586edea (patch) | |
| tree | d014339591b7fb8b343351c3b38a4e59dbad6c7c | |
| parent | 3ab69e2356168414ac9b36eaf14ba18d9e069b45 (diff) | |
| download | qmk_firmware-7004e934d041cf5b187cedb4ab15e649b586edea.tar.gz qmk_firmware-7004e934d041cf5b187cedb4ab15e649b586edea.zip | |
Eco: Refactor, Configurator support and Readme changes (#3143)
* Readme changes
* Refactor matrices; add QMK_KEYBOARD_H
* Configurator Support
| -rw-r--r-- | keyboards/eco/eco.h | 2 | ||||
| -rw-r--r-- | keyboards/eco/info.json | 13 | ||||
| -rw-r--r-- | keyboards/eco/keymaps/default/keymap.c | 107 | ||||
| -rw-r--r-- | keyboards/eco/keymaps/hexwire/keymap.c | 18 | ||||
| -rw-r--r-- | keyboards/eco/keymaps/that_canadian/keymap.c | 182 | ||||
| -rw-r--r-- | keyboards/eco/keymaps/xyverz/keymap.c | 220 | ||||
| -rw-r--r-- | keyboards/eco/readme.md | 5 | ||||
| -rw-r--r-- | keyboards/eco/rev1/rev1.h | 26 | ||||
| -rw-r--r-- | keyboards/eco/rev2/rev2.h | 26 |
9 files changed, 302 insertions, 297 deletions
diff --git a/keyboards/eco/eco.h b/keyboards/eco/eco.h index 2615ac1ae..8c57244fb 100644 --- a/keyboards/eco/eco.h +++ b/keyboards/eco/eco.h | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | #include "quantum.h" | 11 | #include "quantum.h" |
| 12 | 12 | ||
| 13 | // Used to create a keymap using only KC_ prefixed keys | 13 | // Used to create a keymap using only KC_ prefixed keys |
| 14 | #define KC_KEYMAP( \ | 14 | #define LAYOUT_kc( \ |
| 15 | k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, k014, \ | 15 | k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, k014, \ |
| 16 | k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, k114, \ | 16 | k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, k114, \ |
| 17 | k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, k214, \ | 17 | k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, k214, \ |
diff --git a/keyboards/eco/info.json b/keyboards/eco/info.json new file mode 100644 index 000000000..78b1dd770 --- /dev/null +++ b/keyboards/eco/info.json | |||
| @@ -0,0 +1,13 @@ | |||
| 1 | { | ||
| 2 | "keyboard_name": "ECO", | ||
| 3 | "url": "", | ||
| 4 | "maintainer": "qmk", | ||
| 5 | "width": 14, | ||
| 6 | "height": 4, | ||
| 7 | "layouts": { | ||
| 8 | "LAYOUT": { | ||
| 9 | "key_count": 56, | ||
| 10 | "layout": [{"label":"k01", "x":0, "y":0}, {"label":"k02", "x":1, "y":0}, {"label":"k03", "x":2, "y":0}, {"label":"k04", "x":3, "y":0}, {"label":"k05", "x":4, "y":0}, {"label":"k06", "x":5, "y":0}, {"label":"k07", "x":6, "y":0}, {"label":"k08", "x":7, "y":0}, {"label":"k09", "x":8, "y":0}, {"label":"k010", "x":9, "y":0}, {"label":"k011", "x":10, "y":0}, {"label":"k012", "x":11, "y":0}, {"label":"k013", "x":12, "y":0}, {"label":"k014", "x":13, "y":0}, {"label":"k11", "x":0, "y":1}, {"label":"k12", "x":1, "y":1}, {"label":"k13", "x":2, "y":1}, {"label":"k14", "x":3, "y":1}, {"label":"k15", "x":4, "y":1}, {"label":"k16", "x":5, "y":1}, {"label":"k17", "x":6, "y":1}, {"label":"k18", "x":7, "y":1}, {"label":"k19", "x":8, "y":1}, {"label":"k110", "x":9, "y":1}, {"label":"k111", "x":10, "y":1}, {"label":"k112", "x":11, "y":1}, {"label":"k113", "x":12, "y":1}, {"label":"k114", "x":13, "y":1}, {"label":"k21", "x":0, "y":2}, {"label":"k22", "x":1, "y":2}, {"label":"k23", "x":2, "y":2}, {"label":"k24", "x":3, "y":2}, {"label":"k25", "x":4, "y":2}, {"label":"k26", "x":5, "y":2}, {"label":"k27", "x":6, "y":2}, {"label":"k28", "x":7, "y":2}, {"label":"k29", "x":8, "y":2}, {"label":"k210", "x":9, "y":2}, {"label":"k211", "x":10, "y":2}, {"label":"k212", "x":11, "y":2}, {"label":"k213", "x":12, "y":2}, {"label":"k214", "x":13, "y":2}, {"label":"k31", "x":0, "y":3}, {"label":"k32", "x":1, "y":3}, {"label":"k33", "x":2, "y":3}, {"label":"k34", "x":3, "y":3}, {"label":"k35", "x":4, "y":3}, {"label":"k36", "x":5, "y":3}, {"label":"k37", "x":6, "y":3}, {"label":"k38", "x":7, "y":3}, {"label":"k39", "x":8, "y":3}, {"label":"k310", "x":9, "y":3}, {"label":"k311", "x":10, "y":3}, {"label":"k312", "x":11, "y":3}, {"label":"k313", "x":12, "y":3}, {"label":"k314", "x":13, "y":3}] | ||
| 11 | } | ||
| 12 | } | ||
| 13 | } | ||
diff --git a/keyboards/eco/keymaps/default/keymap.c b/keyboards/eco/keymaps/default/keymap.c index 6270d4260..7d714d9ad 100644 --- a/keyboards/eco/keymaps/default/keymap.c +++ b/keyboards/eco/keymaps/default/keymap.c | |||
| @@ -2,9 +2,7 @@ | |||
| 2 | // Default ECO Layout | 2 | // Default ECO Layout |
| 3 | // KLE here : http://www.keyboard-layout-editor.com/#/gists/0733eca6b4cb88ff9d7de746803f4039 | 3 | // KLE here : http://www.keyboard-layout-editor.com/#/gists/0733eca6b4cb88ff9d7de746803f4039 |
| 4 | 4 | ||
| 5 | #include "eco.h" | 5 | #include QMK_KEYBOARD_H |
| 6 | #include "action_layer.h" | ||
| 7 | #include "eeconfig.h" | ||
| 8 | 6 | ||
| 9 | extern keymap_config_t keymap_config; | 7 | extern keymap_config_t keymap_config; |
| 10 | 8 | ||
| @@ -30,59 +28,59 @@ enum eco_keycodes { | |||
| 30 | 28 | ||
| 31 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 29 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 32 | 30 | ||
| 33 | /* Qwerty | 31 | /* Qwerty |
| 34 | * ,-------------------------------------------------------------------------------------------------. | 32 | * ,-------------------------------------------------------------------------------------------------. |
| 35 | * | Esc | Q | W | E | R | T | Y | U | I | O | P | [ | ] | Bksp | | 33 | * | Esc | Q | W | E | R | T | Y | U | I | O | P | [ | ] | Bksp | |
| 36 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| | 34 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| |
| 37 | * | Tab | A | S | D | F | G | H | J | K | L | ; | ' | Enter| \ | | 35 | * | Tab | A | S | D | F | G | H | J | K | L | ; | ' | Enter| \ | |
| 38 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| | 36 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| |
| 39 | * | Shift| Z | X | C | V | B | N | M | , | . | / | Shift| Up | Del | | 37 | * | Shift| Z | X | C | V | B | N | M | , | . | / | Shift| Up | Del | |
| 40 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| | 38 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| |
| 41 | * | Ctrl | GUI | Alt | Del | FN1 | FN1 | Space| Space| FN2 | FN2 | Ctrl | Left | Down | Right| | 39 | * | Ctrl | GUI | Alt | Del | FN1 | FN1 | Space| Space| FN2 | FN2 | Ctrl | Left | Down | Right| |
| 42 | * `-------------------------------------------------------------------------------------------------' | 40 | * `-------------------------------------------------------------------------------------------------' |
| 43 | */ | 41 | */ |
| 44 | [_QWERTY] = KEYMAP( | 42 | [_QWERTY] = LAYOUT( |
| 45 | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, | 43 | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, |
| 46 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_BSLS, | 44 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_BSLS, |
| 47 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL, | 45 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL, |
| 48 | KC_LCTL, KC_LGUI,KC_LALT, KC_DEL, MO(_FN1), MO(_FN1), KC_SPC, KC_SPC, MO(_FN2), MO(_FN2), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT | 46 | KC_LCTL, KC_LGUI,KC_LALT, KC_DEL, MO(_FN1), MO(_FN1), KC_SPC, KC_SPC, MO(_FN2), MO(_FN2), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT |
| 49 | ), | 47 | ), |
| 50 | 48 | ||
| 51 | /* FN1 | 49 | /* FN1 |
| 52 | * ,-------------------------------------------------------------------------------------------------. | 50 | * ,-------------------------------------------------------------------------------------------------. |
| 53 | * | | ! | @ | # | $ | % | ^ | & | * | ( | ) | _ | + | | | 51 | * | | ! | @ | # | $ | % | ^ | & | * | ( | ) | _ | + | | |
| 54 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| | 52 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| |
| 55 | * |caltde| F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | | | 53 | * |caltde| F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | | |
| 56 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| | 54 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| |
| 57 | * | | | | | | | | | | | | | | | | 55 | * | | | | | | | | | | | | | | | |
| 58 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| | 56 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| |
| 59 | * | | | | | | | | | | | | | | RESET| | 57 | * | | | | | | | | | | | | | | RESET| |
| 60 | * `-------------------------------------------------------------------------------------------------' | 58 | * `-------------------------------------------------------------------------------------------------' |
| 61 | */ | 59 | */ |
| 62 | [_FN1] = KEYMAP( | 60 | [_FN1] = LAYOUT( |
| 63 | _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, _______, | 61 | _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, _______, |
| 64 | CALTDEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, | 62 | CALTDEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, |
| 65 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 63 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 66 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET | 64 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET |
| 67 | ), | 65 | ), |
| 68 | 66 | ||
| 69 | /* Raise | 67 | /* Raise |
| 70 | * ,-------------------------------------------------------------------------------------------------. | 68 | * ,-------------------------------------------------------------------------------------------------. |
| 71 | * | | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | | | 69 | * | | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | | |
| 72 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| | 70 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| |
| 73 | * |Taskmg| F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | | | 71 | * |Taskmg| F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | | |
| 74 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| | 72 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| |
| 75 | * | | | | | | | | | | | | | | | | 73 | * | | | | | | | | | | | | | | | |
| 76 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| | 74 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| |
| 77 | * | | | | | | | | | | | | | | | | 75 | * | | | | | | | | | | | | | | | |
| 78 | * `-------------------------------------------------------------------------------------------------' | 76 | * `-------------------------------------------------------------------------------------------------' |
| 79 | */ | 77 | */ |
| 80 | [_FN2] = KEYMAP( | 78 | [_FN2] = LAYOUT( |
| 81 | _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, _______, | 79 | _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, _______, |
| 82 | TSKMGR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, | 80 | TSKMGR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, |
| 83 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 81 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 84 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ | 82 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ |
| 85 | ) | 83 | ) |
| 86 | 84 | ||
| 87 | }; | 85 | }; |
| 88 | 86 | ||
| @@ -102,4 +100,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 102 | } | 100 | } |
| 103 | return true; | 101 | return true; |
| 104 | } | 102 | } |
| 105 | |||
diff --git a/keyboards/eco/keymaps/hexwire/keymap.c b/keyboards/eco/keymaps/hexwire/keymap.c index c20d45c2b..7c6616aac 100644 --- a/keyboards/eco/keymaps/hexwire/keymap.c +++ b/keyboards/eco/keymaps/hexwire/keymap.c | |||
| @@ -2,9 +2,7 @@ | |||
| 2 | // Default ECO Layout | 2 | // Default ECO Layout |
| 3 | // KLE here : http://www.keyboard-layout-editor.com/#/gists/0733eca6b4cb88ff9d7de746803f4039 | 3 | // KLE here : http://www.keyboard-layout-editor.com/#/gists/0733eca6b4cb88ff9d7de746803f4039 |
| 4 | 4 | ||
| 5 | #include "eco.h" | 5 | #include QMK_KEYBOARD_H |
| 6 | #include "action_layer.h" | ||
| 7 | #include "eeconfig.h" | ||
| 8 | 6 | ||
| 9 | extern keymap_config_t keymap_config; | 7 | extern keymap_config_t keymap_config; |
| 10 | 8 | ||
| @@ -50,7 +48,7 @@ enum eco_keycodes { | |||
| 50 | 48 | ||
| 51 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 49 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 52 | 50 | ||
| 53 | [_QWERTY] = KC_KEYMAP( | 51 | [_QWERTY] = LAYOUT_kc( |
| 54 | //,----+----+----+----+----+----+----+----+----+----+----+----+----+----. | 52 | //,----+----+----+----+----+----+----+----+----+----+----+----+----+----. |
| 55 | TAB , Q , W , E , R , T ,LPRN,RPRN, Y , U , I , O , P ,MINS, | 53 | TAB , Q , W , E , R , T ,LPRN,RPRN, Y , U , I , O , P ,MINS, |
| 56 | //|----+----+----+----+----+----+----+----+----+----+----+----+----+----| | 54 | //|----+----+----+----+----+----+----+----+----+----+----+----+----+----| |
| @@ -63,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 63 | ), | 61 | ), |
| 64 | 62 | ||
| 65 | 63 | ||
| 66 | [_LOWER] = KC_KEYMAP( | 64 | [_LOWER] = LAYOUT_kc( |
| 67 | //,----+----+----+----+----+----+----+----+----+----+----+----+----+----. | 65 | //,----+----+----+----+----+----+----+----+----+----+----+----+----+----. |
| 68 | , 1 , 2 , 3 , 4 , 5 ,LPRN,RPRN, 6 , 7 , 8 , 9 , 0 , , | 66 | , 1 , 2 , 3 , 4 , 5 ,LPRN,RPRN, 6 , 7 , 8 , 9 , 0 , , |
| 69 | //|----+----+----+----+----+----+----+----+----+----+----+----+----+----| | 67 | //|----+----+----+----+----+----+----+----+----+----+----+----+----+----| |
| @@ -71,11 +69,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 71 | //|----+----+----+----+----+----+----+----+----+----+----+----+----+----| | 69 | //|----+----+----+----+----+----+----+----+----+----+----+----+----+----| |
| 72 | ,CPYP, , ,DOWN,LCBR,LCBR,RCBR,RCBR, P1 , P2 , P3 ,MINS, , | 70 | ,CPYP, , ,DOWN,LCBR,LCBR,RCBR,RCBR, P1 , P2 , P3 ,MINS, , |
| 73 | //|----+----+----+----+----+----+----+----+----+----+----+----+----+----| | 71 | //|----+----+----+----+----+----+----+----+----+----+----+----+----+----| |
| 74 | , , , , , , ,DEL ,DEL , , P0 ,PDOT, , | 72 | , , , , , , ,DEL ,DEL , , P0 ,PDOT, , |
| 75 | //`----+----+----+----+----+----+----+----+----+----+----+----+----+----' | 73 | //`----+----+----+----+----+----+----+----+----+----+----+----+----+----' |
| 76 | ), | 74 | ), |
| 77 | 75 | ||
| 78 | [_RAISE] = KC_KEYMAP( | 76 | [_RAISE] = LAYOUT_kc( |
| 79 | //,----+----+----+----+----+----+----+----+----+----+----+----+----+----. | 77 | //,----+----+----+----+----+----+----+----+----+----+----+----+----+----. |
| 80 | ,EXLM, AT ,HASH,DLR ,PERC, , ,CIRC,AMPR,ASTR,LPRN,RPRN, , | 78 | ,EXLM, AT ,HASH,DLR ,PERC, , ,CIRC,AMPR,ASTR,LPRN,RPRN, , |
| 81 | //|----+----+----+----+----+----+----+----+----+----+----+----+----+----| | 79 | //|----+----+----+----+----+----+----+----+----+----+----+----+----+----| |
| @@ -83,11 +81,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 83 | //|----+----+----+----+----+----+----+----+----+----+----+----+----+----| | 81 | //|----+----+----+----+----+----+----+----+----+----+----+----+----+----| |
| 84 | MUTE,MSTP,MPLY,VOLD,PGDN,MINS, , ,PLUS,END , , , , , | 82 | MUTE,MSTP,MPLY,VOLD,PGDN,MINS, , ,PLUS,END , , , , , |
| 85 | //|----+----+----+----+----+----+----+----+----+----+----+----+----+----| | 83 | //|----+----+----+----+----+----+----+----+----+----+----+----+----+----| |
| 86 | , , , , , , , , , , , , , | 84 | , , , , , , , , , , , , , |
| 87 | //`----+----+----+----+----+----+----+----+----+----+----+----+----+----' | 85 | //`----+----+----+----+----+----+----+----+----+----+----+----+----+----' |
| 88 | ), | 86 | ), |
| 89 | 87 | ||
| 90 | [_FN3] = KC_KEYMAP( | 88 | [_FN3] = LAYOUT_kc( |
| 91 | //,----+----+----+----+----+----+----+----+----+----+----+----+----+----. | 89 | //,----+----+----+----+----+----+----+----+----+----+----+----+----+----. |
| 92 | F12 , F1 , F2 , F3 , F4 , F5 , , , F6 , F7 , F8 , F9 ,F10 ,F11 , | 90 | F12 , F1 , F2 , F3 , F4 , F5 , , , F6 , F7 , F8 , F9 ,F10 ,F11 , |
| 93 | //|----+----+----+----+----+----+----+----+----+----+----+----+----+----| | 91 | //|----+----+----+----+----+----+----+----+----+----+----+----+----+----| |
| @@ -95,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 95 | //|----+----+----+----+----+----+----+----+----+----+----+----+----+----| | 93 | //|----+----+----+----+----+----+----+----+----+----+----+----+----+----| |
| 96 | RST ,DBUG,RHUD,RSAD,RVAD, , , , , , , , , , | 94 | RST ,DBUG,RHUD,RSAD,RVAD, , , , , , , , , , |
| 97 | //|----+----+----+----+----+----+----+----+----+----+----+----+----+----| | 95 | //|----+----+----+----+----+----+----+----+----+----+----+----+----+----| |
| 98 | , , , , , , , , , , , , , | 96 | , , , , , , , , , , , , , |
| 99 | //`----+----+----+----+----+----+----+----+----+----+----+----+----+----' | 97 | //`----+----+----+----+----+----+----+----+----+----+----+----+----+----' |
| 100 | ), | 98 | ), |
| 101 | 99 | ||
diff --git a/keyboards/eco/keymaps/that_canadian/keymap.c b/keyboards/eco/keymaps/that_canadian/keymap.c index be0004dbb..444bc48f8 100644 --- a/keyboards/eco/keymaps/that_canadian/keymap.c +++ b/keyboards/eco/keymaps/that_canadian/keymap.c | |||
| @@ -1,12 +1,10 @@ | |||
| 1 | 1 | ||
| 2 | // Below layout is based upon /u/That-Canadian's planck layout | 2 | // Below layout is based upon /u/That-Canadian's planck layout |
| 3 | 3 | ||
| 4 | #include "eco.h" | 4 | #include QMK_KEYBOARD_H |
| 5 | #include "action_layer.h" | ||
| 6 | #ifdef AUDIO_ENABLE | 5 | #ifdef AUDIO_ENABLE |
| 7 | #include "audio.h" | 6 | #include "audio.h" |
| 8 | #endif | 7 | #endif |
| 9 | #include "eeconfig.h" | ||
| 10 | 8 | ||
| 11 | extern keymap_config_t keymap_config; | 9 | extern keymap_config_t keymap_config; |
| 12 | 10 | ||
| @@ -37,95 +35,95 @@ enum eco_keycodes { | |||
| 37 | 35 | ||
| 38 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 36 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 39 | 37 | ||
| 40 | /* Qwerty | 38 | /* Qwerty |
| 41 | * ,-------------------------------------------------------------------------------------------------. | 39 | * ,-------------------------------------------------------------------------------------------------. |
| 42 | * | Tab | Q | W | E | R | T | ( | ) | Y | U | I | O | P | Bksp | | 40 | * | Tab | Q | W | E | R | T | ( | ) | Y | U | I | O | P | Bksp | |
| 43 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| | 41 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| |
| 44 | * | Func | A | S | D | F | G | [ | ] | H | J | K | L | ; | Enter| | 42 | * | Func | A | S | D | F | G | [ | ] | H | J | K | L | ; | Enter| |
| 45 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| | 43 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| |
| 46 | * | Shift| Z | X | C | V | B | { | } | N | M | , | . | / | ' | | 44 | * | Shift| Z | X | C | V | B | { | } | N | M | , | . | / | ' | |
| 47 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| | 45 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| |
| 48 | * | Ctrl | ` | GUI | Alt |Lower | Space|Pg-dwn| Pg-up| Space|Raise | Left | Down | Up |Right | | 46 | * | Ctrl | ` | GUI | Alt |Lower | Space|Pg-dwn| Pg-up| Space|Raise | Left | Down | Up |Right | |
| 49 | * `-------------------------------------------------------------------------------------------------' | 47 | * `-------------------------------------------------------------------------------------------------' |
| 50 | */ | 48 | */ |
| 51 | [_QWERTY] = { | 49 | [_QWERTY] = LAYOUT( |
| 52 | {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LPRN, KC_RPRN, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC}, | 50 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LPRN, KC_RPRN, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, |
| 53 | {MO(_FUNCTION), KC_A, KC_S, KC_D, KC_F, KC_G, KC_LBRC, KC_RBRC, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT}, | 51 | MO(_FUNCTION), KC_A, KC_S, KC_D, KC_F, KC_G, KC_LBRC, KC_RBRC, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, |
| 54 | {OSM(MOD_LSFT), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LCBR, KC_RCBR, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_QUOT}, | 52 | OSM(MOD_LSFT), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LCBR, KC_RCBR, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_QUOT, |
| 55 | {KC_LCTL, KC_GRV, KC_LGUI, KC_LALT, LOWER, KC_SPC, KC_PGDN, KC_PGUP, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} | 53 | KC_LCTL, KC_GRV, KC_LGUI, KC_LALT, LOWER, KC_SPC, KC_PGDN, KC_PGUP, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT |
| 56 | }, | 54 | ), |
| 57 | 55 | ||
| 58 | /* Lower | 56 | /* Lower |
| 59 | * ,-------------------------------------------------------------------------------------------------. | 57 | * ,-------------------------------------------------------------------------------------------------. |
| 60 | * | Esc | ! | @ | # | $ | % | | | ^ | & | * | ( | ) | Del | | 58 | * | Esc | ! | @ | # | $ | % | | | ^ | & | * | ( | ) | Del | |
| 61 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| | 59 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| |
| 62 | * | | F1 | F2 | F3 | F4 | F5 | | | F6 | _ | + | { | } |Enter | | 60 | * | | F1 | F2 | F3 | F4 | F5 | | | F6 | _ | + | { | } |Enter | |
| 63 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| | 61 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| |
| 64 | * | | F7 | F8 | F9 | F10 | F11 | | | F12 | | | Mute | | | | | 62 | * | | F7 | F8 | F9 | F10 | F11 | | | F12 | | | Mute | | | | |
| 65 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| | 63 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| |
| 66 | * | | | | |Lower | | | | Bksp |Raise | Next | Vol- | Vol+ | Play | | 64 | * | | | | |Lower | | | | Bksp |Raise | Next | Vol- | Vol+ | Play | |
| 67 | * `-------------------------------------------------------------------------------------------------' | 65 | * `-------------------------------------------------------------------------------------------------' |
| 68 | */ | 66 | */ |
| 69 | [_LOWER] = { | 67 | [_LOWER] = LAYOUT( |
| 70 | {KC_ESC, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL}, | 68 | KC_ESC, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, |
| 71 | {_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______}, | 69 | _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______, |
| 72 | {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, _______, _______, KC_F12, _______, _______, KC_MUTE, _______, KC_PIPE}, | 70 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, _______, _______, KC_F12, _______, _______, KC_MUTE, _______, KC_PIPE, |
| 73 | {_______, _______, _______, _______, _______, _______, _______, _______, KC_BSPC, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} | 71 | _______, _______, _______, _______, _______, _______, _______, _______, KC_BSPC, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY |
| 74 | }, | 72 | ), |
| 75 | 73 | ||
| 76 | /* Raise | 74 | /* Raise |
| 77 | * ,-------------------------------------------------------------------------------------------------. | 75 | * ,-------------------------------------------------------------------------------------------------. |
| 78 | * | Esc | 1 | 2 | 3 | 4 | 5 | | | 6 | 7 | 8 | 9 | 0 | Del | | 76 | * | Esc | 1 | 2 | 3 | 4 | 5 | | | 6 | 7 | 8 | 9 | 0 | Del | |
| 79 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| | 77 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| |
| 80 | * | | 4 | 5 | 6 | + | | | | | - | = | [ | ] |Enter | | 78 | * | | 4 | 5 | 6 | + | | | | | - | = | [ | ] |Enter | |
| 81 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| | 79 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| |
| 82 | * |Enter | 7 | 8 | 9 | - | | | | | | | Mute | | \ | | 80 | * |Enter | 7 | 8 | 9 | - | | | | | | | Mute | | \ | |
| 83 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| | 81 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| |
| 84 | * | | , | 0 | . |Lower | Bksp | | | |Raise | Next | Vol- | Vol+ | Play | | 82 | * | | , | 0 | . |Lower | Bksp | | | |Raise | Next | Vol- | Vol+ | Play | |
| 85 | * `-------------------------------------------------------------------------------------------------' | 83 | * `-------------------------------------------------------------------------------------------------' |
| 86 | */ | 84 | */ |
| 87 | [_RAISE] = { | 85 | [_RAISE] = LAYOUT( |
| 88 | {KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, _______, _______, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL}, | 86 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, _______, _______, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, |
| 89 | {_______, KC_4, KC_5, KC_6, KC_PLUS, _______, _______, _______, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, _______}, | 87 | _______, KC_4, KC_5, KC_6, KC_PLUS, _______, _______, _______, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, _______, |
| 90 | {KC_ENT, KC_7, KC_8, KC_9, KC_MINS, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, KC_BSLS}, | 88 | KC_ENT, KC_7, KC_8, KC_9, KC_MINS, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, KC_BSLS, |
| 91 | {_______, KC_COMM, KC_0, KC_DOT, _______, KC_BSPC, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} | 89 | _______, KC_COMM, KC_0, KC_DOT, _______, KC_BSPC, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY |
| 92 | }, | 90 | ), |
| 93 | 91 | ||
| 94 | /* Adjust (Lower + Raise) | 92 | /* Adjust (Lower + Raise) |
| 95 | * ,-------------------------------------------------------------------------------------------------. | 93 | * ,-------------------------------------------------------------------------------------------------. |
| 96 | * |Taskmg| Reset| | | | | | | | | | | |caltde| | 94 | * |Taskmg| Reset| | | | | | | | | | | |caltde| |
| 97 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| | 95 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| |
| 98 | * | | | | | | | | | | | | | | | | 96 | * | | | | | | | | | | | | | | | |
| 99 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| | 97 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| |
| 100 | * | | | | | | | | | | | | | | | | 98 | * | | | | | | | | | | | | | | | |
| 101 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| | 99 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| |
| 102 | * | | | | | | | | | | | | | | | | 100 | * | | | | | | | | | | | | | | | |
| 103 | * `-------------------------------------------------------------------------------------------------' | 101 | * `-------------------------------------------------------------------------------------------------' |
| 104 | */ | 102 | */ |
| 105 | [_ADJUST] = { | 103 | [_ADJUST] = LAYOUT( |
| 106 | {TSKMGR, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CALTDEL}, | 104 | TSKMGR, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CALTDEL, |
| 107 | {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}, | 105 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 108 | {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}, | 106 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 109 | {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} | 107 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ |
| 110 | }, | 108 | ), |
| 111 | 109 | ||
| 112 | /* Function | 110 | /* Function |
| 113 | * ,-------------------------------------------------------------------------------------------------. | 111 | * ,-------------------------------------------------------------------------------------------------. |
| 114 | * | | | | | | | | | | | Up | | | | | 112 | * | | | | | | | | | | | Up | | | | |
| 115 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| | 113 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| |
| 116 | * | | | | | | | | | | Left | Down |Right | | | | 114 | * | | | | | | | | | | Left | Down |Right | | | |
| 117 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| | 115 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| |
| 118 | * | Caps | | | | | | | | | | | | | | | 116 | * | Caps | | | | | | | | | | | | | | |
| 119 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| | 117 | * |------+------+------+------+------+------+------+------+------+------+------+------+------+------| |
| 120 | * | | | | | | | | | | | | | | | | 118 | * | | | | | | | | | | | | | | | |
| 121 | * `-------------------------------------------------------------------------------------------------' | 119 | * `-------------------------------------------------------------------------------------------------' |
| 122 | */ | 120 | */ |
| 123 | [_FUNCTION] = { | 121 | [_FUNCTION] = LAYOUT( |
| 124 | {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, _______}, | 122 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, _______, |
| 125 | {_______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______}, | 123 | _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, |
| 126 | {KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}, | 124 | KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 127 | {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} | 125 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ |
| 128 | } | 126 | ) |
| 129 | 127 | ||
| 130 | }; | 128 | }; |
| 131 | 129 | ||
diff --git a/keyboards/eco/keymaps/xyverz/keymap.c b/keyboards/eco/keymaps/xyverz/keymap.c index b68f9f858..b4ca0f1a5 100644 --- a/keyboards/eco/keymaps/xyverz/keymap.c +++ b/keyboards/eco/keymaps/xyverz/keymap.c | |||
| @@ -4,9 +4,7 @@ | |||
| 4 | // Default ECO Layout | 4 | // Default ECO Layout |
| 5 | // KLE here : http://www.keyboard-layout-editor.com/#/gists/0733eca6b4cb88ff9d7de746803f4039 | 5 | // KLE here : http://www.keyboard-layout-editor.com/#/gists/0733eca6b4cb88ff9d7de746803f4039 |
| 6 | 6 | ||
| 7 | #include "eco.h" | 7 | #include QMK_KEYBOARD_H |
| 8 | #include "action_layer.h" | ||
| 9 | #include "eeconfig.h" | ||
| 10 | 8 | ||
| 11 | extern keymap_config_t keymap_config; | 9 | extern keymap_config_t keymap_config; |
| 12 | 10 | ||
| @@ -39,114 +37,114 @@ enum planck_keycodes { | |||
| 39 | 37 | ||
| 40 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 38 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 41 | 39 | ||
| 42 | /* Qwerty | 40 | /* Qwerty |
| 43 | * ,-------------------------------------------------------------------------------------------------. | 41 | * ,-------------------------------------------------------------------------------------------------. |
| 44 | * | Tab | Q | W | E | R | T | | | Y | U | I | O | P | Bksp | | 42 | * | Tab | Q | W | E | R | T | | | Y | U | I | O | P | Bksp | |
| 45 | * |------+------+------+------+------+------+------|------+------+------+------+------+------+------| | 43 | * |------+------+------+------+------+------+------|------+------+------+------+------+------+------| |
| 46 | * | Esc | A | S | D | F | G | | | H | J | K | L | ; | " | | 44 | * | Esc | A | S | D | F | G | | | H | J | K | L | ; | " | |
| 47 | * |------+------+------+------+------+------+------|------+------+------+------+------+------+------| | 45 | * |------+------+------+------+------+------+------|------+------+------+------+------+------+------| |
| 48 | * | Shift| Z | X | C | V | B | | | N | M | , | . | / |Shift | | 46 | * | Shift| Z | X | C | V | B | | | N | M | , | . | / |Shift | |
| 49 | * |------+------+------+------+------+------+------|------+------+------+------+------+------+------| | 47 | * |------+------+------+------+------+------+------|------+------+------+------+------+------+------| |
| 50 | * | Ctrl | Alt | Left |Right |Lower | Bksp | GUI |Enter |Space |Raise | Up | Down | GUI |Enter | | 48 | * | Ctrl | Alt | Left |Right |Lower | Bksp | GUI |Enter |Space |Raise | Up | Down | GUI |Enter | |
| 51 | * `-------------------------------------------------------------------------------------------------' | 49 | * `-------------------------------------------------------------------------------------------------' |
| 52 | */ | 50 | */ |
| 53 | [_QWERTY] = KEYMAP( | 51 | [_QWERTY] = LAYOUT( |
| 54 | 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_BSPC, | 52 | 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_BSPC, |
| 55 | KC_ESC, 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, | 53 | KC_ESC, 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, |
| 56 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_NO, KC_NO, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, | 54 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_NO, KC_NO, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, |
| 57 | KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, KC_BSPC, KC_LGUI, KC_ENT, KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_ENT | 55 | KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, KC_BSPC, KC_LGUI, KC_ENT, KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_ENT |
| 58 | ), | 56 | ), |
| 59 | 57 | ||
| 60 | /* Colemak | 58 | /* Colemak |
| 61 | * ,-------------------------------------------------------------------------------------------------. | 59 | * ,-------------------------------------------------------------------------------------------------. |
| 62 | * | Tab | Q | W | F | P | G | | | J | L | U | Y | ; | Bksp | | 60 | * | Tab | Q | W | F | P | G | | | J | L | U | Y | ; | Bksp | |
| 63 | * |------+------+------+------+------+------+------|------+------+------+------+------+------+------| | 61 | * |------+------+------+------+------+------+------|------+------+------+------+------+------+------| |
| 64 | * | Esc | A | R | S | T | D | | | H | N | E | I | O | " | | 62 | * | Esc | A | R | S | T | D | | | H | N | E | I | O | " | |
| 65 | * |------+------+------+------+------+------+------|------+------+------+------+------+------+------| | 63 | * |------+------+------+------+------+------+------|------+------+------+------+------+------+------| |
| 66 | * | Shift| Z | X | C | V | B | | | N | M | , | . | / |Shift | | 64 | * | Shift| Z | X | C | V | B | | | N | M | , | . | / |Shift | |
| 67 | * |------+------+------+------+------+------+------|------+------+------+------+------+------+------| | 65 | * |------+------+------+------+------+------+------|------+------+------+------+------+------+------| |
| 68 | * | Ctrl | Alt | Left |Right |Lower | Bksp | GUI |Enter |Space |Raise | Up | Down | GUI |Enter | | 66 | * | Ctrl | Alt | Left |Right |Lower | Bksp | GUI |Enter |Space |Raise | Up | Down | GUI |Enter | |
| 69 | * `-------------------------------------------------------------------------------------------------' | 67 | * `-------------------------------------------------------------------------------------------------' |
| 70 | */ | 68 | */ |
| 71 | [_COLEMAK] = KEYMAP( | 69 | [_COLEMAK] = LAYOUT( |
| 72 | KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_NO, KC_NO, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, | 70 | KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_NO, KC_NO, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, |
| 73 | KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_NO, KC_NO, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, | 71 | KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_NO, KC_NO, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, |
| 74 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_NO, KC_NO, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, | 72 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_NO, KC_NO, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, |
| 75 | KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, KC_BSPC, KC_LGUI, KC_ENT, KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_ENT | 73 | KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, KC_BSPC, KC_LGUI, KC_ENT, KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_ENT |
| 76 | ), | 74 | ), |
| 77 | 75 | ||
| 78 | /* Dvorak | 76 | /* Dvorak |
| 79 | * ,-------------------------------------------------------------------------------------------------. | 77 | * ,-------------------------------------------------------------------------------------------------. |
| 80 | * | Tab | " | , | . | P | Y | | | F | G | C | R | L | / | | 78 | * | Tab | " | , | . | P | Y | | | F | G | C | R | L | / | |
| 81 | * |------+------+------+------+------+------+------|------+------+------+------+------+------+------| | 79 | * |------+------+------+------+------+------+------|------+------+------+------+------+------+------| |
| 82 | * | Esc | A | O | E | U | I | | | D | H | T | N | S | - | | 80 | * | Esc | A | O | E | U | I | | | D | H | T | N | S | - | |
| 83 | * |------+------+------+------+------+------+------|------+------+------+------+------+------+------| | 81 | * |------+------+------+------+------+------+------|------+------+------+------+------+------+------| |
| 84 | * | Shift| ; | Q | J | K | X | | | B | M | W | V | Z | Shift| | 82 | * | Shift| ; | Q | J | K | X | | | B | M | W | V | Z | Shift| |
| 85 | * |------+------+------+------+------+------+------|------+------+------+------+------+------+------| | 83 | * |------+------+------+------+------+------+------|------+------+------+------+------+------+------| |
| 86 | * | Ctrl | Alt | Left |Right |Lower | Bksp | GUI |Enter |Space |Raise | Up | Down | GUI |Enter | | 84 | * | Ctrl | Alt | Left |Right |Lower | Bksp | GUI |Enter |Space |Raise | Up | Down | GUI |Enter | |
| 87 | * `-------------------------------------------------------------------------------------------------' | 85 | * `-------------------------------------------------------------------------------------------------' |
| 88 | */ | 86 | */ |
| 89 | [_DVORAK] = KEYMAP( | 87 | [_DVORAK] = LAYOUT( |
| 90 | KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_NO, KC_NO, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, | 88 | KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_NO, KC_NO, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, |
| 91 | KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_NO, KC_NO, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, | 89 | KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_NO, KC_NO, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, |
| 92 | KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_NO, KC_NO, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, | 90 | KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_NO, KC_NO, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, |
| 93 | KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, KC_BSPC, KC_LGUI, KC_ENT, KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_ENT | 91 | KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, KC_BSPC, KC_LGUI, KC_ENT, KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_ENT |
| 94 | ), | 92 | ), |
| 95 | 93 | ||
| 96 | /* Lower | 94 | /* Lower |
| 97 | * ,-------------------------------------------------------------------------------------------------. | 95 | * ,-------------------------------------------------------------------------------------------------. |
| 98 | * | ~ | ! | @ | # | $ | % | | | ^ | & | * | ( | ) | | | 96 | * | ~ | ! | @ | # | $ | % | | | ^ | & | * | ( | ) | | |
| 99 | * |------+------+------+------+------+------+------|------+------+------+------+------+------+------| | 97 | * |------+------+------+------+------+------+------|------+------+------+------+------+------+------| |
| 100 | * | Caps | | Mute | Vol- | Vol+ | | | | F6 | F7 | F8 | F9 | F10 | F11 | | 98 | * | Caps | | Mute | Vol- | Vol+ | | | | F6 | F7 | F8 | F9 | F10 | F11 | |
| 101 | * |------+------+------+------+------+------+------|------+------+------+------+------+------+------| | 99 | * |------+------+------+------+------+------+------|------+------+------+------+------+------+------| |
| 102 | * | | | Prev | Play | Next | | | | | | | | | | | 100 | * | | | Prev | Play | Next | | | | | | | | | | |
| 103 | * |------+------+------+------+------+------+------|------+------+------+------+------+------+------| | 101 | * |------+------+------+------+------+------+------|------+------+------+------+------+------+------| |
| 104 | * | Brite| | Home | End | | Del | | | | | | | | | | 102 | * | Brite| | Home | End | | Del | | | | | | | | | |
| 105 | * `-------------------------------------------------------------------------------------------------' | 103 | * `-------------------------------------------------------------------------------------------------' |
| 106 | */ | 104 | */ |
| 107 | [_LOWER] = KEYMAP( | 105 | [_LOWER] = LAYOUT( |
| 108 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_NO, KC_NO, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, | 106 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_NO, KC_NO, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, |
| 109 | KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_NO, KC_NO, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, | 107 | KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_NO, KC_NO, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, |
| 110 | _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_NO, KC_NO, _______, _______, _______, _______, _______, _______, | 108 | _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_NO, KC_NO, _______, _______, _______, _______, _______, _______, |
| 111 | _______, _______, KC_HOME, KC_END, _______, KC_DEL, _______, _______, KC_INS, _______, KC_PGUP, KC_PGDN, _______, _______ | 109 | _______, _______, KC_HOME, KC_END, _______, KC_DEL, _______, _______, KC_INS, _______, KC_PGUP, KC_PGDN, _______, _______ |
| 112 | ), | 110 | ), |
| 113 | 111 | ||
| 114 | /* Raise | 112 | /* Raise |
| 115 | * ,-------------------------------------------------------------------------------------------------. | 113 | * ,-------------------------------------------------------------------------------------------------. |
| 116 | * | | 1 | 2 | 3 | 4 | 5 | | | 6 | 7 | 8 | 9 | 0 | - | | 114 | * | | 1 | 2 | 3 | 4 | 5 | | | 6 | 7 | 8 | 9 | 0 | - | |
| 117 | * |------+------+------+------+------+------+------|------+------+------+------+------+------+------| | 115 | * |------+------+------+------+------+------+------|------+------+------+------+------+------+------| |
| 118 | * | | F1 | F2 | F3 | F4 | F5 | | | F6 | F7 | F8 | F9 | F10 | F11 | | 116 | * | | F1 | F2 | F3 | F4 | F5 | | | F6 | F7 | F8 | F9 | F10 | F11 | |
| 119 | * |------+------+------+------+------+------+------|------+------+------+------+------+------+------| | 117 | * |------+------+------+------+------+------+------|------+------+------+------+------+------+------| |
| 120 | * | | | | | | | | | | | | | | | | 118 | * | | | | | | | | | | | | | | | |
| 121 | * |------+------+------+------+------+------+------|------+------+------+------+------+------+------| | 119 | * |------+------+------+------+------+------+------|------+------+------+------+------+------+------| |
| 122 | * | | | | | | | | | | | | | | | | 120 | * | | | | | | | | | | | | | | | |
| 123 | * `-------------------------------------------------------------------------------------------------' | 121 | * `-------------------------------------------------------------------------------------------------' |
| 124 | */ | 122 | */ |
| 125 | [_RAISE] = KEYMAP( | 123 | [_RAISE] = LAYOUT( |
| 126 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_NO, KC_NO, KC_6, KC_7, KC_8, KC_9, KC_0, _______, | 124 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_NO, KC_NO, KC_6, KC_7, KC_8, KC_9, KC_0, _______, |
| 127 | KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_NO, KC_NO, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, | 125 | KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_NO, KC_NO, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, |
| 128 | _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_NO, KC_NO, _______, _______, _______, _______, _______, _______, | 126 | _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_NO, KC_NO, _______, _______, _______, _______, _______, _______, |
| 129 | _______, _______, KC_HOME, KC_END, _______, KC_DEL, _______, _______, KC_INS, _______, KC_PGUP, KC_PGDN, _______, _______ | 127 | _______, _______, KC_HOME, KC_END, _______, KC_DEL, _______, _______, KC_INS, _______, KC_PGUP, KC_PGDN, _______, _______ |
| 130 | ), | 128 | ), |
| 131 | 129 | ||
| 132 | 130 | ||
| 133 | /* Adjust | 131 | /* Adjust |
| 134 | * ,-------------------------------------------------------------------------------------------------. | 132 | * ,-------------------------------------------------------------------------------------------------. |
| 135 | * | F11 | F1 | F2 | F3 | F4 | F5 | | | F6 | F7 | F8 | F9 | F10 | F12 | | 133 | * | F11 | F1 | F2 | F3 | F4 | F5 | | | F6 | F7 | F8 | F9 | F10 | F12 | |
| 136 | * |------+------+------+------+------+------+------|------+------+------+------+------+------+------| | 134 | * |------+------+------+------+------+------+------|------+------+------+------+------+------+------| |
| 137 | * | | Reset| | | | | | | |Qwerty|Colemk|Dvorak| | | | 135 | * | | Reset| | | | | | | |Qwerty|Colemk|Dvorak| | | |
| 138 | * |------+------+------+------+------+------+------|------+------+------+------+------+------+------| | 136 | * |------+------+------+------+------+------+------|------+------+------+------+------+------+------| |
| 139 | * | | | | | | | | | | | | | | | | 137 | * | | | | | | | | | | | | | | | |
| 140 | * |------+------+------+------+------+------+------|------+------+------+------+------+------+------| | 138 | * |------+------+------+------+------+------+------|------+------+------+------+------+------+------| |
| 141 | * | | | | | | | | | | | | | | | | 139 | * | | | | | | | | | | | | | | | |
| 142 | * `-------------------------------------------------------------------------------------------------' | 140 | * `-------------------------------------------------------------------------------------------------' |
| 143 | */ | 141 | */ |
| 144 | [_ADJUST] = KEYMAP( | 142 | [_ADJUST] = LAYOUT( |
| 145 | KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_NO, KC_NO, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12 , | 143 | KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_NO, KC_NO, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12 , |
| 146 | _______, RESET, _______, _______, _______, _______, KC_NO, KC_NO, _______, QWERTY, COLEMAK, DVORAK, _______, _______, | 144 | _______, RESET, _______, _______, _______, _______, KC_NO, KC_NO, _______, QWERTY, COLEMAK, DVORAK, _______, _______, |
| 147 | _______, _______, _______, _______, _______, _______, KC_NO, KC_NO, _______, _______, _______, _______, _______, _______, | 145 | _______, _______, _______, _______, _______, _______, KC_NO, KC_NO, _______, _______, _______, _______, _______, _______, |
| 148 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ | 146 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ |
| 149 | ), | 147 | ), |
| 150 | 148 | ||
| 151 | }; | 149 | }; |
| 152 | 150 | ||
diff --git a/keyboards/eco/readme.md b/keyboards/eco/readme.md index afa9d5559..0826337e7 100644 --- a/keyboards/eco/readme.md +++ b/keyboards/eco/readme.md | |||
| @@ -5,8 +5,9 @@ ECO | |||
| 5 | 5 | ||
| 6 | An economical 4x14 ortholinear keyboard | 6 | An economical 4x14 ortholinear keyboard |
| 7 | 7 | ||
| 8 | Keyboard Maintainer: BishopKeyboards and That-Canadian | 8 | Keyboard Maintainer: BishopKeyboards and That-Canadian |
| 9 | Hardware Supported: ECO PCB rev1 Pro Micro | 9 | Hardware Supported: ECO PCB rev1 Pro Micro |
| 10 | Hardware Availability: [BishopKeyboards](https://bishopkeyboards.com/product/eco-keyboard-pcb-4x14/) | ||
| 10 | 11 | ||
| 11 | Make example for this keyboard (after setting up your build environment): | 12 | Make example for this keyboard (after setting up your build environment): |
| 12 | 13 | ||
diff --git a/keyboards/eco/rev1/rev1.h b/keyboards/eco/rev1/rev1.h index 41541ac05..ba00615d3 100644 --- a/keyboards/eco/rev1/rev1.h +++ b/keyboards/eco/rev1/rev1.h | |||
| @@ -8,17 +8,17 @@ | |||
| 8 | 8 | ||
| 9 | //void promicro_bootloader_jmp(bool program); | 9 | //void promicro_bootloader_jmp(bool program); |
| 10 | 10 | ||
| 11 | #define KEYMAP( \ | 11 | #define LAYOUT( \ |
| 12 | k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, k014, \ | 12 | k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, k014, \ |
| 13 | k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, k114, \ | 13 | k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, k114, \ |
| 14 | k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, k214, \ | 14 | k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, k214, \ |
| 15 | k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, k314 \ | 15 | k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, k314 \ |
| 16 | ) \ | 16 | ) \ |
| 17 | { \ | 17 | { \ |
| 18 | { k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, k014 }, \ | 18 | { k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, k014 }, \ |
| 19 | { k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, k114 }, \ | 19 | { k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, k114 }, \ |
| 20 | { k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, k214 }, \ | 20 | { k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, k214 }, \ |
| 21 | { k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, k314 } \ | 21 | { k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, k314 } \ |
| 22 | } | 22 | } |
| 23 | 23 | ||
| 24 | #endif \ No newline at end of file | 24 | #endif |
diff --git a/keyboards/eco/rev2/rev2.h b/keyboards/eco/rev2/rev2.h index 5b377f290..adc2c6d40 100644 --- a/keyboards/eco/rev2/rev2.h +++ b/keyboards/eco/rev2/rev2.h | |||
| @@ -8,17 +8,17 @@ | |||
| 8 | 8 | ||
| 9 | //void promicro_bootloader_jmp(bool program); | 9 | //void promicro_bootloader_jmp(bool program); |
| 10 | 10 | ||
| 11 | #define KEYMAP( \ | 11 | #define LAYOUT( \ |
| 12 | k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, k014, \ | 12 | k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, k014, \ |
| 13 | k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, k114, \ | 13 | k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, k114, \ |
| 14 | k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, k214, \ | 14 | k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, k214, \ |
| 15 | k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, k314 \ | 15 | k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, k314 \ |
| 16 | ) \ | 16 | ) \ |
| 17 | { \ | 17 | { \ |
| 18 | { k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, k014 }, \ | 18 | { k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, k014 }, \ |
| 19 | { k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, k114 }, \ | 19 | { k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, k114 }, \ |
| 20 | { k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, k214 }, \ | 20 | { k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, k214 }, \ |
| 21 | { k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, k314 } \ | 21 | { k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, k314 } \ |
| 22 | } | 22 | } |
| 23 | 23 | ||
| 24 | #endif \ No newline at end of file | 24 | #endif |
