[Keyboard] Fixing dactyl manuform 6x6 warnings (#15868)

author: Bartosz Nowak <bartosz.nowak@vimn.com> 2022-01-14 05:33:39 +0100
committer: GitHub <noreply@github.com> 2022-01-13 20:33:39 -0800
commit: 5d51fd4015151c900e79fefc8ece887ce213fae3 (patch)
tree: 97a6baf5194443b0f3286427ee9da1d95d340ac5
parent: 8fe320baa6d6aab7dc5cb1526a9b0df9cc666ed9 (diff)
download: qmk_firmware-5d51fd4015151c900e79fefc8ece887ce213fae3.tar.gz
qmk_firmware-5d51fd4015151c900e79fefc8ece887ce213fae3.zip
2 files changed, 113 insertions, 11 deletions
diff --git a/keyboards/handwired/dactyl_manuform/6x6/6x6.h b/keyboards/handwired/dactyl_manuform/6x6/6x6.h
index 097d1095e..7bff55701 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/6x6.h
+++ b/keyboards/handwired/dactyl_manuform/6x6/6x6.h
@@ -43,14 +43,20 @@
                        L54,                                    R51, \
                                  L64, L65,      R60, R61, \
                                  L62, L63,      R62, R63 \
-) LAYOUT_6x6( \
+) { \
-    L00, L01, L02, L03, L04, L05,                          R00, R01, R02, R03, R04, R05, \
+    { L00, L01, L02, L03, L04, L05 }, \
-    L10, L11, L12, L13, L14, L15,                          R10, R11, R12, R13, R14, R15, \
+    { L10, L11, L12, L13, L14, L15 }, \
-    L20, L21, L22, L23, L24, L25,                          R20, R21, R22, R23, R24, R25, \
+    { L20, L21, L22, L23, L24, L25 }, \
-    L30, L31, L32, L33, L34, L35,                          R30, R31, R32, R33, R34, R35, \
+    { L30, L31, L32, L33, L34, L35 }, \
-    L40, L41, L42, L43, L44, L45,                          R40, R41, R42, R43, R44, R45, \
+    { L40, L41, L42, L43, L44, L45 }, \
-              L52, L53,                                              R52, R53, \
+    { XXX, XXX, L52, L53, L54, XXX }, \
-                        L54, XXX,                          XXX, R51, \
+    { XXX, XXX, L62, L63, L64, L65 }, \
-                                  L64, L65,      R60, R61, \
+\
-                                  L62, L63,      R62, R63 \
+    { R00, R01, R02, R03, R04, R05 }, \
-)
+    { R10, R11, R12, R13, R14, R15 }, \
+    { R20, R21, R22, R23, R24, R25 }, \
+    { R30, R31, R32, R33, R34, R35 }, \
+    { R40, R41, R42, R43, R44, R45 }, \
+    { XXX, R51, R52, R53, XXX, XXX }, \
+    { R60, R61, R62, R63, XXX, XXX } \
+}
diff --git a/keyboards/handwired/dactyl_manuform/6x6/info.json b/keyboards/handwired/dactyl_manuform/6x6/info.json
index 596126879..915431258 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6/info.json
@@ -99,6 +99,102 @@
                {"x": 9, "y": 8},
                {"x": 10, "y": 8}
            ]
+        },
+        
+        "LAYOUT_6x6_5_thumb": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+                {"x": 15, "y": 0},
+                {"x": 16, "y": 0},
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1},
+                {"x": 11, "y": 1},
+                {"x": 12, "y": 1},
+                {"x": 13, "y": 1},
+                {"x": 14, "y": 1},
+                {"x": 15, "y": 1},
+                {"x": 16, "y": 1},
+                {"x": 0, "y": 2},
+                {"x": 1, "y": 2},
+                {"x": 2, "y": 2},
+                {"x": 3, "y": 2},
+                {"x": 4, "y": 2},
+                {"x": 5, "y": 2},
+                {"x": 11, "y": 2},
+                {"x": 12, "y": 2},
+                {"x": 13, "y": 2},
+                {"x": 14, "y": 2},
+                {"x": 15, "y": 2},
+                {"x": 16, "y": 2},
+                {"x": 0, "y": 3},
+                {"x": 1, "y": 3},
+                {"x": 2, "y": 3},
+                {"x": 3, "y": 3},
+                {"x": 4, "y": 3},
+                {"x": 5, "y": 3},
+                {"x": 11, "y": 3},
+                {"x": 12, "y": 3},
+                {"x": 13, "y": 3},
+                {"x": 14, "y": 3},
+                {"x": 15, "y": 3},
+                {"x": 16, "y": 3},
+                {"x": 0, "y": 4},
+                {"x": 1, "y": 4},
+                {"x": 2, "y": 4},
+                {"x": 3, "y": 4},
+                {"x": 4, "y": 4},
+                {"x": 5, "y": 4},
+                {"x": 11, "y": 4},
+                {"x": 12, "y": 4},
+                {"x": 13, "y": 4},
+                {"x": 14, "y": 4},
+                {"x": 15, "y": 4},
+                {"x": 16, "y": 4},
+                {"x": 2, "y": 5},
+                {"x": 3, "y": 5},
+                {"x": 13, "y": 5},
+                {"x": 14, "y": 5},
+                {"x": 4, "y": 6},
+                {"x": 11, "y": 6},
+                {"x": 6, "y": 7},
+                {"x": 7, "y": 7},
+                {"x": 9, "y": 7},
+                {"x": 10, "y": 7},
+                {"x": 6, "y": 8},
+                {"x": 7, "y": 8},
+                {"x": 9, "y": 8},
+                {"x": 10, "y": 8}
+            ]
        }
    }
 }
author	Bartosz Nowak <bartosz.nowak@vimn.com>	2022-01-14 05:33:39 +0100
committer	GitHub <noreply@github.com>	2022-01-13 20:33:39 -0800
commit	5d51fd4015151c900e79fefc8ece887ce213fae3 (patch)
tree	97a6baf5194443b0f3286427ee9da1d95d340ac5
parent	8fe320baa6d6aab7dc5cb1526a9b0df9cc666ed9 (diff)
download	qmk_firmware-5d51fd4015151c900e79fefc8ece887ce213fae3.tar.gz qmk_firmware-5d51fd4015151c900e79fefc8ece887ce213fae3.zip

diff --git a/keyboards/handwired/dactyl_manuform/6x6/6x6.h b/keyboards/handwired/dactyl_manuform/6x6/6x6.h index 097d1095e..7bff55701 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/6x6.h +++ b/keyboards/handwired/dactyl_manuform/6x6/6x6.h
@@ -43,14 +43,20 @@
43	L54, R51, \	43	L54, R51, \
44	L64, L65, R60, R61, \	44	L64, L65, R60, R61, \
45	L62, L63, R62, R63 \	45	L62, L63, R62, R63 \
46	) LAYOUT_6x6( \	46	) { \
47	L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \	47	{ L00, L01, L02, L03, L04, L05 }, \
48	L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \	48	{ L10, L11, L12, L13, L14, L15 }, \
49	L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \	49	{ L20, L21, L22, L23, L24, L25 }, \
50	L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \	50	{ L30, L31, L32, L33, L34, L35 }, \
51	L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45, \	51	{ L40, L41, L42, L43, L44, L45 }, \
52	L52, L53, R52, R53, \	52	{ XXX, XXX, L52, L53, L54, XXX }, \
53	L54, XXX, XXX, R51, \	53	{ XXX, XXX, L62, L63, L64, L65 }, \
54	L64, L65, R60, R61, \	54	\
55	L62, L63, R62, R63 \	55	{ R00, R01, R02, R03, R04, R05 }, \
56	)	56	{ R10, R11, R12, R13, R14, R15 }, \
		57	{ R20, R21, R22, R23, R24, R25 }, \
		58	{ R30, R31, R32, R33, R34, R35 }, \
		59	{ R40, R41, R42, R43, R44, R45 }, \
		60	{ XXX, R51, R52, R53, XXX, XXX }, \
		61	{ R60, R61, R62, R63, XXX, XXX } \
		62	}


diff --git a/keyboards/handwired/dactyl_manuform/6x6/info.json b/keyboards/handwired/dactyl_manuform/6x6/info.json index 596126879..915431258 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/info.json +++ b/keyboards/handwired/dactyl_manuform/6x6/info.json
@@ -99,6 +99,102 @@
99	{"x": 9, "y": 8},	99	{"x": 9, "y": 8},
100	{"x": 10, "y": 8}	100	{"x": 10, "y": 8}
101	]	101	]
		102	},
		103
		104	"LAYOUT_6x6_5_thumb": {
		105	"layout": [
		106	{"x": 0, "y": 0},
		107	{"x": 1, "y": 0},
		108	{"x": 2, "y": 0},
		109	{"x": 3, "y": 0},
		110	{"x": 4, "y": 0},
		111	{"x": 5, "y": 0},
		112
		113	{"x": 11, "y": 0},
		114	{"x": 12, "y": 0},
		115	{"x": 13, "y": 0},
		116	{"x": 14, "y": 0},
		117	{"x": 15, "y": 0},
		118	{"x": 16, "y": 0},
		119
		120	{"x": 0, "y": 1},
		121	{"x": 1, "y": 1},
		122	{"x": 2, "y": 1},
		123	{"x": 3, "y": 1},
		124	{"x": 4, "y": 1},
		125	{"x": 5, "y": 1},
		126
		127	{"x": 11, "y": 1},
		128	{"x": 12, "y": 1},
		129	{"x": 13, "y": 1},
		130	{"x": 14, "y": 1},
		131	{"x": 15, "y": 1},
		132	{"x": 16, "y": 1},
		133
		134	{"x": 0, "y": 2},
		135	{"x": 1, "y": 2},
		136	{"x": 2, "y": 2},
		137	{"x": 3, "y": 2},
		138	{"x": 4, "y": 2},
		139	{"x": 5, "y": 2},
		140
		141	{"x": 11, "y": 2},
		142	{"x": 12, "y": 2},
		143	{"x": 13, "y": 2},
		144	{"x": 14, "y": 2},
		145	{"x": 15, "y": 2},
		146	{"x": 16, "y": 2},
		147
		148	{"x": 0, "y": 3},
		149	{"x": 1, "y": 3},
		150	{"x": 2, "y": 3},
		151	{"x": 3, "y": 3},
		152	{"x": 4, "y": 3},
		153	{"x": 5, "y": 3},
		154
		155	{"x": 11, "y": 3},
		156	{"x": 12, "y": 3},
		157	{"x": 13, "y": 3},
		158	{"x": 14, "y": 3},
		159	{"x": 15, "y": 3},
		160	{"x": 16, "y": 3},
		161
		162	{"x": 0, "y": 4},
		163	{"x": 1, "y": 4},
		164	{"x": 2, "y": 4},
		165	{"x": 3, "y": 4},
		166	{"x": 4, "y": 4},
		167	{"x": 5, "y": 4},
		168
		169	{"x": 11, "y": 4},
		170	{"x": 12, "y": 4},
		171	{"x": 13, "y": 4},
		172	{"x": 14, "y": 4},
		173	{"x": 15, "y": 4},
		174	{"x": 16, "y": 4},
		175
		176	{"x": 2, "y": 5},
		177	{"x": 3, "y": 5},
		178
		179	{"x": 13, "y": 5},
		180	{"x": 14, "y": 5},
		181
		182	{"x": 4, "y": 6},
		183
		184	{"x": 11, "y": 6},
		185
		186	{"x": 6, "y": 7},
		187	{"x": 7, "y": 7},
		188
		189	{"x": 9, "y": 7},
		190	{"x": 10, "y": 7},
		191
		192	{"x": 6, "y": 8},
		193	{"x": 7, "y": 8},
		194
		195	{"x": 9, "y": 8},
		196	{"x": 10, "y": 8}
		197	]
102	}	198	}
103	}	199	}
104	}	200	}