diff options
| author | noroadsleft <18669334+noroadsleft@users.noreply.github.com> | 2018-06-13 16:58:23 +0200 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2018-06-13 16:58:23 +0200 |
| commit | 1912f3617718f4cefa848a35e1fe9524970b6352 (patch) | |
| tree | 22f56c05d0e49851decff727fc419d5b46e06d4b /keyboards/ergodone | |
| parent | 698ce733b73a2a8d6d41942b514af4c9d45190df (diff) | |
| download | qmk_firmware-1912f3617718f4cefa848a35e1fe9524970b6352.tar.gz qmk_firmware-1912f3617718f4cefa848a35e1fe9524970b6352.tar.xz | |
Configurator layout repair for Ergodone, Ergodox Infinity and ErgoTravel (#3173)
* Ergodone refactor
* Ergodox Infinity refactor
* Ergotravel refactor
* Ergotravel configurator layout update
* Fixing include on Ergodox Infinity narze keymap
Diffstat (limited to 'keyboards/ergodone')
| -rw-r--r-- | keyboards/ergodone/ergodone.h | 75 |
1 files changed, 39 insertions, 36 deletions
diff --git a/keyboards/ergodone/ergodone.h b/keyboards/ergodone/ergodone.h index b04826e69..8b51f95b7 100644 --- a/keyboards/ergodone/ergodone.h +++ b/keyboards/ergodone/ergodone.h @@ -67,9 +67,12 @@ inline void ergodox_right_led_3_set(uint8_t n) {} inline void ergodox_right_led_set(uint8_t l, uint8_t n) {} inline void ergodox_led_all_set(uint8_t n) {} -#define KEYMAP( \ +/* + * LEFT HAND: LINES 76-83 + * RIGHT HAND: LINES 85-92 + */ +#define LAYOUT_ergodox( \ \ - /* left hand, spatial positions */ \ k00,k01,k02,k03,k04,k05,k06, \ k10,k11,k12,k13,k14,k15,k16, \ k20,k21,k22,k23,k24,k25, \ @@ -79,7 +82,6 @@ inline void ergodox_led_all_set(uint8_t n) {} k54, \ k53,k52,k51, \ \ - /* right hand, spatial positions */ \ k07,k08,k09,k0A,k0B,k0C,k0D, \ k17,k18,k19,k1A,k1B,k1C,k1D, \ k28,k29,k2A,k2B,k2C,k2D, \ @@ -96,12 +98,15 @@ inline void ergodox_led_all_set(uint8_t n) {} { k20, k21, k22, k23, k24, k25, KC_NO, KC_NO, k28, k29, k2A, k2B, k2C, k2D }, \ { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \ { k40, k41, k42, k43, k44, KC_NO, KC_NO, KC_NO, KC_NO, k49, k4A, k4B, k4C, k4D }, \ - { KC_NO, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, KC_NO } \ + { KC_NO, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, KC_NO } \ } -#define LAYOUT_ergodox_80( \ +/* + * LEFT HAND: LINES 110-117 + * RIGHT HAND: LINES 119-126 + */ +#define LAYOUT_ergodox_80( \ \ - /* left hand, spatial positions */ \ k00,k01,k02,k03,k04,k05,k06, \ k10,k11,k12,k13,k14,k15,k16, \ k20,k21,k22,k23,k24,k25, \ @@ -111,7 +116,6 @@ inline void ergodox_led_all_set(uint8_t n) {} k45,k46,k54, \ k53,k52,k51, \ \ - /* right hand, spatial positions */ \ k07,k08,k09,k0A,k0B,k0C,k0D, \ k17,k18,k19,k1A,k1B,k1C,k1D, \ k28,k29,k2A,k2B,k2C,k2D, \ @@ -128,21 +132,22 @@ inline void ergodox_led_all_set(uint8_t n) {} { k20, k21, k22, k23, k24, k25, KC_NO, KC_NO, k28, k29, k2A, k2B, k2C, k2D }, \ { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \ { k40, k41, k42, k43, k44, k45, k45, k47, k48, k49, k4A, k4B, k4C, k4D }, \ - { KC_NO, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, KC_NO } \ + { KC_NO, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, KC_NO } \ } -#define KEYMAP_PRETTY( \ - /* left hand, spatial positions */ /* right hand, spatial positions */ \ - L00,L01,L02,L03,L04,L05,L06, R00,R01,R02,R03,R04,R05,R06, \ - L10,L11,L12,L13,L14,L15,L16, R10,R11,R12,R13,R14,R15,R16, \ - L20,L21,L22,L23,L24,L25, R21,R22,R23,R24,R25,R26, \ - L30,L31,L32,L33,L34,L35,L36, R30,R31,R32,R33,R34,R35,R36, \ - L40,L41,L42,L43,L44, R42,R43,R44,R45,R46, \ - L55,L56, R50,R51, \ - L54, R52, \ - L53,L52,L51, R55,R54,R53 ) \ - \ - /* matrix positions */ \ +/* ---------- LEFT HAND ----------- ---------- RIGHT HAND ---------- */ +#define LAYOUT_ergodox_pretty( \ + \ + L00,L01,L02,L03,L04,L05,L06, R00,R01,R02,R03,R04,R05,R06, \ + L10,L11,L12,L13,L14,L15,L16, R10,R11,R12,R13,R14,R15,R16, \ + L20,L21,L22,L23,L24,L25, R21,R22,R23,R24,R25,R26, \ + L30,L31,L32,L33,L34,L35,L36, R30,R31,R32,R33,R34,R35,R36, \ + L40,L41,L42,L43,L44, R42,R43,R44,R45,R46, \ + L55,L56, R50,R51, \ + L54, R52, \ + L53,L52,L51, R55,R54,R53 ) \ + \ + /* matrix positions */ \ { \ { L00,L01,L02,L03,L04,L05,L06, R00,R01,R02,R03,R04,R05,R06 }, \ { L10,L11,L12,L13,L14,L15,L16, R10,R11,R12,R13,R14,R15,R16 }, \ @@ -152,19 +157,20 @@ inline void ergodox_led_all_set(uint8_t n) {} { KC_NO,L51,L52,L53,L54,L55,L56, R50,R51,R52,R53,R54,R55,KC_NO } \ } -#define LAYOUT_ergodox_pretty_80( \ - /* left hand, spatial positions */ /* right hand, spatial positions */ \ - L00,L01,L02,L03,L04,L05,L06, R00,R01,R02,R03,R04,R05,R06, \ - L10,L11,L12,L13,L14,L15,L16, R10,R11,R12,R13,R14,R15,R16, \ - L20,L21,L22,L23,L24,L25, R21,R22,R23,R24,R25,R26, \ - L30,L31,L32,L33,L34,L35,L36, R30,R31,R32,R33,R34,R35,R36, \ - L40,L41,L42,L43,L44, R42,R43,R44,R45,R46, \ - L55,L56, R50,R51, \ - L45,L46,L54, R52,R40,R41, \ - L53,L52,L51, R55,R54,R53 ) \ - \ - /* matrix positions */ \ - { \ +/* ---------- LEFT HAND ----------- ---------- RIGHT HAND ---------- */ +#define LAYOUT_ergodox_pretty_80( \ + \ + L00,L01,L02,L03,L04,L05,L06, R00,R01,R02,R03,R04,R05,R06, \ + L10,L11,L12,L13,L14,L15,L16, R10,R11,R12,R13,R14,R15,R16, \ + L20,L21,L22,L23,L24,L25, R21,R22,R23,R24,R25,R26, \ + L30,L31,L32,L33,L34,L35,L36, R30,R31,R32,R33,R34,R35,R36, \ + L40,L41,L42,L43,L44, R42,R43,R44,R45,R46, \ + L55,L56, R50,R51, \ + L45,L46,L54, R52,R40,R41, \ + L53,L52,L51, R55,R54,R53 ) \ + \ + /* matrix positions */ \ + { \ { L00,L01,L02,L03,L04,L05,L06, R00,R01,R02,R03,R04,R05,R06 }, \ { L10,L11,L12,L13,L14,L15,L16, R10,R11,R12,R13,R14,R15,R16 }, \ { L20,L21,L22,L23,L24,L25,KC_NO, KC_NO,R21,R22,R23,R24,R25,R26 }, \ @@ -173,7 +179,4 @@ inline void ergodox_led_all_set(uint8_t n) {} { KC_NO,L51,L52,L53,L54,L55,L56, R50,R51,R52,R53,R54,R55,KC_NO } \ } -#define LAYOUT_ergodox KEYMAP -#define LAYOUT_ergodox_pretty KEYMAP_PRETTY - #endif |