summaryrefslogtreecommitdiff
path: root/keyboards/cmm_studio
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/cmm_studio')
-rw-r--r--keyboards/cmm_studio/fuji65/config.h19
-rw-r--r--keyboards/cmm_studio/fuji65/fuji65.c20
-rw-r--r--keyboards/cmm_studio/fuji65/fuji65.h38
-rw-r--r--keyboards/cmm_studio/fuji65/info.json147
-rw-r--r--keyboards/cmm_studio/saka68/hotswap/config.h35
-rw-r--r--keyboards/cmm_studio/saka68/hotswap/hotswap.c17
-rw-r--r--keyboards/cmm_studio/saka68/hotswap/hotswap.h47
-rw-r--r--keyboards/cmm_studio/saka68/hotswap/info.json303
-rw-r--r--keyboards/cmm_studio/saka68/solder/config.h33
-rw-r--r--keyboards/cmm_studio/saka68/solder/info.json605
-rw-r--r--keyboards/cmm_studio/saka68/solder/solder.c17
-rw-r--r--keyboards/cmm_studio/saka68/solder/solder.h75
12 files changed, 551 insertions, 805 deletions
diff --git a/keyboards/cmm_studio/fuji65/config.h b/keyboards/cmm_studio/fuji65/config.h
index 3e0f08ab9a..97f19f3ffa 100644
--- a/keyboards/cmm_studio/fuji65/config.h
+++ b/keyboards/cmm_studio/fuji65/config.h
@@ -16,24 +16,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 { B5, B4, D7, D6, B6 }
-#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, B0, B1, B2, B3, D5, D3, D2, D1, D0 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -49,7 +31,6 @@
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
-#endif
// generated by KBFirmware JSON to QMK Parser
// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/cmm_studio/fuji65/fuji65.c b/keyboards/cmm_studio/fuji65/fuji65.c
deleted file mode 100644
index 46695a0d21..0000000000
--- a/keyboards/cmm_studio/fuji65/fuji65.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2020 CMM.Studio Freather
- *
- * 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 "fuji65.h"
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/cmm_studio/fuji65/fuji65.h b/keyboards/cmm_studio/fuji65/fuji65.h
deleted file mode 100644
index d5c1e02ece..0000000000
--- a/keyboards/cmm_studio/fuji65/fuji65.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2021 CMM.Studio Freather
- *
- * 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"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
- 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, 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, 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, XXX, K2E }, \
- { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, K49, K4A, K4B, K4C, K4D, XXX }, \
-}
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/cmm_studio/fuji65/info.json b/keyboards/cmm_studio/fuji65/info.json
index 9f47befd54..2225bedad3 100644
--- a/keyboards/cmm_studio/fuji65/info.json
+++ b/keyboards/cmm_studio/fuji65/info.json
@@ -8,78 +8,91 @@
"pid": "0x364D",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "E6"
+ },
+ "matrix_pins": {
+ "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B0", "B1", "B2", "B3", "D5", "D3", "D2", "D1", "D0"],
+ "rows": ["B5", "B4", "D7", "D6", "B6"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
"layout": [
- { "label": "K00 (B5,F7)", "x": 0, "y": 0 },
- { "label": "K01 (B5,F6)", "x": 1, "y": 0 },
- { "label": "K02 (B5,F5)", "x": 2, "y": 0 },
- { "label": "K03 (B5,F4)", "x": 3, "y": 0 },
- { "label": "K04 (B5,F1)", "x": 4, "y": 0 },
- { "label": "K05 (B5,F0)", "x": 5, "y": 0 },
- { "label": "K06 (B5,B0)", "x": 6, "y": 0 },
- { "label": "K07 (B5,B1)", "x": 7, "y": 0 },
- { "label": "K08 (B5,B2)", "x": 8, "y": 0 },
- { "label": "K09 (B5,B3)", "x": 9, "y": 0 },
- { "label": "K0A (B5,D5)", "x": 10, "y": 0 },
- { "label": "K0B (B5,D3)", "x": 11, "y": 0 },
- { "label": "K0C (B5,D2)", "x": 12, "y": 0 },
- { "label": "K0D (B5,D1)", "x": 13, "y": 0 },
- { "label": "K0E (B5,D0)", "x": 14, "y": 0 },
- { "label": "K10 (B4,F7)", "x": 0, "y": 1, "w": 1.5 },
- { "label": "K11 (B4,F6)", "x": 1.5, "y": 1 },
- { "label": "K12 (B4,F5)", "x": 2.5, "y": 1 },
- { "label": "K13 (B4,F4)", "x": 3.5, "y": 1 },
- { "label": "K14 (B4,F1)", "x": 4.5, "y": 1 },
- { "label": "K15 (B4,F0)", "x": 5.5, "y": 1 },
- { "label": "K16 (B4,B0)", "x": 6.5, "y": 1 },
- { "label": "K17 (B4,B1)", "x": 7.5, "y": 1 },
- { "label": "K18 (B4,B2)", "x": 8.5, "y": 1 },
- { "label": "K19 (B4,B3)", "x": 9.5, "y": 1 },
- { "label": "K1A (B4,D5)", "x": 10.5, "y": 1 },
- { "label": "K1B (B4,D3)", "x": 11.5, "y": 1 },
- { "label": "K1C (B4,D2)", "x": 12.5, "y": 1 },
- { "label": "K1D (B4,D1)", "x": 13.5, "y": 1, "w": 1.5 },
- { "label": "K1E (B4,D0)", "x": 15, "y": 1 },
- { "label": "K20 (D7,F7)", "x": 0, "y": 2, "w": 1.75 },
- { "label": "K21 (D7,F6)", "x": 1.75, "y": 2 },
- { "label": "K22 (D7,F5)", "x": 2.75, "y": 2 },
- { "label": "K23 (D7,F4)", "x": 3.75, "y": 2 },
- { "label": "K24 (D7,F1)", "x": 4.75, "y": 2 },
- { "label": "K25 (D7,F0)", "x": 5.75, "y": 2 },
- { "label": "K26 (D7,B0)", "x": 6.75, "y": 2 },
- { "label": "K27 (D7,B1)", "x": 7.75, "y": 2 },
- { "label": "K28 (D7,B2)", "x": 8.75, "y": 2 },
- { "label": "K29 (D7,B3)", "x": 9.75, "y": 2 },
- { "label": "K2A (D7,D5)", "x": 10.75, "y": 2 },
- { "label": "K2B (D7,D3)", "x": 11.75, "y": 2 },
- { "label": "K2C (D7,D2)", "x": 12.75, "y": 2, "w": 2.25 },
- { "label": "K2E (D7,D0)", "x": 15, "y": 2 },
- { "label": "K30 (D6,F7)", "x": 0, "y": 3, "w": 2.25 },
- { "label": "K32 (D6,F5)", "x": 2.25, "y": 3 },
- { "label": "K33 (D6,F4)", "x": 3.25, "y": 3 },
- { "label": "K34 (D6,F1)", "x": 4.25, "y": 3 },
- { "label": "K35 (D6,F0)", "x": 5.25, "y": 3 },
- { "label": "K36 (D6,B0)", "x": 6.25, "y": 3 },
- { "label": "K37 (D6,B1)", "x": 7.25, "y": 3 },
- { "label": "K38 (D6,B2)", "x": 8.25, "y": 3 },
- { "label": "K39 (D6,B3)", "x": 9.25, "y": 3 },
- { "label": "K3A (D6,D5)", "x": 10.25, "y": 3 },
- { "label": "K3B (D6,D3)", "x": 11.25, "y": 3 },
- { "label": "K3C (D6,D2)", "x": 12.25, "y": 3, "w": 1.75 },
- { "label": "K3D (D6,D1)", "x": 14, "y": 3 },
- { "label": "K3E (D6,D0)", "x": 15, "y": 3 },
- { "label": "K40 (B6,F7)", "x": 0, "y": 4, "w": 1.25 },
- { "label": "K41 (B6,F6)", "x": 1.25, "y": 4, "w": 1.25 },
- { "label": "K42 (B6,F5)", "x": 2.5, "y": 4, "w": 1.25 },
- { "label": "K46 (B6,B0)", "x": 3.75, "y": 4, "w": 6.25 },
- { "label": "K49 (B6,B3)", "x": 10, "y": 4, "w": 1.25 },
- { "label": "K4A (B6,D5)", "x": 11.25, "y": 4, "w": 1.25 },
- { "label": "K4B (B6,D3)", "x": 13, "y": 4 },
- { "label": "K4C (B6,D2)", "x": 14, "y": 4 },
- { "label": "K4D (B6,D1)", "x": 15, "y": 4 }
+ {"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": [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},
+
+ {"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, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"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},
+
+ {"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/cmm_studio/saka68/hotswap/config.h b/keyboards/cmm_studio/saka68/hotswap/config.h
deleted file mode 100644
index b8a29be0de..0000000000
--- a/keyboards/cmm_studio/saka68/hotswap/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2021 CMM.Studio Freather
-
-
-
-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
-
-
-/*
- * 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 { D2, D1, B0, F6, F7 }
-#define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, C6, F5, F4, F1, F0, B1, B2, B3, D3, D5 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cmm_studio/saka68/hotswap/hotswap.c b/keyboards/cmm_studio/saka68/hotswap/hotswap.c
deleted file mode 100644
index 14454b58ba..0000000000
--- a/keyboards/cmm_studio/saka68/hotswap/hotswap.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 CMM.Studio Freather
- *
- * 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 "hotswap.h"
diff --git a/keyboards/cmm_studio/saka68/hotswap/hotswap.h b/keyboards/cmm_studio/saka68/hotswap/hotswap.h
deleted file mode 100644
index f8b45f0980..0000000000
--- a/keyboards/cmm_studio/saka68/hotswap/hotswap.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2021 CMM.Studio Freather
- *
- * 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"
-
-#define LAYOUT_68_ansi( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, \
- K40, K41, K42, K46, K49, K4A, K4B, K4D, K4E, K4F \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO, KC_NO }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, KC_NO, K3E, KC_NO }, \
- { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, K49, K4A, K4B, KC_NO, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_68_iso( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K1F, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, \
- K40, K41, K42, K46, K49, K4A, K4B, K4D, K4E, K4F \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, K1E, K1F }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO, KC_NO }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, KC_NO, K3E, KC_NO }, \
- { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, K49, K4A, K4B, KC_NO, K4D, K4E, K4F }, \
-}
diff --git a/keyboards/cmm_studio/saka68/hotswap/info.json b/keyboards/cmm_studio/saka68/hotswap/info.json
index ee91cf527f..e2327e8145 100644
--- a/keyboards/cmm_studio/saka68/hotswap/info.json
+++ b/keyboards/cmm_studio/saka68/hotswap/info.json
@@ -8,6 +8,11 @@
"pid": "0x5348",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "D3", "D5"],
+ "rows": ["D2", "D1", "B0", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layout_aliases": {
@@ -17,155 +22,163 @@
"layouts": {
"LAYOUT_68_ansi": {
"layout": [
- {"label":"K00 (D2,D4)", "x":0, "y":0},
- {"label":"K01 (D2,D6)", "x":1, "y":0},
- {"label":"K02 (D2,D7)", "x":2, "y":0},
- {"label":"K03 (D2,B4)", "x":3, "y":0},
- {"label":"K04 (D2,B5)", "x":4, "y":0},
- {"label":"K05 (D2,B6)", "x":5, "y":0},
- {"label":"K06 (D2,C6)", "x":6, "y":0},
- {"label":"K07 (D2,F5)", "x":7, "y":0},
- {"label":"K08 (D2,F4)", "x":8, "y":0},
- {"label":"K09 (D2,F1)", "x":9, "y":0},
- {"label":"K0A (D2,F0)", "x":10, "y":0},
- {"label":"K0B (D2,B1)", "x":11, "y":0},
- {"label":"K0C (D2,B2)", "x":12, "y":0},
- {"label":"K0D (D2,B3)", "x":13, "y":0, "w":2},
- {"label":"K0E (D2,D3)", "x":15.25, "y":0},
- {"label":"K0F (D2,D5)", "x":16.25, "y":0},
-
- {"label":"K10 (D1,D4)", "x":0, "y":1, "w":1.5},
- {"label":"K11 (D1,D6)", "x":1.5, "y":1},
- {"label":"K12 (D1,D7)", "x":2.5, "y":1},
- {"label":"K13 (D1,B4)", "x":3.5, "y":1},
- {"label":"K14 (D1,B5)", "x":4.5, "y":1},
- {"label":"K15 (D1,B6)", "x":5.5, "y":1},
- {"label":"K16 (D1,C6)", "x":6.5, "y":1},
- {"label":"K17 (D1,F5)", "x":7.5, "y":1},
- {"label":"K18 (D1,F4)", "x":8.5, "y":1},
- {"label":"K19 (D1,F1)", "x":9.5, "y":1},
- {"label":"K1A (D1,F0)", "x":10.5, "y":1},
- {"label":"K1B (D1,B1)", "x":11.5, "y":1},
- {"label":"K1C (D1,B2)", "x":12.5, "y":1},
- {"label":"K1D (D1,B3)", "x":13.5, "y":1, "w":1.5},
- {"label":"K1E (D1,D3)", "x":15.25, "y":1},
- {"label":"K1F (D1,D5)", "x":16.25, "y":1},
-
- {"label":"K20 (B0,D4)", "x":0, "y":2, "w":1.75},
- {"label":"K21 (B0,D6)", "x":1.75, "y":2},
- {"label":"K22 (B0,D7)", "x":2.75, "y":2},
- {"label":"K23 (B0,B4)", "x":3.75, "y":2},
- {"label":"K24 (B0,B5)", "x":4.75, "y":2},
- {"label":"K25 (B0,B6)", "x":5.75, "y":2},
- {"label":"K26 (B0,C6)", "x":6.75, "y":2},
- {"label":"K27 (B0,F5)", "x":7.75, "y":2},
- {"label":"K28 (B0,F4)", "x":8.75, "y":2},
- {"label":"K29 (B0,F1)", "x":9.75, "y":2},
- {"label":"K2A (B0,F0)", "x":10.75, "y":2},
- {"label":"K2B (B0,B1)", "x":11.75, "y":2},
- {"label":"K2D (B0,B3)", "x":12.75, "y":2, "w":2.25},
-
- {"label":"K30 (F6,D4)", "x":0, "y":3, "w":2.25},
- {"label":"K32 (F6,D7)", "x":2.25, "y":3},
- {"label":"K33 (F6,B4)", "x":3.25, "y":3},
- {"label":"K34 (F6,B5)", "x":4.25, "y":3},
- {"label":"K35 (F6,B6)", "x":5.25, "y":3},
- {"label":"K36 (F6,C6)", "x":6.25, "y":3},
- {"label":"K37 (F6,F5)", "x":7.25, "y":3},
- {"label":"K38 (F6,F4)", "x":8.25, "y":3},
- {"label":"K39 (F6,F1)", "x":9.25, "y":3},
- {"label":"K3A (F6,F0)", "x":10.25, "y":3},
- {"label":"K3B (F6,B1)", "x":11.25, "y":3},
- {"label":"K3C (F6,B2)", "x":12.25, "y":3, "w":2.75},
- {"label":"K3E (F6,D3)", "x":15.25, "y":3},
-
- {"label":"K40 (F7,D4)", "x":0, "y":4, "w":1.25},
- {"label":"K41 (F7,D6)", "x":1.25, "y":4, "w":1.25},
- {"label":"K42 (F7,D7)", "x":2.5, "y":4, "w":1.25},
- {"label":"K46 (F7,C6)", "x":3.75, "y":4, "w":6.25},
- {"label":"K49 (F7,F1)", "x":10, "y":4, "w":1.25},
- {"label":"K4A (F7,F0)", "x":11.25, "y":4, "w":1.25},
- {"label":"K4B (F7,B1)", "x":12.5, "y":4, "w":1.25},
- {"label":"K4D (F7,B3)", "x":14.25, "y":4},
- {"label":"K4E (F7,D3)", "x":15.25, "y":4},
- {"label":"K4F (F7,D5)", "x":16.25, "y":4}
+ {"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, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+ {"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.25, "y": 1},
+ {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+ {"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": [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": 2.75},
+
+ {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+ {"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": 12.5, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 13], "x": 14.25, "y": 4},
+ {"matrix": [4, 14], "x": 15.25, "y": 4},
+ {"matrix": [4, 15], "x": 16.25, "y": 4}
]
},
"LAYOUT_68_iso": {
"layout": [
- {"label":"K00 (D2,D4)", "x":0, "y":0},
- {"label":"K01 (D2,D6)", "x":1, "y":0},
- {"label":"K02 (D2,D7)", "x":2, "y":0},
- {"label":"K03 (D2,B4)", "x":3, "y":0},
- {"label":"K04 (D2,B5)", "x":4, "y":0},
- {"label":"K05 (D2,B6)", "x":5, "y":0},
- {"label":"K06 (D2,C6)", "x":6, "y":0},
- {"label":"K07 (D2,F5)", "x":7, "y":0},
- {"label":"K08 (D2,F4)", "x":8, "y":0},
- {"label":"K09 (D2,F1)", "x":9, "y":0},
- {"label":"K0A (D2,F0)", "x":10, "y":0},
- {"label":"K0B (D2,B1)", "x":11, "y":0},
- {"label":"K0C (D2,B2)", "x":12, "y":0},
- {"label":"K0D (D2,B3)", "x":13, "y":0, "w":2},
- {"label":"K0E (D2,D3)", "x":15.25, "y":0},
- {"label":"K0F (D2,D5)", "x":16.25, "y":0},
-
- {"label":"K10 (D1,D4)", "x":0, "y":1, "w":1.5},
- {"label":"K11 (D1,D6)", "x":1.5, "y":1},
- {"label":"K12 (D1,D7)", "x":2.5, "y":1},
- {"label":"K13 (D1,B4)", "x":3.5, "y":1},
- {"label":"K14 (D1,B5)", "x":4.5, "y":1},
- {"label":"K15 (D1,B6)", "x":5.5, "y":1},
- {"label":"K16 (D1,C6)", "x":6.5, "y":1},
- {"label":"K17 (D1,F5)", "x":7.5, "y":1},
- {"label":"K18 (D1,F4)", "x":8.5, "y":1},
- {"label":"K19 (D1,F1)", "x":9.5, "y":1},
- {"label":"K1A (D1,F0)", "x":10.5, "y":1},
- {"label":"K1B (D1,B1)", "x":11.5, "y":1},
- {"label":"K1C (D1,B2)", "x":12.5, "y":1},
- {"label":"K1E (D1,D3)", "x":15.25, "y":1},
- {"label":"K1F (D1,D5)", "x":16.25, "y":1},
-
- {"label":"K20 (B0,D4)", "x":0, "y":2, "w":1.75},
- {"label":"K21 (B0,D6)", "x":1.75, "y":2},
- {"label":"K22 (B0,D7)", "x":2.75, "y":2},
- {"label":"K23 (B0,B4)", "x":3.75, "y":2},
- {"label":"K24 (B0,B5)", "x":4.75, "y":2},
- {"label":"K25 (B0,B6)", "x":5.75, "y":2},
- {"label":"K26 (B0,C6)", "x":6.75, "y":2},
- {"label":"K27 (B0,F5)", "x":7.75, "y":2},
- {"label":"K28 (B0,F4)", "x":8.75, "y":2},
- {"label":"K29 (B0,F1)", "x":9.75, "y":2},
- {"label":"K2A (B0,F0)", "x":10.75, "y":2},
- {"label":"K2B (B0,B1)", "x":11.75, "y":2},
- {"label":"K2C (B0,B2)", "x":12.75, "y":2},
- {"label":"K2D (B0,B3)", "x":13.75, "y":1, "w":1.25, "h":2},
-
- {"label":"K30 (F6,D4)", "x":0, "y":3, "w":1.25},
- {"label":"K31 (F6,D6)", "x":1.25, "y":3},
- {"label":"K32 (F6,D7)", "x":2.25, "y":3},
- {"label":"K33 (F6,B4)", "x":3.25, "y":3},
- {"label":"K34 (F6,B5)", "x":4.25, "y":3},
- {"label":"K35 (F6,B6)", "x":5.25, "y":3},
- {"label":"K36 (F6,C6)", "x":6.25, "y":3},
- {"label":"K37 (F6,F5)", "x":7.25, "y":3},
- {"label":"K38 (F6,F4)", "x":8.25, "y":3},
- {"label":"K39 (F6,F1)", "x":9.25, "y":3},
- {"label":"K3A (F6,F0)", "x":10.25, "y":3},
- {"label":"K3B (F6,B1)", "x":11.25, "y":3},
- {"label":"K3C (F6,B2)", "x":12.25, "y":3, "w":2.75},
- {"label":"K3E (F6,D3)", "x":15.25, "y":3},
-
- {"label":"K40 (F7,D4)", "x":0, "y":4, "w":1.25},
- {"label":"K41 (F7,D6)", "x":1.25, "y":4, "w":1.25},
- {"label":"K42 (F7,D7)", "x":2.5, "y":4, "w":1.25},
- {"label":"K46 (F7,C6)", "x":3.75, "y":4, "w":6.25},
- {"label":"K49 (F7,F1)", "x":10, "y":4, "w":1.25},
- {"label":"K4A (F7,F0)", "x":11.25, "y":4, "w":1.25},
- {"label":"K4B (F7,B1)", "x":12.5, "y":4, "w":1.25},
- {"label":"K4D (F7,B3)", "x":14.25, "y":4},
- {"label":"K4E (F7,D3)", "x":15.25, "y":4},
- {"label":"K4F (F7,D5)", "x":16.25, "y":4}
+ {"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, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+ {"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.25, "y": 1},
+ {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+ {"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": [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": 2.75},
+
+ {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+ {"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": 12.5, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 13], "x": 14.25, "y": 4},
+ {"matrix": [4, 14], "x": 15.25, "y": 4},
+ {"matrix": [4, 15], "x": 16.25, "y": 4}
]
}
}
diff --git a/keyboards/cmm_studio/saka68/solder/config.h b/keyboards/cmm_studio/saka68/solder/config.h
deleted file mode 100644
index 76960df064..0000000000
--- a/keyboards/cmm_studio/saka68/solder/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2020 CMM.Studio Freather
- *
- * 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
-
-
-/*
- * 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 { D1, D0, B0, F6, F7 }
-#define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, C6, F5, F4, F1, F0, B1, B2, B3, D2, D3, D5 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cmm_studio/saka68/solder/info.json b/keyboards/cmm_studio/saka68/solder/info.json
index 8612ead7ae..145883fc1d 100644
--- a/keyboards/cmm_studio/saka68/solder/info.json
+++ b/keyboards/cmm_studio/saka68/solder/info.json
@@ -8,6 +8,11 @@
"pid": "0x534B",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "D2", "D3", "D5"],
+ "rows": ["D1", "D0", "B0", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layout_aliases": {
@@ -17,310 +22,326 @@
"layouts": {
"LAYOUT_68_ansi": {
"layout": [
- {"label":"K00 (D1,D4)", "x":0, "y":0},
- {"label":"K01 (D1,D6)", "x":1, "y":0},
- {"label":"K02 (D1,D7)", "x":2, "y":0},
- {"label":"K03 (D1,B4)", "x":3, "y":0},
- {"label":"K04 (D1,B5)", "x":4, "y":0},
- {"label":"K05 (D1,B6)", "x":5, "y":0},
- {"label":"K06 (D1,C6)", "x":6, "y":0},
- {"label":"K07 (D1,F5)", "x":7, "y":0},
- {"label":"K08 (D1,F4)", "x":8, "y":0},
- {"label":"K09 (D1,F1)", "x":9, "y":0},
- {"label":"K0A (D1,F0)", "x":10, "y":0},
- {"label":"K0B (D1,B1)", "x":11, "y":0},
- {"label":"K0C (D1,B2)", "x":12, "y":0},
- {"label":"K0D (D1,B3)", "x":13, "y":0, "w":2},
- {"label":"K0F (D1,D3)", "x":15.25, "y":0},
- {"label":"K0G (D1,D5)", "x":16.25, "y":0},
-
- {"label":"K10 (D0,D4)", "x":0, "y":1, "w":1.5},
- {"label":"K11 (D0,D6)", "x":1.5, "y":1},
- {"label":"K12 (D0,D7)", "x":2.5, "y":1},
- {"label":"K13 (D0,B4)", "x":3.5, "y":1},
- {"label":"K14 (D0,B5)", "x":4.5, "y":1},
- {"label":"K15 (D0,B6)", "x":5.5, "y":1},
- {"label":"K16 (D0,C6)", "x":6.5, "y":1},
- {"label":"K17 (D0,F5)", "x":7.5, "y":1},
- {"label":"K18 (D0,F4)", "x":8.5, "y":1},
- {"label":"K19 (D0,F1)", "x":9.5, "y":1},
- {"label":"K1A (D0,F0)", "x":10.5, "y":1},
- {"label":"K1B (D0,B1)", "x":11.5, "y":1},
- {"label":"K1C (D0,B2)", "x":12.5, "y":1},
- {"label":"K1D (D0,B3)", "x":13.5, "y":1, "w":1.5},
- {"label":"K1E (D0,D2)", "x":15.25, "y":1},
- {"label":"K1F (D0,D3)", "x":16.25, "y":1},
-
- {"label":"K20 (B0,D4)", "x":0, "y":2, "w":1.75},
- {"label":"K21 (B0,D6)", "x":1.75, "y":2},
- {"label":"K22 (B0,D7)", "x":2.75, "y":2},
- {"label":"K23 (B0,B4)", "x":3.75, "y":2},
- {"label":"K24 (B0,B5)", "x":4.75, "y":2},
- {"label":"K25 (B0,B6)", "x":5.75, "y":2},
- {"label":"K26 (B0,C6)", "x":6.75, "y":2},
- {"label":"K27 (B0,F5)", "x":7.75, "y":2},
- {"label":"K28 (B0,F4)", "x":8.75, "y":2},
- {"label":"K29 (B0,F1)", "x":9.75, "y":2},
- {"label":"K2A (B0,F0)", "x":10.75, "y":2},
- {"label":"K2B (B0,B1)", "x":11.75, "y":2},
- {"label":"K2D (B0,B3)", "x":12.75, "y":2, "w":2.25},
-
- {"label":"K30 (F6,D4)", "x":0, "y":3, "w":2.25},
- {"label":"K32 (F6,D7)", "x":2.25, "y":3},
- {"label":"K33 (F6,B4)", "x":3.25, "y":3},
- {"label":"K34 (F6,B5)", "x":4.25, "y":3},
- {"label":"K35 (F6,B6)", "x":5.25, "y":3},
- {"label":"K36 (F6,C6)", "x":6.25, "y":3},
- {"label":"K37 (F6,F5)", "x":7.25, "y":3},
- {"label":"K38 (F6,F4)", "x":8.25, "y":3},
- {"label":"K39 (F6,F1)", "x":9.25, "y":3},
- {"label":"K3A (F6,F0)", "x":10.25, "y":3},
- {"label":"K3B (F6,B1)", "x":11.25, "y":3},
- {"label":"K3C (F6,B2)", "x":12.25, "y":3, "w":2.75},
- {"label":"K3E (F6,D2)", "x":15.25, "y":3},
-
- {"label":"K40 (F7,D4)", "x":0, "y":4, "w":1.25},
- {"label":"K41 (F7,D6)", "x":1.25, "y":4, "w":1.25},
- {"label":"K42 (F7,D7)", "x":2.5, "y":4, "w":1.25},
- {"label":"K46 (F7,C6)", "x":3.75, "y":4, "w":6.25},
- {"label":"K4A (F7,F0)", "x":10, "y":4, "w":1.25},
- {"label":"K4B (F7,B1)", "x":11.25, "y":4, "w":1.25},
- {"label":"K4C (F7,B2)", "x":12.5, "y":4, "w":1.25},
- {"label":"K4D (F7,B3)", "x":14.25, "y":4},
- {"label":"K4E (F7,D2)", "x":15.25, "y":4},
- {"label":"K4F (F7,D3)", "x":16.25, "y":4}
+ {"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.25, "y": 0},
+ {"matrix": [0, 16], "x": 16.25, "y": 0},
+
+ {"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.25, "y": 1},
+ {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+ {"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": [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": 2.75},
+
+ {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+ {"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": 12.5, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 13], "x": 14.25, "y": 4},
+ {"matrix": [4, 14], "x": 15.25, "y": 4},
+ {"matrix": [4, 15], "x": 16.25, "y": 4}
]
},
"LAYOUT_68_ansi_split_bs": {
"layout": [
- {"label":"K00 (D1,D4)", "x":0, "y":0},
- {"label":"K01 (D1,D6)", "x":1, "y":0},
- {"label":"K02 (D1,D7)", "x":2, "y":0},
- {"label":"K03 (D1,B4)", "x":3, "y":0},
- {"label":"K04 (D1,B5)", "x":4, "y":0},
- {"label":"K05 (D1,B6)", "x":5, "y":0},
- {"label":"K06 (D1,C6)", "x":6, "y":0},
- {"label":"K07 (D1,F5)", "x":7, "y":0},
- {"label":"K08 (D1,F4)", "x":8, "y":0},
- {"label":"K09 (D1,F1)", "x":9, "y":0},
- {"label":"K0A (D1,F0)", "x":10, "y":0},
- {"label":"K0B (D1,B1)", "x":11, "y":0},
- {"label":"K0C (D1,B2)", "x":12, "y":0},
- {"label":"K0D (D1,B3)", "x":13, "y":0},
- {"label":"K0E (D1,D2)", "x":14, "y":0},
- {"label":"K0F (D1,D3)", "x":15.25, "y":0},
- {"label":"K0G (D1,D5)", "x":16.25, "y":0},
-
- {"label":"K10 (D0,D4)", "x":0, "y":1, "w":1.5},
- {"label":"K11 (D0,D6)", "x":1.5, "y":1},
- {"label":"K12 (D0,D7)", "x":2.5, "y":1},
- {"label":"K13 (D0,B4)", "x":3.5, "y":1},
- {"label":"K14 (D0,B5)", "x":4.5, "y":1},
- {"label":"K15 (D0,B6)", "x":5.5, "y":1},
- {"label":"K16 (D0,C6)", "x":6.5, "y":1},
- {"label":"K17 (D0,F5)", "x":7.5, "y":1},
- {"label":"K18 (D0,F4)", "x":8.5, "y":1},
- {"label":"K19 (D0,F1)", "x":9.5, "y":1},
- {"label":"K1A (D0,F0)", "x":10.5, "y":1},
- {"label":"K1B (D0,B1)", "x":11.5, "y":1},
- {"label":"K1C (D0,B2)", "x":12.5, "y":1},
- {"label":"K1D (D0,B3)", "x":13.5, "y":1, "w":1.5},
- {"label":"K1E (D0,D2)", "x":15.25, "y":1},
- {"label":"K1F (D0,D3)", "x":16.25, "y":1},
-
- {"label":"K20 (B0,D4)", "x":0, "y":2, "w":1.75},
- {"label":"K21 (B0,D6)", "x":1.75, "y":2},
- {"label":"K22 (B0,D7)", "x":2.75, "y":2},
- {"label":"K23 (B0,B4)", "x":3.75, "y":2},
- {"label":"K24 (B0,B5)", "x":4.75, "y":2},
- {"label":"K25 (B0,B6)", "x":5.75, "y":2},
- {"label":"K26 (B0,C6)", "x":6.75, "y":2},
- {"label":"K27 (B0,F5)", "x":7.75, "y":2},
- {"label":"K28 (B0,F4)", "x":8.75, "y":2},
- {"label":"K29 (B0,F1)", "x":9.75, "y":2},
- {"label":"K2A (B0,F0)", "x":10.75, "y":2},
- {"label":"K2B (B0,B1)", "x":11.75, "y":2},
- {"label":"K2D (B0,B3)", "x":12.75, "y":2, "w":2.25},
-
- {"label":"K30 (F6,D4)", "x":0, "y":3, "w":2.25},
- {"label":"K32 (F6,D7)", "x":2.25, "y":3},
- {"label":"K33 (F6,B4)", "x":3.25, "y":3},
- {"label":"K34 (F6,B5)", "x":4.25, "y":3},
- {"label":"K35 (F6,B6)", "x":5.25, "y":3},
- {"label":"K36 (F6,C6)", "x":6.25, "y":3},
- {"label":"K37 (F6,F5)", "x":7.25, "y":3},
- {"label":"K38 (F6,F4)", "x":8.25, "y":3},
- {"label":"K39 (F6,F1)", "x":9.25, "y":3},
- {"label":"K3A (F6,F0)", "x":10.25, "y":3},
- {"label":"K3B (F6,B1)", "x":11.25, "y":3},
- {"label":"K3C (F6,B2)", "x":12.25, "y":3, "w":2.75},
- {"label":"K3E (F6,D2)", "x":15.25, "y":3},
-
- {"label":"K40 (F7,D4)", "x":0, "y":4, "w":1.25},
- {"label":"K41 (F7,D6)", "x":1.25, "y":4, "w":1.25},
- {"label":"K42 (F7,D7)", "x":2.5, "y":4, "w":1.25},
- {"label":"K46 (F7,C6)", "x":3.75, "y":4, "w":6.25},
- {"label":"K4A (F7,F0)", "x":10, "y":4, "w":1.25},
- {"label":"K4B (F7,B1)", "x":11.25, "y":4, "w":1.25},
- {"label":"K4C (F7,B2)", "x":12.5, "y":4, "w":1.25},
- {"label":"K4D (F7,B3)", "x":14.25, "y":4},
- {"label":"K4E (F7,D2)", "x":15.25, "y":4},
- {"label":"K4F (F7,D3)", "x":16.25, "y":4}
+ {"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.25, "y": 0},
+ {"matrix": [0, 16], "x": 16.25, "y": 0},
+
+ {"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.25, "y": 1},
+ {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+ {"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": [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": 2.75},
+
+ {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+ {"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, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 13], "x": 14.25, "y": 4},
+ {"matrix": [4, 14], "x": 15.25, "y": 4},
+ {"matrix": [4, 15], "x": 16.25, "y": 4}
]
},
"LAYOUT_68_iso": {
"layout": [
- {"label":"K00 (D1,D4)", "x":0, "y":0},
- {"label":"K01 (D1,D6)", "x":1, "y":0},
- {"label":"K02 (D1,D7)", "x":2, "y":0},
- {"label":"K03 (D1,B4)", "x":3, "y":0},
- {"label":"K04 (D1,B5)", "x":4, "y":0},
- {"label":"K05 (D1,B6)", "x":5, "y":0},
- {"label":"K06 (D1,C6)", "x":6, "y":0},
- {"label":"K07 (D1,F5)", "x":7, "y":0},
- {"label":"K08 (D1,F4)", "x":8, "y":0},
- {"label":"K09 (D1,F1)", "x":9, "y":0},
- {"label":"K0A (D1,F0)", "x":10, "y":0},
- {"label":"K0B (D1,B1)", "x":11, "y":0},
- {"label":"K0C (D1,B2)", "x":12, "y":0},
- {"label":"K0D (D1,B3)", "x":13, "y":0, "w":2},
- {"label":"K0F (D1,D3)", "x":15.25, "y":0},
- {"label":"K0G (D1,D5)", "x":16.25, "y":0},
-
- {"label":"K10 (D0,D4)", "x":0, "y":1, "w":1.5},
- {"label":"K11 (D0,D6)", "x":1.5, "y":1},
- {"label":"K12 (D0,D7)", "x":2.5, "y":1},
- {"label":"K13 (D0,B4)", "x":3.5, "y":1},
- {"label":"K14 (D0,B5)", "x":4.5, "y":1},
- {"label":"K15 (D0,B6)", "x":5.5, "y":1},
- {"label":"K16 (D0,C6)", "x":6.5, "y":1},
- {"label":"K17 (D0,F5)", "x":7.5, "y":1},
- {"label":"K18 (D0,F4)", "x":8.5, "y":1},
- {"label":"K19 (D0,F1)", "x":9.5, "y":1},
- {"label":"K1A (D0,F0)", "x":10.5, "y":1},
- {"label":"K1B (D0,B1)", "x":11.5, "y":1},
- {"label":"K1C (D0,B2)", "x":12.5, "y":1},
- {"label":"K1E (D0,D2)", "x":15.25, "y":1},
- {"label":"K1F (D0,D3)", "x":16.25, "y":1},
-
- {"label":"K20 (B0,D4)", "x":0, "y":2, "w":1.75},
- {"label":"K21 (B0,D6)", "x":1.75, "y":2},
- {"label":"K22 (B0,D7)", "x":2.75, "y":2},
- {"label":"K23 (B0,B4)", "x":3.75, "y":2},
- {"label":"K24 (B0,B5)", "x":4.75, "y":2},
- {"label":"K25 (B0,B6)", "x":5.75, "y":2},
- {"label":"K26 (B0,C6)", "x":6.75, "y":2},
- {"label":"K27 (B0,F5)", "x":7.75, "y":2},
- {"label":"K28 (B0,F4)", "x":8.75, "y":2},
- {"label":"K29 (B0,F1)", "x":9.75, "y":2},
- {"label":"K2A (B0,F0)", "x":10.75, "y":2},
- {"label":"K2B (B0,B1)", "x":11.75, "y":2},
- {"label":"K2C (B0,B2)", "x":12.75, "y":2},
- {"label":"K2D (B0,B3)", "x":13.75, "y":1, "w":1.25, "h":2},
-
- {"label":"K30 (F6,D4)", "x":0, "y":3, "w":1.25},
- {"label":"K31 (F6,D6)", "x":1.25, "y":3},
- {"label":"K32 (F6,D7)", "x":2.25, "y":3},
- {"label":"K33 (F6,B4)", "x":3.25, "y":3},
- {"label":"K34 (F6,B5)", "x":4.25, "y":3},
- {"label":"K35 (F6,B6)", "x":5.25, "y":3},
- {"label":"K36 (F6,C6)", "x":6.25, "y":3},
- {"label":"K37 (F6,F5)", "x":7.25, "y":3},
- {"label":"K38 (F6,F4)", "x":8.25, "y":3},
- {"label":"K39 (F6,F1)", "x":9.25, "y":3},
- {"label":"K3A (F6,F0)", "x":10.25, "y":3},
- {"label":"K3B (F6,B1)", "x":11.25, "y":3},
- {"label":"K3C (F6,B2)", "x":12.25, "y":3, "w":2.75},
- {"label":"K3E (F6,D2)", "x":15.25, "y":3},
-
- {"label":"K40 (F7,D4)", "x":0, "y":4, "w":1.25},
- {"label":"K41 (F7,D6)", "x":1.25, "y":4, "w":1.25},
- {"label":"K42 (F7,D7)", "x":2.5, "y":4, "w":1.25},
- {"label":"K46 (F7,C6)", "x":3.75, "y":4, "w":6.25},
- {"label":"K4A (F7,F0)", "x":10, "y":4, "w":1.25},
- {"label":"K4B (F7,B1)", "x":11.25, "y":4, "w":1.25},
- {"label":"K4C (F7,B2)", "x":12.5, "y":4, "w":1.25},
- {"label":"K4D (F7,B3)", "x":14.25, "y":4},
- {"label":"K4E (F7,D2)", "x":15.25, "y":4},
- {"label":"K4F (F7,D3)", "x":16.25, "y":4}
+ {"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.25, "y": 0},
+ {"matrix": [0, 16], "x": 16.25, "y": 0},
+
+ {"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.25, "y": 1},
+ {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+ {"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": [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": 2.75},
+
+ {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+ {"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, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 13], "x": 14.25, "y": 4},
+ {"matrix": [4, 14], "x": 15.25, "y": 4},
+ {"matrix": [4, 15], "x": 16.25, "y": 4}
]
},
"LAYOUT_68_iso_split_bs": {
"layout": [
- {"label":"K00 (D1,D4)", "x":0, "y":0},
- {"label":"K01 (D1,D6)", "x":1, "y":0},
- {"label":"K02 (D1,D7)", "x":2, "y":0},
- {"label":"K03 (D1,B4)", "x":3, "y":0},
- {"label":"K04 (D1,B5)", "x":4, "y":0},
- {"label":"K05 (D1,B6)", "x":5, "y":0},
- {"label":"K06 (D1,C6)", "x":6, "y":0},
- {"label":"K07 (D1,F5)", "x":7, "y":0},
- {"label":"K08 (D1,F4)", "x":8, "y":0},
- {"label":"K09 (D1,F1)", "x":9, "y":0},
- {"label":"K0A (D1,F0)", "x":10, "y":0},
- {"label":"K0B (D1,B1)", "x":11, "y":0},
- {"label":"K0C (D1,B2)", "x":12, "y":0},
- {"label":"K0D (D1,B3)", "x":13, "y":0},
- {"label":"K0E (D1,D2)", "x":14, "y":0},
- {"label":"K0F (D1,D3)", "x":15.25, "y":0},
- {"label":"K0G (D1,D5)", "x":16.25, "y":0},
-
- {"label":"K10 (D0,D4)", "x":0, "y":1, "w":1.5},
- {"label":"K11 (D0,D6)", "x":1.5, "y":1},
- {"label":"K12 (D0,D7)", "x":2.5, "y":1},
- {"label":"K13 (D0,B4)", "x":3.5, "y":1},
- {"label":"K14 (D0,B5)", "x":4.5, "y":1},
- {"label":"K15 (D0,B6)", "x":5.5, "y":1},
- {"label":"K16 (D0,C6)", "x":6.5, "y":1},
- {"label":"K17 (D0,F5)", "x":7.5, "y":1},
- {"label":"K18 (D0,F4)", "x":8.5, "y":1},
- {"label":"K19 (D0,F1)", "x":9.5, "y":1},
- {"label":"K1A (D0,F0)", "x":10.5, "y":1},
- {"label":"K1B (D0,B1)", "x":11.5, "y":1},
- {"label":"K1C (D0,B2)", "x":12.5, "y":1},
- {"label":"K1E (D0,D2)", "x":15.25, "y":1},
- {"label":"K1F (D0,D3)", "x":16.25, "y":1},
-
- {"label":"K20 (B0,D4)", "x":0, "y":2, "w":1.75},
- {"label":"K21 (B0,D6)", "x":1.75, "y":2},
- {"label":"K22 (B0,D7)", "x":2.75, "y":2},
- {"label":"K23 (B0,B4)", "x":3.75, "y":2},
- {"label":"K24 (B0,B5)", "x":4.75, "y":2},
- {"label":"K25 (B0,B6)", "x":5.75, "y":2},
- {"label":"K26 (B0,C6)", "x":6.75, "y":2},
- {"label":"K27 (B0,F5)", "x":7.75, "y":2},
- {"label":"K28 (B0,F4)", "x":8.75, "y":2},
- {"label":"K29 (B0,F1)", "x":9.75, "y":2},
- {"label":"K2A (B0,F0)", "x":10.75, "y":2},
- {"label":"K2B (B0,B1)", "x":11.75, "y":2},
- {"label":"K2C (B0,B2)", "x":12.75, "y":2},
- {"label":"K2D (B0,B3)", "x":13.75, "y":1, "w":1.25, "h":2},
-
- {"label":"K30 (F6,D4)", "x":0, "y":3, "w":1.25},
- {"label":"K31 (F6,D6)", "x":1.25, "y":3},
- {"label":"K32 (F6,D7)", "x":2.25, "y":3},
- {"label":"K33 (F6,B4)", "x":3.25, "y":3},
- {"label":"K34 (F6,B5)", "x":4.25, "y":3},
- {"label":"K35 (F6,B6)", "x":5.25, "y":3},
- {"label":"K36 (F6,C6)", "x":6.25, "y":3},
- {"label":"K37 (F6,F5)", "x":7.25, "y":3},
- {"label":"K38 (F6,F4)", "x":8.25, "y":3},
- {"label":"K39 (F6,F1)", "x":9.25, "y":3},
- {"label":"K3A (F6,F0)", "x":10.25, "y":3},
- {"label":"K3B (F6,B1)", "x":11.25, "y":3},
- {"label":"K3C (F6,B2)", "x":12.25, "y":3, "w":2.75},
- {"label":"K3E (F6,D2)", "x":15.25, "y":3},
-
- {"label":"K40 (F7,D4)", "x":0, "y":4, "w":1.25},
- {"label":"K41 (F7,D6)", "x":1.25, "y":4, "w":1.25},
- {"label":"K42 (F7,D7)", "x":2.5, "y":4, "w":1.25},
- {"label":"K46 (F7,C6)", "x":3.75, "y":4, "w":6.25},
- {"label":"K4A (F7,F0)", "x":10, "y":4, "w":1.25},
- {"label":"K4B (F7,B1)", "x":11.25, "y":4, "w":1.25},
- {"label":"K4C (F7,B2)", "x":12.5, "y":4, "w":1.25},
- {"label":"K4D (F7,B3)", "x":14.25, "y":4},
- {"label":"K4E (F7,D2)", "x":15.25, "y":4},
- {"label":"K4F (F7,D3)", "x":16.25, "y":4}
+ {"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.25, "y": 0},
+ {"matrix": [0, 16], "x": 16.25, "y": 0},
+
+ {"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.25, "y": 1},
+ {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+ {"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": [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": 2.75},
+
+ {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+ {"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, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 13], "x": 14.25, "y": 4},
+ {"matrix": [4, 14], "x": 15.25, "y": 4},
+ {"matrix": [4, 15], "x": 16.25, "y": 4}
]
}
}
diff --git a/keyboards/cmm_studio/saka68/solder/solder.c b/keyboards/cmm_studio/saka68/solder/solder.c
deleted file mode 100644
index 195c14023b..0000000000
--- a/keyboards/cmm_studio/saka68/solder/solder.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 CMM.Studio Freather
- *
- * 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 "solder.h"
diff --git a/keyboards/cmm_studio/saka68/solder/solder.h b/keyboards/cmm_studio/saka68/solder/solder.h
deleted file mode 100644
index a39205f247..0000000000
--- a/keyboards/cmm_studio/saka68/solder/solder.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Copyright 2020 CMM.Studio Freather
- *
- * 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"
-
-#define LAYOUT_68_ansi( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, K0G, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, \
- K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E, K4F \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO, K0F, K0G }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, KC_NO }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO, KC_NO, KC_NO }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, KC_NO, K3E, KC_NO, KC_NO }, \
- { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, K4A, K4B, K4C, KC_NO, K4D, K4E, K4F, KC_NO }, \
-}
-
-#define LAYOUT_68_ansi_split_bs( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, \
- K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E, K4F \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, KC_NO }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO, KC_NO, KC_NO }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, KC_NO, K3E, KC_NO, KC_NO }, \
- { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E, K4F, KC_NO }, \
-}
-
-#define LAYOUT_68_iso( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, K0G, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K1F, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, \
- K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E, K4F \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO, K0F, K0G }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, K1E, K1F, KC_NO }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO, KC_NO, KC_NO }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, KC_NO, K3E, KC_NO, KC_NO }, \
- { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E, K4F, KC_NO }, \
-}
-
-#define LAYOUT_68_iso_split_bs( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K1F, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, \
- K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E, K4F \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, K1E, K1F, KC_NO }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO, KC_NO, KC_NO }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, KC_NO, K3E, KC_NO, KC_NO }, \
- { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E, K4F, KC_NO }, \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 00:15:29 +0000