summaryrefslogtreecommitdiffstats
path: root/keyboards
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-07-30 18:18:01 +0000
committerQMK Bot <hello@qmk.fm>2021-07-30 18:18:01 +0000
commitde1898e69e6338d51a4f28d0b1418d2c06b7e77b (patch)
tree8e63bdb4cd7f7d1595d41d07586b7a42b23f3cf2 /keyboards
parentd34e61a43c6a6009282b5db5d0453c1c7dba7041 (diff)
parente180524c10a8d740dce193c8596af3957b4a9dd9 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/tiger910/info.json2
-rw-r--r--keyboards/txuu/info.json7
-rw-r--r--keyboards/txuu/txuu.h2
3 files changed, 7 insertions, 4 deletions
diff --git a/keyboards/tiger910/info.json b/keyboards/tiger910/info.json
index 0701fbdd32..01a0ab425d 100644
--- a/keyboards/tiger910/info.json
+++ b/keyboards/tiger910/info.json
@@ -64,7 +64,7 @@
{"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75},
{"label":"K3E (B3,D3)", "x":14, "y":3},
{"label":"K3F (B3,D4)", "x":15, "y":3},
- {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.56},
+ {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.5},
{"label":"K41 (B4,B6)", "x":1.5, "y":4},
{"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.5},
{"label":"K46 (B4,C3)", "x":4, "y":4, "w":7},
diff --git a/keyboards/txuu/info.json b/keyboards/txuu/info.json
index 7225605f5e..d3dd0a8c26 100644
--- a/keyboards/txuu/info.json
+++ b/keyboards/txuu/info.json
@@ -3,8 +3,11 @@
"maintainer": "matthewdias",
"width": 16,
"height": 5,
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_65_ansi_blocker_split_bs"
+ },
"layouts": {
- "LAYOUT": {
+ "LAYOUT_65_ansi_blocker_split_bs": {
"layout": [
{"label":"0,0", "x":0, "y":0},
{"label":"0,1", "x":1, "y":0},
@@ -77,4 +80,4 @@
]
}
}
-} \ No newline at end of file
+}
diff --git a/keyboards/txuu/txuu.h b/keyboards/txuu/txuu.h
index 2de782c64b..6ba459804b 100644
--- a/keyboards/txuu/txuu.h
+++ b/keyboards/txuu/txuu.h
@@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define XXX KC_NO
-#define LAYOUT( \
+#define LAYOUT_65_ansi_blocker_split_bs( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K1F, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2F, \