Nack: rename layout macro to LAYOUT_ortho_4x13 (#13784)

author: James Young <18669334+noroadsleft@users.noreply.github.com> 2021-07-30 08:10:59 -0700
committer: GitHub <noreply@github.com> 2021-07-30 08:10:59 -0700
commit: f2d34f38be1e793068ab02d6a7942ca7a3a5188c (patch)
tree: d803d77ae4ceacf3516f01c24e6a2ed206d0d03d
parent: 8b39a3c48470ff95ba358dcb36c3c2f3b8e5a70f (diff)
download: qmk_firmware-f2d34f38be1e793068ab02d6a7942ca7a3a5188c.tar.gz
qmk_firmware-f2d34f38be1e793068ab02d6a7942ca7a3a5188c.zip
2 files changed, 62 insertions, 3 deletions
diff --git a/keyboards/nack/info.json b/keyboards/nack/info.json
index 47942c4f1..2df08a85d 100644
--- a/keyboards/nack/info.json
+++ b/keyboards/nack/info.json
@@ -4,9 +4,68 @@
    "maintainer": "farfalleflickan",
    "width": 13,
    "height": 4,
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_4x13"
+    },
    "layouts": {
-        "LAYOUT": {
+        "LAYOUT_ortho_4x13": {
-            "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"\u00c5", "x":11, "y":0}, {"label":"\u00a8", "x":12, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":"\u00d6", "x":10, "y":1}, {"label":"\u00c4", "x":11, "y":1}, {"label":"'", "x":12, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"", "x":10, "y":2}, {"label":"&uarr;", "x":11, "y":2}, {"label":"backsp", "x":12, "y":2}, {"label":"Ctrl", "x":0, "y":3}, {"label":"Super", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Fn", "x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"label":"Fn", "x":6, "y":3}, {"label":"", "x":7, "y":3}, {"label":"Alt Gr", "x":8, "y":3}, {"label":"Enter", "x":9, "y":3}, {"label":"&larr;", "x":10, "y":3}, {"label":"&darr;", "x":11, "y":3}, {"label":"&rarr;", "x":12, "y":3}]
+            "layout": [
+                {"label":"Tab", "x":0, "y":0},
+                {"label":"Q", "x":1, "y":0},
+                {"label":"W", "x":2, "y":0},
+                {"label":"E", "x":3, "y":0},
+                {"label":"R", "x":4, "y":0},
+                {"label":"T", "x":5, "y":0},
+                {"label":"Y", "x":6, "y":0},
+                {"label":"U", "x":7, "y":0},
+                {"label":"I", "x":8, "y":0},
+                {"label":"O", "x":9, "y":0},
+                {"label":"P", "x":10, "y":0},
+                {"label":"Å", "x":11, "y":0},
+                {"label":"¨", "x":12, "y":0},
+                {"label":"Esc", "x":0, "y":1},
+                {"label":"A", "x":1, "y":1},
+                {"label":"S", "x":2, "y":1},
+                {"label":"D", "x":3, "y":1},
+                {"label":"F", "x":4, "y":1},
+                {"label":"G", "x":5, "y":1},
+                {"label":"H", "x":6, "y":1},
+                {"label":"J", "x":7, "y":1},
+                {"label":"K", "x":8, "y":1},
+                {"label":"L", "x":9, "y":1},
+                {"label":"Ö", "x":10, "y":1},
+                {"label":"Ä", "x":11, "y":1},
+                {"label":"'", "x":12, "y":1},
+                {"label":"Shift", "x":0, "y":2},
+                {"label":"Z", "x":1, "y":2},
+                {"label":"X", "x":2, "y":2},
+                {"label":"C", "x":3, "y":2},
+                {"label":"V", "x":4, "y":2},
+                {"label":"B", "x":5, "y":2},
+                {"label":"N", "x":6, "y":2},
+                {"label":"M", "x":7, "y":2},
+                {"label":",", "x":8, "y":2},
+                {"label":".", "x":9, "y":2},
+                {"label":"-", "x":10, "y":2},
+                {"label":"Up", "x":11, "y":2},
+                {"label":"Backspace", "x":12, "y":2},
+                {"label":"Ctrl", "x":0, "y":3},
+                {"label":"Alt", "x":1, "y":3},
+                {"label":"GUI", "x":2, "y":3},
+                {"label":"Fn1", "x":3, "y":3},
+                {"label":"Space", "x":4, "y":3},
+                {"label":"NoOp", "x":5, "y":3},
+                {"label":"Fn2", "x":6, "y":3},
+                {"label":"Alt Gr", "x":7, "y":3},
+                {"label":"<", "x":8, "y":3},
+                {"label":"Enter", "x":9, "y":3},
+                {"label":"Left", "x":10, "y":3},
+                {"label":"Down", "x":11, "y":3},
+                {"label":"Right", "x":12, "y":3}
+            ]
        }
    }
 }
diff --git a/keyboards/nack/nack.h b/keyboards/nack/nack.h
index 6680e992e..b409d40df 100644
--- a/keyboards/nack/nack.h
+++ b/keyboards/nack/nack.h
@@ -17,7 +17,7 @@
 #pragma once
 #include "quantum.h"
-#define LAYOUT( \
+#define LAYOUT_ortho_4x13( \
    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12,\
    k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25,\
    k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, k36, k37, k38,\
author	James Young <18669334+noroadsleft@users.noreply.github.com>	2021-07-30 08:10:59 -0700
committer	GitHub <noreply@github.com>	2021-07-30 08:10:59 -0700
commit	f2d34f38be1e793068ab02d6a7942ca7a3a5188c (patch)
tree	d803d77ae4ceacf3516f01c24e6a2ed206d0d03d
parent	8b39a3c48470ff95ba358dcb36c3c2f3b8e5a70f (diff)
download	qmk_firmware-f2d34f38be1e793068ab02d6a7942ca7a3a5188c.tar.gz qmk_firmware-f2d34f38be1e793068ab02d6a7942ca7a3a5188c.zip

diff --git a/keyboards/nack/info.json b/keyboards/nack/info.json index 47942c4f1..2df08a85d 100644 --- a/keyboards/nack/info.json +++ b/keyboards/nack/info.json
@@ -4,9 +4,68 @@
4	"maintainer": "farfalleflickan",	4	"maintainer": "farfalleflickan",
5	"width": 13,	5	"width": 13,
6	"height": 4,	6	"height": 4,
		7	"layout_aliases": {
		8	"LAYOUT": "LAYOUT_ortho_4x13"
		9	},
7	"layouts": {	10	"layouts": {
8	"LAYOUT": {	11	"LAYOUT_ortho_4x13": {
9	"layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"\u00c5", "x":11, "y":0}, {"label":"\u00a8", "x":12, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":"\u00d6", "x":10, "y":1}, {"label":"\u00c4", "x":11, "y":1}, {"label":"'", "x":12, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"", "x":10, "y":2}, {"label":"↑", "x":11, "y":2}, {"label":"backsp", "x":12, "y":2}, {"label":"Ctrl", "x":0, "y":3}, {"label":"Super", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Fn", "x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"label":"Fn", "x":6, "y":3}, {"label":"", "x":7, "y":3}, {"label":"Alt Gr", "x":8, "y":3}, {"label":"Enter", "x":9, "y":3}, {"label":"←", "x":10, "y":3}, {"label":"↓", "x":11, "y":3}, {"label":"→", "x":12, "y":3}]	12	"layout": [
		13	{"label":"Tab", "x":0, "y":0},
		14	{"label":"Q", "x":1, "y":0},
		15	{"label":"W", "x":2, "y":0},
		16	{"label":"E", "x":3, "y":0},
		17	{"label":"R", "x":4, "y":0},
		18	{"label":"T", "x":5, "y":0},
		19	{"label":"Y", "x":6, "y":0},
		20	{"label":"U", "x":7, "y":0},
		21	{"label":"I", "x":8, "y":0},
		22	{"label":"O", "x":9, "y":0},
		23	{"label":"P", "x":10, "y":0},
		24	{"label":"Å", "x":11, "y":0},
		25	{"label":"¨", "x":12, "y":0},
		26
		27	{"label":"Esc", "x":0, "y":1},
		28	{"label":"A", "x":1, "y":1},
		29	{"label":"S", "x":2, "y":1},
		30	{"label":"D", "x":3, "y":1},
		31	{"label":"F", "x":4, "y":1},
		32	{"label":"G", "x":5, "y":1},
		33	{"label":"H", "x":6, "y":1},
		34	{"label":"J", "x":7, "y":1},
		35	{"label":"K", "x":8, "y":1},
		36	{"label":"L", "x":9, "y":1},
		37	{"label":"Ö", "x":10, "y":1},
		38	{"label":"Ä", "x":11, "y":1},
		39	{"label":"'", "x":12, "y":1},
		40
		41	{"label":"Shift", "x":0, "y":2},
		42	{"label":"Z", "x":1, "y":2},
		43	{"label":"X", "x":2, "y":2},
		44	{"label":"C", "x":3, "y":2},
		45	{"label":"V", "x":4, "y":2},
		46	{"label":"B", "x":5, "y":2},
		47	{"label":"N", "x":6, "y":2},
		48	{"label":"M", "x":7, "y":2},
		49	{"label":",", "x":8, "y":2},
		50	{"label":".", "x":9, "y":2},
		51	{"label":"-", "x":10, "y":2},
		52	{"label":"Up", "x":11, "y":2},
		53	{"label":"Backspace", "x":12, "y":2},
		54
		55	{"label":"Ctrl", "x":0, "y":3},
		56	{"label":"Alt", "x":1, "y":3},
		57	{"label":"GUI", "x":2, "y":3},
		58	{"label":"Fn1", "x":3, "y":3},
		59	{"label":"Space", "x":4, "y":3},
		60	{"label":"NoOp", "x":5, "y":3},
		61	{"label":"Fn2", "x":6, "y":3},
		62	{"label":"Alt Gr", "x":7, "y":3},
		63	{"label":"<", "x":8, "y":3},
		64	{"label":"Enter", "x":9, "y":3},
		65	{"label":"Left", "x":10, "y":3},
		66	{"label":"Down", "x":11, "y":3},
		67	{"label":"Right", "x":12, "y":3}
		68	]
10	}	69	}
11	}	70	}
12	}	71	}


diff --git a/keyboards/nack/nack.h b/keyboards/nack/nack.h index 6680e992e..b409d40df 100644 --- a/keyboards/nack/nack.h +++ b/keyboards/nack/nack.h
@@ -17,7 +17,7 @@
17	#pragma once	17	#pragma once
18	#include "quantum.h"	18	#include "quantum.h"
19		19
20	#define LAYOUT( \	20	#define LAYOUT_ortho_4x13( \
21	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12,\	21	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12,\
22	k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25,\	22	k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25,\
23	k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, k36, k37, k38,\	23	k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, k36, k37, k38,\