add 60_ansi layout to YD60MQ (#8696)

author: James Young <18669334+noroadsleft@users.noreply.github.com> 2020-04-05 22:47:24 -0700
committer: GitHub <noreply@github.com> 2020-04-05 22:47:24 -0700
commit: 6add103827ecb9aba8f5293f4db300bd5e75ea99 (patch)
tree: 55deab7a656494cbcfd97a111e1dbc067dcbd2d2 /keyboards/yd60mq
parent: 7642075fc3bf1b3484f04619b0b75b942d05e7a2 (diff)
download: qmk_firmware-6add103827ecb9aba8f5293f4db300bd5e75ea99.tar.gz
qmk_firmware-6add103827ecb9aba8f5293f4db300bd5e75ea99.zip
3 files changed, 82 insertions, 0 deletions
diff --git a/keyboards/yd60mq/info.json b/keyboards/yd60mq/info.json
index 79d5e9d98..816d653bc 100644
--- a/keyboards/yd60mq/info.json
+++ b/keyboards/yd60mq/info.json
@@ -78,6 +78,72 @@
                {"label":"Down", "x":13, "y":4},
                {"label":"Right", "x":14, "y":4}
            ]
+        },
+        "LAYOUT_60_ansi": {
+            "key_count": 61,
+            "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":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":2.75},
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+                {"x":12.5, "y":4, "w":1.25},
+                {"x":13.75, "y":4, "w":1.25}
+            ]
        }
    }
 }
diff --git a/keyboards/yd60mq/rules.mk b/keyboards/yd60mq/rules.mk
index 5159ae59f..f28f80058 100644
--- a/keyboards/yd60mq/rules.mk
+++ b/keyboards/yd60mq/rules.mk
@@ -30,3 +30,5 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6
 FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
 HD44780_ENABLE = no         # Enable support for HD44780 based LCDs
+LAYOUTS = 60_ansi
diff --git a/keyboards/yd60mq/yd60mq.h b/keyboards/yd60mq/yd60mq.h
index 850cf8d22..0f6fde965 100644
--- a/keyboards/yd60mq/yd60mq.h
+++ b/keyboards/yd60mq/yd60mq.h
@@ -16,4 +16,18 @@
    { K40, K41, K42, K43, KC_NO, KC_NO, KC_NO, K47, K48, K49, K4A, K4B, K4C, K4D, KC_NO }  \
 }
+#define LAYOUT_60_ansi( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, \
+    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,    K1D, \
+    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,        K2D, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,           K3D, \
+    K40, K41, K42,                  K47,                   K49, K4A, K4C, K4D  \
+) { \
+    { K00, K01,   K02, K03,   K04,   K05,   K06,   K07, K08,   K09, K0A, K0B,   K0C,   KC_NO, K0E   }, \
+    { K10, K11,   K12, K13,   K14,   K15,   K16,   K17, K18,   K19, K1A, K1B,   K1C,   K1D,   KC_NO }, \
+    { K20, K21,   K22, K23,   K24,   K25,   K26,   K27, K28,   K29, K2A, K2B,   KC_NO, K2D,   KC_NO }, \
+    { K30, KC_NO, K32, K33,   K34,   K35,   K36,   K37, K38,   K39, K3A, K3B,   KC_NO, K3D,   KC_NO }, \
+    { K40, K41,   K42, KC_NO, KC_NO, KC_NO, KC_NO, K47, KC_NO, K49, K4A, KC_NO, K4C,   K4D,   KC_NO }  \
+}
 #define LAYOUT LAYOUT_all
author	James Young <18669334+noroadsleft@users.noreply.github.com>	2020-04-05 22:47:24 -0700
committer	GitHub <noreply@github.com>	2020-04-05 22:47:24 -0700
commit	6add103827ecb9aba8f5293f4db300bd5e75ea99 (patch)
tree	55deab7a656494cbcfd97a111e1dbc067dcbd2d2 /keyboards/yd60mq
parent	7642075fc3bf1b3484f04619b0b75b942d05e7a2 (diff)
download	qmk_firmware-6add103827ecb9aba8f5293f4db300bd5e75ea99.tar.gz qmk_firmware-6add103827ecb9aba8f5293f4db300bd5e75ea99.zip

diff --git a/keyboards/yd60mq/info.json b/keyboards/yd60mq/info.json index 79d5e9d98..816d653bc 100644 --- a/keyboards/yd60mq/info.json +++ b/keyboards/yd60mq/info.json
@@ -78,6 +78,72 @@
78	{"label":"Down", "x":13, "y":4},	78	{"label":"Down", "x":13, "y":4},
79	{"label":"Right", "x":14, "y":4}	79	{"label":"Right", "x":14, "y":4}
80	]	80	]
		81	},
		82	"LAYOUT_60_ansi": {
		83	"key_count": 61,
		84	"layout": [
		85	{"x":0, "y":0},
		86	{"x":1, "y":0},
		87	{"x":2, "y":0},
		88	{"x":3, "y":0},
		89	{"x":4, "y":0},
		90	{"x":5, "y":0},
		91	{"x":6, "y":0},
		92	{"x":7, "y":0},
		93	{"x":8, "y":0},
		94	{"x":9, "y":0},
		95	{"x":10, "y":0},
		96	{"x":11, "y":0},
		97	{"x":12, "y":0},
		98	{"x":13, "y":0, "w":2},
		99	{"x":0, "y":1, "w":1.5},
		100	{"x":1.5, "y":1},
		101	{"x":2.5, "y":1},
		102	{"x":3.5, "y":1},
		103	{"x":4.5, "y":1},
		104	{"x":5.5, "y":1},
		105	{"x":6.5, "y":1},
		106	{"x":7.5, "y":1},
		107	{"x":8.5, "y":1},
		108	{"x":9.5, "y":1},
		109	{"x":10.5, "y":1},
		110	{"x":11.5, "y":1},
		111	{"x":12.5, "y":1},
		112	{"x":13.5, "y":1, "w":1.5},
		113	{"x":0, "y":2, "w":1.75},
		114	{"x":1.75, "y":2},
		115	{"x":2.75, "y":2},
		116	{"x":3.75, "y":2},
		117	{"x":4.75, "y":2},
		118	{"x":5.75, "y":2},
		119	{"x":6.75, "y":2},
		120	{"x":7.75, "y":2},
		121	{"x":8.75, "y":2},
		122	{"x":9.75, "y":2},
		123	{"x":10.75, "y":2},
		124	{"x":11.75, "y":2},
		125	{"x":12.75, "y":2, "w":2.25},
		126	{"x":0, "y":3, "w":2.25},
		127	{"x":2.25, "y":3},
		128	{"x":3.25, "y":3},
		129	{"x":4.25, "y":3},
		130	{"x":5.25, "y":3},
		131	{"x":6.25, "y":3},
		132	{"x":7.25, "y":3},
		133	{"x":8.25, "y":3},
		134	{"x":9.25, "y":3},
		135	{"x":10.25, "y":3},
		136	{"x":11.25, "y":3},
		137	{"x":12.25, "y":3, "w":2.75},
		138	{"x":0, "y":4, "w":1.25},
		139	{"x":1.25, "y":4, "w":1.25},
		140	{"x":2.5, "y":4, "w":1.25},
		141	{"x":3.75, "y":4, "w":6.25},
		142	{"x":10, "y":4, "w":1.25},
		143	{"x":11.25, "y":4, "w":1.25},
		144	{"x":12.5, "y":4, "w":1.25},
		145	{"x":13.75, "y":4, "w":1.25}
		146	]
81	}	147	}
82	}	148	}
83	}	149	}


diff --git a/keyboards/yd60mq/rules.mk b/keyboards/yd60mq/rules.mk index 5159ae59f..f28f80058 100644 --- a/keyboards/yd60mq/rules.mk +++ b/keyboards/yd60mq/rules.mk
@@ -30,3 +30,5 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
30	AUDIO_ENABLE = no # Audio output on port C6	30	AUDIO_ENABLE = no # Audio output on port C6
31	FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches	31	FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
32	HD44780_ENABLE = no # Enable support for HD44780 based LCDs	32	HD44780_ENABLE = no # Enable support for HD44780 based LCDs
		33
		34	LAYOUTS = 60_ansi


diff --git a/keyboards/yd60mq/yd60mq.h b/keyboards/yd60mq/yd60mq.h index 850cf8d22..0f6fde965 100644 --- a/keyboards/yd60mq/yd60mq.h +++ b/keyboards/yd60mq/yd60mq.h
@@ -16,4 +16,18 @@
16	{ K40, K41, K42, K43, KC_NO, KC_NO, KC_NO, K47, K48, K49, K4A, K4B, K4C, K4D, KC_NO } \	16	{ K40, K41, K42, K43, KC_NO, KC_NO, KC_NO, K47, K48, K49, K4A, K4B, K4C, K4D, KC_NO } \
17	}	17	}
18		18
		19	#define LAYOUT_60_ansi( \
		20	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, \
		21	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
		22	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
		23	K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
		24	K40, K41, K42, K47, K49, K4A, K4C, K4D \
		25	) { \
		26	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E }, \
		27	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, KC_NO }, \
		28	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO }, \
		29	{ K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, KC_NO }, \
		30	{ K40, K41, K42, KC_NO, KC_NO, KC_NO, KC_NO, K47, KC_NO, K49, K4A, KC_NO, K4C, K4D, KC_NO } \
		31	}
		32
19	#define LAYOUT LAYOUT_all	33	#define LAYOUT LAYOUT_all