diff options
| author | Drashna Jaelre <drashna@live.com> | 2018-05-20 21:45:38 -0700 |
|---|---|---|
| committer | skullydazed <skullydazed@users.noreply.github.com> | 2018-05-20 21:45:38 -0700 |
| commit | 9483a88d75fc6fd42c1ad138cf39e66e1874dcb5 (patch) | |
| tree | 704383c49574bc9c4da4b82c171d7b03f7e24b92 /keyboards/ergodone | |
| parent | 4dc89d974b5faa6c39281f07f901877541ca8b12 (diff) | |
| download | qmk_firmware-9483a88d75fc6fd42c1ad138cf39e66e1874dcb5.tar.gz qmk_firmware-9483a88d75fc6fd42c1ad138cf39e66e1874dcb5.zip | |
Add 80 key layout to Ergodone, as it appears to support it (#2984)
* Add 80 key layout to Ergodone
* Add layouts
* Missed a comma .....
Diffstat (limited to 'keyboards/ergodone')
| -rw-r--r-- | keyboards/ergodone/ergodone.h | 53 | ||||
| -rw-r--r-- | keyboards/ergodone/info.json | 75 |
2 files changed, 116 insertions, 12 deletions
diff --git a/keyboards/ergodone/ergodone.h b/keyboards/ergodone/ergodone.h index c63afe838..b04826e69 100644 --- a/keyboards/ergodone/ergodone.h +++ b/keyboards/ergodone/ergodone.h | |||
| @@ -99,6 +99,38 @@ inline void ergodox_led_all_set(uint8_t n) {} | |||
| 99 | { KC_NO, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, KC_NO } \ | 99 | { KC_NO, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, KC_NO } \ |
| 100 | } | 100 | } |
| 101 | 101 | ||
| 102 | #define LAYOUT_ergodox_80( \ | ||
| 103 | \ | ||
| 104 | /* left hand, spatial positions */ \ | ||
| 105 | k00,k01,k02,k03,k04,k05,k06, \ | ||
| 106 | k10,k11,k12,k13,k14,k15,k16, \ | ||
| 107 | k20,k21,k22,k23,k24,k25, \ | ||
| 108 | k30,k31,k32,k33,k34,k35,k36, \ | ||
| 109 | k40,k41,k42,k43,k44, \ | ||
| 110 | k55,k56, \ | ||
| 111 | k45,k46,k54, \ | ||
| 112 | k53,k52,k51, \ | ||
| 113 | \ | ||
| 114 | /* right hand, spatial positions */ \ | ||
| 115 | k07,k08,k09,k0A,k0B,k0C,k0D, \ | ||
| 116 | k17,k18,k19,k1A,k1B,k1C,k1D, \ | ||
| 117 | k28,k29,k2A,k2B,k2C,k2D, \ | ||
| 118 | k37,k38,k39,k3A,k3B,k3C,k3D, \ | ||
| 119 | k49,k4A,k4B,k4C,k4D, \ | ||
| 120 | k57,k58, \ | ||
| 121 | k59,k47,k48, \ | ||
| 122 | k5C,k5B,k5A ) \ | ||
| 123 | \ | ||
| 124 | /* matrix positions */ \ | ||
| 125 | { \ | ||
| 126 | { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \ | ||
| 127 | { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \ | ||
| 128 | { k20, k21, k22, k23, k24, k25, KC_NO, KC_NO, k28, k29, k2A, k2B, k2C, k2D }, \ | ||
| 129 | { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \ | ||
| 130 | { k40, k41, k42, k43, k44, k45, k45, k47, k48, k49, k4A, k4B, k4C, k4D }, \ | ||
| 131 | { KC_NO, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, KC_NO } \ | ||
| 132 | } | ||
| 133 | |||
| 102 | #define KEYMAP_PRETTY( \ | 134 | #define KEYMAP_PRETTY( \ |
| 103 | /* left hand, spatial positions */ /* right hand, spatial positions */ \ | 135 | /* left hand, spatial positions */ /* right hand, spatial positions */ \ |
| 104 | L00,L01,L02,L03,L04,L05,L06, R00,R01,R02,R03,R04,R05,R06, \ | 136 | L00,L01,L02,L03,L04,L05,L06, R00,R01,R02,R03,R04,R05,R06, \ |
| @@ -120,6 +152,27 @@ inline void ergodox_led_all_set(uint8_t n) {} | |||
| 120 | { KC_NO,L51,L52,L53,L54,L55,L56, R50,R51,R52,R53,R54,R55,KC_NO } \ | 152 | { KC_NO,L51,L52,L53,L54,L55,L56, R50,R51,R52,R53,R54,R55,KC_NO } \ |
| 121 | } | 153 | } |
| 122 | 154 | ||
| 155 | #define LAYOUT_ergodox_pretty_80( \ | ||
| 156 | /* left hand, spatial positions */ /* right hand, spatial positions */ \ | ||
| 157 | L00,L01,L02,L03,L04,L05,L06, R00,R01,R02,R03,R04,R05,R06, \ | ||
| 158 | L10,L11,L12,L13,L14,L15,L16, R10,R11,R12,R13,R14,R15,R16, \ | ||
| 159 | L20,L21,L22,L23,L24,L25, R21,R22,R23,R24,R25,R26, \ | ||
| 160 | L30,L31,L32,L33,L34,L35,L36, R30,R31,R32,R33,R34,R35,R36, \ | ||
| 161 | L40,L41,L42,L43,L44, R42,R43,R44,R45,R46, \ | ||
| 162 | L55,L56, R50,R51, \ | ||
| 163 | L45,L46,L54, R52,R40,R41, \ | ||
| 164 | L53,L52,L51, R55,R54,R53 ) \ | ||
| 165 | \ | ||
| 166 | /* matrix positions */ \ | ||
| 167 | { \ | ||
| 168 | { L00,L01,L02,L03,L04,L05,L06, R00,R01,R02,R03,R04,R05,R06 }, \ | ||
| 169 | { L10,L11,L12,L13,L14,L15,L16, R10,R11,R12,R13,R14,R15,R16 }, \ | ||
| 170 | { L20,L21,L22,L23,L24,L25,KC_NO, KC_NO,R21,R22,R23,R24,R25,R26 }, \ | ||
| 171 | { L30,L31,L32,L33,L34,L35,L36, R30,R31,R32,R33,R34,R35,R36 }, \ | ||
| 172 | { L40,L41,L42,L43,L44,L45,L46, R40,R41,R42,R43,R44,R45,R46 }, \ | ||
| 173 | { KC_NO,L51,L52,L53,L54,L55,L56, R50,R51,R52,R53,R54,R55,KC_NO } \ | ||
| 174 | } | ||
| 175 | |||
| 123 | #define LAYOUT_ergodox KEYMAP | 176 | #define LAYOUT_ergodox KEYMAP |
| 124 | #define LAYOUT_ergodox_pretty KEYMAP_PRETTY | 177 | #define LAYOUT_ergodox_pretty KEYMAP_PRETTY |
| 125 | 178 | ||
diff --git a/keyboards/ergodone/info.json b/keyboards/ergodone/info.json index 31e756466..81c7e2afa 100644 --- a/keyboards/ergodone/info.json +++ b/keyboards/ergodone/info.json | |||
| @@ -6,6 +6,55 @@ | |||
| 6 | 6 | ||
| 7 | "layouts": { | 7 | "layouts": { |
| 8 | "LAYOUT_ergodox": { | 8 | "LAYOUT_ergodox": { |
| 9 | |||
| 10 | "layout": [ | ||
| 11 | {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25}, | ||
| 12 | {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5}, | ||
| 13 | {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25}, | ||
| 14 | {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5}, | ||
| 15 | {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125}, | ||
| 16 | |||
| 17 | {"x":6, "y":5}, {"x":7, "y":5}, | ||
| 18 | {"x":7, "y":6}, | ||
| 19 | {"x":5, "y":6, "h":2}, {"x":6, "y":6, "h":2}, {"x":7, "y":7}, | ||
| 20 | |||
| 21 | |||
| 22 | {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5}, | ||
| 23 | {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5}, | ||
| 24 | {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5}, | ||
| 25 | {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5}, | ||
| 26 | {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375}, | ||
| 27 | |||
| 28 | |||
| 29 | {"x":9, "y":5}, {"x":10, "y":5}, | ||
| 30 | {"x":9, "y":6}, | ||
| 31 | {"x":9, "y":7}, {"x":10, "y":6, "h":2}, {"x":11, "y":6, "h":2} | ||
| 32 | ] | ||
| 33 | }, | ||
| 34 | "LAYOUT_ergodox_pretty": { | ||
| 35 | "layout": [ | ||
| 36 | {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25}, | ||
| 37 | {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5}, | ||
| 38 | |||
| 39 | {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5}, | ||
| 40 | {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5}, | ||
| 41 | |||
| 42 | {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25}, | ||
| 43 | {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5}, | ||
| 44 | |||
| 45 | {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5}, | ||
| 46 | {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5}, | ||
| 47 | |||
| 48 | {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125}, | ||
| 49 | {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375}, | ||
| 50 | |||
| 51 | {"x":6, "y":5}, {"x":7, "y":5}, {"x":9, "y":5}, {"x":10, "y":5}, | ||
| 52 | {"x":7, "y":6}, {"x":9, "y":6}, | ||
| 53 | {"x":5, "y":6, "h":2}, {"x":6, "y":6, "h":2}, {"x":7, "y":7}, {"x":9, "y":7}, {"x":10, "y":6, "h":2}, {"x":11, "y":6, "h":2} | ||
| 54 | ] | ||
| 55 | }, | ||
| 56 | "LAYOUT_ergodox_80": { | ||
| 57 | |||
| 9 | "layout": [ | 58 | "layout": [ |
| 10 | {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25}, | 59 | {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25}, |
| 11 | {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5}, | 60 | {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5}, |
| @@ -14,23 +63,25 @@ | |||
| 14 | {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125}, | 63 | {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125}, |
| 15 | 64 | ||
| 16 | {"x":6, "y":5}, {"x":7, "y":5}, | 65 | {"x":6, "y":5}, {"x":7, "y":5}, |
| 17 | {"x":7, "y":6}, | ||
| 18 | {"x":5, "y":6, "h":2}, {"x":6, "y":6, "h":2}, {"x":7, "y":7}, | ||
| 19 | 66 | ||
| 67 | {"x":5, "y":6}, {"x":6, "y":6}, {"x":7, "y":6}, | ||
| 68 | {"x":5, "y":7}, {"x":6, "y":7}, {"x":7, "y":7}, | ||
| 20 | 69 | ||
| 21 | {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5}, | 70 | |
| 22 | {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5}, | 71 | {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5}, |
| 23 | {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5}, | 72 | {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5}, |
| 24 | {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5}, | 73 | {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5}, |
| 25 | {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375}, | 74 | {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5}, |
| 75 | {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375}, | ||
| 26 | 76 | ||
| 27 | 77 | ||
| 28 | {"x":9, "y":5}, {"x":10, "y":5}, | 78 | {"x":9, "y":5}, {"x":10, "y":5}, |
| 29 | {"x":9, "y":6}, | 79 | {"x":9, "y":6}, {"x":10, "y":6}, {"x":11, "y":6}, |
| 30 | {"x":9, "y":7}, {"x":10, "y":6, "h":2}, {"x":11, "y":6, "h":2} | 80 | {"x":9, "y":7}, {"x":10, "y":7}, {"x":11, "y":7} |
| 31 | ] | 81 | ] |
| 32 | }, | 82 | }, |
| 33 | "LAYOUT_ergodox_pretty": { | 83 | "LAYOUT_ergodox_pretty_80": { |
| 84 | |||
| 34 | "layout": [ | 85 | "layout": [ |
| 35 | {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25}, | 86 | {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25}, |
| 36 | {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5}, | 87 | {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5}, |
| @@ -48,8 +99,8 @@ | |||
| 48 | {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375}, | 99 | {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375}, |
| 49 | 100 | ||
| 50 | {"x":6, "y":5}, {"x":7, "y":5}, {"x":9, "y":5}, {"x":10, "y":5}, | 101 | {"x":6, "y":5}, {"x":7, "y":5}, {"x":9, "y":5}, {"x":10, "y":5}, |
| 51 | {"x":7, "y":6}, {"x":9, "y":6}, | 102 | {"x":5, "y":6}, {"x":6, "y":6}, {"x":7, "y":6}, {"x":9, "y":6}, {"x":10, "y":6}, {"x":11, "y":6}, |
| 52 | {"x":5, "y":6, "h":2}, {"x":6, "y":6, "h":2}, {"x":7, "y":7}, {"x":9, "y":7}, {"x":10, "y":6, "h":2}, {"x":11, "y":6, "h":2} | 103 | {"x":5, "y":7}, {"x":6, "y":7}, {"x":7, "y":7}, {"x":9, "y":7}, {"x":10, "y":7}, {"x":11, "y":7} |
| 53 | ] | 104 | ] |
| 54 | } | 105 | } |
| 55 | } | 106 | } |
