diff options
| -rw-r--r-- | keyboards/handwired/dactyl_manuform/5x6/5x6.h | 54 | ||||
| -rw-r--r-- | keyboards/handwired/dactyl_manuform/5x6/info.json | 2 | ||||
| -rw-r--r-- | keyboards/handwired/dactyl_manuform/5x7/5x7.h | 66 | ||||
| -rw-r--r-- | keyboards/handwired/dactyl_manuform/5x7/info.json | 4 | ||||
| -rw-r--r-- | keyboards/handwired/dactyl_manuform/6x6/6x6.h | 60 | ||||
| -rw-r--r-- | keyboards/handwired/dactyl_manuform/6x6/info.json | 2 |
6 files changed, 92 insertions, 96 deletions
diff --git a/keyboards/handwired/dactyl_manuform/5x6/5x6.h b/keyboards/handwired/dactyl_manuform/5x6/5x6.h index 72045cc29..5292ca097 100644 --- a/keyboards/handwired/dactyl_manuform/5x6/5x6.h +++ b/keyboards/handwired/dactyl_manuform/5x6/5x6.h | |||
| @@ -6,35 +6,33 @@ | |||
| 6 | #ifdef USE_I2C | 6 | #ifdef USE_I2C |
| 7 | #include <stddef.h> | 7 | #include <stddef.h> |
| 8 | #ifdef __AVR__ | 8 | #ifdef __AVR__ |
| 9 | #include <avr/io.h> | 9 | #include <avr/io.h> |
| 10 | #include <avr/interrupt.h> | 10 | #include <avr/interrupt.h> |
| 11 | #endif | 11 | #endif |
| 12 | #endif | 12 | #endif |
| 13 | 13 | ||
| 14 | #define LAYOUT_5x6(\ | 14 | #define LAYOUT_5x6(\ |
| 15 | L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ | 15 | L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ |
| 16 | L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ | 16 | L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ |
| 17 | L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ | 17 | L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ |
| 18 | L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ | 18 | L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ |
| 19 | L42, L43, R42, R43, \ | 19 | L42, L43, R42, R43, \ |
| 20 | L44, L45, R40, R41, \ | 20 | L44, L45, R40, R41, \ |
| 21 | L54, L55, R50, R51, \ | 21 | L54, L55, R50, R51, \ |
| 22 | L52, L53, R52, R53 \ | 22 | L52, L53, R52, R53 \ |
| 23 | ) \ | 23 | ) \ |
| 24 | { \ | 24 | { \ |
| 25 | { L00, L01, L02, L03, L04, L05 }, \ | 25 | { L00, L01, L02, L03, L04, L05 }, \ |
| 26 | { L10, L11, L12, L13, L14, L15 }, \ | 26 | { L10, L11, L12, L13, L14, L15 }, \ |
| 27 | { L20, L21, L22, L23, L24, L25 }, \ | 27 | { L20, L21, L22, L23, L24, L25 }, \ |
| 28 | { L30, L31, L32, L33, L34, L35 }, \ | 28 | { L30, L31, L32, L33, L34, L35 }, \ |
| 29 | { KC_NO, KC_NO, L42, L43, L44, L45 }, \ | 29 | { KC_NO, KC_NO, L42, L43, L44, L45 }, \ |
| 30 | { KC_NO, KC_NO, L52, L53, L54, L55 }, \ | 30 | { KC_NO, KC_NO, L52, L53, L54, L55 }, \ |
| 31 | \ | 31 | \ |
| 32 | { R00, R01, R02, R03, R04, R05 }, \ | 32 | { R00, R01, R02, R03, R04, R05 }, \ |
| 33 | { R10, R11, R12, R13, R14, R15 }, \ | 33 | { R10, R11, R12, R13, R14, R15 }, \ |
| 34 | { R20, R21, R22, R23, R24, R25 }, \ | 34 | { R20, R21, R22, R23, R24, R25 }, \ |
| 35 | { R30, R31, R32, R33, R34, R35 }, \ | 35 | { R30, R31, R32, R33, R34, R35 }, \ |
| 36 | { R40, R41, R42, R43, KC_NO, KC_NO },\ | 36 | { R40, R41, R42, R43, KC_NO, KC_NO }, \ |
| 37 | { R50, R51, R52, R53, KC_NO, KC_NO }, \ | 37 | { R50, R51, R52, R53, KC_NO, KC_NO } \ |
| 38 | } | 38 | } |
| 39 | |||
| 40 | |||
diff --git a/keyboards/handwired/dactyl_manuform/5x6/info.json b/keyboards/handwired/dactyl_manuform/5x6/info.json index d7aa3acee..14afc704c 100644 --- a/keyboards/handwired/dactyl_manuform/5x6/info.json +++ b/keyboards/handwired/dactyl_manuform/5x6/info.json | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | "width": 17, | 5 | "width": 17, |
| 6 | "height": 8, | 6 | "height": 8, |
| 7 | "layouts": { | 7 | "layouts": { |
| 8 | "LAYOUT": { | 8 | "LAYOUT_5x6": { |
| 9 | "layout": [ | 9 | "layout": [ |
| 10 | {"label":"L00", "x":0, "y":0}, | 10 | {"label":"L00", "x":0, "y":0}, |
| 11 | {"label":"L01", "x":1, "y":0}, | 11 | {"label":"L01", "x":1, "y":0}, |
diff --git a/keyboards/handwired/dactyl_manuform/5x7/5x7.h b/keyboards/handwired/dactyl_manuform/5x7/5x7.h index 95fd5bb10..88b68b31e 100644 --- a/keyboards/handwired/dactyl_manuform/5x7/5x7.h +++ b/keyboards/handwired/dactyl_manuform/5x7/5x7.h | |||
| @@ -6,40 +6,40 @@ | |||
| 6 | #ifdef USE_I2C | 6 | #ifdef USE_I2C |
| 7 | #include <stddef.h> | 7 | #include <stddef.h> |
| 8 | #ifdef __AVR__ | 8 | #ifdef __AVR__ |
| 9 | #include <avR/io.h> | 9 | #include <avR/io.h> |
| 10 | #include <avR/inteRRupt.h> | 10 | #include <avR/inteRRupt.h> |
| 11 | #endif | 11 | #endif |
| 12 | #endif | 12 | #endif |
| 13 | 13 | ||
| 14 | #define LAYOUT_5x7( \ | 14 | #define LAYOUT_5x7( \ |
| 15 | L11, L12, L13, L14, L15, L16, L17, \ | 15 | L11, L12, L13, L14, L15, L16, L17, \ |
| 16 | L21, L22, L23, L24, L25, L26, L27, \ | 16 | L21, L22, L23, L24, L25, L26, L27, \ |
| 17 | L31, L32, L33, L34, L35, L36, L37, \ | 17 | L31, L32, L33, L34, L35, L36, L37, \ |
| 18 | L41, L42, L43, L44, L45, L46, \ | 18 | L41, L42, L43, L44, L45, L46, \ |
| 19 | L51, L52, L53, L54, \ | 19 | L51, L52, L53, L54, \ |
| 20 | L55, L56, \ | 20 | L55, L56, \ |
| 21 | L65, L66, \ | 21 | L65, L66, \ |
| 22 | L63, L64, \ | 22 | L63, L64, \ |
| 23 | R11, R12, R13, R14, R15, R16, R17, \ | 23 | R11, R12, R13, R14, R15, R16, R17, \ |
| 24 | R21, R22, R23, R24, R25, R26, R27, \ | 24 | R21, R22, R23, R24, R25, R26, R27, \ |
| 25 | R31, R32, R33, R34, R35, R36, R37, \ | 25 | R31, R32, R33, R34, R35, R36, R37, \ |
| 26 | R42, R43, R44, R45, R46, R47, \ | 26 | R42, R43, R44, R45, R46, R47, \ |
| 27 | R54, R55, R56, R57, \ | 27 | R54, R55, R56, R57, \ |
| 28 | R52, R53, \ | 28 | R52, R53, \ |
| 29 | R62, R63, \ | 29 | R62, R63, \ |
| 30 | R64, R65 \ | 30 | R64, R65 \ |
| 31 | ) \ | 31 | ) \ |
| 32 | { \ | 32 | { \ |
| 33 | { L11, L12, L13, L14, L15, L16, L17 }, \ | 33 | { L11, L12, L13, L14, L15, L16, L17 }, \ |
| 34 | { L21, L22, L23, L24, L25, L26, L27 }, \ | 34 | { L21, L22, L23, L24, L25, L26, L27 }, \ |
| 35 | { L31, L32, L33, L34, L35, L36, L37 }, \ | 35 | { L31, L32, L33, L34, L35, L36, L37 }, \ |
| 36 | { L41, L42, L43, L44, L45, L46, KC_NO }, \ | 36 | { L41, L42, L43, L44, L45, L46, KC_NO }, \ |
| 37 | { L51, L52, L53, L54, L55, L56, KC_NO }, \ | 37 | { L51, L52, L53, L54, L55, L56, KC_NO }, \ |
| 38 | { KC_NO, KC_NO, L63, L64, L65, L66, KC_NO }, \ | 38 | { KC_NO, KC_NO, L63, L64, L65, L66, KC_NO }, \ |
| 39 | { R11, R12, R13, R14, R15, R16, R17 }, \ | 39 | { R11, R12, R13, R14, R15, R16, R17 }, \ |
| 40 | { R21, R22, R23, R24, R25, R26, R27 }, \ | 40 | { R21, R22, R23, R24, R25, R26, R27 }, \ |
| 41 | { R31, R32, R33, R34, R35, R36, R37 }, \ | 41 | { R31, R32, R33, R34, R35, R36, R37 }, \ |
| 42 | { KC_NO, R42, R43, R44, R45, R46, R47 }, \ | 42 | { KC_NO, R42, R43, R44, R45, R46, R47 }, \ |
| 43 | { KC_NO, R52, R53, R54, R55, R56, R57 }, \ | 43 | { KC_NO, R52, R53, R54, R55, R56, R57 }, \ |
| 44 | { KC_NO, R62, R63, R64, R65, KC_NO, KC_NO } \ | 44 | { KC_NO, R62, R63, R64, R65, KC_NO, KC_NO } \ |
| 45 | } | 45 | } |
diff --git a/keyboards/handwired/dactyl_manuform/5x7/info.json b/keyboards/handwired/dactyl_manuform/5x7/info.json index b4b2c7b79..33ba1b0e7 100644 --- a/keyboards/handwired/dactyl_manuform/5x7/info.json +++ b/keyboards/handwired/dactyl_manuform/5x7/info.json | |||
| @@ -3,9 +3,9 @@ | |||
| 3 | "url": "", | 3 | "url": "", |
| 4 | "maintainer": "qmk", | 4 | "maintainer": "qmk", |
| 5 | "width": 17, | 5 | "width": 17, |
| 6 | "height": 16, | 6 | "height": 8, |
| 7 | "layouts": { | 7 | "layouts": { |
| 8 | "LAYOUT": { | 8 | "LAYOUT_5x7": { |
| 9 | "layout": [ | 9 | "layout": [ |
| 10 | {"label":"L11", "x":0, "y":0}, | 10 | {"label":"L11", "x":0, "y":0}, |
| 11 | {"label":"L12", "x":1, "y":0}, | 11 | {"label":"L12", "x":1, "y":0}, |
diff --git a/keyboards/handwired/dactyl_manuform/6x6/6x6.h b/keyboards/handwired/dactyl_manuform/6x6/6x6.h index c2980b3d3..039e6b40d 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/6x6.h +++ b/keyboards/handwired/dactyl_manuform/6x6/6x6.h | |||
| @@ -7,38 +7,36 @@ | |||
| 7 | #ifdef USE_I2C | 7 | #ifdef USE_I2C |
| 8 | #include <stddef.h> | 8 | #include <stddef.h> |
| 9 | #ifdef __AVR__ | 9 | #ifdef __AVR__ |
| 10 | #include <avr/io.h> | 10 | #include <avr/io.h> |
| 11 | #include <avr/interrupt.h> | 11 | #include <avr/interrupt.h> |
| 12 | #endif | 12 | #endif |
| 13 | #endif | 13 | #endif |
| 14 | 14 | ||
| 15 | #define LAYOUT_6x6(\ | 15 | #define LAYOUT_6x6(\ |
| 16 | L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ | 16 | L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ |
| 17 | L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ | 17 | L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ |
| 18 | L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ | 18 | L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ |
| 19 | L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ | 19 | L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ |
| 20 | L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45, \ | 20 | L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45, \ |
| 21 | L52, L53, R52, R53, \ | 21 | L52, L53, R52, R53, \ |
| 22 | L54, L55, R50, R51, \ | 22 | L54, L55, R50, R51, \ |
| 23 | L64, L65, R60, R61, \ | 23 | L64, L65, R60, R61, \ |
| 24 | L62, L63, R62, R63 \ | 24 | L62, L63, R62, R63 \ |
| 25 | ) \ | 25 | ) \ |
| 26 | { \ | 26 | { \ |
| 27 | { L00, L01, L02, L03, L04, L05 }, \ | 27 | { L00, L01, L02, L03, L04, L05 }, \ |
| 28 | { L10, L11, L12, L13, L14, L15 }, \ | 28 | { L10, L11, L12, L13, L14, L15 }, \ |
| 29 | { L20, L21, L22, L23, L24, L25 }, \ | 29 | { L20, L21, L22, L23, L24, L25 }, \ |
| 30 | { L30, L31, L32, L33, L34, L35 }, \ | 30 | { L30, L31, L32, L33, L34, L35 }, \ |
| 31 | { L40, L41, L42, L43, L44, L45 }, \ | 31 | { L40, L41, L42, L43, L44, L45 }, \ |
| 32 | { KC_NO, KC_NO, L52, L53, L54, L55 }, \ | 32 | { KC_NO, KC_NO, L52, L53, L54, L55 }, \ |
| 33 | { KC_NO, KC_NO, L62, L63, L64, L65 }, \ | 33 | { KC_NO, KC_NO, L62, L63, L64, L65 }, \ |
| 34 | \ | 34 | \ |
| 35 | { R00, R01, R02, R03, R04, R05 }, \ | 35 | { R00, R01, R02, R03, R04, R05 }, \ |
| 36 | { R10, R11, R12, R13, R14, R15 }, \ | 36 | { R10, R11, R12, R13, R14, R15 }, \ |
| 37 | { R20, R21, R22, R23, R24, R25 }, \ | 37 | { R20, R21, R22, R23, R24, R25 }, \ |
| 38 | { R30, R31, R32, R33, R34, R35 }, \ | 38 | { R30, R31, R32, R33, R34, R35 }, \ |
| 39 | { R40, R41, R42, R43, R44, R45 }, \ | 39 | { R40, R41, R42, R43, R44, R45 }, \ |
| 40 | { R50, R51, R52, R53, KC_NO, KC_NO },\ | 40 | { R50, R51, R52, R53, KC_NO, KC_NO }, \ |
| 41 | { R60, R61, R62, R63, KC_NO, KC_NO }, \ | 41 | { R60, R61, R62, R63, KC_NO, KC_NO } \ |
| 42 | } | 42 | } |
| 43 | |||
| 44 | |||
diff --git a/keyboards/handwired/dactyl_manuform/6x6/info.json b/keyboards/handwired/dactyl_manuform/6x6/info.json index 2ae91d469..e617b39a8 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/info.json +++ b/keyboards/handwired/dactyl_manuform/6x6/info.json | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | "width": 17, | 5 | "width": 17, |
| 6 | "height": 9, | 6 | "height": 9, |
| 7 | "layouts": { | 7 | "layouts": { |
| 8 | "LAYOUT": { | 8 | "LAYOUT_6x6": { |
| 9 | "layout": [ | 9 | "layout": [ |
| 10 | {"label":"L00", "x":0, "y":0}, | 10 | {"label":"L00", "x":0, "y":0}, |
| 11 | {"label":"L01", "x":1, "y":0}, | 11 | {"label":"L01", "x":1, "y":0}, |
