summaryrefslogtreecommitdiff
path: root/keyboards/ft
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/ft')
-rw-r--r--keyboards/ft/mars65/config.h19
-rw-r--r--keyboards/ft/mars65/info.json692
-rw-r--r--keyboards/ft/mars65/mars65.c8
-rw-r--r--keyboards/ft/mars65/mars65.h111
-rw-r--r--keyboards/ft/mars80/config.h6
-rw-r--r--keyboards/ft/mars80/info.json216
-rw-r--r--keyboards/ft/mars80/mars80.c17
-rw-r--r--keyboards/ft/mars80/mars80.h63
-rw-r--r--keyboards/ft/mars80/rules.mk1
9 files changed, 563 insertions, 570 deletions
diff --git a/keyboards/ft/mars65/config.h b/keyboards/ft/mars65/config.h
index 53f33428df..d13d66431e 100644
--- a/keyboards/ft/mars65/config.h
+++ b/keyboards/ft/mars65/config.h
@@ -3,24 +3,6 @@
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
-#define MATRIX_COL_PINS { C6, C7, D0, D1, D2, D3, D4, D5, D6, D7, F0, F1, F4, F5, F6, F7 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 24
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -37,7 +19,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
// generated by KBFirmware JSON to QMK Parser
// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/ft/mars65/info.json b/keyboards/ft/mars65/info.json
index 1d1dd840d9..fd4a9ac167 100644
--- a/keyboards/ft/mars65/info.json
+++ b/keyboards/ft/mars65/info.json
@@ -8,393 +8,401 @@
"pid": "0x422F",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["C6", "C7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "F0", "F1", "F4", "F5", "F6", "F7"],
+ "rows": ["B0", "B1", "B2", "B3", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B7"
},
+ "ws2812": {
+ "pin": "E6"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_iso_blocker", "65_iso_blocker_split_bs"],
"layouts": {
"LAYOUT_all": {
"layout": [
- {"label":"K00 (B0,C6)", "x":0, "y":0},
- {"label":"K01 (B0,C7)", "x":1, "y":0},
- {"label":"K02 (B0,D0)", "x":2, "y":0},
- {"label":"K03 (B0,D1)", "x":3, "y":0},
- {"label":"K04 (B0,D2)", "x":4, "y":0},
- {"label":"K05 (B0,D3)", "x":5, "y":0},
- {"label":"K06 (B0,D4)", "x":6, "y":0},
- {"label":"K07 (B0,D5)", "x":7, "y":0},
- {"label":"K08 (B0,D6)", "x":8, "y":0},
- {"label":"K09 (B0,D7)", "x":9, "y":0},
- {"label":"K0A (B0,F0)", "x":10, "y":0},
- {"label":"K0B (B0,F1)", "x":11, "y":0},
- {"label":"K0C (B0,F4)", "x":12, "y":0},
- {"label":"K0D (B0,F5)", "x":13, "y":0},
- {"label":"K0E (B0,F6)", "x":14, "y":0},
- {"label":"K0F (B0,F7)", "x":15, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 15], "x": 15, "y": 0},
- {"label":"K10 (B1,C6)", "x":0, "y":1, "w":1.5},
- {"label":"K12 (B1,D0)", "x":1.5, "y":1},
- {"label":"K13 (B1,D1)", "x":2.5, "y":1},
- {"label":"K14 (B1,D2)", "x":3.5, "y":1},
- {"label":"K15 (B1,D3)", "x":4.5, "y":1},
- {"label":"K16 (B1,D4)", "x":5.5, "y":1},
- {"label":"K17 (B1,D5)", "x":6.5, "y":1},
- {"label":"K18 (B1,D6)", "x":7.5, "y":1},
- {"label":"K19 (B1,D7)", "x":8.5, "y":1},
- {"label":"K1A (B1,F0)", "x":9.5, "y":1},
- {"label":"K1B (B1,F1)", "x":10.5, "y":1},
- {"label":"K1C (B1,F4)", "x":11.5, "y":1},
- {"label":"K1D (B1,F5)", "x":12.5, "y":1},
- {"label":"K1E (B1,F6)", "x":13.5, "y":1, "w":1.5},
- {"label":"K1F (B1,F7)", "x":15, "y":1},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 1.5, "y": 1},
+ {"matrix": [1, 3], "x": 2.5, "y": 1},
+ {"matrix": [1, 4], "x": 3.5, "y": 1},
+ {"matrix": [1, 5], "x": 4.5, "y": 1},
+ {"matrix": [1, 6], "x": 5.5, "y": 1},
+ {"matrix": [1, 7], "x": 6.5, "y": 1},
+ {"matrix": [1, 8], "x": 7.5, "y": 1},
+ {"matrix": [1, 9], "x": 8.5, "y": 1},
+ {"matrix": [1, 10], "x": 9.5, "y": 1},
+ {"matrix": [1, 11], "x": 10.5, "y": 1},
+ {"matrix": [1, 12], "x": 11.5, "y": 1},
+ {"matrix": [1, 13], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 15], "x": 15, "y": 1},
- {"label":"K20 (B2,C6)", "x":0, "y":2, "w":1.75},
- {"label":"K22 (B2,D0)", "x":1.75, "y":2},
- {"label":"K23 (B2,D1)", "x":2.75, "y":2},
- {"label":"K24 (B2,D2)", "x":3.75, "y":2},
- {"label":"K25 (B2,D3)", "x":4.75, "y":2},
- {"label":"K26 (B2,D4)", "x":5.75, "y":2},
- {"label":"K27 (B2,D5)", "x":6.75, "y":2},
- {"label":"K28 (B2,D6)", "x":7.75, "y":2},
- {"label":"K29 (B2,D7)", "x":8.75, "y":2},
- {"label":"K2A (B2,F0)", "x":9.75, "y":2},
- {"label":"K2B (B2,F1)", "x":10.75, "y":2},
- {"label":"K2C (B2,F4)", "x":11.75, "y":2},
- {"label":"K2E (B2,F6)", "x":12.75, "y":2, "w":2.25},
- {"label":"K2F (B2,F7)", "x":15, "y":2},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2},
+ {"matrix": [2, 12], "x": 11.75, "y": 2},
+ {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 15], "x": 15, "y": 2},
- {"label":"K30 (B3,C6)", "x":0, "y":3, "w":1.25},
- {"label":"K31 (B3,C7)", "x":1.25, "y":3},
- {"label":"K32 (B3,D0)", "x":2.25, "y":3},
- {"label":"K33 (B3,D1)", "x":3.25, "y":3},
- {"label":"K34 (B3,D2)", "x":4.25, "y":3},
- {"label":"K35 (B3,D3)", "x":5.25, "y":3},
- {"label":"K36 (B3,D4)", "x":6.25, "y":3},
- {"label":"K37 (B3,D5)", "x":7.25, "y":3},
- {"label":"K38 (B3,D6)", "x":8.25, "y":3},
- {"label":"K39 (B3,D7)", "x":9.25, "y":3},
- {"label":"K3A (B3,F0)", "x":10.25, "y":3},
- {"label":"K3B (B3,F1)", "x":11.25, "y":3},
- {"label":"K3D (B3,F5)", "x":12.25, "y":3, "w":1.75},
- {"label":"K3E (B3,F6)", "x":14, "y":3},
- {"label":"K3F (B3,F7)", "x":15, "y":3},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+ {"matrix": [3, 15], "x": 15, "y": 3},
- {"label":"K40 (B4,C6)", "x":0, "y":4, "w":1.25},
- {"label":"K41 (B4,C7)", "x":1.25, "y":4, "w":1.25},
- {"label":"K43 (B4,D1)", "x":2.5, "y":4, "w":1.25},
- {"label":"K46 (B4,D4)", "x":3.75, "y":4, "w":6.25},
- {"label":"K4A (B4,F0)", "x":10, "y":4},
- {"label":"K4B (B4,F1)", "x":11, "y":4},
- {"label":"K4C (B4,F4)", "x":12, "y":4},
- {"label":"K4D (B4,F5)", "x":13, "y":4},
- {"label":"K4E (B4,F6)", "x":14, "y":4},
- {"label":"K4F (B4,F7)", "x":15, "y":4}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4},
+ {"matrix": [4, 11], "x": 11, "y": 4},
+ {"matrix": [4, 12], "x": 12, "y": 4},
+ {"matrix": [4, 13], "x": 13, "y": 4},
+ {"matrix": [4, 14], "x": 14, "y": 4},
+ {"matrix": [4, 15], "x": 15, "y": 4}
]
},
"LAYOUT_65_ansi_blocker": {
"layout": [
- {"label":"K00 (B0,C6)", "x":0, "y":0},
- {"label":"K01 (B0,C7)", "x":1, "y":0},
- {"label":"K02 (B0,D0)", "x":2, "y":0},
- {"label":"K03 (B0,D1)", "x":3, "y":0},
- {"label":"K04 (B0,D2)", "x":4, "y":0},
- {"label":"K05 (B0,D3)", "x":5, "y":0},
- {"label":"K06 (B0,D4)", "x":6, "y":0},
- {"label":"K07 (B0,D5)", "x":7, "y":0},
- {"label":"K08 (B0,D6)", "x":8, "y":0},
- {"label":"K09 (B0,D7)", "x":9, "y":0},
- {"label":"K0A (B0,F0)", "x":10, "y":0},
- {"label":"K0B (B0,F1)", "x":11, "y":0},
- {"label":"K0C (B0,F4)", "x":12, "y":0},
- {"label":"K0D (B0,F5)", "x":13, "y":0, "w":2},
- {"label":"K0F (B0,F7)", "x":15, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 15], "x": 15, "y": 0},
- {"label":"K10 (B1,C6)", "x":0, "y":1, "w":1.5},
- {"label":"K12 (B1,D0)", "x":1.5, "y":1},
- {"label":"K13 (B1,D1)", "x":2.5, "y":1},
- {"label":"K14 (B1,D2)", "x":3.5, "y":1},
- {"label":"K15 (B1,D3)", "x":4.5, "y":1},
- {"label":"K16 (B1,D4)", "x":5.5, "y":1},
- {"label":"K17 (B1,D5)", "x":6.5, "y":1},
- {"label":"K18 (B1,D6)", "x":7.5, "y":1},
- {"label":"K19 (B1,D7)", "x":8.5, "y":1},
- {"label":"K1A (B1,F0)", "x":9.5, "y":1},
- {"label":"K1B (B1,F1)", "x":10.5, "y":1},
- {"label":"K1C (B1,F4)", "x":11.5, "y":1},
- {"label":"K1D (B1,F5)", "x":12.5, "y":1},
- {"label":"K1E (B1,F6)", "x":13.5, "y":1, "w":1.5},
- {"label":"K1F (B1,F7)", "x":15, "y":1},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 1.5, "y": 1},
+ {"matrix": [1, 3], "x": 2.5, "y": 1},
+ {"matrix": [1, 4], "x": 3.5, "y": 1},
+ {"matrix": [1, 5], "x": 4.5, "y": 1},
+ {"matrix": [1, 6], "x": 5.5, "y": 1},
+ {"matrix": [1, 7], "x": 6.5, "y": 1},
+ {"matrix": [1, 8], "x": 7.5, "y": 1},
+ {"matrix": [1, 9], "x": 8.5, "y": 1},
+ {"matrix": [1, 10], "x": 9.5, "y": 1},
+ {"matrix": [1, 11], "x": 10.5, "y": 1},
+ {"matrix": [1, 12], "x": 11.5, "y": 1},
+ {"matrix": [1, 13], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 15], "x": 15, "y": 1},
- {"label":"K20 (B2,C6)", "x":0, "y":2, "w":1.75},
- {"label":"K22 (B2,D0)", "x":1.75, "y":2},
- {"label":"K23 (B2,D1)", "x":2.75, "y":2},
- {"label":"K24 (B2,D2)", "x":3.75, "y":2},
- {"label":"K25 (B2,D3)", "x":4.75, "y":2},
- {"label":"K26 (B2,D4)", "x":5.75, "y":2},
- {"label":"K27 (B2,D5)", "x":6.75, "y":2},
- {"label":"K28 (B2,D6)", "x":7.75, "y":2},
- {"label":"K29 (B2,D7)", "x":8.75, "y":2},
- {"label":"K2A (B2,F0)", "x":9.75, "y":2},
- {"label":"K2B (B2,F1)", "x":10.75, "y":2},
- {"label":"K2C (B2,F4)", "x":11.75, "y":2},
- {"label":"K2E (B2,F6)", "x":12.75, "y":2, "w":2.25},
- {"label":"K2F (B2,F7)", "x":15, "y":2},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2},
+ {"matrix": [2, 12], "x": 11.75, "y": 2},
+ {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 15], "x": 15, "y": 2},
- {"label":"K30 (B3,C6)", "x":0, "y":3, "w":2.25},
- {"label":"K32 (B3,D0)", "x":2.25, "y":3},
- {"label":"K33 (B3,D1)", "x":3.25, "y":3},
- {"label":"K34 (B3,D2)", "x":4.25, "y":3},
- {"label":"K35 (B3,D3)", "x":5.25, "y":3},
- {"label":"K36 (B3,D4)", "x":6.25, "y":3},
- {"label":"K37 (B3,D5)", "x":7.25, "y":3},
- {"label":"K38 (B3,D6)", "x":8.25, "y":3},
- {"label":"K39 (B3,D7)", "x":9.25, "y":3},
- {"label":"K3A (B3,F0)", "x":10.25, "y":3},
- {"label":"K3B (B3,F1)", "x":11.25, "y":3},
- {"label":"K3D (B3,F5)", "x":12.25, "y":3, "w":1.75},
- {"label":"K3E (B3,F6)", "x":14, "y":3},
- {"label":"K3F (B3,F7)", "x":15, "y":3},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+ {"matrix": [3, 15], "x": 15, "y": 3},
- {"label":"K40 (B4,C6)", "x":0, "y":4, "w":1.25},
- {"label":"K41 (B4,C7)", "x":1.25, "y":4, "w":1.25},
- {"label":"K43 (B4,D1)", "x":2.5, "y":4, "w":1.25},
- {"label":"K46 (B4,D4)", "x":3.75, "y":4, "w":6.25},
- {"label":"K4A (B4,F0)", "x":10, "y":4, "w":1.25},
- {"label":"K4B (B4,F1)", "x":11.25, "y":4, "w":1.25},
- {"label":"K4D (B4,F5)", "x":13, "y":4},
- {"label":"K4E (B4,F6)", "x":14, "y":4},
- {"label":"K4F (B4,F7)", "x":15, "y":4}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13, "y": 4},
+ {"matrix": [4, 14], "x": 14, "y": 4},
+ {"matrix": [4, 15], "x": 15, "y": 4}
]
},
"LAYOUT_65_ansi_blocker_split_bs": {
"layout": [
- {"label":"K00 (B0,C6)", "x":0, "y":0},
- {"label":"K01 (B0,C7)", "x":1, "y":0},
- {"label":"K02 (B0,D0)", "x":2, "y":0},
- {"label":"K03 (B0,D1)", "x":3, "y":0},
- {"label":"K04 (B0,D2)", "x":4, "y":0},
- {"label":"K05 (B0,D3)", "x":5, "y":0},
- {"label":"K06 (B0,D4)", "x":6, "y":0},
- {"label":"K07 (B0,D5)", "x":7, "y":0},
- {"label":"K08 (B0,D6)", "x":8, "y":0},
- {"label":"K09 (B0,D7)", "x":9, "y":0},
- {"label":"K0A (B0,F0)", "x":10, "y":0},
- {"label":"K0B (B0,F1)", "x":11, "y":0},
- {"label":"K0C (B0,F4)", "x":12, "y":0},
- {"label":"K0D (B0,F5)", "x":13, "y":0},
- {"label":"K0E (B0,F6)", "x":14, "y":0},
- {"label":"K0F (B0,F7)", "x":15, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 15], "x": 15, "y": 0},
- {"label":"K10 (B1,C6)", "x":0, "y":1, "w":1.5},
- {"label":"K12 (B1,D0)", "x":1.5, "y":1},
- {"label":"K13 (B1,D1)", "x":2.5, "y":1},
- {"label":"K14 (B1,D2)", "x":3.5, "y":1},
- {"label":"K15 (B1,D3)", "x":4.5, "y":1},
- {"label":"K16 (B1,D4)", "x":5.5, "y":1},
- {"label":"K17 (B1,D5)", "x":6.5, "y":1},
- {"label":"K18 (B1,D6)", "x":7.5, "y":1},
- {"label":"K19 (B1,D7)", "x":8.5, "y":1},
- {"label":"K1A (B1,F0)", "x":9.5, "y":1},
- {"label":"K1B (B1,F1)", "x":10.5, "y":1},
- {"label":"K1C (B1,F4)", "x":11.5, "y":1},
- {"label":"K1D (B1,F5)", "x":12.5, "y":1},
- {"label":"K1E (B1,F6)", "x":13.5, "y":1, "w":1.5},
- {"label":"K1F (B1,F7)", "x":15, "y":1},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 1.5, "y": 1},
+ {"matrix": [1, 3], "x": 2.5, "y": 1},
+ {"matrix": [1, 4], "x": 3.5, "y": 1},
+ {"matrix": [1, 5], "x": 4.5, "y": 1},
+ {"matrix": [1, 6], "x": 5.5, "y": 1},
+ {"matrix": [1, 7], "x": 6.5, "y": 1},
+ {"matrix": [1, 8], "x": 7.5, "y": 1},
+ {"matrix": [1, 9], "x": 8.5, "y": 1},
+ {"matrix": [1, 10], "x": 9.5, "y": 1},
+ {"matrix": [1, 11], "x": 10.5, "y": 1},
+ {"matrix": [1, 12], "x": 11.5, "y": 1},
+ {"matrix": [1, 13], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 15], "x": 15, "y": 1},
- {"label":"K20 (B2,C6)", "x":0, "y":2, "w":1.75},
- {"label":"K22 (B2,D0)", "x":1.75, "y":2},
- {"label":"K23 (B2,D1)", "x":2.75, "y":2},
- {"label":"K24 (B2,D2)", "x":3.75, "y":2},
- {"label":"K25 (B2,D3)", "x":4.75, "y":2},
- {"label":"K26 (B2,D4)", "x":5.75, "y":2},
- {"label":"K27 (B2,D5)", "x":6.75, "y":2},
- {"label":"K28 (B2,D6)", "x":7.75, "y":2},
- {"label":"K29 (B2,D7)", "x":8.75, "y":2},
- {"label":"K2A (B2,F0)", "x":9.75, "y":2},
- {"label":"K2B (B2,F1)", "x":10.75, "y":2},
- {"label":"K2C (B2,F4)", "x":11.75, "y":2},
- {"label":"K2E (B2,F6)", "x":12.75, "y":2, "w":2.25},
- {"label":"K2F (B2,F7)", "x":15, "y":2},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2},
+ {"matrix": [2, 12], "x": 11.75, "y": 2},
+ {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 15], "x": 15, "y": 2},
- {"label":"K30 (B3,C6)", "x":0, "y":3, "w":2.25},
- {"label":"K32 (B3,D0)", "x":2.25, "y":3},
- {"label":"K33 (B3,D1)", "x":3.25, "y":3},
- {"label":"K34 (B3,D2)", "x":4.25, "y":3},
- {"label":"K35 (B3,D3)", "x":5.25, "y":3},
- {"label":"K36 (B3,D4)", "x":6.25, "y":3},
- {"label":"K37 (B3,D5)", "x":7.25, "y":3},
- {"label":"K38 (B3,D6)", "x":8.25, "y":3},
- {"label":"K39 (B3,D7)", "x":9.25, "y":3},
- {"label":"K3A (B3,F0)", "x":10.25, "y":3},
- {"label":"K3B (B3,F1)", "x":11.25, "y":3},
- {"label":"K3D (B3,F5)", "x":12.25, "y":3, "w":1.75},
- {"label":"K3E (B3,F6)", "x":14, "y":3},
- {"label":"K3F (B3,F7)", "x":15, "y":3},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+ {"matrix": [3, 15], "x": 15, "y": 3},
- {"label":"K40 (B4,C6)", "x":0, "y":4, "w":1.25},
- {"label":"K41 (B4,C7)", "x":1.25, "y":4, "w":1.25},
- {"label":"K43 (B4,D1)", "x":2.5, "y":4, "w":1.25},
- {"label":"K46 (B4,D4)", "x":3.75, "y":4, "w":6.25},
- {"label":"K4A (B4,F0)", "x":10, "y":4, "w":1.25},
- {"label":"K4B (B4,F1)", "x":11.25, "y":4, "w":1.25},
- {"label":"K4D (B4,F5)", "x":13, "y":4},
- {"label":"K4E (B4,F6)", "x":14, "y":4},
- {"label":"K4F (B4,F7)", "x":15, "y":4}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13, "y": 4},
+ {"matrix": [4, 14], "x": 14, "y": 4},
+ {"matrix": [4, 15], "x": 15, "y": 4}
]
},
"LAYOUT_65_iso_blocker": {
"layout": [
- {"label":"K00 (B0,C6)", "x":0, "y":0},
- {"label":"K01 (B0,C7)", "x":1, "y":0},
- {"label":"K02 (B0,D0)", "x":2, "y":0},
- {"label":"K03 (B0,D1)", "x":3, "y":0},
- {"label":"K04 (B0,D2)", "x":4, "y":0},
- {"label":"K05 (B0,D3)", "x":5, "y":0},
- {"label":"K06 (B0,D4)", "x":6, "y":0},
- {"label":"K07 (B0,D5)", "x":7, "y":0},
- {"label":"K08 (B0,D6)", "x":8, "y":0},
- {"label":"K09 (B0,D7)", "x":9, "y":0},
- {"label":"K0A (B0,F0)", "x":10, "y":0},
- {"label":"K0B (B0,F1)", "x":11, "y":0},
- {"label":"K0C (B0,F4)", "x":12, "y":0},
- {"label":"K0D (B0,F5)", "x":13, "y":0, "w":2},
- {"label":"K0F (B0,F7)", "x":15, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 15], "x": 15, "y": 0},
- {"label":"K10 (B1,C6)", "x":0, "y":1, "w":1.5},
- {"label":"K12 (B1,D0)", "x":1.5, "y":1},
- {"label":"K13 (B1,D1)", "x":2.5, "y":1},
- {"label":"K14 (B1,D2)", "x":3.5, "y":1},
- {"label":"K15 (B1,D3)", "x":4.5, "y":1},
- {"label":"K16 (B1,D4)", "x":5.5, "y":1},
- {"label":"K17 (B1,D5)", "x":6.5, "y":1},
- {"label":"K18 (B1,D6)", "x":7.5, "y":1},
- {"label":"K19 (B1,D7)", "x":8.5, "y":1},
- {"label":"K1A (B1,F0)", "x":9.5, "y":1},
- {"label":"K1B (B1,F1)", "x":10.5, "y":1},
- {"label":"K1C (B1,F4)", "x":11.5, "y":1},
- {"label":"K1D (B1,F5)", "x":12.5, "y":1},
- {"label":"K1F (B1,F7)", "x":15, "y":1},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 1.5, "y": 1},
+ {"matrix": [1, 3], "x": 2.5, "y": 1},
+ {"matrix": [1, 4], "x": 3.5, "y": 1},
+ {"matrix": [1, 5], "x": 4.5, "y": 1},
+ {"matrix": [1, 6], "x": 5.5, "y": 1},
+ {"matrix": [1, 7], "x": 6.5, "y": 1},
+ {"matrix": [1, 8], "x": 7.5, "y": 1},
+ {"matrix": [1, 9], "x": 8.5, "y": 1},
+ {"matrix": [1, 10], "x": 9.5, "y": 1},
+ {"matrix": [1, 11], "x": 10.5, "y": 1},
+ {"matrix": [1, 12], "x": 11.5, "y": 1},
+ {"matrix": [1, 13], "x": 12.5, "y": 1},
+ {"matrix": [1, 15], "x": 15, "y": 1},
- {"label":"K20 (B2,C6)", "x":0, "y":2, "w":1.75},
- {"label":"K22 (B2,D0)", "x":1.75, "y":2},
- {"label":"K23 (B2,D1)", "x":2.75, "y":2},
- {"label":"K24 (B2,D2)", "x":3.75, "y":2},
- {"label":"K25 (B2,D3)", "x":4.75, "y":2},
- {"label":"K26 (B2,D4)", "x":5.75, "y":2},
- {"label":"K27 (B2,D5)", "x":6.75, "y":2},
- {"label":"K28 (B2,D6)", "x":7.75, "y":2},
- {"label":"K29 (B2,D7)", "x":8.75, "y":2},
- {"label":"K2A (B2,F0)", "x":9.75, "y":2},
- {"label":"K2B (B2,F1)", "x":10.75, "y":2},
- {"label":"K2C (B2,F4)", "x":11.75, "y":2},
- {"label":"K2E (B2,F6)", "x":12.75, "y":2},
- {"label":"K1E (B1,F6)", "x":13.75, "y":1, "w":1.25, "h":2},
- {"label":"K2F (B2,F7)", "x":15, "y":2},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2},
+ {"matrix": [2, 12], "x": 11.75, "y": 2},
+ {"matrix": [2, 14], "x": 12.75, "y": 2},
+ {"matrix": [1, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [2, 15], "x": 15, "y": 2},
- {"label":"K30 (B3,C6)", "x":0, "y":3, "w":1.25},
- {"label":"K31 (B3,C7)", "x":1.25, "y":3},
- {"label":"K32 (B3,D0)", "x":2.25, "y":3},
- {"label":"K33 (B3,D1)", "x":3.25, "y":3},
- {"label":"K34 (B3,D2)", "x":4.25, "y":3},
- {"label":"K35 (B3,D3)", "x":5.25, "y":3},
- {"label":"K36 (B3,D4)", "x":6.25, "y":3},
- {"label":"K37 (B3,D5)", "x":7.25, "y":3},
- {"label":"K38 (B3,D6)", "x":8.25, "y":3},
- {"label":"K39 (B3,D7)", "x":9.25, "y":3},
- {"label":"K3A (B3,F0)", "x":10.25, "y":3},
- {"label":"K3B (B3,F1)", "x":11.25, "y":3},
- {"label":"K3D (B3,F5)", "x":12.25, "y":3, "w":1.75},
- {"label":"K3E (B3,F6)", "x":14, "y":3},
- {"label":"K3F (B3,F7)", "x":15, "y":3},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+ {"matrix": [3, 15], "x": 15, "y": 3},
- {"label":"K40 (B4,C6)", "x":0, "y":4, "w":1.25},
- {"label":"K41 (B4,C7)", "x":1.25, "y":4, "w":1.25},
- {"label":"K43 (B4,D1)", "x":2.5, "y":4, "w":1.25},
- {"label":"K46 (B4,D4)", "x":3.75, "y":4, "w":6.25},
- {"label":"K4A (B4,F0)", "x":10, "y":4, "w":1.25},
- {"label":"K4B (B4,F1)", "x":11.25, "y":4, "w":1.25},
- {"label":"K4D (B4,F5)", "x":13, "y":4},
- {"label":"K4E (B4,F6)", "x":14, "y":4},
- {"label":"K4F (B4,F7)", "x":15, "y":4}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13, "y": 4},
+ {"matrix": [4, 14], "x": 14, "y": 4},
+ {"matrix": [4, 15], "x": 15, "y": 4}
]
},
"LAYOUT_65_iso_blocker_split_bs": {
"layout": [
- {"label":"K00 (B0,C6)", "x":0, "y":0},
- {"label":"K01 (B0,C7)", "x":1, "y":0},
- {"label":"K02 (B0,D0)", "x":2, "y":0},
- {"label":"K03 (B0,D1)", "x":3, "y":0},
- {"label":"K04 (B0,D2)", "x":4, "y":0},
- {"label":"K05 (B0,D3)", "x":5, "y":0},
- {"label":"K06 (B0,D4)", "x":6, "y":0},
- {"label":"K07 (B0,D5)", "x":7, "y":0},
- {"label":"K08 (B0,D6)", "x":8, "y":0},
- {"label":"K09 (B0,D7)", "x":9, "y":0},
- {"label":"K0A (B0,F0)", "x":10, "y":0},
- {"label":"K0B (B0,F1)", "x":11, "y":0},
- {"label":"K0C (B0,F4)", "x":12, "y":0},
- {"label":"K0D (B0,F5)", "x":13, "y":0},
- {"label":"K0E (B0,F6)", "x":14, "y":0},
- {"label":"K0F (B0,F7)", "x":15, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 15], "x": 15, "y": 0},
- {"label":"K10 (B1,C6)", "x":0, "y":1, "w":1.5},
- {"label":"K12 (B1,D0)", "x":1.5, "y":1},
- {"label":"K13 (B1,D1)", "x":2.5, "y":1},
- {"label":"K14 (B1,D2)", "x":3.5, "y":1},
- {"label":"K15 (B1,D3)", "x":4.5, "y":1},
- {"label":"K16 (B1,D4)", "x":5.5, "y":1},
- {"label":"K17 (B1,D5)", "x":6.5, "y":1},
- {"label":"K18 (B1,D6)", "x":7.5, "y":1},
- {"label":"K19 (B1,D7)", "x":8.5, "y":1},
- {"label":"K1A (B1,F0)", "x":9.5, "y":1},
- {"label":"K1B (B1,F1)", "x":10.5, "y":1},
- {"label":"K1C (B1,F4)", "x":11.5, "y":1},
- {"label":"K1D (B1,F5)", "x":12.5, "y":1},
- {"label":"K1F (B1,F7)", "x":15, "y":1},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 1.5, "y": 1},
+ {"matrix": [1, 3], "x": 2.5, "y": 1},
+ {"matrix": [1, 4], "x": 3.5, "y": 1},
+ {"matrix": [1, 5], "x": 4.5, "y": 1},
+ {"matrix": [1, 6], "x": 5.5, "y": 1},
+ {"matrix": [1, 7], "x": 6.5, "y": 1},
+ {"matrix": [1, 8], "x": 7.5, "y": 1},
+ {"matrix": [1, 9], "x": 8.5, "y": 1},
+ {"matrix": [1, 10], "x": 9.5, "y": 1},
+ {"matrix": [1, 11], "x": 10.5, "y": 1},
+ {"matrix": [1, 12], "x": 11.5, "y": 1},
+ {"matrix": [1, 13], "x": 12.5, "y": 1},
+ {"matrix": [1, 15], "x": 15, "y": 1},
- {"label":"K20 (B2,C6)", "x":0, "y":2, "w":1.75},
- {"label":"K22 (B2,D0)", "x":1.75, "y":2},
- {"label":"K23 (B2,D1)", "x":2.75, "y":2},
- {"label":"K24 (B2,D2)", "x":3.75, "y":2},
- {"label":"K25 (B2,D3)", "x":4.75, "y":2},
- {"label":"K26 (B2,D4)", "x":5.75, "y":2},
- {"label":"K27 (B2,D5)", "x":6.75, "y":2},
- {"label":"K28 (B2,D6)", "x":7.75, "y":2},
- {"label":"K29 (B2,D7)", "x":8.75, "y":2},
- {"label":"K2A (B2,F0)", "x":9.75, "y":2},
- {"label":"K2B (B2,F1)", "x":10.75, "y":2},
- {"label":"K2C (B2,F4)", "x":11.75, "y":2},
- {"label":"K2E (B2,F6)", "x":12.75, "y":2},
- {"label":"K1E (B1,F6)", "x":13.75, "y":1, "w":1.25, "h":2},
- {"label":"K2F (B2,F7)", "x":15, "y":2},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2},
+ {"matrix": [2, 12], "x": 11.75, "y": 2},
+ {"matrix": [2, 14], "x": 12.75, "y": 2},
+ {"matrix": [1, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [2, 15], "x": 15, "y": 2},
- {"label":"K30 (B3,C6)", "x":0, "y":3, "w":1.25},
- {"label":"K31 (B3,C7)", "x":1.25, "y":3},
- {"label":"K32 (B3,D0)", "x":2.25, "y":3},
- {"label":"K33 (B3,D1)", "x":3.25, "y":3},
- {"label":"K34 (B3,D2)", "x":4.25, "y":3},
- {"label":"K35 (B3,D3)", "x":5.25, "y":3},
- {"label":"K36 (B3,D4)", "x":6.25, "y":3},
- {"label":"K37 (B3,D5)", "x":7.25, "y":3},
- {"label":"K38 (B3,D6)", "x":8.25, "y":3},
- {"label":"K39 (B3,D7)", "x":9.25, "y":3},
- {"label":"K3A (B3,F0)", "x":10.25, "y":3},
- {"label":"K3B (B3,F1)", "x":11.25, "y":3},
- {"label":"K3D (B3,F5)", "x":12.25, "y":3, "w":1.75},
- {"label":"K3E (B3,F6)", "x":14, "y":3},
- {"label":"K3F (B3,F7)", "x":15, "y":3},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+ {"matrix": [3, 15], "x": 15, "y": 3},
- {"label":"K40 (B4,C6)", "x":0, "y":4, "w":1.25},
- {"label":"K41 (B4,C7)", "x":1.25, "y":4, "w":1.25},
- {"label":"K43 (B4,D1)", "x":2.5, "y":4, "w":1.25},
- {"label":"K46 (B4,D4)", "x":3.75, "y":4, "w":6.25},
- {"label":"K4A (B4,F0)", "x":10, "y":4, "w":1.25},
- {"label":"K4B (B4,F1)", "x":11.25, "y":4, "w":1.25},
- {"label":"K4D (B4,F5)", "x":13, "y":4},
- {"label":"K4E (B4,F6)", "x":14, "y":4},
- {"label":"K4F (B4,F7)", "x":15, "y":4}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13, "y": 4},
+ {"matrix": [4, 14], "x": 14, "y": 4},
+ {"matrix": [4, 15], "x": 15, "y": 4}
]
}
},
diff --git a/keyboards/ft/mars65/mars65.c b/keyboards/ft/mars65/mars65.c
deleted file mode 100644
index d4fbf86d5a..0000000000
--- a/keyboards/ft/mars65/mars65.c
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2022 wonderbeel (https://github.com/wonderbeel)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "mars65.h"
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
-
diff --git a/keyboards/ft/mars65/mars65.h b/keyboards/ft/mars65/mars65.h
deleted file mode 100644
index 8627ad09bb..0000000000
--- a/keyboards/ft/mars65/mars65.h
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright 2022 wonderbeel (https://github.com/wonderbeel)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* ANSI
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───────┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │ │0D │ 2u Backspace
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ └───────┘
- * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │1F │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2E │2F │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D │3E │3F │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40 │41 │43 │46 │4A │4B │ │4D │4E │4F │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- */
-
-
-/* ISO
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───────┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │ │0D │ 2u Backspace
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ └───────┘
- * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │ 1E │1F │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ ├───┤
- * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2E │ │2F │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
- * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D │3E │3F │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40 │41 │43 │46 │4A │4B │ │4D │4E │4F │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- */
-
-#define LAYOUT_all( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
- K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
- K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, K2F, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \
- K40, K41, K43, K46, K4A, K4B, K4C, K4D, K4E, K4F \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
- { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
- { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
- { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_65_ansi_blocker( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, \
- K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
- K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, K2F, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \
- K40, K41, K43, K46, K4A, K4B, K4D, K4E, K4F \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F }, \
- { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
- { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F }, \
- { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
- { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, XXX, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_65_ansi_blocker_split_bs( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
- K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
- K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, K2F, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \
- K40, K41, K43, K46, K4A, K4B, K4D, K4E, K4F \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
- { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
- { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F }, \
- { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
- { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, XXX, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_65_iso_blocker( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, \
- K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1F, \
- K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, K1E, K2F, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \
- K40, K41, K43, K46, K4A, K4B, K4D, K4E, K4F \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F }, \
- { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
- { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
- { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, XXX, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_65_iso_blocker_split_bs( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
- K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1F, \
- K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, K1E, K2F, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \
- K40, K41, K43, K46, K4A, K4B, K4D, K4E, K4F \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
- { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
- { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
- { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, XXX, K4D, K4E, K4F }, \
-}
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
-
diff --git a/keyboards/ft/mars80/config.h b/keyboards/ft/mars80/config.h
index 727718e396..116c09d6ac 100644
--- a/keyboards/ft/mars80/config.h
+++ b/keyboards/ft/mars80/config.h
@@ -20,12 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLED_NUM 20
-// 0 1 2 3 4 5 6 7 8 9 A B C D
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B5, B6, B7 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2 }
-
-#define DIODE_DIRECTION COL2ROW
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/ft/mars80/info.json b/keyboards/ft/mars80/info.json
index ff451d8bcf..c2d0f0a5a6 100644
--- a/keyboards/ft/mars80/info.json
+++ b/keyboards/ft/mars80/info.json
@@ -8,9 +8,17 @@
"pid": "0x422D",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2"],
+ "rows": ["B0", "B1", "B2", "B3", "B5", "B6", "B7"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "D4"
},
+ "ws2812": {
+ "driver": "i2c"
+ },
"indicators": {
"caps_lock": "D1",
"scroll_lock": "D6"
@@ -20,11 +28,213 @@
"community_layouts": ["tkl_ansi", "tkl_iso"],
"layouts": {
"LAYOUT_tkl_ansi": {
- "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5, "w":2}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5, "w":2.25}, {"x":0, "y":4.5, "w":2.25}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":2.75}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.25}, {"x":1.25, "y":5.5, "w":1.25}, {"x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"x":10, "y":5.5, "w":1.25}, {"x":11.25, "y":5.5, "w":1.25}, {"x":12.5, "y":5.5, "w":1.25}, {"x":13.75, "y":5.5, "w":1.25}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}]
- },
+ "layout": [
+ {"matrix": [1, 1], "x": 0, "y": 0},
+
+ {"matrix": [1, 3], "x": 2, "y": 0},
+ {"matrix": [1, 4], "x": 3, "y": 0},
+ {"matrix": [1, 5], "x": 4, "y": 0},
+ {"matrix": [1, 6], "x": 5, "y": 0},
+
+ {"matrix": [1, 8], "x": 6.5, "y": 0},
+ {"matrix": [1, 9], "x": 7.5, "y": 0},
+ {"matrix": [1, 10], "x": 8.5, "y": 0},
+ {"matrix": [1, 11], "x": 9.5, "y": 0},
+
+ {"matrix": [1, 12], "x": 11, "y": 0},
+ {"matrix": [1, 0], "x": 12, "y": 0},
+ {"matrix": [1, 13], "x": 13, "y": 0},
+ {"matrix": [1, 2], "x": 14, "y": 0},
+
+ {"matrix": [0, 2], "x": 15.25, "y": 0},
+ {"matrix": [0, 3], "x": 16.25, "y": 0},
+ {"matrix": [0, 0], "x": 17.25, "y": 0},
+
+ {"matrix": [2, 1], "x": 0, "y": 1.5},
+ {"matrix": [2, 2], "x": 1, "y": 1.5},
+ {"matrix": [2, 3], "x": 2, "y": 1.5},
+ {"matrix": [2, 4], "x": 3, "y": 1.5},
+ {"matrix": [2, 5], "x": 4, "y": 1.5},
+ {"matrix": [2, 6], "x": 5, "y": 1.5},
+ {"matrix": [2, 7], "x": 6, "y": 1.5},
+ {"matrix": [2, 8], "x": 7, "y": 1.5},
+ {"matrix": [2, 9], "x": 8, "y": 1.5},
+ {"matrix": [2, 10], "x": 9, "y": 1.5},
+ {"matrix": [2, 11], "x": 10, "y": 1.5},
+ {"matrix": [2, 12], "x": 11, "y": 1.5},
+ {"matrix": [2, 0], "x": 12, "y": 1.5},
+ {"matrix": [2, 13], "x": 13, "y": 1.5, "w": 2},
+
+ {"matrix": [0, 7], "x": 15.25, "y": 1.5},
+ {"matrix": [0, 6], "x": 16.25, "y": 1.5},
+ {"matrix": [0, 5], "x": 17.25, "y": 1.5},
+
+ {"matrix": [3, 1], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [3, 2], "x": 1.5, "y": 2.5},
+ {"matrix": [3, 3], "x": 2.5, "y": 2.5},
+ {"matrix": [3, 4], "x": 3.5, "y": 2.5},
+ {"matrix": [3, 5], "x": 4.5, "y": 2.5},
+ {"matrix": [3, 6], "x": 5.5, "y": 2.5},
+ {"matrix": [3, 7], "x": 6.5, "y": 2.5},
+ {"matrix": [3, 8], "x": 7.5, "y": 2.5},
+ {"matrix": [3, 9], "x": 8.5, "y": 2.5},
+ {"matrix": [3, 10], "x": 9.5, "y": 2.5},
+ {"matrix": [3, 11], "x": 10.5, "y": 2.5},
+ {"matrix": [3, 12], "x": 11.5, "y": 2.5},
+ {"matrix": [3, 0], "x": 12.5, "y": 2.5},
+ {"matrix": [3, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"matrix": [0, 13], "x": 15.25, "y": 2.5},
+ {"matrix": [0, 9], "x": 16.25, "y": 2.5},
+ {"matrix": [0, 8], "x": 17.25, "y": 2.5},
+
+ {"matrix": [4, 1], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [4, 2], "x": 1.75, "y": 3.5},
+ {"matrix": [4, 3], "x": 2.75, "y": 3.5},
+ {"matrix": [4, 4], "x": 3.75, "y": 3.5},
+ {"matrix": [4, 5], "x": 4.75, "y": 3.5},
+ {"matrix": [4, 6], "x": 5.75, "y": 3.5},
+ {"matrix": [4, 7], "x": 6.75, "y": 3.5},
+ {"matrix": [4, 8], "x": 7.75, "y": 3.5},
+ {"matrix": [4, 9], "x": 8.75, "y": 3.5},
+ {"matrix": [4, 10], "x": 9.75, "y": 3.5},
+ {"matrix": [4, 11], "x": 10.75, "y": 3.5},
+ {"matrix": [4, 12], "x": 11.75, "y": 3.5},
+ {"matrix": [4, 0], "x": 12.75, "y": 3.5, "w": 2.25},
+
+ {"matrix": [5, 1], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [5, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [5, 3], "x": 3.25, "y": 4.5},
+ {"matrix": [5, 4], "x": 4.25, "y": 4.5},
+ {"matrix": [5, 5], "x": 5.25, "y": 4.5},
+ {"matrix": [5, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [5, 7], "x": 7.25, "y": 4.5},
+ {"matrix": [5, 8], "x": 8.25, "y": 4.5},
+ {"matrix": [5, 9], "x": 9.25, "y": 4.5},
+ {"matrix": [5, 10], "x": 10.25, "y": 4.5},
+ {"matrix": [5, 11], "x": 11.25, "y": 4.5},
+ {"matrix": [5, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+ {"matrix": [5, 13], "x": 16.25, "y": 4.5},
+
+ {"matrix": [6, 1], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [6, 2], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [6, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [6, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [6, 9], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [6, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [6, 11], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [6, 12], "x": 13.75, "y": 5.5, "w": 1.25},
+ {"matrix": [6, 0], "x": 15.25, "y": 5.5},
+ {"matrix": [6, 13], "x": 16.25, "y": 5.5},
+ {"matrix": [6, 8], "x": 17.25, "y": 5.5}
+ ]
+ },
"LAYOUT_tkl_iso": {
- "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5, "w":2}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.75, "y":2.5, "w":1.25, "h":2}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":2.75}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.25}, {"x":1.25, "y":5.5, "w":1.25}, {"x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"x":10, "y":5.5, "w":1.25}, {"x":11.25, "y":5.5, "w":1.25}, {"x":12.5, "y":5.5, "w":1.25}, {"x":13.75, "y":5.5, "w":1.25}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}]
+ "layout": [
+ {"matrix": [1, 1], "x": 0, "y": 0},
+
+ {"matrix": [1, 3], "x": 2, "y": 0},
+ {"matrix": [1, 4], "x": 3, "y": 0},
+ {"matrix": [1, 5], "x": 4, "y": 0},
+ {"matrix": [1, 6], "x": 5, "y": 0},
+
+ {"matrix": [1, 8], "x": 6.5, "y": 0},
+ {"matrix": [1, 9], "x": 7.5, "y": 0},
+ {"matrix": [1, 10], "x": 8.5, "y": 0},
+ {"matrix": [1, 11], "x": 9.5, "y": 0},
+
+ {"matrix": [1, 12], "x": 11, "y": 0},
+ {"matrix": [1, 0], "x": 12, "y": 0},
+ {"matrix": [1, 13], "x": 13, "y": 0},
+ {"matrix": [1, 2], "x": 14, "y": 0},
+
+ {"matrix": [0, 2], "x": 15.25, "y": 0},
+ {"matrix": [0, 3], "x": 16.25, "y": 0},
+ {"matrix": [0, 0], "x": 17.25, "y": 0},
+
+ {"matrix": [2, 1], "x": 0, "y": 1.5},
+ {"matrix": [2, 2], "x": 1, "y": 1.5},
+ {"matrix": [2, 3], "x": 2, "y": 1.5},
+ {"matrix": [2, 4], "x": 3, "y": 1.5},
+ {"matrix": [2, 5], "x": 4, "y": 1.5},
+ {"matrix": [2, 6], "x": 5, "y": 1.5},
+ {"matrix": [2, 7], "x": 6, "y": 1.5},
+ {"matrix": [2, 8], "x": 7, "y": 1.5},
+ {"matrix": [2, 9], "x": 8, "y": 1.5},
+ {"matrix": [2, 10], "x": 9, "y": 1.5},
+ {"matrix": [2, 11], "x": 10, "y": 1.5},
+ {"matrix": [2, 12], "x": 11, "y": 1.5},
+ {"matrix": [2, 0], "x": 12, "y": 1.5},
+ {"matrix": [2, 13], "x": 13, "y": 1.5, "w": 2},
+
+ {"matrix": [0, 7], "x": 15.25, "y": 1.5},
+ {"matrix": [0, 6], "x": 16.25, "y": 1.5},
+ {"matrix": [0, 5], "x": 17.25, "y": 1.5},
+
+ {"matrix": [3, 1], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [3, 2], "x": 1.5, "y": 2.5},
+ {"matrix": [3, 3], "x": 2.5, "y": 2.5},
+ {"matrix": [3, 4], "x": 3.5, "y": 2.5},
+ {"matrix": [3, 5], "x": 4.5, "y": 2.5},
+ {"matrix": [3, 6], "x": 5.5, "y": 2.5},
+ {"matrix": [3, 7], "x": 6.5, "y": 2.5},
+ {"matrix": [3, 8], "x": 7.5, "y": 2.5},
+ {"matrix": [3, 9], "x": 8.5, "y": 2.5},
+ {"matrix": [3, 10], "x": 9.5, "y": 2.5},
+ {"matrix": [3, 11], "x": 10.5, "y": 2.5},
+ {"matrix": [3, 12], "x": 11.5, "y": 2.5},
+ {"matrix": [3, 0], "x": 12.5, "y": 2.5},
+ {"matrix": [0, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+ {"matrix": [0, 9], "x": 15.25, "y": 2.5},
+ {"matrix": [0, 8], "x": 16.25, "y": 2.5},
+ {"matrix": [4, 1], "x": 17.25, "y": 2.5},
+
+ {"matrix": [4, 2], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [4, 3], "x": 1.75, "y": 3.5},
+ {"matrix": [4, 4], "x": 2.75, "y": 3.5},
+ {"matrix": [4, 5], "x": 3.75, "y": 3.5},
+ {"matrix": [4, 6], "x": 4.75, "y": 3.5},
+ {"matrix": [4, 7], "x": 5.75, "y": 3.5},
+ {"matrix": [4, 8], "x": 6.75, "y": 3.5},
+ {"matrix": [4, 9], "x": 7.75, "y": 3.5},
+ {"matrix": [4, 10], "x": 8.75, "y": 3.5},
+ {"matrix": [4, 11], "x": 9.75, "y": 3.5},
+ {"matrix": [4, 12], "x": 10.75, "y": 3.5},
+ {"matrix": [3, 13], "x": 11.75, "y": 3.5},
+ {"matrix": [4, 0], "x": 12.75, "y": 3.5},
+
+ {"matrix": [5, 1], "x": 0, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 13], "x": 1.25, "y": 4.5},
+ {"matrix": [5, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [5, 3], "x": 3.25, "y": 4.5},
+ {"matrix": [5, 4], "x": 4.25, "y": 4.5},
+ {"matrix": [5, 5], "x": 5.25, "y": 4.5},
+ {"matrix": [5, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [5, 7], "x": 7.25, "y": 4.5},
+ {"matrix": [5, 8], "x": 8.25, "y": 4.5},
+ {"matrix": [5, 9], "x": 9.25, "y": 4.5},
+ {"matrix": [5, 10], "x": 10.25, "y": 4.5},
+ {"matrix": [5, 11], "x": 11.25, "y": 4.5},
+ {"matrix": [5, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+ {"matrix": [5, 13], "x": 16.25, "y": 4.5},
+
+ {"matrix": [6, 1], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [6, 2], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [6, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [6, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [6, 9], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [6, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [6, 11], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [6, 12], "x": 13.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [6, 0], "x": 15.25, "y": 5.5},
+ {"matrix": [6, 13], "x": 16.25, "y": 5.5},
+ {"matrix": [6, 8], "x": 17.25, "y": 5.5}
+ ]
}
}
}
diff --git a/keyboards/ft/mars80/mars80.c b/keyboards/ft/mars80/mars80.c
deleted file mode 100644
index 5c95d04e35..0000000000
--- a/keyboards/ft/mars80/mars80.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "mars80.h"
diff --git a/keyboards/ft/mars80/mars80.h b/keyboards/ft/mars80/mars80.h
deleted file mode 100644
index fdeb4f9857..0000000000
--- a/keyboards/ft/mars80/mars80.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_tkl_iso( \
- k11, k13, k14, k15, k16, k18, k19, k1A, k1B, k1C, k10, k1D, k12, k02, k03, k00, \
- k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k20, k2D, k07, k06, k05, \
- k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k30, k0D, k09, k08, \
- k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k3D, k40, \
- k51, k4D, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, \
- k61, k62, k63, k65, k69, k6A, k6B, k6C, k60, k6D, k68 \
-) \
-{ \
- { k00, KC_NO, k02, k03, KC_NO, k05, k06, k07, k08, k09, KC_NO, KC_NO, KC_NO, k0D }, \
- { k10, k11, k12, k13, k14, k15, k16, KC_NO, k18, k19, k1A, k1B, k1C, k1D }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D }, \
- { KC_NO, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D }, \
- { k60, k61, k62, k63, KC_NO, k65, KC_NO, KC_NO, k68, k69, k6A, k6B, k6C, k6D }, \
-}
-
-#define LAYOUT_tkl_ansi( \
- k11, k13, k14, k15, k16, k18, k19, k1A, k1B, k1C, k10, k1D, k12, k02, k03, k00, \
- k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k20, k2D, k07, k06, k05, \
- k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k30, k3D, k0D, k09, k08, \
- k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k40, \
- k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, \
- k61, k62, k63, k65, k69, k6A, k6B, k6C, k60, k6D, k68 \
-) \
-{ \
- { k00, KC_NO, k02, k03, KC_NO, k05, k06, k07, k08, k09, KC_NO, KC_NO, KC_NO, k0D }, \
- { k10, k11, k12, k13, k14, k15, k16, KC_NO, k18, k19, k1A, k1B, k1C, k1D }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, KC_NO }, \
- { KC_NO, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D }, \
- { k60, k61, k62, k63, KC_NO, k65, KC_NO, KC_NO, k68, k69, k6A, k6B, k6C, k6D }, \
-}
diff --git a/keyboards/ft/mars80/rules.mk b/keyboards/ft/mars80/rules.mk
index 9a00928ea8..51df0b642e 100644
--- a/keyboards/ft/mars80/rules.mk
+++ b/keyboards/ft/mars80/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no
COMMAND_ENABLE = yes
BACKLIGHT_ENABLE = yes
RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = i2c
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-03 07:21:35 +0000