diff options
Diffstat (limited to 'keyboards/melgeek')
-rwxr-xr-x | keyboards/melgeek/mj6xy/info.json | 101 | ||||
-rwxr-xr-x | keyboards/melgeek/mj6xy/keymaps/via/keymap.c | 14 |
2 files changed, 59 insertions, 56 deletions
diff --git a/keyboards/melgeek/mj6xy/info.json b/keyboards/melgeek/mj6xy/info.json index 5f0db8e1a..5e9724716 100755 --- a/keyboards/melgeek/mj6xy/info.json +++ b/keyboards/melgeek/mj6xy/info.json | |||
@@ -476,6 +476,7 @@ | |||
476 | {"x": 12.75, "y": 2, "w": 2.25}, | 476 | {"x": 12.75, "y": 2, "w": 2.25}, |
477 | 477 | ||
478 | {"x": 0, "y": 3, "w": 2}, | 478 | {"x": 0, "y": 3, "w": 2}, |
479 | {"x": 2, "y": 3}, | ||
479 | {"x": 3, "y": 3}, | 480 | {"x": 3, "y": 3}, |
480 | {"x": 4, "y": 3}, | 481 | {"x": 4, "y": 3}, |
481 | {"x": 5, "y": 3}, | 482 | {"x": 5, "y": 3}, |
@@ -547,6 +548,7 @@ | |||
547 | {"x": 12.75, "y": 2, "w": 2.25}, | 548 | {"x": 12.75, "y": 2, "w": 2.25}, |
548 | 549 | ||
549 | {"x": 0, "y": 3, "w": 2}, | 550 | {"x": 0, "y": 3, "w": 2}, |
551 | {"x": 2, "y": 3}, | ||
550 | {"x": 3, "y": 3}, | 552 | {"x": 3, "y": 3}, |
551 | {"x": 4, "y": 3}, | 553 | {"x": 4, "y": 3}, |
552 | {"x": 5, "y": 3}, | 554 | {"x": 5, "y": 3}, |
@@ -618,6 +620,7 @@ | |||
618 | {"x": 12.75, "y": 2, "w": 2.25}, | 620 | {"x": 12.75, "y": 2, "w": 2.25}, |
619 | 621 | ||
620 | {"x": 0, "y": 3, "w": 2}, | 622 | {"x": 0, "y": 3, "w": 2}, |
623 | {"x": 2, "y": 3}, | ||
621 | {"x": 3, "y": 3}, | 624 | {"x": 3, "y": 3}, |
622 | {"x": 4, "y": 3}, | 625 | {"x": 4, "y": 3}, |
623 | {"x": 5, "y": 3}, | 626 | {"x": 5, "y": 3}, |
@@ -691,6 +694,7 @@ | |||
691 | {"x": 12.75, "y": 2, "w": 2.25}, | 694 | {"x": 12.75, "y": 2, "w": 2.25}, |
692 | 695 | ||
693 | {"x": 0, "y": 3, "w": 2}, | 696 | {"x": 0, "y": 3, "w": 2}, |
697 | {"x": 2, "y": 3}, | ||
694 | {"x": 3, "y": 3}, | 698 | {"x": 3, "y": 3}, |
695 | {"x": 4, "y": 3}, | 699 | {"x": 4, "y": 3}, |
696 | {"x": 5, "y": 3}, | 700 | {"x": 5, "y": 3}, |
@@ -746,7 +750,6 @@ | |||
746 | {"x": 10.5, "y": 1}, | 750 | {"x": 10.5, "y": 1}, |
747 | {"x": 11.5, "y": 1}, | 751 | {"x": 11.5, "y": 1}, |
748 | {"x": 12.5, "y": 1}, | 752 | {"x": 12.5, "y": 1}, |
749 | {"x": 13.5, "y": 1, "w": 1.5}, | ||
750 | 753 | ||
751 | {"x": 0, "y": 2, "w": 1.75}, | 754 | {"x": 0, "y": 2, "w": 1.75}, |
752 | {"x": 1.75, "y": 2}, | 755 | {"x": 1.75, "y": 2}, |
@@ -761,7 +764,7 @@ | |||
761 | {"x": 10.75, "y": 2}, | 764 | {"x": 10.75, "y": 2}, |
762 | {"x": 11.75, "y": 2}, | 765 | {"x": 11.75, "y": 2}, |
763 | {"x": 12.75, "y": 2}, | 766 | {"x": 12.75, "y": 2}, |
764 | {"x": 13.75, "y": 2, "w": 1.25, "h": 2}, | 767 | {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, |
765 | 768 | ||
766 | {"x": 0, "y": 3, "w": 2.25}, | 769 | {"x": 0, "y": 3, "w": 2.25}, |
767 | {"x": 2.25, "y": 3}, | 770 | {"x": 2.25, "y": 3}, |
@@ -816,7 +819,6 @@ | |||
816 | {"x": 10.5, "y": 1}, | 819 | {"x": 10.5, "y": 1}, |
817 | {"x": 11.5, "y": 1}, | 820 | {"x": 11.5, "y": 1}, |
818 | {"x": 12.5, "y": 1}, | 821 | {"x": 12.5, "y": 1}, |
819 | {"x": 13.5, "y": 1, "w": 1.5}, | ||
820 | 822 | ||
821 | {"x": 0, "y": 2, "w": 1.75}, | 823 | {"x": 0, "y": 2, "w": 1.75}, |
822 | {"x": 1.75, "y": 2}, | 824 | {"x": 1.75, "y": 2}, |
@@ -831,7 +833,7 @@ | |||
831 | {"x": 10.75, "y": 2}, | 833 | {"x": 10.75, "y": 2}, |
832 | {"x": 11.75, "y": 2}, | 834 | {"x": 11.75, "y": 2}, |
833 | {"x": 12.75, "y": 2}, | 835 | {"x": 12.75, "y": 2}, |
834 | {"x": 13.75, "y": 2, "w": 1.25, "h": 2}, | 836 | {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, |
835 | 837 | ||
836 | {"x": 0, "y": 3, "w": 1.25}, | 838 | {"x": 0, "y": 3, "w": 1.25}, |
837 | {"x": 1.25, "y": 3}, | 839 | {"x": 1.25, "y": 3}, |
@@ -888,7 +890,6 @@ | |||
888 | {"x": 10.5, "y": 1}, | 890 | {"x": 10.5, "y": 1}, |
889 | {"x": 11.5, "y": 1}, | 891 | {"x": 11.5, "y": 1}, |
890 | {"x": 12.5, "y": 1}, | 892 | {"x": 12.5, "y": 1}, |
891 | {"x": 13.5, "y": 1, "w": 1.5}, | ||
892 | 893 | ||
893 | {"x": 0, "y": 2, "w": 1.75}, | 894 | {"x": 0, "y": 2, "w": 1.75}, |
894 | {"x": 1.75, "y": 2}, | 895 | {"x": 1.75, "y": 2}, |
@@ -903,7 +904,7 @@ | |||
903 | {"x": 10.75, "y": 2}, | 904 | {"x": 10.75, "y": 2}, |
904 | {"x": 11.75, "y": 2}, | 905 | {"x": 11.75, "y": 2}, |
905 | {"x": 12.75, "y": 2}, | 906 | {"x": 12.75, "y": 2}, |
906 | {"x": 13.75, "y": 2, "w": 1.25, "h": 2}, | 907 | {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, |
907 | 908 | ||
908 | {"x": 0, "y": 3, "w": 1.25}, | 909 | {"x": 0, "y": 3, "w": 1.25}, |
909 | {"x": 1.25, "y": 3}, | 910 | {"x": 1.25, "y": 3}, |
@@ -959,7 +960,6 @@ | |||
959 | {"x": 10.5, "y": 1}, | 960 | {"x": 10.5, "y": 1}, |
960 | {"x": 11.5, "y": 1}, | 961 | {"x": 11.5, "y": 1}, |
961 | {"x": 12.5, "y": 1}, | 962 | {"x": 12.5, "y": 1}, |
962 | {"x": 13.5, "y": 1, "w": 1.5}, | ||
963 | 963 | ||
964 | {"x": 0, "y": 2, "w": 1.75}, | 964 | {"x": 0, "y": 2, "w": 1.75}, |
965 | {"x": 1.75, "y": 2}, | 965 | {"x": 1.75, "y": 2}, |
@@ -974,7 +974,7 @@ | |||
974 | {"x": 10.75, "y": 2}, | 974 | {"x": 10.75, "y": 2}, |
975 | {"x": 11.75, "y": 2}, | 975 | {"x": 11.75, "y": 2}, |
976 | {"x": 12.75, "y": 2}, | 976 | {"x": 12.75, "y": 2}, |
977 | {"x": 13.75, "y": 2, "w": 1.25, "h": 2}, | 977 | {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, |
978 | 978 | ||
979 | {"x": 0, "y": 3, "w": 2.25}, | 979 | {"x": 0, "y": 3, "w": 2.25}, |
980 | {"x": 2.25, "y": 3}, | 980 | {"x": 2.25, "y": 3}, |
@@ -1031,7 +1031,6 @@ | |||
1031 | {"x": 10.5, "y": 1}, | 1031 | {"x": 10.5, "y": 1}, |
1032 | {"x": 11.5, "y": 1}, | 1032 | {"x": 11.5, "y": 1}, |
1033 | {"x": 12.5, "y": 1}, | 1033 | {"x": 12.5, "y": 1}, |
1034 | {"x": 13.5, "y": 1, "w": 1.5}, | ||
1035 | 1034 | ||
1036 | {"x": 0, "y": 2, "w": 1.75}, | 1035 | {"x": 0, "y": 2, "w": 1.75}, |
1037 | {"x": 1.75, "y": 2}, | 1036 | {"x": 1.75, "y": 2}, |
@@ -1046,7 +1045,7 @@ | |||
1046 | {"x": 10.75, "y": 2}, | 1045 | {"x": 10.75, "y": 2}, |
1047 | {"x": 11.75, "y": 2}, | 1046 | {"x": 11.75, "y": 2}, |
1048 | {"x": 12.75, "y": 2}, | 1047 | {"x": 12.75, "y": 2}, |
1049 | {"x": 13.75, "y": 2, "w": 1.25, "h": 2}, | 1048 | {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, |
1050 | 1049 | ||
1051 | {"x": 0, "y": 3, "w": 2.25}, | 1050 | {"x": 0, "y": 3, "w": 2.25}, |
1052 | {"x": 2.25, "y": 3}, | 1051 | {"x": 2.25, "y": 3}, |
@@ -1103,7 +1102,6 @@ | |||
1103 | {"x": 10.5, "y": 1}, | 1102 | {"x": 10.5, "y": 1}, |
1104 | {"x": 11.5, "y": 1}, | 1103 | {"x": 11.5, "y": 1}, |
1105 | {"x": 12.5, "y": 1}, | 1104 | {"x": 12.5, "y": 1}, |
1106 | {"x": 13.5, "y": 1, "w": 1.5}, | ||
1107 | 1105 | ||
1108 | {"x": 0, "y": 2, "w": 1.75}, | 1106 | {"x": 0, "y": 2, "w": 1.75}, |
1109 | {"x": 1.75, "y": 2}, | 1107 | {"x": 1.75, "y": 2}, |
@@ -1118,7 +1116,7 @@ | |||
1118 | {"x": 10.75, "y": 2}, | 1116 | {"x": 10.75, "y": 2}, |
1119 | {"x": 11.75, "y": 2}, | 1117 | {"x": 11.75, "y": 2}, |
1120 | {"x": 12.75, "y": 2}, | 1118 | {"x": 12.75, "y": 2}, |
1121 | {"x": 13.75, "y": 2, "w": 1.25, "h": 2}, | 1119 | {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, |
1122 | 1120 | ||
1123 | {"x": 0, "y": 3, "w": 2.25}, | 1121 | {"x": 0, "y": 3, "w": 2.25}, |
1124 | {"x": 2.25, "y": 3}, | 1122 | {"x": 2.25, "y": 3}, |
@@ -1177,7 +1175,6 @@ | |||
1177 | {"x": 10.5, "y": 1}, | 1175 | {"x": 10.5, "y": 1}, |
1178 | {"x": 11.5, "y": 1}, | 1176 | {"x": 11.5, "y": 1}, |
1179 | {"x": 12.5, "y": 1}, | 1177 | {"x": 12.5, "y": 1}, |
1180 | {"x": 13.5, "y": 1, "w": 1.5}, | ||
1181 | 1178 | ||
1182 | {"x": 0, "y": 2, "w": 1.75}, | 1179 | {"x": 0, "y": 2, "w": 1.75}, |
1183 | {"x": 1.75, "y": 2}, | 1180 | {"x": 1.75, "y": 2}, |
@@ -1192,7 +1189,7 @@ | |||
1192 | {"x": 10.75, "y": 2}, | 1189 | {"x": 10.75, "y": 2}, |
1193 | {"x": 11.75, "y": 2}, | 1190 | {"x": 11.75, "y": 2}, |
1194 | {"x": 12.75, "y": 2}, | 1191 | {"x": 12.75, "y": 2}, |
1195 | {"x": 13.75, "y": 2, "w": 1.25, "h": 2}, | 1192 | {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, |
1196 | 1193 | ||
1197 | {"x": 0, "y": 3, "w": 2.25}, | 1194 | {"x": 0, "y": 3, "w": 2.25}, |
1198 | {"x": 2.25, "y": 3}, | 1195 | {"x": 2.25, "y": 3}, |
@@ -1250,7 +1247,6 @@ | |||
1250 | {"x": 10.5, "y": 1}, | 1247 | {"x": 10.5, "y": 1}, |
1251 | {"x": 11.5, "y": 1}, | 1248 | {"x": 11.5, "y": 1}, |
1252 | {"x": 12.5, "y": 1}, | 1249 | {"x": 12.5, "y": 1}, |
1253 | {"x": 13.5, "y": 1, "w": 1.5}, | ||
1254 | 1250 | ||
1255 | {"x": 0, "y": 2, "w": 1.75}, | 1251 | {"x": 0, "y": 2, "w": 1.75}, |
1256 | {"x": 1.75, "y": 2}, | 1252 | {"x": 1.75, "y": 2}, |
@@ -1265,7 +1261,7 @@ | |||
1265 | {"x": 10.75, "y": 2}, | 1261 | {"x": 10.75, "y": 2}, |
1266 | {"x": 11.75, "y": 2}, | 1262 | {"x": 11.75, "y": 2}, |
1267 | {"x": 12.75, "y": 2}, | 1263 | {"x": 12.75, "y": 2}, |
1268 | {"x": 13.75, "y": 2, "w": 1.25, "h": 2}, | 1264 | {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, |
1269 | 1265 | ||
1270 | {"x": 0, "y": 3, "w": 2.25}, | 1266 | {"x": 0, "y": 3, "w": 2.25}, |
1271 | {"x": 2.25, "y": 3}, | 1267 | {"x": 2.25, "y": 3}, |
@@ -1320,7 +1316,6 @@ | |||
1320 | {"x": 10.5, "y": 1}, | 1316 | {"x": 10.5, "y": 1}, |
1321 | {"x": 11.5, "y": 1}, | 1317 | {"x": 11.5, "y": 1}, |
1322 | {"x": 12.5, "y": 1}, | 1318 | {"x": 12.5, "y": 1}, |
1323 | {"x": 13.5, "y": 1, "w": 1.5}, | ||
1324 | 1319 | ||
1325 | {"x": 0, "y": 2, "w": 1.75}, | 1320 | {"x": 0, "y": 2, "w": 1.75}, |
1326 | {"x": 1.75, "y": 2}, | 1321 | {"x": 1.75, "y": 2}, |
@@ -1335,9 +1330,10 @@ | |||
1335 | {"x": 10.75, "y": 2}, | 1330 | {"x": 10.75, "y": 2}, |
1336 | {"x": 11.75, "y": 2}, | 1331 | {"x": 11.75, "y": 2}, |
1337 | {"x": 12.75, "y": 2}, | 1332 | {"x": 12.75, "y": 2}, |
1338 | {"x": 13.75, "y": 2, "w": 1.25, "h": 2}, | 1333 | {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, |
1339 | 1334 | ||
1340 | {"x": 0, "y": 3, "w": 2}, | 1335 | {"x": 0, "y": 3, "w": 2}, |
1336 | {"x": 2, "y": 3}, | ||
1341 | {"x": 3, "y": 3}, | 1337 | {"x": 3, "y": 3}, |
1342 | {"x": 4, "y": 3}, | 1338 | {"x": 4, "y": 3}, |
1343 | {"x": 5, "y": 3}, | 1339 | {"x": 5, "y": 3}, |
@@ -1392,7 +1388,6 @@ | |||
1392 | {"x": 10.5, "y": 1}, | 1388 | {"x": 10.5, "y": 1}, |
1393 | {"x": 11.5, "y": 1}, | 1389 | {"x": 11.5, "y": 1}, |
1394 | {"x": 12.5, "y": 1}, | 1390 | {"x": 12.5, "y": 1}, |
1395 | {"x": 13.5, "y": 1, "w": 1.5}, | ||
1396 | 1391 | ||
1397 | {"x": 0, "y": 2, "w": 1.75}, | 1392 | {"x": 0, "y": 2, "w": 1.75}, |
1398 | {"x": 1.75, "y": 2}, | 1393 | {"x": 1.75, "y": 2}, |
@@ -1407,9 +1402,10 @@ | |||
1407 | {"x": 10.75, "y": 2}, | 1402 | {"x": 10.75, "y": 2}, |
1408 | {"x": 11.75, "y": 2}, | 1403 | {"x": 11.75, "y": 2}, |
1409 | {"x": 12.75, "y": 2}, | 1404 | {"x": 12.75, "y": 2}, |
1410 | {"x": 13.75, "y": 2, "w": 1.25, "h": 2}, | 1405 | {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, |
1411 | 1406 | ||
1412 | {"x": 0, "y": 3, "w": 2}, | 1407 | {"x": 0, "y": 3, "w": 2}, |
1408 | {"x": 2, "y": 3}, | ||
1413 | {"x": 3, "y": 3}, | 1409 | {"x": 3, "y": 3}, |
1414 | {"x": 4, "y": 3}, | 1410 | {"x": 4, "y": 3}, |
1415 | {"x": 5, "y": 3}, | 1411 | {"x": 5, "y": 3}, |
@@ -1464,7 +1460,6 @@ | |||
1464 | {"x": 10.5, "y": 1}, | 1460 | {"x": 10.5, "y": 1}, |
1465 | {"x": 11.5, "y": 1}, | 1461 | {"x": 11.5, "y": 1}, |
1466 | {"x": 12.5, "y": 1}, | 1462 | {"x": 12.5, "y": 1}, |
1467 | {"x": 13.5, "y": 1, "w": 1.5}, | ||
1468 | 1463 | ||
1469 | {"x": 0, "y": 2, "w": 1.75}, | 1464 | {"x": 0, "y": 2, "w": 1.75}, |
1470 | {"x": 1.75, "y": 2}, | 1465 | {"x": 1.75, "y": 2}, |
@@ -1479,9 +1474,10 @@ | |||
1479 | {"x": 10.75, "y": 2}, | 1474 | {"x": 10.75, "y": 2}, |
1480 | {"x": 11.75, "y": 2}, | 1475 | {"x": 11.75, "y": 2}, |
1481 | {"x": 12.75, "y": 2}, | 1476 | {"x": 12.75, "y": 2}, |
1482 | {"x": 13.75, "y": 2, "w": 1.25, "h": 2}, | 1477 | {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, |
1483 | 1478 | ||
1484 | {"x": 0, "y": 3, "w": 2}, | 1479 | {"x": 0, "y": 3, "w": 2}, |
1480 | {"x": 2, "y": 3}, | ||
1485 | {"x": 3, "y": 3}, | 1481 | {"x": 3, "y": 3}, |
1486 | {"x": 4, "y": 3}, | 1482 | {"x": 4, "y": 3}, |
1487 | {"x": 5, "y": 3}, | 1483 | {"x": 5, "y": 3}, |
@@ -1538,7 +1534,6 @@ | |||
1538 | {"x": 10.5, "y": 1}, | 1534 | {"x": 10.5, "y": 1}, |
1539 | {"x": 11.5, "y": 1}, | 1535 | {"x": 11.5, "y": 1}, |
1540 | {"x": 12.5, "y": 1}, | 1536 | {"x": 12.5, "y": 1}, |
1541 | {"x": 13.5, "y": 1, "w": 1.5}, | ||
1542 | 1537 | ||
1543 | {"x": 0, "y": 2, "w": 1.75}, | 1538 | {"x": 0, "y": 2, "w": 1.75}, |
1544 | {"x": 1.75, "y": 2}, | 1539 | {"x": 1.75, "y": 2}, |
@@ -1553,9 +1548,10 @@ | |||
1553 | {"x": 10.75, "y": 2}, | 1548 | {"x": 10.75, "y": 2}, |
1554 | {"x": 11.75, "y": 2}, | 1549 | {"x": 11.75, "y": 2}, |
1555 | {"x": 12.75, "y": 2}, | 1550 | {"x": 12.75, "y": 2}, |
1556 | {"x": 13.75, "y": 2, "w": 1.25, "h": 2}, | 1551 | {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, |
1557 | 1552 | ||
1558 | {"x": 0, "y": 3, "w": 2}, | 1553 | {"x": 0, "y": 3, "w": 2}, |
1554 | {"x": 2, "y": 3}, | ||
1559 | {"x": 3, "y": 3}, | 1555 | {"x": 3, "y": 3}, |
1560 | {"x": 4, "y": 3}, | 1556 | {"x": 4, "y": 3}, |
1561 | {"x": 5, "y": 3}, | 1557 | {"x": 5, "y": 3}, |
@@ -1611,7 +1607,6 @@ | |||
1611 | {"x": 10.5, "y": 1}, | 1607 | {"x": 10.5, "y": 1}, |
1612 | {"x": 11.5, "y": 1}, | 1608 | {"x": 11.5, "y": 1}, |
1613 | {"x": 12.5, "y": 1}, | 1609 | {"x": 12.5, "y": 1}, |
1614 | {"x": 13.5, "y": 1, "w": 1.5}, | ||
1615 | 1610 | ||
1616 | {"x": 0, "y": 2, "w": 1.75}, | 1611 | {"x": 0, "y": 2, "w": 1.75}, |
1617 | {"x": 1.75, "y": 2}, | 1612 | {"x": 1.75, "y": 2}, |
@@ -1626,7 +1621,7 @@ | |||
1626 | {"x": 10.75, "y": 2}, | 1621 | {"x": 10.75, "y": 2}, |
1627 | {"x": 11.75, "y": 2}, | 1622 | {"x": 11.75, "y": 2}, |
1628 | {"x": 12.75, "y": 2}, | 1623 | {"x": 12.75, "y": 2}, |
1629 | {"x": 13.75, "y": 2, "w": 1.25, "h": 2}, | 1624 | {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, |
1630 | 1625 | ||
1631 | {"x": 0, "y": 3}, | 1626 | {"x": 0, "y": 3}, |
1632 | {"x": 1, "y": 3}, | 1627 | {"x": 1, "y": 3}, |
@@ -1683,7 +1678,6 @@ | |||
1683 | {"x": 10.5, "y": 1}, | 1678 | {"x": 10.5, "y": 1}, |
1684 | {"x": 11.5, "y": 1}, | 1679 | {"x": 11.5, "y": 1}, |
1685 | {"x": 12.5, "y": 1}, | 1680 | {"x": 12.5, "y": 1}, |
1686 | {"x": 13.5, "y": 1, "w": 1.5}, | ||
1687 | 1681 | ||
1688 | {"x": 0, "y": 2, "w": 1.75}, | 1682 | {"x": 0, "y": 2, "w": 1.75}, |
1689 | {"x": 1.75, "y": 2}, | 1683 | {"x": 1.75, "y": 2}, |
@@ -1698,7 +1692,7 @@ | |||
1698 | {"x": 10.75, "y": 2}, | 1692 | {"x": 10.75, "y": 2}, |
1699 | {"x": 11.75, "y": 2}, | 1693 | {"x": 11.75, "y": 2}, |
1700 | {"x": 12.75, "y": 2}, | 1694 | {"x": 12.75, "y": 2}, |
1701 | {"x": 13.75, "y": 2, "w": 1.25, "h": 2}, | 1695 | {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, |
1702 | 1696 | ||
1703 | {"x": 0, "y": 3}, | 1697 | {"x": 0, "y": 3}, |
1704 | {"x": 1, "y": 3}, | 1698 | {"x": 1, "y": 3}, |
@@ -2202,6 +2196,7 @@ | |||
2202 | {"x": 12.75, "y": 2, "w": 2.25}, | 2196 | {"x": 12.75, "y": 2, "w": 2.25}, |
2203 | 2197 | ||
2204 | {"x": 0, "y": 3, "w": 2}, | 2198 | {"x": 0, "y": 3, "w": 2}, |
2199 | {"x": 2, "y": 3}, | ||
2205 | {"x": 3, "y": 3}, | 2200 | {"x": 3, "y": 3}, |
2206 | {"x": 4, "y": 3}, | 2201 | {"x": 4, "y": 3}, |
2207 | {"x": 5, "y": 3}, | 2202 | {"x": 5, "y": 3}, |
@@ -2274,6 +2269,7 @@ | |||
2274 | {"x": 12.75, "y": 2, "w": 2.25}, | 2269 | {"x": 12.75, "y": 2, "w": 2.25}, |
2275 | 2270 | ||
2276 | {"x": 0, "y": 3, "w": 2}, | 2271 | {"x": 0, "y": 3, "w": 2}, |
2272 | {"x": 2, "y": 3}, | ||
2277 | {"x": 3, "y": 3}, | 2273 | {"x": 3, "y": 3}, |
2278 | {"x": 4, "y": 3}, | 2274 | {"x": 4, "y": 3}, |
2279 | {"x": 5, "y": 3}, | 2275 | {"x": 5, "y": 3}, |
@@ -2346,6 +2342,7 @@ | |||
2346 | {"x": 12.75, "y": 2, "w": 2.25}, | 2342 | {"x": 12.75, "y": 2, "w": 2.25}, |
2347 | 2343 | ||
2348 | {"x": 0, "y": 3, "w": 2}, | 2344 | {"x": 0, "y": 3, "w": 2}, |
2345 | {"x": 2, "y": 3}, | ||
2349 | {"x": 3, "y": 3}, | 2346 | {"x": 3, "y": 3}, |
2350 | {"x": 4, "y": 3}, | 2347 | {"x": 4, "y": 3}, |
2351 | {"x": 5, "y": 3}, | 2348 | {"x": 5, "y": 3}, |
@@ -2420,6 +2417,7 @@ | |||
2420 | {"x": 12.75, "y": 2, "w": 2.25}, | 2417 | {"x": 12.75, "y": 2, "w": 2.25}, |
2421 | 2418 | ||
2422 | {"x": 0, "y": 3, "w": 2}, | 2419 | {"x": 0, "y": 3, "w": 2}, |
2420 | {"x": 2, "y": 3}, | ||
2423 | {"x": 3, "y": 3}, | 2421 | {"x": 3, "y": 3}, |
2424 | {"x": 4, "y": 3}, | 2422 | {"x": 4, "y": 3}, |
2425 | {"x": 5, "y": 3}, | 2423 | {"x": 5, "y": 3}, |
@@ -2476,7 +2474,6 @@ | |||
2476 | {"x": 10.5, "y": 1}, | 2474 | {"x": 10.5, "y": 1}, |
2477 | {"x": 11.5, "y": 1}, | 2475 | {"x": 11.5, "y": 1}, |
2478 | {"x": 12.5, "y": 1}, | 2476 | {"x": 12.5, "y": 1}, |
2479 | {"x": 13.5, "y": 1, "w": 1.5}, | ||
2480 | 2477 | ||
2481 | {"x": 0, "y": 2, "w": 1.75}, | 2478 | {"x": 0, "y": 2, "w": 1.75}, |
2482 | {"x": 1.75, "y": 2}, | 2479 | {"x": 1.75, "y": 2}, |
@@ -2491,7 +2488,7 @@ | |||
2491 | {"x": 10.75, "y": 2}, | 2488 | {"x": 10.75, "y": 2}, |
2492 | {"x": 11.75, "y": 2}, | 2489 | {"x": 11.75, "y": 2}, |
2493 | {"x": 12.75, "y": 2}, | 2490 | {"x": 12.75, "y": 2}, |
2494 | {"x": 13.75, "y": 2, "w": 1.25, "h": 2}, | 2491 | {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, |
2495 | 2492 | ||
2496 | {"x": 0, "y": 3, "w": 2.25}, | 2493 | {"x": 0, "y": 3, "w": 2.25}, |
2497 | {"x": 2.25, "y": 3}, | 2494 | {"x": 2.25, "y": 3}, |
@@ -2547,7 +2544,6 @@ | |||
2547 | {"x": 10.5, "y": 1}, | 2544 | {"x": 10.5, "y": 1}, |
2548 | {"x": 11.5, "y": 1}, | 2545 | {"x": 11.5, "y": 1}, |
2549 | {"x": 12.5, "y": 1}, | 2546 | {"x": 12.5, "y": 1}, |
2550 | {"x": 13.5, "y": 1, "w": 1.5}, | ||
2551 | 2547 | ||
2552 | {"x": 0, "y": 2, "w": 1.75}, | 2548 | {"x": 0, "y": 2, "w": 1.75}, |
2553 | {"x": 1.75, "y": 2}, | 2549 | {"x": 1.75, "y": 2}, |
@@ -2562,7 +2558,7 @@ | |||
2562 | {"x": 10.75, "y": 2}, | 2558 | {"x": 10.75, "y": 2}, |
2563 | {"x": 11.75, "y": 2}, | 2559 | {"x": 11.75, "y": 2}, |
2564 | {"x": 12.75, "y": 2}, | 2560 | {"x": 12.75, "y": 2}, |
2565 | {"x": 13.75, "y": 2, "w": 1.25, "h": 2}, | 2561 | {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, |
2566 | 2562 | ||
2567 | {"x": 0, "y": 3, "w": 1.25}, | 2563 | {"x": 0, "y": 3, "w": 1.25}, |
2568 | {"x": 1.25, "y": 3}, | 2564 | {"x": 1.25, "y": 3}, |
@@ -2620,7 +2616,6 @@ | |||
2620 | {"x": 10.5, "y": 1}, | 2616 | {"x": 10.5, "y": 1}, |
2621 | {"x": 11.5, "y": 1}, | 2617 | {"x": 11.5, "y": 1}, |
2622 | {"x": 12.5, "y": 1}, | 2618 | {"x": 12.5, "y": 1}, |
2623 | {"x": 13.5, "y": 1, "w": 1.5}, | ||
2624 | 2619 | ||
2625 | {"x": 0, "y": 2, "w": 1.75}, | 2620 | {"x": 0, "y": 2, "w": 1.75}, |
2626 | {"x": 1.75, "y": 2}, | 2621 | {"x": 1.75, "y": 2}, |
@@ -2635,7 +2630,7 @@ | |||
2635 | {"x": 10.75, "y": 2}, | 2630 | {"x": 10.75, "y": 2}, |
2636 | {"x": 11.75, "y": 2}, | 2631 | {"x": 11.75, "y": 2}, |
2637 | {"x": 12.75, "y": 2}, | 2632 | {"x": 12.75, "y": 2}, |
2638 | {"x": 13.75, "y": 2, "w": 1.25, "h": 2}, | 2633 | {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, |
2639 | 2634 | ||
2640 | {"x": 0, "y": 3, "w": 1.25}, | 2635 | {"x": 0, "y": 3, "w": 1.25}, |
2641 | {"x": 1.25, "y": 3}, | 2636 | {"x": 1.25, "y": 3}, |
@@ -2692,7 +2687,6 @@ | |||
2692 | {"x": 10.5, "y": 1}, | 2687 | {"x": 10.5, "y": 1}, |
2693 | {"x": 11.5, "y": 1}, | 2688 | {"x": 11.5, "y": 1}, |
2694 | {"x": 12.5, "y": 1}, | 2689 | {"x": 12.5, "y": 1}, |
2695 | {"x": 13.5, "y": 1, "w": 1.5}, | ||
2696 | 2690 | ||
2697 | {"x": 0, "y": 2, "w": 1.75}, | 2691 | {"x": 0, "y": 2, "w": 1.75}, |
2698 | {"x": 1.75, "y": 2}, | 2692 | {"x": 1.75, "y": 2}, |
@@ -2707,7 +2701,7 @@ | |||
2707 | {"x": 10.75, "y": 2}, | 2701 | {"x": 10.75, "y": 2}, |
2708 | {"x": 11.75, "y": 2}, | 2702 | {"x": 11.75, "y": 2}, |
2709 | {"x": 12.75, "y": 2}, | 2703 | {"x": 12.75, "y": 2}, |
2710 | {"x": 13.75, "y": 2, "w": 1.25, "h": 2}, | 2704 | {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, |
2711 | 2705 | ||
2712 | {"x": 0, "y": 3, "w": 2.25}, | 2706 | {"x": 0, "y": 3, "w": 2.25}, |
2713 | {"x": 2.25, "y": 3}, | 2707 | {"x": 2.25, "y": 3}, |
@@ -2765,7 +2759,6 @@ | |||
2765 | {"x": 10.5, "y": 1}, | 2759 | {"x": 10.5, "y": 1}, |
2766 | {"x": 11.5, "y": 1}, | 2760 | {"x": 11.5, "y": 1}, |
2767 | {"x": 12.5, "y": 1}, | 2761 | {"x": 12.5, "y": 1}, |
2768 | {"x": 13.5, "y": 1, "w": 1.5}, | ||
2769 | 2762 | ||
2770 | {"x": 0, "y": 2, "w": 1.75}, | 2763 | {"x": 0, "y": 2, "w": 1.75}, |
2771 | {"x": 1.75, "y": 2}, | 2764 | {"x": 1.75, "y": 2}, |
@@ -2780,7 +2773,7 @@ | |||
2780 | {"x": 10.75, "y": 2}, | 2773 | {"x": 10.75, "y": 2}, |
2781 | {"x": 11.75, "y": 2}, | 2774 | {"x": 11.75, "y": 2}, |
2782 | {"x": 12.75, "y": 2}, | 2775 | {"x": 12.75, "y": 2}, |
2783 | {"x": 13.75, "y": 2, "w": 1.25, "h": 2}, | 2776 | {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, |
2784 | 2777 | ||
2785 | {"x": 0, "y": 3, "w": 2.25}, | 2778 | {"x": 0, "y": 3, "w": 2.25}, |
2786 | {"x": 2.25, "y": 3}, | 2779 | {"x": 2.25, "y": 3}, |
@@ -2838,7 +2831,6 @@ | |||
2838 | {"x": 10.5, "y": 1}, | 2831 | {"x": 10.5, "y": 1}, |
2839 | {"x": 11.5, "y": 1}, | 2832 | {"x": 11.5, "y": 1}, |
2840 | {"x": 12.5, "y": 1}, | 2833 | {"x": 12.5, "y": 1}, |
2841 | {"x": 13.5, "y": 1, "w": 1.5}, | ||
2842 | 2834 | ||
2843 | {"x": 0, "y": 2, "w": 1.75}, | 2835 | {"x": 0, "y": 2, "w": 1.75}, |
2844 | {"x": 1.75, "y": 2}, | 2836 | {"x": 1.75, "y": 2}, |
@@ -2853,7 +2845,7 @@ | |||
2853 | {"x": 10.75, "y": 2}, | 2845 | {"x": 10.75, "y": 2}, |
2854 | {"x": 11.75, "y": 2}, | 2846 | {"x": 11.75, "y": 2}, |
2855 | {"x": 12.75, "y": 2}, | 2847 | {"x": 12.75, "y": 2}, |
2856 | {"x": 13.75, "y": 2, "w": 1.25, "h": 2}, | 2848 | {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, |
2857 | 2849 | ||
2858 | {"x": 0, "y": 3, "w": 2.25}, | 2850 | {"x": 0, "y": 3, "w": 2.25}, |
2859 | {"x": 2.25, "y": 3}, | 2851 | {"x": 2.25, "y": 3}, |
@@ -2913,7 +2905,6 @@ | |||
2913 | {"x": 10.5, "y": 1}, | 2905 | {"x": 10.5, "y": 1}, |
2914 | {"x": 11.5, "y": 1}, | 2906 | {"x": 11.5, "y": 1}, |
2915 | {"x": 12.5, "y": 1}, | 2907 | {"x": 12.5, "y": 1}, |
2916 | {"x": 13.5, "y": 1, "w": 1.5}, | ||
2917 | 2908 | ||
2918 | {"x": 0, "y": 2, "w": 1.75}, | 2909 | {"x": 0, "y": 2, "w": 1.75}, |
2919 | {"x": 1.75, "y": 2}, | 2910 | {"x": 1.75, "y": 2}, |
@@ -2928,7 +2919,7 @@ | |||
2928 | {"x": 10.75, "y": 2}, | 2919 | {"x": 10.75, "y": 2}, |
2929 | {"x": 11.75, "y": 2}, | 2920 | {"x": 11.75, "y": 2}, |
2930 | {"x": 12.75, "y": 2}, | 2921 | {"x": 12.75, "y": 2}, |
2931 | {"x": 13.75, "y": 2, "w": 1.25, "h": 2}, | 2922 | {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, |
2932 | 2923 | ||
2933 | {"x": 0, "y": 3, "w": 2.25}, | 2924 | {"x": 0, "y": 3, "w": 2.25}, |
2934 | {"x": 2.25, "y": 3}, | 2925 | {"x": 2.25, "y": 3}, |
@@ -2987,7 +2978,6 @@ | |||
2987 | {"x": 10.5, "y": 1}, | 2978 | {"x": 10.5, "y": 1}, |
2988 | {"x": 11.5, "y": 1}, | 2979 | {"x": 11.5, "y": 1}, |
2989 | {"x": 12.5, "y": 1}, | 2980 | {"x": 12.5, "y": 1}, |
2990 | {"x": 13.5, "y": 1, "w": 1.5}, | ||
2991 | 2981 | ||
2992 | {"x": 0, "y": 2, "w": 1.75}, | 2982 | {"x": 0, "y": 2, "w": 1.75}, |
2993 | {"x": 1.75, "y": 2}, | 2983 | {"x": 1.75, "y": 2}, |
@@ -3002,7 +2992,7 @@ | |||
3002 | {"x": 10.75, "y": 2}, | 2992 | {"x": 10.75, "y": 2}, |
3003 | {"x": 11.75, "y": 2}, | 2993 | {"x": 11.75, "y": 2}, |
3004 | {"x": 12.75, "y": 2}, | 2994 | {"x": 12.75, "y": 2}, |
3005 | {"x": 13.75, "y": 2, "w": 1.25, "h": 2}, | 2995 | {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, |
3006 | 2996 | ||
3007 | {"x": 0, "y": 3, "w": 2.25}, | 2997 | {"x": 0, "y": 3, "w": 2.25}, |
3008 | {"x": 2.25, "y": 3}, | 2998 | {"x": 2.25, "y": 3}, |
@@ -3044,7 +3034,6 @@ | |||
3044 | {"x": 13, "y": 0}, | 3034 | {"x": 13, "y": 0}, |
3045 | {"x": 14, "y": 0}, | 3035 | {"x": 14, "y": 0}, |
3046 | 3036 | ||
3047 | |||
3048 | {"x": 0, "y": 1, "w": 1.5}, | 3037 | {"x": 0, "y": 1, "w": 1.5}, |
3049 | {"x": 1.5, "y": 1}, | 3038 | {"x": 1.5, "y": 1}, |
3050 | {"x": 2.5, "y": 1}, | 3039 | {"x": 2.5, "y": 1}, |
@@ -3058,7 +3047,6 @@ | |||
3058 | {"x": 10.5, "y": 1}, | 3047 | {"x": 10.5, "y": 1}, |
3059 | {"x": 11.5, "y": 1}, | 3048 | {"x": 11.5, "y": 1}, |
3060 | {"x": 12.5, "y": 1}, | 3049 | {"x": 12.5, "y": 1}, |
3061 | {"x": 13.5, "y": 1, "w": 1.5}, | ||
3062 | 3050 | ||
3063 | {"x": 0, "y": 2, "w": 1.75}, | 3051 | {"x": 0, "y": 2, "w": 1.75}, |
3064 | {"x": 1.75, "y": 2}, | 3052 | {"x": 1.75, "y": 2}, |
@@ -3073,9 +3061,10 @@ | |||
3073 | {"x": 10.75, "y": 2}, | 3061 | {"x": 10.75, "y": 2}, |
3074 | {"x": 11.75, "y": 2}, | 3062 | {"x": 11.75, "y": 2}, |
3075 | {"x": 12.75, "y": 2}, | 3063 | {"x": 12.75, "y": 2}, |
3076 | {"x": 13.75, "y": 2, "w": 1.25, "h": 2}, | 3064 | {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, |
3077 | 3065 | ||
3078 | {"x": 0, "y": 3, "w": 2}, | 3066 | {"x": 0, "y": 3, "w": 2}, |
3067 | {"x": 2, "y": 3}, | ||
3079 | {"x": 3, "y": 3}, | 3068 | {"x": 3, "y": 3}, |
3080 | {"x": 4, "y": 3}, | 3069 | {"x": 4, "y": 3}, |
3081 | {"x": 5, "y": 3}, | 3070 | {"x": 5, "y": 3}, |
@@ -3131,7 +3120,6 @@ | |||
3131 | {"x": 10.5, "y": 1}, | 3120 | {"x": 10.5, "y": 1}, |
3132 | {"x": 11.5, "y": 1}, | 3121 | {"x": 11.5, "y": 1}, |
3133 | {"x": 12.5, "y": 1}, | 3122 | {"x": 12.5, "y": 1}, |
3134 | {"x": 13.5, "y": 1, "w": 1.5}, | ||
3135 | 3123 | ||
3136 | {"x": 0, "y": 2, "w": 1.75}, | 3124 | {"x": 0, "y": 2, "w": 1.75}, |
3137 | {"x": 1.75, "y": 2}, | 3125 | {"x": 1.75, "y": 2}, |
@@ -3146,9 +3134,10 @@ | |||
3146 | {"x": 10.75, "y": 2}, | 3134 | {"x": 10.75, "y": 2}, |
3147 | {"x": 11.75, "y": 2}, | 3135 | {"x": 11.75, "y": 2}, |
3148 | {"x": 12.75, "y": 2}, | 3136 | {"x": 12.75, "y": 2}, |
3149 | {"x": 13.75, "y": 2, "w": 1.25, "h": 2}, | 3137 | {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, |
3150 | 3138 | ||
3151 | {"x": 0, "y": 3, "w": 2}, | 3139 | {"x": 0, "y": 3, "w": 2}, |
3140 | {"x": 2, "y": 3}, | ||
3152 | {"x": 3, "y": 3}, | 3141 | {"x": 3, "y": 3}, |
3153 | {"x": 4, "y": 3}, | 3142 | {"x": 4, "y": 3}, |
3154 | {"x": 5, "y": 3}, | 3143 | {"x": 5, "y": 3}, |
@@ -3204,7 +3193,6 @@ | |||
3204 | {"x": 10.5, "y": 1}, | 3193 | {"x": 10.5, "y": 1}, |
3205 | {"x": 11.5, "y": 1}, | 3194 | {"x": 11.5, "y": 1}, |
3206 | {"x": 12.5, "y": 1}, | 3195 | {"x": 12.5, "y": 1}, |
3207 | {"x": 13.5, "y": 1, "w": 1.5}, | ||
3208 | 3196 | ||
3209 | {"x": 0, "y": 2, "w": 1.75}, | 3197 | {"x": 0, "y": 2, "w": 1.75}, |
3210 | {"x": 1.75, "y": 2}, | 3198 | {"x": 1.75, "y": 2}, |
@@ -3219,9 +3207,10 @@ | |||
3219 | {"x": 10.75, "y": 2}, | 3207 | {"x": 10.75, "y": 2}, |
3220 | {"x": 11.75, "y": 2}, | 3208 | {"x": 11.75, "y": 2}, |
3221 | {"x": 12.75, "y": 2}, | 3209 | {"x": 12.75, "y": 2}, |
3222 | {"x": 13.75, "y": 2, "w": 1.25, "h": 2}, | 3210 | {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, |
3223 | 3211 | ||
3224 | {"x": 0, "y": 3, "w": 2}, | 3212 | {"x": 0, "y": 3, "w": 2}, |
3213 | {"x": 2, "y": 3}, | ||
3225 | {"x": 3, "y": 3}, | 3214 | {"x": 3, "y": 3}, |
3226 | {"x": 4, "y": 3}, | 3215 | {"x": 4, "y": 3}, |
3227 | {"x": 5, "y": 3}, | 3216 | {"x": 5, "y": 3}, |
@@ -3294,9 +3283,10 @@ | |||
3294 | {"x": 10.75, "y": 2}, | 3283 | {"x": 10.75, "y": 2}, |
3295 | {"x": 11.75, "y": 2}, | 3284 | {"x": 11.75, "y": 2}, |
3296 | {"x": 12.75, "y": 2}, | 3285 | {"x": 12.75, "y": 2}, |
3297 | {"x": 13.75, "y": 2, "w": 1.25, "h": 2}, | 3286 | {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, |
3298 | 3287 | ||
3299 | {"x": 0, "y": 3, "w": 2}, | 3288 | {"x": 0, "y": 3, "w": 2}, |
3289 | {"x": 2, "y": 3}, | ||
3300 | {"x": 3, "y": 3}, | 3290 | {"x": 3, "y": 3}, |
3301 | {"x": 4, "y": 3}, | 3291 | {"x": 4, "y": 3}, |
3302 | {"x": 5, "y": 3}, | 3292 | {"x": 5, "y": 3}, |
@@ -3353,7 +3343,6 @@ | |||
3353 | {"x": 10.5, "y": 1}, | 3343 | {"x": 10.5, "y": 1}, |
3354 | {"x": 11.5, "y": 1}, | 3344 | {"x": 11.5, "y": 1}, |
3355 | {"x": 12.5, "y": 1}, | 3345 | {"x": 12.5, "y": 1}, |
3356 | {"x": 13.5, "y": 1, "w": 1.5}, | ||
3357 | 3346 | ||
3358 | {"x": 0, "y": 2, "w": 1.75}, | 3347 | {"x": 0, "y": 2, "w": 1.75}, |
3359 | {"x": 1.75, "y": 2}, | 3348 | {"x": 1.75, "y": 2}, |
@@ -3368,7 +3357,7 @@ | |||
3368 | {"x": 10.75, "y": 2}, | 3357 | {"x": 10.75, "y": 2}, |
3369 | {"x": 11.75, "y": 2}, | 3358 | {"x": 11.75, "y": 2}, |
3370 | {"x": 12.75, "y": 2}, | 3359 | {"x": 12.75, "y": 2}, |
3371 | {"x": 13.75, "y": 2, "w": 1.25, "h": 2}, | 3360 | {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, |
3372 | 3361 | ||
3373 | {"x": 0, "y": 3}, | 3362 | {"x": 0, "y": 3}, |
3374 | {"x": 1, "y": 3}, | 3363 | {"x": 1, "y": 3}, |
@@ -3412,7 +3401,7 @@ | |||
3412 | {"x": 12, "y": 0}, | 3401 | {"x": 12, "y": 0}, |
3413 | {"x": 13, "y": 0}, | 3402 | {"x": 13, "y": 0}, |
3414 | {"x": 14, "y": 0}, | 3403 | {"x": 14, "y": 0}, |
3415 | 3404 | ||
3416 | {"x": 0, "y": 1, "w": 1.5}, | 3405 | {"x": 0, "y": 1, "w": 1.5}, |
3417 | {"x": 1.5, "y": 1}, | 3406 | {"x": 1.5, "y": 1}, |
3418 | {"x": 2.5, "y": 1}, | 3407 | {"x": 2.5, "y": 1}, |
@@ -3441,7 +3430,7 @@ | |||
3441 | {"x": 10.75, "y": 2}, | 3430 | {"x": 10.75, "y": 2}, |
3442 | {"x": 11.75, "y": 2}, | 3431 | {"x": 11.75, "y": 2}, |
3443 | {"x": 12.75, "y": 2}, | 3432 | {"x": 12.75, "y": 2}, |
3444 | {"x": 13.75, "y": 2, "w": 1.25, "h": 2}, | 3433 | {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, |
3445 | 3434 | ||
3446 | {"x": 0, "y": 3}, | 3435 | {"x": 0, "y": 3}, |
3447 | {"x": 1, "y": 3}, | 3436 | {"x": 1, "y": 3}, |
diff --git a/keyboards/melgeek/mj6xy/keymaps/via/keymap.c b/keyboards/melgeek/mj6xy/keymaps/via/keymap.c index 4bedb0d40..be2bcc247 100755 --- a/keyboards/melgeek/mj6xy/keymaps/via/keymap.c +++ b/keyboards/melgeek/mj6xy/keymaps/via/keymap.c | |||
@@ -30,6 +30,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
30 | KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, RESET, | 30 | KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, RESET, |
31 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_TRNS, | 31 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_TRNS, |
32 | KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC, BL_TOGG, BL_INC, BL_STEP, KC_TRNS, KC_DEL, KC_END, KC_PGDN, KC_TRNS, | 32 | KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC, BL_TOGG, BL_INC, BL_STEP, KC_TRNS, KC_DEL, KC_END, KC_PGDN, KC_TRNS, |
33 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), | ||
34 | |||
35 | LAYOUT_60_ansi( | ||
36 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
37 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
38 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
39 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
40 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), | ||
41 | |||
42 | LAYOUT_60_ansi( | ||
43 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
44 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
45 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
46 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
33 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) | 47 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) |
34 | }; | 48 | }; |
35 | 49 | ||