aboutsummaryrefslogtreecommitdiff
path: root/keyboards/ergodash
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/ergodash')
-rw-r--r--keyboards/ergodash/config.h5
-rw-r--r--keyboards/ergodash/mini/mini.h67
-rw-r--r--keyboards/ergodash/rev1/rev1.h182
3 files changed, 119 insertions, 135 deletions
diff --git a/keyboards/ergodash/config.h b/keyboards/ergodash/config.h
index c910d8f24..cfb6bf4ff 100644
--- a/keyboards/ergodash/config.h
+++ b/keyboards/ergodash/config.h
@@ -16,9 +16,6 @@ You should have received a copy of the GNU General Public License
16along with this program. If not, see <http://www.gnu.org/licenses/>. 16along with this program. If not, see <http://www.gnu.org/licenses/>.
17*/ 17*/
18 18
19#ifndef CONFIG_H 19#pragma once
20#define CONFIG_H
21 20
22#include "config_common.h" 21#include "config_common.h"
23
24#endif
diff --git a/keyboards/ergodash/mini/mini.h b/keyboards/ergodash/mini/mini.h
index d565c6168..4aca15775 100644
--- a/keyboards/ergodash/mini/mini.h
+++ b/keyboards/ergodash/mini/mini.h
@@ -1,5 +1,4 @@
1#ifndef MINI_H 1#pragma once
2#define MINI_H
3 2
4#include "ergodash.h" 3#include "ergodash.h"
5 4
@@ -16,41 +15,37 @@
16#ifndef FLIP_HALF 15#ifndef FLIP_HALF
17// Standard Keymap 16// Standard Keymap
18// (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left) 17// (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
19#define LAYOUT( \ 18# define LAYOUT( \
20 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ 19 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
21 L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ 20 L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
22 L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ 21 L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
23 L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36 \ 22 L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36 \
24 ) \ 23) { \
25 { \ 24 { L00, L01, L02, L03, L04, L05, L06 }, \
26 { L00, L01, L02, L03, L04, L05, L06 }, \ 25 { L10, L11, L12, L13, L14, L15, L16 }, \
27 { L10, L11, L12, L13, L14, L15, L16 }, \ 26 { L20, L21, L22, L23, L24, L25, L26 }, \
28 { L20, L21, L22, L23, L24, L25, L26 }, \ 27 { L30, L31, L32, L33, L34, L35, L36 }, \
29 { L30, L31, L32, L33, L34, L35, L36 }, \ 28 { R06, R05, R04, R03, R02, R01, R00 }, \
30 { R06, R05, R04, R03, R02, R01, R00 }, \ 29 { R16, R15, R14, R13, R12, R11, R10 }, \
31 { R16, R15, R14, R13, R12, R11, R10 }, \ 30 { R26, R25, R24, R23, R22, R21, R20 }, \
32 { R26, R25, R24, R23, R22, R21, R20 }, \ 31 { R36, R35, R34, R33, R32, R31, R30 } \
33 { R36, R35, R34, R33, R32, R31, R30 }, \ 32}
34 }
35#else 33#else
36// Keymap with right side flipped 34// Keymap with right side flipped
37// (TRRS jack on both halves are to the right) 35// (TRRS jack on both halves are to the right)
38#define LAYOUT( \ 36# define LAYOUT( \
39 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ 37 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
40 L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ 38 L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
41 L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ 39 L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
42 L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36 \ 40 L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36 \
43 ) \ 41) { \
44 { \ 42 { L00, L01, L02, L03, L04, L05, L06 }, \
45 { L00, L01, L02, L03, L04, L05, L06 }, \ 43 { L10, L11, L12, L13, L14, L15, L16 }, \
46 { L10, L11, L12, L13, L14, L15, L16 }, \ 44 { L20, L21, L22, L23, L24, L25, L26 }, \
47 { L20, L21, L22, L23, L24, L25, L26 }, \ 45 { L30, L31, L32, L33, L34, L35, L36 }, \
48 { L30, L31, L32, L33, L34, L35, L36 }, \ 46 { R00, R01, R02, R03, R04, R05, R06 }, \
49 { R00, R01, R02, R03, R04, R05, R06 }, \ 47 { R10, R11, R12, R13, R14, R15, R16 }, \
50 { R10, R11, R12, R13, R14, R15, R16 }, \ 48 { R20, R21, R22, R23, R24, R25, R26 }, \
51 { R20, R21, R22, R23, R24, R25, R26 }, \ 49 { R30, R31, R32, R33, R34, R35, R36 } \
52 { R30, R31, R32, R33, R34, R35, R36 }, \ 50}
53 }
54#endif
55
56#endif 51#endif
diff --git a/keyboards/ergodash/rev1/rev1.h b/keyboards/ergodash/rev1/rev1.h
index eaabf7cc5..7f094534c 100644
--- a/keyboards/ergodash/rev1/rev1.h
+++ b/keyboards/ergodash/rev1/rev1.h
@@ -1,5 +1,4 @@
1#ifndef REV1_H 1#pragma once
2#define REV1_H
3 2
4#include "ergodash.h" 3#include "ergodash.h"
5 4
@@ -13,135 +12,128 @@
13#endif 12#endif
14#endif 13#endif
15 14
15#define XXX KC_NO
16
16#ifndef FLIP_HALF 17#ifndef FLIP_HALF
17// Standard Keymap 18// Standard Keymap
18// (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left) 19// (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
19#define LAYOUT_4key( \ 20# define LAYOUT_4key( \
20 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ 21 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
21 L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ 22 L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
22 L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ 23 L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
23 L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ 24 L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
24 L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \ 25 L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \
25 ) \ 26) { \
26 { \ 27 { L00, L01, L02, L03, L04, L05, L06 }, \
27 { L00, L01, L02, L03, L04, L05, L06 }, \ 28 { L10, L11, L12, L13, L14, L15, L16 }, \
28 { L10, L11, L12, L13, L14, L15, L16 }, \ 29 { L20, L21, L22, L23, L24, L25, L26 }, \
29 { L20, L21, L22, L23, L24, L25, L26 }, \ 30 { L30, L31, L32, L33, L34, L35, L36 }, \
30 { L30, L31, L32, L33, L34, L35, L36 }, \ 31 { L40, L41, L42, L43, L44, L45, L46 }, \
31 { L40, L41, L42, L43, L44, L45, L46 }, \ 32 { R06, R05, R04, R03, R02, R01, R00 }, \
32 { R06, R05, R04, R03, R02, R01, R00 }, \ 33 { R16, R15, R14, R13, R12, R11, R10 }, \
33 { R16, R15, R14, R13, R12, R11, R10 }, \ 34 { R26, R25, R24, R23, R22, R21, R20 }, \
34 { R26, R25, R24, R23, R22, R21, R20 }, \ 35 { R36, R35, R34, R33, R32, R31, R30 }, \
35 { R36, R35, R34, R33, R32, R31, R30 }, \ 36 { R46, R45, R44, R43, R42, R41, R40 } \
36 { R46, R45, R44, R43, R42, R41, R40 } \ 37}
37 }
38 38
39// Just defined for configurator support, the matrix is identical to LAYOUT_4key 39// Just defined for configurator support, the matrix is identical to LAYOUT_4key
40#define LAYOUT_4key_2u_inner( \ 40# define LAYOUT_4key_2u_inner( \
41 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ 41 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
42 L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ 42 L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
43 L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ 43 L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
44 L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ 44 L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
45 L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \ 45 L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \
46 ) \ 46) { \
47 { \ 47 { L00, L01, L02, L03, L04, L05, L06 }, \
48 { L00, L01, L02, L03, L04, L05, L06 }, \ 48 { L10, L11, L12, L13, L14, L15, L16 }, \
49 { L10, L11, L12, L13, L14, L15, L16 }, \ 49 { L20, L21, L22, L23, L24, L25, L26 }, \
50 { L20, L21, L22, L23, L24, L25, L26 }, \ 50 { L30, L31, L32, L33, L34, L35, L36 }, \
51 { L30, L31, L32, L33, L34, L35, L36 }, \ 51 { L40, L41, L42, L43, L44, L45, L46 }, \
52 { L40, L41, L42, L43, L44, L45, L46 }, \ 52 { R06, R05, R04, R03, R02, R01, R00 }, \
53 { R06, R05, R04, R03, R02, R01, R00 }, \ 53 { R16, R15, R14, R13, R12, R11, R10 }, \
54 { R16, R15, R14, R13, R12, R11, R10 }, \ 54 { R26, R25, R24, R23, R22, R21, R20 }, \
55 { R26, R25, R24, R23, R22, R21, R20 }, \ 55 { R36, R35, R34, R33, R32, R31, R30 }, \
56 { R36, R35, R34, R33, R32, R31, R30 }, \ 56 { R46, R45, R44, R43, R42, R41, R40 } \
57 { R46, R45, R44, R43, R42, R41, R40 } \ 57}
58 }
59 58
60#define LAYOUT_3key_2us( \ 59# define LAYOUT_3key_2us( \
61 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ 60 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
62 L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ 61 L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
63 L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ 62 L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
64 L30, L31, L32, L33, L34, L35, R31, R32, R33, R34, R35, R36, \ 63 L30, L31, L32, L33, L34, L35, R31, R32, R33, R34, R35, R36, \
65 L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \ 64 L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \
66 ) \ 65) { \
67 { \ 66 { L00, L01, L02, L03, L04, L05, L06 }, \
68 { L00, L01, L02, L03, L04, L05, L06 }, \ 67 { L10, L11, L12, L13, L14, L15, L16 }, \
69 { L10, L11, L12, L13, L14, L15, L16 }, \ 68 { L20, L21, L22, L23, L24, L25, L26 }, \
70 { L20, L21, L22, L23, L24, L25, L26 }, \ 69 { L30, L31, L32, L33, L34, L35, XXX }, \
71 { L30, L31, L32, L33, L34, L35, KC_NO }, \ 70 { L40, L41, L42, L43, L44, L45, L46 }, \
72 { L40, L41, L42, L43, L44, L45, L46 }, \ 71 { R06, R05, R04, R03, R02, R01, R00 }, \
73 { R06, R05, R04, R03, R02, R01, R00 }, \ 72 { R16, R15, R14, R13, R12, R11, R10 }, \
74 { R16, R15, R14, R13, R12, R11, R10 }, \ 73 { R26, R25, R24, R23, R22, R21, R20 }, \
75 { R26, R25, R24, R23, R22, R21, R20 }, \ 74 { R36, R35, R34, R33, R32, R31, XXX }, \
76 { R36, R35, R34, R33, R32, R31, KC_NO }, \ 75 { R46, R45, R44, R43, R42, R41, R40 } \
77 { R46, R45, R44, R43, R42, R41, R40 } \ 76}
78 }
79
80 77
81#define LAYOUT_3key_1us( \ 78# define LAYOUT_3key_1us( \
82 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ 79 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
83 L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ 80 L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
84 L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ 81 L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
85 L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ 82 L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
86 L40, L41, L42, L43, L44, L45, R41, R42, R43, R44, R45, R46 \ 83 L40, L41, L42, L43, L44, L45, R41, R42, R43, R44, R45, R46 \
87 ) \ 84) { \
88 { \ 85 { L00, L01, L02, L03, L04, L05, L06 }, \
89 { L00, L01, L02, L03, L04, L05, L06 }, \ 86 { L10, L11, L12, L13, L14, L15, L16 }, \
90 { L10, L11, L12, L13, L14, L15, L16 }, \ 87 { L20, L21, L22, L23, L24, L25, L26 }, \
91 { L20, L21, L22, L23, L24, L25, L26 }, \ 88 { L30, L31, L32, L33, L34, L35, L36 }, \
92 { L30, L31, L32, L33, L34, L35, L36 }, \ 89 { L40, L41, L42, L43, L44, L45, XXX }, \
93 { L40, L41, L42, L43, L44, L45, KC_NO }, \ 90 { R06, R05, R04, R03, R02, R01, R00 }, \
94 { R06, R05, R04, R03, R02, R01, R00 }, \ 91 { R16, R15, R14, R13, R12, R11, R10 }, \
95 { R16, R15, R14, R13, R12, R11, R10 }, \ 92 { R26, R25, R24, R23, R22, R21, R20 }, \
96 { R26, R25, R24, R23, R22, R21, R20 }, \ 93 { R36, R35, R34, R33, R32, R31, R30 }, \
97 { R36, R35, R34, R33, R32, R31, R30 }, \ 94 { R46, R45, R44, R43, R42, R41, XXX } \
98 { R46, R45, R44, R43, R42, R41, KC_NO } \ 95}
99 }
100 96
101#define LAYOUT_2key( \ 97# define LAYOUT_2key( \
102 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ 98 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
103 L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ 99 L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
104 L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ 100 L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
105 L30, L31, L32, L33, L34, L35, R31, R32, R33, R34, R35, R36, \ 101 L30, L31, L32, L33, L34, L35, R31, R32, R33, R34, R35, R36, \
106 L40, L41, L42, L43, L44, L45, R41, R42, R43, R44, R45, R46 \ 102 L40, L41, L42, L43, L44, L45, R41, R42, R43, R44, R45, R46 \
107 ) \ 103) { \
108 { \ 104 { L00, L01, L02, L03, L04, L05, L06 }, \
109 { L00, L01, L02, L03, L04, L05, L06 }, \ 105 { L10, L11, L12, L13, L14, L15, L16 }, \
110 { L10, L11, L12, L13, L14, L15, L16 }, \ 106 { L20, L21, L22, L23, L24, L25, L26 }, \
111 { L20, L21, L22, L23, L24, L25, L26 }, \ 107 { L30, L31, L32, L33, L34, L35, XXX }, \
112 { L30, L31, L32, L33, L34, L35, KC_NO }, \ 108 { L40, L41, L42, L43, L44, L45, XXX }, \
113 { L40, L41, L42, L43, L44, L45, KC_NO }, \ 109 { R06, R05, R04, R03, R02, R01, R00 }, \
114 { R06, R05, R04, R03, R02, R01, R00 }, \ 110 { R16, R15, R14, R13, R12, R11, R10 }, \
115 { R16, R15, R14, R13, R12, R11, R10 }, \ 111 { R26, R25, R24, R23, R22, R21, R20 }, \
116 { R26, R25, R24, R23, R22, R21, R20 }, \ 112 { R36, R35, R34, R33, R32, R31, XXX }, \
117 { R36, R35, R34, R33, R32, R31, KC_NO }, \ 113 { R46, R45, R44, R43, R42, R41, XXX } \
118 { R46, R45, R44, R43, R42, R41, KC_NO } \ 114}
119 }
120 115
121#define LAYOUT LAYOUT_4key 116#define LAYOUT LAYOUT_4key
122 117
123#else 118#else
124// Keymap with right side flipped 119// Keymap with right side flipped
125// (TRRS jack on both halves are to the right) 120// (TRRS jack on both halves are to the right)
126#define LAYOUT( \ 121# define LAYOUT( \
127 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ 122 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
128 L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ 123 L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
129 L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ 124 L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
130 L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ 125 L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
131 L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \ 126 L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \
132 ) \ 127) { \
133 { \ 128 { L00, L01, L02, L03, L04, L05, L06 }, \
134 { L00, L01, L02, L03, L04, L05, L06 }, \ 129 { L10, L11, L12, L13, L14, L15, L16 }, \
135 { L10, L11, L12, L13, L14, L15, L16 }, \ 130 { L20, L21, L22, L23, L24, L25, L26 }, \
136 { L20, L21, L22, L23, L24, L25, L26 }, \ 131 { L30, L31, L32, L33, L34, L35, L36 }, \
137 { L30, L31, L32, L33, L34, L35, L36 }, \ 132 { L40, L41, L42, L43, L44, L45, L46 }, \
138 { L40, L41, L42, L43, L44, L45, L46 }, \ 133 { R00, R01, R02, R03, R04, R05, R06 }, \
139 { R00, R01, R02, R03, R04, R05, R06 }, \ 134 { R10, R11, R12, R13, R14, R15, R16 }, \
140 { R10, R11, R12, R13, R14, R15, R16 }, \ 135 { R20, R21, R22, R23, R24, R25, R26 }, \
141 { R20, R21, R22, R23, R24, R25, R26 }, \ 136 { R30, R31, R32, R33, R34, R35, R36 }, \
142 { R30, R31, R32, R33, R34, R35, R36 }, \ 137 { R40, R41, R42, R43, R44, R45, R46 } \
143 { R40, R41, R42, R43, R44, R45, R46 } \ 138}
144 }
145#endif
146
147#endif 139#endif