summaryrefslogtreecommitdiff
path: root/keyboards/smithrune
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/smithrune')
-rw-r--r--keyboards/smithrune/iron165r2/config.h6
-rw-r--r--keyboards/smithrune/iron165r2/f072/config.h1
-rw-r--r--keyboards/smithrune/iron165r2/f072/info.json3
-rw-r--r--keyboards/smithrune/iron165r2/f411/config.h1
-rw-r--r--keyboards/smithrune/iron165r2/f411/info.json4
-rw-r--r--keyboards/smithrune/iron165r2/f411/rules.mk1
-rw-r--r--keyboards/smithrune/iron165r2/info.json683
-rw-r--r--keyboards/smithrune/iron165r2/iron165r2.c2
-rw-r--r--keyboards/smithrune/iron165r2/iron165r2.h109
-rw-r--r--keyboards/smithrune/iron180/config.h4
-rw-r--r--keyboards/smithrune/iron180/info.json5
-rw-r--r--keyboards/smithrune/iron180/iron180.c18
12 files changed, 357 insertions, 480 deletions
diff --git a/keyboards/smithrune/iron165r2/config.h b/keyboards/smithrune/iron165r2/config.h
index d8e7bc64d8..9749d68d72 100644
--- a/keyboards/smithrune/iron165r2/config.h
+++ b/keyboards/smithrune/iron165r2/config.h
@@ -17,12 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-#define MATRIX_COL_PINS { A3 , B8 , B9 , B1 , B0 , B5 , B4 , B3 , A15, A8 , A1 , A0 , C15, C14, C13}
-#define MATRIX_ROW_PINS { B10, A10, A2 , A5 , A7 }
-
-#define DIODE_DIRECTION COL2ROW
-
#define LOCKING_SUPPORT_ENABLE
#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/smithrune/iron165r2/f072/config.h b/keyboards/smithrune/iron165r2/f072/config.h
index 21702a94a6..9f86b9e55c 100644
--- a/keyboards/smithrune/iron165r2/f072/config.h
+++ b/keyboards/smithrune/iron165r2/f072/config.h
@@ -21,7 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 1
-#define RGB_DI_PIN B15
#define RGBLED_NUM 22
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/smithrune/iron165r2/f072/info.json b/keyboards/smithrune/iron165r2/f072/info.json
index a4171d423e..8ced3df775 100644
--- a/keyboards/smithrune/iron165r2/f072/info.json
+++ b/keyboards/smithrune/iron165r2/f072/info.json
@@ -4,6 +4,9 @@
"levels": 20,
"breathing": true
},
+ "ws2812": {
+ "pin": "B15"
+ },
"processor": "STM32F072",
"bootloader": "stm32-dfu"
}
diff --git a/keyboards/smithrune/iron165r2/f411/config.h b/keyboards/smithrune/iron165r2/f411/config.h
index 88ff1d167a..fa904fdabb 100644
--- a/keyboards/smithrune/iron165r2/f411/config.h
+++ b/keyboards/smithrune/iron165r2/f411/config.h
@@ -21,7 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 2
-#define RGB_DI_PIN B15
#define RGBLED_NUM 22
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/smithrune/iron165r2/f411/info.json b/keyboards/smithrune/iron165r2/f411/info.json
index e3a63f8764..7fd45874f2 100644
--- a/keyboards/smithrune/iron165r2/f411/info.json
+++ b/keyboards/smithrune/iron165r2/f411/info.json
@@ -4,6 +4,10 @@
"levels": 20,
"breathing": true
},
+ "ws2812": {
+ "pin": "B15",
+ "driver": "pwm"
+ },
"processor": "STM32F411",
"bootloader": "stm32-dfu"
}
diff --git a/keyboards/smithrune/iron165r2/f411/rules.mk b/keyboards/smithrune/iron165r2/f411/rules.mk
index b5b0582d5d..5d4fe45457 100644
--- a/keyboards/smithrune/iron165r2/f411/rules.mk
+++ b/keyboards/smithrune/iron165r2/f411/rules.mk
@@ -13,7 +13,6 @@ LTO_ENABLE = no
ENCODER_ENABLE = no
EEPROM_DRIVER = i2c
BACKLIGHT_ENABLE = yes
-WS2812_DRIVER = pwm
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/smithrune/iron165r2/info.json b/keyboards/smithrune/iron165r2/info.json
index ed24e0e63c..cff9a97cb7 100644
--- a/keyboards/smithrune/iron165r2/info.json
+++ b/keyboards/smithrune/iron165r2/info.json
@@ -8,386 +8,391 @@
"pid": "0x1652",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["A3", "B8", "B9", "B1", "B0", "B5", "B4", "B3", "A15", "A8", "A1", "A0", "C15", "C14", "C13"],
+ "rows": ["B10", "A10", "A2", "A5", "A7"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "A4"
},
- "layouts": {
+ "layouts": {
"LAYOUT_all": {
"layout": [
- {"label":"0,0", "x":0, "y":0},
- {"label":"0,1", "x":1, "y":0},
- {"label":"0,2", "x":2, "y":0},
- {"label":"0,3", "x":3, "y":0},
- {"label":"0,4", "x":4, "y":0},
- {"label":"0,5", "x":5, "y":0},
- {"label":"0,6", "x":6, "y":0},
- {"label":"0,7", "x":7, "y":0},
- {"label":"0,8", "x":8, "y":0},
- {"label":"0,9", "x":9, "y":0},
- {"label":"0,10", "x":10, "y":0},
- {"label":"0,11", "x":11, "y":0},
- {"label":"0,12", "x":12, "y":0},
- {"label":"0,13", "x":13, "y":0},
- {"label":"0,14", "x":14, "y":0},
- {"label":"4,14", "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": [4, 14], "x": 15, "y": 0},
- {"label":"1,0", "x":0, "y":1, "w":1.5},
- {"label":"1,1", "x":1.5, "y":1},
- {"label":"1,2", "x":2.5, "y":1},
- {"label":"1,3", "x":3.5, "y":1},
- {"label":"1,4", "x":4.5, "y":1},
- {"label":"1,5", "x":5.5, "y":1},
- {"label":"1,6", "x":6.5, "y":1},
- {"label":"1,7", "x":7.5, "y":1},
- {"label":"1,8", "x":8.5, "y":1},
- {"label":"1,9", "x":9.5, "y":1},
- {"label":"1,10", "x":10.5, "y":1},
- {"label":"1,11", "x":11.5, "y":1},
- {"label":"1,12", "x":12.5, "y":1},
- {"label":"1,13", "x":13.5, "y":1, "w":1.5},
- {"label":"1,14", "x":15, "y":1},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
- {"label":"2,0", "x":0, "y":2, "w":1.75},
- {"label":"2,1", "x":1.75, "y":2},
- {"label":"2,2", "x":2.75, "y":2},
- {"label":"2,3", "x":3.75, "y":2},
- {"label":"2,4", "x":4.75, "y":2},
- {"label":"2,5", "x":5.75, "y":2},
- {"label":"2,6", "x":6.75, "y":2},
- {"label":"2,7", "x":7.75, "y":2},
- {"label":"2,8", "x":8.75, "y":2},
- {"label":"2,9", "x":9.75, "y":2},
- {"label":"2,10", "x":10.75, "y":2},
- {"label":"2,11", "x":11.75, "y":2},
- {"label":"2,12", "x":12.75, "y":2},
- {"label":"2,13", "x":13.75, "y":2, "w":1.25},
- {"label":"2,14", "x":15, "y":2},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
- {"label":"3,0", "x":0, "y":3, "w":1.25},
- {"label":"3,1", "x":1.25, "y":3},
- {"label":"3,2", "x":2.25, "y":3},
- {"label":"3,3", "x":3.25, "y":3},
- {"label":"3,4", "x":4.25, "y":3},
- {"label":"3,5", "x":5.25, "y":3},
- {"label":"3,6", "x":6.25, "y":3},
- {"label":"3,7", "x":7.25, "y":3},
- {"label":"3,8", "x":8.25, "y":3},
- {"label":"3,9", "x":9.25, "y":3},
- {"label":"3,10", "x":10.25, "y":3},
- {"label":"3,11", "x":11.25, "y":3},
- {"label":"3,12", "x":12.25, "y":3, "w":1.75},
- {"label":"3,13", "x":14, "y":3},
- {"label":"3,14", "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, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
- {"label":"4,0", "x":0, "y":4, "w":1.25},
- {"label":"4,1", "x":1.25, "y":4, "w":1.25},
- {"label":"4,2", "x":2.5, "y":4, "w":1.25},
- {"label":"4,6", "x":3.75, "y":4, "w":6.25},
- {"label":"4,9", "x":10, "y":4, "w":1.25},
- {"label":"4,10", "x":11.25, "y":4, "w":1.25},
- {"label":"4,11", "x":13, "y":4},
- {"label":"4,12", "x":14, "y":4},
- {"label":"4,13", "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, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 13, "y": 4},
+ {"matrix": [4, 12], "x": 14, "y": 4},
+ {"matrix": [4, 13], "x": 15, "y": 4}
]
},
"LAYOUT_65_ansi_cb_blocker": {
"layout": [
- {"label":"0,0", "x":0, "y":0},
- {"label":"0,1", "x":1, "y":0},
- {"label":"0,2", "x":2, "y":0},
- {"label":"0,3", "x":3, "y":0},
- {"label":"0,4", "x":4, "y":0},
- {"label":"0,5", "x":5, "y":0},
- {"label":"0,6", "x":6, "y":0},
- {"label":"0,7", "x":7, "y":0},
- {"label":"0,8", "x":8, "y":0},
- {"label":"0,9", "x":9, "y":0},
- {"label":"0,10", "x":10, "y":0},
- {"label":"0,11", "x":11, "y":0},
- {"label":"0,12", "x":12, "y":0},
- {"label":"0,13", "x":13, "y":0, "w":2},
+ {"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},
- {"label":"1,0", "x":0, "y":1, "w":1.5},
- {"label":"1,1", "x":1.5, "y":1},
- {"label":"1,2", "x":2.5, "y":1},
- {"label":"1,3", "x":3.5, "y":1},
- {"label":"1,4", "x":4.5, "y":1},
- {"label":"1,5", "x":5.5, "y":1},
- {"label":"1,6", "x":6.5, "y":1},
- {"label":"1,7", "x":7.5, "y":1},
- {"label":"1,8", "x":8.5, "y":1},
- {"label":"1,9", "x":9.5, "y":1},
- {"label":"1,10", "x":10.5, "y":1},
- {"label":"1,11", "x":11.5, "y":1},
- {"label":"1,12", "x":12.5, "y":1},
- {"label":"1,13", "x":13.5, "y":1, "w":1.5},
- {"label":"1,14", "x":15, "y":1},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
- {"label":"2,0", "x":0, "y":2, "w":1.75},
- {"label":"2,1", "x":1.75, "y":2},
- {"label":"2,2", "x":2.75, "y":2},
- {"label":"2,3", "x":3.75, "y":2},
- {"label":"2,4", "x":4.75, "y":2},
- {"label":"2,5", "x":5.75, "y":2},
- {"label":"2,6", "x":6.75, "y":2},
- {"label":"2,7", "x":7.75, "y":2},
- {"label":"2,8", "x":8.75, "y":2},
- {"label":"2,9", "x":9.75, "y":2},
- {"label":"2,10", "x":10.75, "y":2},
- {"label":"2,11", "x":11.75, "y":2},
- {"label":"2,13", "x":12.75, "y":2, "w":2.25},
- {"label":"2,14", "x":15, "y":2},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
- {"label":"3,0", "x":0, "y":3, "w":2.25},
- {"label":"3,2", "x":2.25, "y":3},
- {"label":"3,3", "x":3.25, "y":3},
- {"label":"3,4", "x":4.25, "y":3},
- {"label":"3,5", "x":5.25, "y":3},
- {"label":"3,6", "x":6.25, "y":3},
- {"label":"3,7", "x":7.25, "y":3},
- {"label":"3,8", "x":8.25, "y":3},
- {"label":"3,9", "x":9.25, "y":3},
- {"label":"3,10", "x":10.25, "y":3},
- {"label":"3,11", "x":11.25, "y":3},
- {"label":"3,12", "x":12.25, "y":3, "w":1.75},
- {"label":"3,13", "x":14, "y":3},
- {"label":"3,14", "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, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
- {"label":"4,0", "x":0, "y":4, "w":1.25},
- {"label":"4,1", "x":1.25, "y":4, "w":1.25},
- {"label":"4,2", "x":2.5, "y":4, "w":1.25},
- {"label":"4,6", "x":3.75, "y":4, "w":6.25},
- {"label":"4,9", "x":10, "y":4, "w":1.25},
- {"label":"4,10", "x":11.25, "y":4, "w":1.25},
- {"label":"4,11", "x":13, "y":4},
- {"label":"4,12", "x":14, "y":4},
- {"label":"4,13", "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, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 13, "y": 4},
+ {"matrix": [4, 12], "x": 14, "y": 4},
+ {"matrix": [4, 13], "x": 15, "y": 4}
]
},
"LAYOUT_65_ansi_blocker": {
"layout": [
- {"label":"0,0", "x":0, "y":0},
- {"label":"0,1", "x":1, "y":0},
- {"label":"0,2", "x":2, "y":0},
- {"label":"0,3", "x":3, "y":0},
- {"label":"0,4", "x":4, "y":0},
- {"label":"0,5", "x":5, "y":0},
- {"label":"0,6", "x":6, "y":0},
- {"label":"0,7", "x":7, "y":0},
- {"label":"0,8", "x":8, "y":0},
- {"label":"0,9", "x":9, "y":0},
- {"label":"0,10", "x":10, "y":0},
- {"label":"0,11", "x":11, "y":0},
- {"label":"0,12", "x":12, "y":0},
- {"label":"0,13", "x":13, "y":0, "w":2},
- {"label":"4,14", "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": [4, 14], "x": 15, "y": 0},
- {"label":"1,0", "x":0, "y":1, "w":1.5},
- {"label":"1,1", "x":1.5, "y":1},
- {"label":"1,2", "x":2.5, "y":1},
- {"label":"1,3", "x":3.5, "y":1},
- {"label":"1,4", "x":4.5, "y":1},
- {"label":"1,5", "x":5.5, "y":1},
- {"label":"1,6", "x":6.5, "y":1},
- {"label":"1,7", "x":7.5, "y":1},
- {"label":"1,8", "x":8.5, "y":1},
- {"label":"1,9", "x":9.5, "y":1},
- {"label":"1,10", "x":10.5, "y":1},
- {"label":"1,11", "x":11.5, "y":1},
- {"label":"1,12", "x":12.5, "y":1},
- {"label":"1,13", "x":13.5, "y":1, "w":1.5},
- {"label":"1,14", "x":15, "y":1},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
- {"label":"2,0", "x":0, "y":2, "w":1.75},
- {"label":"2,1", "x":1.75, "y":2},
- {"label":"2,2", "x":2.75, "y":2},
- {"label":"2,3", "x":3.75, "y":2},
- {"label":"2,4", "x":4.75, "y":2},
- {"label":"2,5", "x":5.75, "y":2},
- {"label":"2,6", "x":6.75, "y":2},
- {"label":"2,7", "x":7.75, "y":2},
- {"label":"2,8", "x":8.75, "y":2},
- {"label":"2,9", "x":9.75, "y":2},
- {"label":"2,10", "x":10.75, "y":2},
- {"label":"2,11", "x":11.75, "y":2},
- {"label":"2,13", "x":12.75, "y":2, "w":2.25},
- {"label":"2,14", "x":15, "y":2},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
- {"label":"3,0", "x":0, "y":3, "w":2.25},
- {"label":"3,2", "x":2.25, "y":3},
- {"label":"3,3", "x":3.25, "y":3},
- {"label":"3,4", "x":4.25, "y":3},
- {"label":"3,5", "x":5.25, "y":3},
- {"label":"3,6", "x":6.25, "y":3},
- {"label":"3,7", "x":7.25, "y":3},
- {"label":"3,8", "x":8.25, "y":3},
- {"label":"3,9", "x":9.25, "y":3},
- {"label":"3,10", "x":10.25, "y":3},
- {"label":"3,11", "x":11.25, "y":3},
- {"label":"3,12", "x":12.25, "y":3, "w":1.75},
- {"label":"3,13", "x":14, "y":3},
- {"label":"3,14", "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, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
- {"label":"4,0", "x":0, "y":4, "w":1.25},
- {"label":"4,1", "x":1.25, "y":4, "w":1.25},
- {"label":"4,2", "x":2.5, "y":4, "w":1.25},
- {"label":"4,6", "x":3.75, "y":4, "w":6.25},
- {"label":"4,9", "x":10, "y":4, "w":1.25},
- {"label":"4,10", "x":11.25, "y":4, "w":1.25},
- {"label":"4,11", "x":13, "y":4},
- {"label":"4,12", "x":14, "y":4},
- {"label":"4,13", "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, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 13, "y": 4},
+ {"matrix": [4, 12], "x": 14, "y": 4},
+ {"matrix": [4, 13], "x": 15, "y": 4}
]
},
"LAYOUT_65_iso_cb_blocker": {
"layout": [
- {"label":"0,0", "x":0, "y":0},
- {"label":"0,1", "x":1, "y":0},
- {"label":"0,2", "x":2, "y":0},
- {"label":"0,3", "x":3, "y":0},
- {"label":"0,4", "x":4, "y":0},
- {"label":"0,5", "x":5, "y":0},
- {"label":"0,6", "x":6, "y":0},
- {"label":"0,7", "x":7, "y":0},
- {"label":"0,8", "x":8, "y":0},
- {"label":"0,9", "x":9, "y":0},
- {"label":"0,10", "x":10, "y":0},
- {"label":"0,11", "x":11, "y":0},
- {"label":"0,12", "x":12, "y":0},
- {"label":"0,13", "x":13, "y":0, "w":2},
+ {"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},
- {"label":"1,0", "x":0, "y":1, "w":1.5},
- {"label":"1,1", "x":1.5, "y":1},
- {"label":"1,2", "x":2.5, "y":1},
- {"label":"1,3", "x":3.5, "y":1},
- {"label":"1,4", "x":4.5, "y":1},
- {"label":"1,5", "x":5.5, "y":1},
- {"label":"1,6", "x":6.5, "y":1},
- {"label":"1,7", "x":7.5, "y":1},
- {"label":"1,8", "x":8.5, "y":1},
- {"label":"1,9", "x":9.5, "y":1},
- {"label":"1,10", "x":10.5, "y":1},
- {"label":"1,11", "x":11.5, "y":1},
- {"label":"1,12", "x":12.5, "y":1},
- {"label":"1,14", "x":15, "y":1},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 15, "y": 1},
- {"label":"2,0", "x":0, "y":2, "w":1.75},
- {"label":"2,1", "x":1.75, "y":2},
- {"label":"2,2", "x":2.75, "y":2},
- {"label":"2,3", "x":3.75, "y":2},
- {"label":"2,4", "x":4.75, "y":2},
- {"label":"2,5", "x":5.75, "y":2},
- {"label":"2,6", "x":6.75, "y":2},
- {"label":"2,7", "x":7.75, "y":2},
- {"label":"2,8", "x":8.75, "y":2},
- {"label":"2,9", "x":9.75, "y":2},
- {"label":"2,10", "x":10.75, "y":2},
- {"label":"2,11", "x":11.75, "y":2},
- {"label":"2,12", "x":12.75, "y":2},
- {"label":"2,13", "x":13.75, "y":1, "w":1.25, "h":2},
- {"label":"2,14", "x":15, "y":2},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [2, 14], "x": 15, "y": 2},
- {"label":"3,0", "x":0, "y":3, "w":1.25},
- {"label":"3,1", "x":1.25, "y":3},
- {"label":"3,2", "x":2.25, "y":3},
- {"label":"3,3", "x":3.25, "y":3},
- {"label":"3,4", "x":4.25, "y":3},
- {"label":"3,5", "x":5.25, "y":3},
- {"label":"3,6", "x":6.25, "y":3},
- {"label":"3,7", "x":7.25, "y":3},
- {"label":"3,8", "x":8.25, "y":3},
- {"label":"3,9", "x":9.25, "y":3},
- {"label":"3,10", "x":10.25, "y":3},
- {"label":"3,11", "x":11.25, "y":3},
- {"label":"3,12", "x":12.25, "y":3, "w":1.75},
- {"label":"3,13", "x":14, "y":3},
- {"label":"3,14", "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, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
- {"label":"4,0", "x":0, "y":4, "w":1.25},
- {"label":"4,1", "x":1.25, "y":4, "w":1.25},
- {"label":"4,2", "x":2.5, "y":4, "w":1.25},
- {"label":"4,6", "x":3.75, "y":4, "w":6.25},
- {"label":"4,9", "x":10, "y":4, "w":1.25},
- {"label":"4,10", "x":11.25, "y":4, "w":1.25},
- {"label":"4,11", "x":13, "y":4},
- {"label":"4,12", "x":14, "y":4},
- {"label":"4,13", "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, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 13, "y": 4},
+ {"matrix": [4, 12], "x": 14, "y": 4},
+ {"matrix": [4, 13], "x": 15, "y": 4}
]
},
"LAYOUT_65_iso_blocker": {
"layout": [
- {"label":"0,0", "x":0, "y":0},
- {"label":"0,1", "x":1, "y":0},
- {"label":"0,2", "x":2, "y":0},
- {"label":"0,3", "x":3, "y":0},
- {"label":"0,4", "x":4, "y":0},
- {"label":"0,5", "x":5, "y":0},
- {"label":"0,6", "x":6, "y":0},
- {"label":"0,7", "x":7, "y":0},
- {"label":"0,8", "x":8, "y":0},
- {"label":"0,9", "x":9, "y":0},
- {"label":"0,10", "x":10, "y":0},
- {"label":"0,11", "x":11, "y":0},
- {"label":"0,12", "x":12, "y":0},
- {"label":"0,13", "x":13, "y":0, "w":2},
- {"label":"4,14", "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": [4, 14], "x": 15, "y": 0},
- {"label":"1,0", "x":0, "y":1, "w":1.5},
- {"label":"1,1", "x":1.5, "y":1},
- {"label":"1,2", "x":2.5, "y":1},
- {"label":"1,3", "x":3.5, "y":1},
- {"label":"1,4", "x":4.5, "y":1},
- {"label":"1,5", "x":5.5, "y":1},
- {"label":"1,6", "x":6.5, "y":1},
- {"label":"1,7", "x":7.5, "y":1},
- {"label":"1,8", "x":8.5, "y":1},
- {"label":"1,9", "x":9.5, "y":1},
- {"label":"1,10", "x":10.5, "y":1},
- {"label":"1,11", "x":11.5, "y":1},
- {"label":"1,12", "x":12.5, "y":1},
- {"label":"1,14", "x":15, "y":1},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 15, "y": 1},
- {"label":"2,0", "x":0, "y":2, "w":1.75},
- {"label":"2,1", "x":1.75, "y":2},
- {"label":"2,2", "x":2.75, "y":2},
- {"label":"2,3", "x":3.75, "y":2},
- {"label":"2,4", "x":4.75, "y":2},
- {"label":"2,5", "x":5.75, "y":2},
- {"label":"2,6", "x":6.75, "y":2},
- {"label":"2,7", "x":7.75, "y":2},
- {"label":"2,8", "x":8.75, "y":2},
- {"label":"2,9", "x":9.75, "y":2},
- {"label":"2,10", "x":10.75, "y":2},
- {"label":"2,11", "x":11.75, "y":2},
- {"label":"2,12", "x":12.75, "y":2},
- {"label":"2,13", "x":13.75, "y":1, "w":1.25, "h":2},
- {"label":"2,14", "x":15, "y":2},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [2, 14], "x": 15, "y": 2},
- {"label":"3,0", "x":0, "y":3, "w":1.25},
- {"label":"3,1", "x":1.25, "y":3},
- {"label":"3,2", "x":2.25, "y":3},
- {"label":"3,3", "x":3.25, "y":3},
- {"label":"3,4", "x":4.25, "y":3},
- {"label":"3,5", "x":5.25, "y":3},
- {"label":"3,6", "x":6.25, "y":3},
- {"label":"3,7", "x":7.25, "y":3},
- {"label":"3,8", "x":8.25, "y":3},
- {"label":"3,9", "x":9.25, "y":3},
- {"label":"3,10", "x":10.25, "y":3},
- {"label":"3,11", "x":11.25, "y":3},
- {"label":"3,12", "x":12.25, "y":3, "w":1.75},
- {"label":"3,13", "x":14, "y":3},
- {"label":"3,14", "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, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
- {"label":"4,0", "x":0, "y":4, "w":1.25},
- {"label":"4,1", "x":1.25, "y":4, "w":1.25},
- {"label":"4,2", "x":2.5, "y":4, "w":1.25},
- {"label":"4,6", "x":3.75, "y":4, "w":6.25},
- {"label":"4,9", "x":10, "y":4, "w":1.25},
- {"label":"4,10", "x":11.25, "y":4, "w":1.25},
- {"label":"4,11", "x":13, "y":4},
- {"label":"4,12", "x":14, "y":4},
- {"label":"4,13", "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, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 13, "y": 4},
+ {"matrix": [4, 12], "x": 14, "y": 4},
+ {"matrix": [4, 13], "x": 15, "y": 4}
]
}
}
diff --git a/keyboards/smithrune/iron165r2/iron165r2.c b/keyboards/smithrune/iron165r2/iron165r2.c
index c13c362556..7406c0029c 100644
--- a/keyboards/smithrune/iron165r2/iron165r2.c
+++ b/keyboards/smithrune/iron165r2/iron165r2.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "iron165r2.h"
+#include "quantum.h"
void board_init(void) {
setPinInput(B6);
diff --git a/keyboards/smithrune/iron165r2/iron165r2.h b/keyboards/smithrune/iron165r2/iron165r2.h
deleted file mode 100644
index 8bb349d874..0000000000
--- a/keyboards/smithrune/iron165r2/iron165r2.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* Copyright 2022 Gondolindrim
- *
- * 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
-#define ___ KC_NO
-
-#include "quantum.h"
-
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───────┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │4E │ │0D │ 2u Backspace
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ └─┬─────┤
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │ │ │
- * 2.25u ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ ┌──┴┐2D │ ISO Enter
- * LShift │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D │2E │ │2C │ │
- * ┌────────┐ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ └───┴────┘
- * │30 │ │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │
- * └────────┘ ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40 │41 │42 │46 │49 │4A │ │4B │4C │4D │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- * ┌─────┬───┬─────┬───────────────────────────┬─────┐
- * │40 │41 │42 │46 │4A │ Tsangan
- * └─────┴───┴─────┴───────────────────────────┴─────┘
- *
- * Position K4E exists on the PCB, but is physically unavailable with the Iron165R2 case.
- */
-
-#define LAYOUT_all( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
- K40, K41, K42, K46, K49, K4A, K4B, K4C, K4D )\
-{\
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, K41, K42, ___, ___, ___, K46, ___, ___, K49, K4A, K4B, K4C, K4D, K4E } \
-}
-
-#define LAYOUT_65_ansi_cb_blocker( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
- K40, K41, K42, K46, K49, K4A, K4B, K4C, K4D \
-) {\
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___ }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, K2E }, \
- { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, K41, K42, ___, ___, ___, K46, ___, ___, K49, K4A, K4B, K4C, K4D, ___ } \
-}
-
-#define LAYOUT_65_ansi_blocker( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K4E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
- K40, K41, K42, K46, K49, K4A, K4B, K4C, K4D \
-) {\
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___ }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, K2E }, \
- { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, K41, K42, ___, ___, ___, K46, ___, ___, K49, K4A, K4B, K4C, K4D, K4E } \
-}
-
-#define LAYOUT_65_iso_cb_blocker( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
- K40, K41, K42, K46, K49, K4A, K4B, K4C, K4D \
-) {\
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___ }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, K41, K42, ___, ___, ___, K46, ___, ___, K49, K4A, K4B, K4C, K4D, ___ } \
-}
-
-#define LAYOUT_65_iso_blocker( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K4E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
- K40, K41, K42, K46, K49, K4A, K4B, K4C, K4D \
-) {\
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___ }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, K41, K42, ___, ___, ___, K46, ___, ___, K49, K4A, K4B, K4C, K4D, K4E } \
-}
diff --git a/keyboards/smithrune/iron180/config.h b/keyboards/smithrune/iron180/config.h
index 92c28d5719..7506922b00 100644
--- a/keyboards/smithrune/iron180/config.h
+++ b/keyboards/smithrune/iron180/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_COL_PINS { B7 , B6 , B5 , B4 , B3 , A10, A9 , A8 , B15, B14, B13, B12, B11, B2 , A4 , B1 , A3 }
-#define MATRIX_ROW_PINS { B9 , B8 , A15, B0 , A7 , A5 }
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 1
diff --git a/keyboards/smithrune/iron180/info.json b/keyboards/smithrune/iron180/info.json
index 0f8c436240..17febf6be5 100644
--- a/keyboards/smithrune/iron180/info.json
+++ b/keyboards/smithrune/iron180/info.json
@@ -8,6 +8,11 @@
"pid": "0x1180",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B7", "B6", "B5", "B4", "B3", "A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B2", "A4", "B1", "A3"],
+ "rows": ["B9", "B8", "A15", "B0", "A7", "A5"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "A6",
"levels": 6,
diff --git a/keyboards/smithrune/iron180/iron180.c b/keyboards/smithrune/iron180/iron180.c
deleted file mode 100644
index 236f8176f6..0000000000
--- a/keyboards/smithrune/iron180/iron180.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 Álvaro "Gondolindrim" Volpato <gondolindrim@acheronproject.com>
-
-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 "iron180.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 10:42:26 +0000