summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-07-30 15:11:30 +0000
committerQMK Bot <hello@qmk.fm>2021-07-30 15:11:30 +0000
commitf87c72ef8f7854eb6a35c6ef75306289156bbbb4 (patch)
treee1d841b04865364c60d3e31236e4efe25a95208f
parent4735aab75bf86b5bd1e3218c5f5b3f3b51dfba49 (diff)
parentf2d34f38be1e793068ab02d6a7942ca7a3a5188c (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/nack/info.json63
-rw-r--r--keyboards/nack/nack.h2
2 files changed, 62 insertions, 3 deletions
diff --git a/keyboards/nack/info.json b/keyboards/nack/info.json
index 47942c4f19..2df08a85de 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": [{"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_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":"Å", "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 6680e992ee..b409d40df3 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,\