aboutsummaryrefslogtreecommitdiff
path: root/keyboards/rmi_kb/squishytkl
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/rmi_kb/squishytkl')
-rw-r--r--keyboards/rmi_kb/squishytkl/config.h22
-rw-r--r--keyboards/rmi_kb/squishytkl/info.json847
-rw-r--r--keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c18
-rw-r--r--keyboards/rmi_kb/squishytkl/squishytkl.c17
-rw-r--r--keyboards/rmi_kb/squishytkl/squishytkl.h127
5 files changed, 441 insertions, 590 deletions
diff --git a/keyboards/rmi_kb/squishytkl/config.h b/keyboards/rmi_kb/squishytkl/config.h
index 20e98b3d53..69522b8362 100644
--- a/keyboards/rmi_kb/squishytkl/config.h
+++ b/keyboards/rmi_kb/squishytkl/config.h
@@ -17,26 +17,6 @@ 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 { B3, B4, B5, C13, B9, B8, A0, A1, A9, A8, B11, A6, A5, C0 }
-#define MATRIX_COL_PINS { A15, C10, C11, C12, D2, A7, C4, C5, B0, B1, B2, B10, B12, B13, B14, B15, C6, C9, C7, C8, A10, A4, C14, A3, A2, C3 }
-
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN C15
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 16
//# define RGBLIGHT_HUE_STEP 8
//# define RGBLIGHT_SAT_STEP 8
@@ -53,7 +33,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
@@ -78,4 +57,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* QoL improvements */
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/rmi_kb/squishytkl/info.json b/keyboards/rmi_kb/squishytkl/info.json
index 17236053ca..b49d72c829 100644
--- a/keyboards/rmi_kb/squishytkl/info.json
+++ b/keyboards/rmi_kb/squishytkl/info.json
@@ -8,6 +8,14 @@
"pid": "0x00B1",
"device_version": "1.0.0"
},
+ "ws2812": {
+ "pin": "C15"
+ },
+ "matrix_pins": {
+ "cols": ["A15", "C10", "C11", "C12", "D2", "A7", "C4", "C5", "B0", "B1", "B2", "B10", "B12", "B13", "B14", "B15", "C6", "C9", "C7", "C8", "A10", "A4", "C14", "A3", "A2", "C3"],
+ "rows": ["B3", "B4", "B5", "C13", "B9", "B8", "A0", "A1", "A9", "A8", "B11", "A6", "A5", "C0"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B6", "pin_b": "B7", "resolution": 1}
@@ -18,434 +26,441 @@
"layouts": {
"LAYOUT_ansi": {
"layout": [
- {"x": 0, "y": 0},
-
- {"x": 1.25, "y": 0},
- {"x": 2.25, "y": 0},
- {"x": 3.25, "y": 0},
- {"x": 4.25, "y": 0},
-
- {"x": 5.5, "y": 0},
- {"x": 6.5, "y": 0},
- {"x": 7.5, "y": 0},
- {"x": 8.5, "y": 0},
-
- {"x": 9.75, "y": 0},
- {"x": 10.75, "y": 0},
- {"x": 11.75, "y": 0},
- {"x": 12.75, "y": 0},
-
- {"x": 14, "y": 0},
-
- {"x": 15.25, "y": 0},
- {"x": 16.25, "y": 0},
- {"x": 17.25, "y": 0},
-
- {"x": 0, "y": 1.25},
- {"x": 1, "y": 1.25},
- {"x": 2, "y": 1.25},
- {"x": 3, "y": 1.25},
- {"x": 4, "y": 1.25},
- {"x": 5, "y": 1.25},
- {"x": 6, "y": 1.25},
- {"x": 7, "y": 1.25},
- {"x": 8, "y": 1.25},
- {"x": 9, "y": 1.25},
- {"x": 10, "y": 1.25},
- {"x": 11, "y": 1.25},
- {"x": 12, "y": 1.25},
- {"x": 13, "y": 1.25, "w": 2},
-
- {"x": 15.25, "y": 1.25},
- {"x": 16.25, "y": 1.25},
- {"x": 17.25, "y": 1.25},
-
- {"x": 0, "y": 2.25, "w": 1.5},
- {"x": 1.5, "y": 2.25},
- {"x": 2.5, "y": 2.25},
- {"x": 3.5, "y": 2.25},
- {"x": 4.5, "y": 2.25},
- {"x": 5.5, "y": 2.25},
- {"x": 6.5, "y": 2.25},
- {"x": 7.5, "y": 2.25},
- {"x": 8.5, "y": 2.25},
- {"x": 9.5, "y": 2.25},
- {"x": 10.5, "y": 2.25},
- {"x": 11.5, "y": 2.25},
- {"x": 12.5, "y": 2.25},
- {"x": 13.5, "y": 2.25, "w": 1.5},
-
- {"x": 15.25, "y": 2.25},
- {"x": 16.25, "y": 2.25},
- {"x": 17.25, "y": 2.25},
-
- {"x": 0, "y": 3.25, "w": 1.75},
- {"x": 1.75, "y": 3.25},
- {"x": 2.75, "y": 3.25},
- {"x": 3.75, "y": 3.25},
- {"x": 4.75, "y": 3.25},
- {"x": 5.75, "y": 3.25},
- {"x": 6.75, "y": 3.25},
- {"x": 7.75, "y": 3.25},
- {"x": 8.75, "y": 3.25},
- {"x": 9.75, "y": 3.25},
- {"x": 10.75, "y": 3.25},
- {"x": 11.75, "y": 3.25},
- {"x": 12.75, "y": 3.25, "w": 2.25},
-
- {"x": 0, "y": 4.25, "w": 2.25},
- {"x": 2.25, "y": 4.25},
- {"x": 3.25, "y": 4.25},
- {"x": 4.25, "y": 4.25},
- {"x": 5.25, "y": 4.25},
- {"x": 6.25, "y": 4.25},
- {"x": 7.25, "y": 4.25},
- {"x": 8.25, "y": 4.25},
- {"x": 9.25, "y": 4.25},
- {"x": 10.25, "y": 4.25},
- {"x": 11.25, "y": 4.25},
- {"x": 12.25, "y": 4.25, "w": 2.75},
-
- {"x": 16.25, "y": 4.25},
-
- {"x": 0, "y": 5.25, "w": 1.25},
- {"x": 1.25, "y": 5.25, "w": 1.25},
- {"x": 2.5, "y": 5.25, "w": 1.25},
- {"x": 3.75, "y": 5.25, "w": 6.25},
- {"x": 10, "y": 5.25, "w": 1.25},
- {"x": 11.25, "y": 5.25, "w": 1.25},
- {"x": 12.5, "y": 5.25, "w": 1.25},
- {"x": 13.75, "y": 5.25, "w": 1.25},
-
- {"x": 15.25, "y": 5.25},
- {"x": 16.25, "y": 5.25},
- {"x": 17.25, "y": 5.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 5.5, "y": 0},
+ {"matrix": [1, 1], "x": 6.5, "y": 0},
+ {"matrix": [1, 2], "x": 7.5, "y": 0},
+ {"matrix": [1, 3], "x": 8.5, "y": 0},
+
+ {"matrix": [2, 0], "x": 9.75, "y": 0},
+ {"matrix": [2, 1], "x": 10.75, "y": 0},
+ {"matrix": [2, 2], "x": 11.75, "y": 0},
+ {"matrix": [2, 3], "x": 12.75, "y": 0},
+
+ {"matrix": [2, 4], "x": 14, "y": 0},
+
+ {"matrix": [3, 20], "x": 15.25, "y": 0},
+ {"matrix": [3, 21], "x": 16.25, "y": 0},
+ {"matrix": [3, 22], "x": 17.25, "y": 0},
+
+ {"matrix": [8, 5], "x": 0, "y": 1.25},
+ {"matrix": [8, 6], "x": 1, "y": 1.25},
+ {"matrix": [8, 7], "x": 2, "y": 1.25},
+ {"matrix": [8, 8], "x": 3, "y": 1.25},
+ {"matrix": [8, 9], "x": 4, "y": 1.25},
+ {"matrix": [8, 10], "x": 5, "y": 1.25},
+ {"matrix": [8, 11], "x": 6, "y": 1.25},
+ {"matrix": [8, 12], "x": 7, "y": 1.25},
+ {"matrix": [8, 13], "x": 8, "y": 1.25},
+ {"matrix": [8, 14], "x": 9, "y": 1.25},
+ {"matrix": [8, 15], "x": 10, "y": 1.25},
+ {"matrix": [8, 16], "x": 11, "y": 1.25},
+ {"matrix": [8, 17], "x": 12, "y": 1.25},
+ {"matrix": [8, 18], "x": 13, "y": 1.25, "w": 2},
+
+ {"matrix": [4, 20], "x": 15.25, "y": 1.25},
+ {"matrix": [4, 21], "x": 16.25, "y": 1.25},
+ {"matrix": [4, 22], "x": 17.25, "y": 1.25},
+
+ {"matrix": [9, 5], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [9, 6], "x": 1.5, "y": 2.25},
+ {"matrix": [9, 7], "x": 2.5, "y": 2.25},
+ {"matrix": [9, 8], "x": 3.5, "y": 2.25},
+ {"matrix": [9, 9], "x": 4.5, "y": 2.25},
+ {"matrix": [9, 10], "x": 5.5, "y": 2.25},
+ {"matrix": [9, 11], "x": 6.5, "y": 2.25},
+ {"matrix": [9, 12], "x": 7.5, "y": 2.25},
+ {"matrix": [9, 13], "x": 8.5, "y": 2.25},
+ {"matrix": [9, 14], "x": 9.5, "y": 2.25},
+ {"matrix": [9, 15], "x": 10.5, "y": 2.25},
+ {"matrix": [9, 16], "x": 11.5, "y": 2.25},
+ {"matrix": [9, 17], "x": 12.5, "y": 2.25},
+ {"matrix": [9, 19], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [5, 20], "x": 15.25, "y": 2.25},
+ {"matrix": [5, 21], "x": 16.25, "y": 2.25},
+ {"matrix": [5, 22], "x": 17.25, "y": 2.25},
+
+ {"matrix": [10, 5], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [10, 6], "x": 1.75, "y": 3.25},
+ {"matrix": [10, 7], "x": 2.75, "y": 3.25},
+ {"matrix": [10, 8], "x": 3.75, "y": 3.25},
+ {"matrix": [10, 9], "x": 4.75, "y": 3.25},
+ {"matrix": [10, 10], "x": 5.75, "y": 3.25},
+ {"matrix": [10, 11], "x": 6.75, "y": 3.25},
+ {"matrix": [10, 12], "x": 7.75, "y": 3.25},
+ {"matrix": [10, 13], "x": 8.75, "y": 3.25},
+ {"matrix": [10, 14], "x": 9.75, "y": 3.25},
+ {"matrix": [10, 15], "x": 10.75, "y": 3.25},
+ {"matrix": [10, 16], "x": 11.75, "y": 3.25},
+ {"matrix": [10, 18], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"matrix": [11, 5], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [11, 7], "x": 2.25, "y": 4.25},
+ {"matrix": [11, 8], "x": 3.25, "y": 4.25},
+ {"matrix": [11, 9], "x": 4.25, "y": 4.25},
+ {"matrix": [11, 10], "x": 5.25, "y": 4.25},
+ {"matrix": [11, 11], "x": 6.25, "y": 4.25},
+ {"matrix": [11, 12], "x": 7.25, "y": 4.25},
+ {"matrix": [11, 13], "x": 8.25, "y": 4.25},
+ {"matrix": [11, 14], "x": 9.25, "y": 4.25},
+ {"matrix": [11, 15], "x": 10.25, "y": 4.25},
+ {"matrix": [11, 16], "x": 11.25, "y": 4.25},
+ {"matrix": [11, 18], "x": 12.25, "y": 4.25, "w": 2.75},
+
+ {"matrix": [6, 24], "x": 16.25, "y": 4.25},
+
+ {"matrix": [12, 5], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [12, 6], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [12, 7], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [12, 13], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [12, 15], "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [12, 16], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [12, 18], "x": 12.5, "y": 5.25, "w": 1.25},
+ {"matrix": [12, 19], "x": 13.75, "y": 5.25, "w": 1.25},
+
+ {"matrix": [7, 23], "x": 15.25, "y": 5.25},
+ {"matrix": [7, 24], "x": 16.25, "y": 5.25},
+ {"matrix": [7, 25], "x": 17.25, "y": 5.25}
]
},
"LAYOUT_iso": {
"layout": [
- {"x": 0, "y": 0},
-
- {"x": 1.25, "y": 0},
- {"x": 2.25, "y": 0},
- {"x": 3.25, "y": 0},
- {"x": 4.25, "y": 0},
-
- {"x": 5.5, "y": 0},
- {"x": 6.5, "y": 0},
- {"x": 7.5, "y": 0},
- {"x": 8.5, "y": 0},
-
- {"x": 9.75, "y": 0},
- {"x": 10.75, "y": 0},
- {"x": 11.75, "y": 0},
- {"x": 12.75, "y": 0},
-
- {"x": 14, "y": 0},
-
- {"x": 15.25, "y": 0},
- {"x": 16.25, "y": 0},
- {"x": 17.25, "y": 0},
-
- {"x": 0, "y": 1.25},
- {"x": 1, "y": 1.25},
- {"x": 2, "y": 1.25},
- {"x": 3, "y": 1.25},
- {"x": 4, "y": 1.25},
- {"x": 5, "y": 1.25},
- {"x": 6, "y": 1.25},
- {"x": 7, "y": 1.25},
- {"x": 8, "y": 1.25},
- {"x": 9, "y": 1.25},
- {"x": 10, "y": 1.25},
- {"x": 11, "y": 1.25},
- {"x": 12, "y": 1.25},
- {"x": 13, "y": 1.25, "w": 2},
-
- {"x": 15.25, "y": 1.25},
- {"x": 16.25, "y": 1.25},
- {"x": 17.25, "y": 1.25},
-
- {"x": 0, "y": 2.25, "w": 1.5},
- {"x": 1.5, "y": 2.25},
- {"x": 2.5, "y": 2.25},
- {"x": 3.5, "y": 2.25},
- {"x": 4.5, "y": 2.25},
- {"x": 5.5, "y": 2.25},
- {"x": 6.5, "y": 2.25},
- {"x": 7.5, "y": 2.25},
- {"x": 8.5, "y": 2.25},
- {"x": 9.5, "y": 2.25},
- {"x": 10.5, "y": 2.25},
- {"x": 11.5, "y": 2.25},
- {"x": 12.5, "y": 2.25},
-
- {"x": 15.25, "y": 2.25},
- {"x": 16.25, "y": 2.25},
- {"x": 17.25, "y": 2.25},
-
- {"x": 0, "y": 3.25, "w": 1.75},
- {"x": 1.75, "y": 3.25},
- {"x": 2.75, "y": 3.25},
- {"x": 3.75, "y": 3.25},
- {"x": 4.75, "y": 3.25},
- {"x": 5.75, "y": 3.25},
- {"x": 6.75, "y": 3.25},
- {"x": 7.75, "y": 3.25},
- {"x": 8.75, "y": 3.25},
- {"x": 9.75, "y": 3.25},
- {"x": 10.75, "y": 3.25},
- {"x": 11.75, "y": 3.25},
- {"x": 12.75, "y": 3.25},
- {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
- {"x": 0, "y": 4.25, "w": 1.25},
- {"x": 1.25, "y": 4.25},
- {"x": 2.25, "y": 4.25},
- {"x": 3.25, "y": 4.25},
- {"x": 4.25, "y": 4.25},
- {"x": 5.25, "y": 4.25},
- {"x": 6.25, "y": 4.25},
- {"x": 7.25, "y": 4.25},
- {"x": 8.25, "y": 4.25},
- {"x": 9.25, "y": 4.25},
- {"x": 10.25, "y": 4.25},
- {"x": 11.25, "y": 4.25},
- {"x": 12.25, "y": 4.25, "w": 2.75},
-
- {"x": 16.25, "y": 4.25},
-
- {"x": 0, "y": 5.25, "w": 1.25},
- {"x": 1.25, "y": 5.25, "w": 1.25},
- {"x": 2.5, "y": 5.25, "w": 1.25},
- {"x": 3.75, "y": 5.25, "w": 6.25},
- {"x": 10, "y": 5.25, "w": 1.25},
- {"x": 11.25, "y": 5.25, "w": 1.25},
- {"x": 12.5, "y": 5.25, "w": 1.25},
- {"x": 13.75, "y": 5.25, "w": 1.25},
-
- {"x": 15.25, "y": 5.25},
- {"x": 16.25, "y": 5.25},
- {"x": 17.25, "y": 5.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 5.5, "y": 0},
+ {"matrix": [1, 1], "x": 6.5, "y": 0},
+ {"matrix": [1, 2], "x": 7.5, "y": 0},
+ {"matrix": [1, 3], "x": 8.5, "y": 0},
+
+ {"matrix": [2, 0], "x": 9.75, "y": 0},
+ {"matrix": [2, 1], "x": 10.75, "y": 0},
+ {"matrix": [2, 2], "x": 11.75, "y": 0},
+ {"matrix": [2, 3], "x": 12.75, "y": 0},
+
+ {"matrix": [2, 4], "x": 14, "y": 0},
+
+ {"matrix": [3, 20], "x": 15.25, "y": 0},
+ {"matrix": [3, 21], "x": 16.25, "y": 0},
+ {"matrix": [3, 22], "x": 17.25, "y": 0},
+
+ {"matrix": [8, 5], "x": 0, "y": 1.25},
+ {"matrix": [8, 6], "x": 1, "y": 1.25},
+ {"matrix": [8, 7], "x": 2, "y": 1.25},
+ {"matrix": [8, 8], "x": 3, "y": 1.25},
+ {"matrix": [8, 9], "x": 4, "y": 1.25},
+ {"matrix": [8, 10], "x": 5, "y": 1.25},
+ {"matrix": [8, 11], "x": 6, "y": 1.25},
+ {"matrix": [8, 12], "x": 7, "y": 1.25},
+ {"matrix": [8, 13], "x": 8, "y": 1.25},
+ {"matrix": [8, 14], "x": 9, "y": 1.25},
+ {"matrix": [8, 15], "x": 10, "y": 1.25},
+ {"matrix": [8, 16], "x": 11, "y": 1.25},
+ {"matrix": [8, 17], "x": 12, "y": 1.25},
+ {"matrix": [8, 18], "x": 13, "y": 1.25, "w": 2},
+
+ {"matrix": [4, 20], "x": 15.25, "y": 1.25},
+ {"matrix": [4, 21], "x": 16.25, "y": 1.25},
+ {"matrix": [4, 22], "x": 17.25, "y": 1.25},
+
+ {"matrix": [9, 5], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [9, 6], "x": 1.5, "y": 2.25},
+ {"matrix": [9, 7], "x": 2.5, "y": 2.25},
+ {"matrix": [9, 8], "x": 3.5, "y": 2.25},
+ {"matrix": [9, 9], "x": 4.5, "y": 2.25},
+ {"matrix": [9, 10], "x": 5.5, "y": 2.25},
+ {"matrix": [9, 11], "x": 6.5, "y": 2.25},
+ {"matrix": [9, 12], "x": 7.5, "y": 2.25},
+ {"matrix": [9, 13], "x": 8.5, "y": 2.25},
+ {"matrix": [9, 14], "x": 9.5, "y": 2.25},
+ {"matrix": [9, 15], "x": 10.5, "y": 2.25},
+ {"matrix": [9, 16], "x": 11.5, "y": 2.25},
+ {"matrix": [9, 17], "x": 12.5, "y": 2.25},
+
+ {"matrix": [5, 20], "x": 15.25, "y": 2.25},
+ {"matrix": [5, 21], "x": 16.25, "y": 2.25},
+ {"matrix": [5, 22], "x": 17.25, "y": 2.25},
+
+ {"matrix": [10, 5], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [10, 6], "x": 1.75, "y": 3.25},
+ {"matrix": [10, 7], "x": 2.75, "y": 3.25},
+ {"matrix": [10, 8], "x": 3.75, "y": 3.25},
+ {"matrix": [10, 9], "x": 4.75, "y": 3.25},
+ {"matrix": [10, 10], "x": 5.75, "y": 3.25},
+ {"matrix": [10, 11], "x": 6.75, "y": 3.25},
+ {"matrix": [10, 12], "x": 7.75, "y": 3.25},
+ {"matrix": [10, 13], "x": 8.75, "y": 3.25},
+ {"matrix": [10, 14], "x": 9.75, "y": 3.25},
+ {"matrix": [10, 15], "x": 10.75, "y": 3.25},
+ {"matrix": [10, 16], "x": 11.75, "y": 3.25},
+ {"matrix": [10, 18], "x": 12.75, "y": 3.25},
+ {"matrix": [9, 19], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+ {"matrix": [11, 5], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [11, 6], "x": 1.25, "y": 4.25},
+ {"matrix": [11, 7], "x": 2.25, "y": 4.25},
+ {"matrix": [11, 8], "x": 3.25, "y": 4.25},
+ {"matrix": [11, 9], "x": 4.25, "y": 4.25},
+ {"matrix": [11, 10], "x": 5.25, "y": 4.25},
+ {"matrix": [11, 11], "x": 6.25, "y": 4.25},
+ {"matrix": [11, 12], "x": 7.25, "y": 4.25},
+ {"matrix": [11, 13], "x": 8.25, "y": 4.25},
+ {"matrix": [11, 14], "x": 9.25, "y": 4.25},
+ {"matrix": [11, 15], "x": 10.25, "y": 4.25},
+ {"matrix": [11, 16], "x": 11.25, "y": 4.25},
+ {"matrix": [11, 18], "x": 12.25, "y": 4.25, "w": 2.75},
+
+ {"matrix": [6, 24], "x": 16.25, "y": 4.25},
+
+ {"matrix": [12, 5], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [12, 6], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [12, 7], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [12, 13], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [12, 15], "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [12, 16], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [12, 18], "x": 12.5, "y": 5.25, "w": 1.25},
+ {"matrix": [12, 19], "x": 13.75, "y": 5.25, "w": 1.25},
+
+ {"matrix": [7, 23], "x": 15.25, "y": 5.25},
+ {"matrix": [7, 24], "x": 16.25, "y": 5.25},
+ {"matrix": [7, 25], "x": 17.25, "y": 5.25}
]
},
"LAYOUT_jis": {
"layout": [
- {"x": 0, "y": 0},
- {"x": 1.25, "y": 0},
- {"x": 2.25, "y": 0},
- {"x": 3.25, "y": 0},
- {"x": 4.25, "y": 0},
- {"x": 5.5, "y": 0},
- {"x": 6.5, "y": 0},
- {"x": 7.5, "y": 0},
- {"x": 8.5, "y": 0},
- {"x": 9.75, "y": 0},
- {"x": 10.75, "y": 0},
- {"x": 11.75, "y": 0},
- {"x": 12.75, "y": 0},
- {"x": 14, "y": 0},
- {"x": 15.25, "y": 0},
- {"x": 16.25, "y": 0},
- {"x": 17.25, "y": 0},
-
- {"x": 0, "y": 1.25},
- {"x": 1, "y": 1.25},
- {"x": 2, "y": 1.25},
- {"x": 3, "y": 1.25},
- {"x": 4, "y": 1.25},
- {"x": 5, "y": 1.25},
- {"x": 6, "y": 1.25},
- {"x": 7, "y": 1.25},
- {"x": 8, "y": 1.25},
- {"x": 9, "y": 1.25},
- {"x": 10, "y": 1.25},
- {"x": 11, "y": 1.25},
- {"x": 12, "y": 1.25},
- {"x": 13, "y": 1.25},
- {"x": 14, "y": 1.25},
- {"x": 15.25, "y": 1.25},
- {"x": 16.25, "y": 1.25},
- {"x": 17.25, "y": 1.25},
-
- {"x": 0, "y": 2.25, "w": 1.5},
- {"x": 1.5, "y": 2.25},
- {"x": 2.5, "y": 2.25},
- {"x": 3.5, "y": 2.25},
- {"x": 4.5, "y": 2.25},
- {"x": 5.5, "y": 2.25},
- {"x": 6.5, "y": 2.25},
- {"x": 7.5, "y": 2.25},
- {"x": 8.5, "y": 2.25},
- {"x": 9.5, "y": 2.25},
- {"x": 10.5, "y": 2.25},
- {"x": 11.5, "y": 2.25},
- {"x": 12.5, "y": 2.25},
- {"x": 15.25, "y": 2.25},
- {"x": 16.25, "y": 2.25},
- {"x": 17.25, "y": 2.25},
-
- {"x": 0, "y": 3.25, "w": 1.75},
- {"x": 1.75, "y": 3.25},
- {"x": 2.75, "y": 3.25},
- {"x": 3.75, "y": 3.25},
- {"x": 4.75, "y": 3.25},
- {"x": 5.75, "y": 3.25},
- {"x": 6.75, "y": 3.25},
- {"x": 7.75, "y": 3.25},
- {"x": 8.75, "y": 3.25},
- {"x": 9.75, "y": 3.25},
- {"x": 10.75, "y": 3.25},
- {"x": 11.75, "y": 3.25},
- {"x": 12.75, "y": 3.25},
- {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
- {"x": 0, "y": 4.25, "w": 2.25},
- {"x": 2.25, "y": 4.25},
- {"x": 3.25, "y": 4.25},
- {"x": 4.25, "y": 4.25},
- {"x": 5.25, "y": 4.25},
- {"x": 6.25, "y": 4.25},
- {"x": 7.25, "y": 4.25},
- {"x": 8.25, "y": 4.25},
- {"x": 9.25, "y": 4.25},
- {"x": 10.25, "y": 4.25},
- {"x": 11.25, "y": 4.25},
- {"x": 12.25, "y": 4.25},
- {"x": 13.25, "y": 4.25, "w": 1.75},
-
- {"x": 16.25, "y": 4.25},
-
- {"x": 0, "y": 5.25, "w": 1.5},
- {"x": 1.5, "y": 5.25},
- {"x": 2.5, "y": 5.25, "w": 1.5},
- {"x": 4, "y": 5.25},
- {"x": 5, "y": 5.25},
- {"x": 6, "y": 5.25, "w": 3},
- {"x": 9, "y": 5.25},
- {"x": 10, "y": 5.25},
- {"x": 11, "y": 5.25, "w": 1.5},
- {"x": 12.5, "y": 5.25},
- {"x": 13.5, "y": 5.25, "w": 1.5},
-
- {"x": 15.25, "y": 5.25},
- {"x": 16.25, "y": 5.25},
- {"x": 17.25, "y": 5.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 5.5, "y": 0},
+ {"matrix": [1, 1], "x": 6.5, "y": 0},
+ {"matrix": [1, 2], "x": 7.5, "y": 0},
+ {"matrix": [1, 3], "x": 8.5, "y": 0},
+
+ {"matrix": [2, 0], "x": 9.75, "y": 0},
+ {"matrix": [2, 1], "x": 10.75, "y": 0},
+ {"matrix": [2, 2], "x": 11.75, "y": 0},
+ {"matrix": [2, 3], "x": 12.75, "y": 0},
+
+ {"matrix": [2, 4], "x": 14, "y": 0},
+
+ {"matrix": [3, 20], "x": 15.25, "y": 0},
+ {"matrix": [3, 21], "x": 16.25, "y": 0},
+ {"matrix": [3, 22], "x": 17.25, "y": 0},
+
+ {"matrix": [8, 5], "x": 0, "y": 1.25},
+ {"matrix": [8, 6], "x": 1, "y": 1.25},
+ {"matrix": [8, 7], "x": 2, "y": 1.25},
+ {"matrix": [8, 8], "x": 3, "y": 1.25},
+ {"matrix": [8, 9], "x": 4, "y": 1.25},
+ {"matrix": [8, 10], "x": 5, "y": 1.25},
+ {"matrix": [8, 11], "x": 6, "y": 1.25},
+ {"matrix": [8, 12], "x": 7, "y": 1.25},
+ {"matrix": [8, 13], "x": 8, "y": 1.25},
+ {"matrix": [8, 14], "x": 9, "y": 1.25},
+ {"matrix": [8, 15], "x": 10, "y": 1.25},
+ {"matrix": [8, 16], "x": 11, "y": 1.25},
+ {"matrix": [8, 17], "x": 12, "y": 1.25},
+ {"matrix": [8, 18], "x": 13, "y": 1.25},
+ {"matrix": [8, 19], "x": 14, "y": 1.25},
+
+ {"matrix": [4, 20], "x": 15.25, "y": 1.25},
+ {"matrix": [4, 21], "x": 16.25, "y": 1.25},
+ {"matrix": [4, 22], "x": 17.25, "y": 1.25},
+
+ {"matrix": [9, 5], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [9, 6], "x": 1.5, "y": 2.25},
+ {"matrix": [9, 7], "x": 2.5, "y": 2.25},
+ {"matrix": [9, 8], "x": 3.5, "y": 2.25},
+ {"matrix": [9, 9], "x": 4.5, "y": 2.25},
+ {"matrix": [9, 10], "x": 5.5, "y": 2.25},
+ {"matrix": [9, 11], "x": 6.5, "y": 2.25},
+ {"matrix": [9, 12], "x": 7.5, "y": 2.25},
+ {"matrix": [9, 13], "x": 8.5, "y": 2.25},
+ {"matrix": [9, 14], "x": 9.5, "y": 2.25},
+ {"matrix": [9, 15], "x": 10.5, "y": 2.25},
+ {"matrix": [9, 16], "x": 11.5, "y": 2.25},
+ {"matrix": [9, 17], "x": 12.5, "y": 2.25},
+
+ {"matrix": [5, 20], "x": 15.25, "y": 2.25},
+ {"matrix": [5, 21], "x": 16.25, "y": 2.25},
+ {"matrix": [5, 22], "x": 17.25, "y": 2.25},
+
+ {"matrix": [10, 5], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [10, 6], "x": 1.75, "y": 3.25},
+ {"matrix": [10, 7], "x": 2.75, "y": 3.25},
+ {"matrix": [10, 8], "x": 3.75, "y": 3.25},
+ {"matrix": [10, 9], "x": 4.75, "y": 3.25},
+ {"matrix": [10, 10], "x": 5.75, "y": 3.25},
+ {"matrix": [10, 11], "x": 6.75, "y": 3.25},
+ {"matrix": [10, 12], "x": 7.75, "y": 3.25},
+ {"matrix": [10, 13], "x": 8.75, "y": 3.25},
+ {"matrix": [10, 14], "x": 9.75, "y": 3.25},
+ {"matrix": [10, 15], "x": 10.75, "y": 3.25},
+ {"matrix": [10, 16], "x": 11.75, "y": 3.25},
+ {"matrix": [10, 18], "x": 12.75, "y": 3.25},
+ {"matrix": [9, 19], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+ {"matrix": [11, 5], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [11, 7], "x": 2.25, "y": 4.25},
+ {"matrix": [11, 8], "x": 3.25, "y": 4.25},
+ {"matrix": [11, 9], "x": 4.25, "y": 4.25},
+ {"matrix": [11, 10], "x": 5.25, "y": 4.25},
+ {"matrix": [11, 11], "x": 6.25, "y": 4.25},
+ {"matrix": [11, 12], "x": 7.25, "y": 4.25},
+ {"matrix": [11, 13], "x": 8.25, "y": 4.25},
+ {"matrix": [11, 14], "x": 9.25, "y": 4.25},
+ {"matrix": [11, 15], "x": 10.25, "y": 4.25},
+ {"matrix": [11, 16], "x": 11.25, "y": 4.25},
+ {"matrix": [11, 18], "x": 12.25, "y": 4.25},
+ {"matrix": [11, 19], "x": 13.25, "y": 4.25, "w": 1.75},
+
+ {"matrix": [6, 24], "x": 16.25, "y": 4.25},
+
+ {"matrix": [12, 5], "x": 0, "y": 5.25, "w": 1.5},
+ {"matrix": [12, 6], "x": 1.5, "y": 5.25},
+ {"matrix": [12, 7], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"matrix": [12, 8], "x": 4, "y": 5.25},
+ {"matrix": [12, 9], "x": 5, "y": 5.25},
+ {"matrix": [12, 13], "x": 6, "y": 5.25, "w": 3},
+ {"matrix": [12, 14], "x": 9, "y": 5.25},
+ {"matrix": [12, 15], "x": 10, "y": 5.25},
+ {"matrix": [12, 16], "x": 11, "y": 5.25, "w": 1.5},
+ {"matrix": [12, 18], "x": 12.5, "y": 5.25},
+ {"matrix": [12, 19], "x": 13.5, "y": 5.25, "w": 1.5},
+
+ {"matrix": [7, 23], "x": 15.25, "y": 5.25},
+ {"matrix": [7, 24], "x": 16.25, "y": 5.25},
+ {"matrix": [7, 25], "x": 17.25, "y": 5.25}
]
},
"LAYOUT_all": {
"layout": [
- {"x": 0, "y": 0.5},
-
- {"x": 1.25, "y": 0.5},
- {"x": 2.25, "y": 0.5},
- {"x": 3.25, "y": 0.5},
- {"x": 4.25, "y": 0.5},
-
- {"x": 5.5, "y": 0.5},
- {"x": 6.5, "y": 0.5},
- {"x": 7.5, "y": 0.5},
- {"x": 8.5, "y": 0.5},
-
- {"x": 9.75, "y": 0.5},
- {"x": 10.75, "y": 0.5},
- {"x": 11.75, "y": 0.5},
- {"x": 12.75, "y": 0.5},
-
- {"x": 14, "y": 0.5},
-
- {"x": 15.25, "y": 0.5},
- {"x": 16.25, "y": 0.5},
- {"x": 17.25, "y": 0.5},
-
- {"x": 0, "y": 1.75},
- {"x": 1, "y": 1.75},
- {"x": 2, "y": 1.75},
- {"x": 3, "y": 1.75},
- {"x": 4, "y": 1.75},
- {"x": 5, "y": 1.75},
- {"x": 6, "y": 1.75},
- {"x": 7, "y": 1.75},
- {"x": 8, "y": 1.75},
- {"x": 9, "y": 1.75},
- {"x": 10, "y": 1.75},
- {"x": 11, "y": 1.75},
- {"x": 12, "y": 1.75},
- {"x": 13, "y": 1.75},
- {"x": 14, "y": 1.75},
-
- {"x": 15.25, "y": 1.75},
- {"x": 16.25, "y": 1.75},
- {"x": 17.25, "y": 1.75},
-
- {"x": 0, "y": 2.75, "w": 1.5},
- {"x": 1.5, "y": 2.75},
- {"x": 2.5, "y": 2.75},
- {"x": 3.5, "y": 2.75},
- {"x": 4.5, "y": 2.75},
- {"x": 5.5, "y": 2.75},
- {"x": 6.5, "y": 2.75},
- {"x": 7.5, "y": 2.75},
- {"x": 8.5, "y": 2.75},
- {"x": 9.5, "y": 2.75},
- {"x": 10.5, "y": 2.75},
- {"x": 11.5, "y": 2.75},
- {"x": 12.5, "y": 2.75},
- {"x": 13.5, "y": 2.75, "w": 1.5},
-
- {"x": 15.25, "y": 2.75},
- {"x": 16.25, "y": 2.75},
- {"x": 17.25, "y": 2.75},
-
- {"x": 0, "y": 3.75, "w": 1.75},
- {"x": 1.75, "y": 3.75},
- {"x": 2.75, "y": 3.75},
- {"x": 3.75, "y": 3.75},
- {"x": 4.75, "y": 3.75},
- {"x": 5.75, "y": 3.75},
- {"x": 6.75, "y": 3.75},
- {"x": 7.75, "y": 3.75},
- {"x": 8.75, "y": 3.75},
- {"x": 9.75, "y": 3.75},
- {"x": 10.75, "y": 3.75},
- {"x": 11.75, "y": 3.75},
- {"x": 12.75, "y": 3.75, "w": 2.25},
-
- {"x": 0, "y": 4.75, "w": 1.25},
- {"x": 1.25, "y": 4.75},
- {"x": 2.25, "y": 4.75},
- {"x": 3.25, "y": 4.75},
- {"x": 4.25, "y": 4.75},
- {"x": 5.25, "y": 4.75},
- {"x": 6.25, "y": 4.75},
- {"x": 7.25, "y": 4.75},
- {"x": 8.25, "y": 4.75},
- {"x": 9.25, "y": 4.75},
- {"x": 10.25, "y": 4.75},
- {"x": 11.25, "y": 4.75},
- {"x": 12.25, "y": 4.75, "w": 1.75},
- {"x": 14, "y": 4.75},
-
- {"x": 16.25, "y": 4.75},
-
- {"x": 0, "y": 5.75, "w": 1.25},
- {"x": 1.25, "y": 5.75, "w": 1.25},
- {"x": 2.5, "y": 5.75, "w": 1.25},
- {"x": 3.75, "y": 5.75},
- {"x": 4.75, "y": 5.75, "w": 1.5},
- {"x": 6.25, "y": 5.75},
- {"x": 7.25, "y": 5.75, "w": 2.75},
- {"x": 10, "y": 5.75, "w": 1.25},
- {"x": 11.25, "y": 5.75, "w": 1.25},
- {"x": 12.5, "y": 5.75, "w": 1.25},
- {"x": 13.75, "y": 5.75, "w": 1.25},
-
- {"x": 15.25, "y": 5.75},
- {"x": 16.25, "y": 5.75},
- {"x": 17.25, "y": 5.75},
-
- {"x": 18.5, "y": 0},
- {"x": 18.5, "y": 1}
+ {"matrix": [0, 0], "x": 0, "y": 0.5},
+
+ {"matrix": [0, 1], "x": 1.25, "y": 0.5},
+ {"matrix": [0, 2], "x": 2.25, "y": 0.5},
+ {"matrix": [0, 3], "x": 3.25, "y": 0.5},
+ {"matrix": [0, 4], "x": 4.25, "y": 0.5},
+
+ {"matrix": [1, 0], "x": 5.5, "y": 0.5},
+ {"matrix": [1, 1], "x": 6.5, "y": 0.5},
+ {"matrix": [1, 2], "x": 7.5, "y": 0.5},
+ {"matrix": [1, 3], "x": 8.5, "y": 0.5},
+
+ {"matrix": [2, 0], "x": 9.75, "y": 0.5},
+ {"matrix": [2, 1], "x": 10.75, "y": 0.5},
+ {"matrix": [2, 2], "x": 11.75, "y": 0.5},
+ {"matrix": [2, 3], "x": 12.75, "y": 0.5},
+
+ {"matrix": [2, 4], "x": 14, "y": 0.5},
+
+ {"matrix": [3, 20], "x": 15.25, "y": 0.5},
+ {"matrix": [3, 21], "x": 16.25, "y": 0.5},
+ {"matrix": [3, 22], "x": 17.25, "y": 0.5},
+
+ {"matrix": [8, 5], "x": 0, "y": 1.75},
+ {"matrix": [8, 6], "x": 1, "y": 1.75},
+ {"matrix": [8, 7], "x": 2, "y": 1.75},
+ {"matrix": [8, 8], "x": 3, "y": 1.75},
+ {"matrix": [8, 9], "x": 4, "y": 1.75},
+ {"matrix": [8, 10], "x": 5, "y": 1.75},
+ {"matrix": [8, 11], "x": 6, "y": 1.75},
+ {"matrix": [8, 12], "x": 7, "y": 1.75},
+ {"matrix": [8, 13], "x": 8, "y": 1.75},
+ {"matrix": [8, 14], "x": 9, "y": 1.75},
+ {"matrix": [8, 15], "x": 10, "y": 1.75},
+ {"matrix": [8, 16], "x": 11, "y": 1.75},
+ {"matrix": [8, 17], "x": 12, "y": 1.75},
+ {"matrix": [8, 18], "x": 13, "y": 1.75},
+ {"matrix": [8, 19], "x": 14, "y": 1.75},
+
+ {"matrix": [4, 20], "x": 15.25, "y": 1.75},
+ {"matrix": [4, 21], "x": 16.25, "y": 1.75},
+ {"matrix": [4, 22], "x": 17.25, "y": 1.75},
+
+ {"matrix": [9, 5], "x": 0, "y": 2.75, "w": 1.5},
+ {"matrix": [9, 6], "x": 1.5, "y": 2.75},
+ {"matrix": [9, 7], "x": 2.5, "y": 2.75},
+ {"matrix": [9, 8], "x": 3.5, "y": 2.75},
+ {"matrix": [9, 9], "x": 4.5, "y": 2.75},
+ {"matrix": [9, 10], "x": 5.5, "y": 2.75},
+ {"matrix": [9, 11], "x": 6.5, "y": 2.75},
+ {"matrix": [9, 12], "x": 7.5, "y": 2.75},
+ {"matrix": [9, 13], "x": 8.5, "y": 2.75},
+ {"matrix": [9, 14], "x": 9.5, "y": 2.75},
+ {"matrix": [9, 15], "x": 10.5, "y": 2.75},
+ {"matrix": [9, 16], "x": 11.5, "y": 2.75},
+ {"matrix": [9, 17], "x": 12.5, "y": 2.75},
+ {"matrix": [9, 19], "x": 13.5, "y": 2.75, "w": 1.5},
+
+ {"matrix": [5, 20], "x": 15.25, "y": 2.75},
+ {"matrix": [5, 21], "x": 16.25, "y": 2.75},
+ {"matrix": [5, 22], "x": 17.25, "y": 2.75},
+
+ {"matrix": [10, 5], "x": 0, "y": 3.75, "w": 1.75},
+ {"matrix": [10, 6], "x": 1.75, "y": 3.75},
+ {"matrix": [10, 7], "x": 2.75, "y": 3.75},
+ {"matrix": [10, 8], "x": 3.75, "y": 3.75},
+ {"matrix": [10, 9], "x": 4.75, "y": 3.75},
+ {"matrix": [10, 10], "x": 5.75, "y": 3.75},
+ {"matrix": [10, 11], "x": 6.75, "y": 3.75},
+ {"matrix": [10, 12], "x": 7.75, "y": 3.75},
+ {"matrix": [10, 13], "x": 8.75, "y": 3.75},
+ {"matrix": [10, 14], "x": 9.75, "y": 3.75},
+ {"matrix": [10, 15], "x": 10.75, "y": 3.75},
+ {"matrix": [10, 16], "x": 11.75, "y": 3.75},
+ {"matrix": [10, 18], "x": 12.75, "y": 3.75, "w": 2.25},
+
+ {"matrix": [11, 5], "x": 0, "y": 4.75, "w": 1.25},
+ {"matrix": [11, 6], "x": 1.25, "y": 4.75},
+ {"matrix": [11, 7], "x": 2.25, "y": 4.75},
+ {"matrix": [11, 8], "x": 3.25, "y": 4.75},
+ {"matrix": [11, 9], "x": 4.25, "y": 4.75},
+ {"matrix": [11, 10], "x": 5.25, "y": 4.75},
+ {"matrix": [11, 11], "x": 6.25, "y": 4.75},
+ {"matrix": [11, 12], "x": 7.25, "y": 4.75},
+ {"matrix": [11, 13], "x": 8.25, "y": 4.75},
+ {"matrix": [11, 14], "x": 9.25, "y": 4.75},
+ {"matrix": [11, 15], "x": 10.25, "y": 4.75},
+ {"matrix": [11, 16], "x": 11.25, "y": 4.75},
+ {"matrix": [11, 18], "x": 12.25, "y": 4.75, "w": 1.75},
+ {"matrix": [11, 19], "x": 14, "y": 4.75},
+
+ {"matrix": [6, 24], "x": 16.25, "y": 4.75},
+
+ {"matrix": [12, 5], "x": 0, "y": 5.75, "w": 1.25},
+ {"matrix": [12, 6], "x": 1.25, "y": 5.75, "w": 1.25},
+ {"matrix": [12, 7], "x": 2.5, "y": 5.75, "w": 1.25},
+ {"matrix": [12, 8], "x": 3.75, "y": 5.75},
+ {"matrix": [12, 9], "x": 4.75, "y": 5.75, "w": 1.5},
+ {"matrix": [12, 13], "x": 6.25, "y": 5.75},
+ {"matrix": [12, 14], "x": 7.25, "y": 5.75, "w": 2.75},
+ {"matrix": [12, 15], "x": 10, "y": 5.75, "w": 1.25},
+ {"matrix": [12, 16], "x": 11.25, "y": 5.75, "w": 1.25},
+ {"matrix": [12, 18], "x": 12.5, "y": 5.75, "w": 1.25},
+ {"matrix": [12, 19], "x": 13.75, "y": 5.75, "w": 1.25},
+
+ {"matrix": [7, 23], "x": 15.25, "y": 5.75},
+ {"matrix": [7, 24], "x": 16.25, "y": 5.75},
+ {"matrix": [7, 25], "x": 17.25, "y": 5.75},
+
+ {"matrix": [13, 0], "x": 18.5, "y": 0},
+ {"matrix": [13, 1], "x": 18.5, "y": 1}
]
}
}
diff --git a/keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c b/keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c
index 7bd524f9d9..2c33b4869c 100644
--- a/keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c
+++ b/keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c
@@ -29,24 +29,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
keyevent_t encoder_ccw = {
.key = (keypos_t){.row = 13, .col = 0},
- .pressed = false
+ .pressed = false,
+ .type = KEY_EVENT
};
keyevent_t encoder_cw = {
.key = (keypos_t){.row = 13, .col = 1},
- .pressed = false
+ .pressed = false,
+ .type = KEY_EVENT
};
void matrix_scan_user(void) {
- if (IS_PRESSED(encoder_ccw)) {
+ if (encoder_ccw.pressed) {
encoder_ccw.pressed = false;
- encoder_ccw.time = (timer_read() | 1);
+ encoder_ccw.time = timer_read();
action_exec(encoder_ccw);
}
- if (IS_PRESSED(encoder_cw)) {
+ if (encoder_cw.pressed) {
encoder_cw.pressed = false;
- encoder_cw.time = (timer_read() | 1);
+ encoder_cw.time = timer_read();
action_exec(encoder_cw);
}
}
@@ -54,11 +56,11 @@ void matrix_scan_user(void) {
bool encoder_update_user(uint8_t index, bool clockwise) {
if (clockwise) {
encoder_cw.pressed = true;
- encoder_cw.time = (timer_read() | 1);
+ encoder_cw.time = timer_read();
action_exec(encoder_cw);
} else {
encoder_ccw.pressed = true;
- encoder_ccw.time = (timer_read() | 1);
+ encoder_ccw.time = timer_read();
action_exec(encoder_ccw);
}
return true;
diff --git a/keyboards/rmi_kb/squishytkl/squishytkl.c b/keyboards/rmi_kb/squishytkl/squishytkl.c
deleted file mode 100644
index 9a63c81364..0000000000
--- a/keyboards/rmi_kb/squishytkl/squishytkl.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Ramon Imbao
- *
- * 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 "squishytkl.h"
diff --git a/keyboards/rmi_kb/squishytkl/squishytkl.h b/keyboards/rmi_kb/squishytkl/squishytkl.h
deleted file mode 100644
index 204d497a57..0000000000
--- a/keyboards/rmi_kb/squishytkl/squishytkl.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/* Copyright 2021 Ramon Imbao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define ___ KC_NO
-
-#define LAYOUT_ansi( \
- k00, k01, k02, k03, k04, k10, k11, k12, k13, k20, k21, k22, k23, k24, k3K, k3L, k3M, \
- k85, k86, k87, k88, k89, k8A, k8B, k8C, k8D, k8E, k8F, k8G, k8H, k8I, k4K, k4L, k4M, \
- k95, k96, k97, k98, k99, k9A, k9B, k9C, k9D, k9E, k9F, k9G, k9H, k9J, k5K, k5L, k5M, \
- kA5, kA6, kA7, kA8, kA9, kAA, kAB, kAC, kAD, kAE, kAF, kAG, kAI, \
- kB5, kB7, kB8, kB9, kBA, kBB, kBC, kBD, kBE, kBF, kBG, kBI, k6O, \
- kC5, kC6, kC7, kCD, kCF, kCG, kCI, kCJ, k7N, k7O, k7P \
-) { \
- { k00, k01, k02, k03, k04, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
- { k10, k11, k12, k13, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
- { k20, k21, k22, k23, k24, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
- { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k3K, k3L, k3M, ___, ___, ___ }, \
- { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k4K, k4L, k4M, ___, ___, ___ }, \
- { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k5K, k5L, k5M, ___, ___, ___ }, \
- { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k6O, ___ }, \
- { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k7N, k7O, k7P }, \
- { ___, ___, ___, ___, ___, k85, k86, k87, k88, k89, k8A, k8B, k8C, k8D, k8E, k8F, k8G, k8H, k8I, ___, ___, ___, ___, ___, ___, ___ }, \
- { ___, ___, ___, ___, ___, k95, k96, k97, k98, k99, k9A, k9B, k9C, k9D, k9E, k9F, k9G, k9H, ___, k9J, ___, ___, ___, ___, ___, ___ }, \
- { ___, ___, ___, ___, ___, kA5, kA6, kA7, kA8, kA9, kAA, kAB, kAC, kAD, kAE, kAF, kAG, ___, kAI, ___, ___, ___, ___, ___, ___, ___ }, \
- { ___, ___, ___, ___, ___, kB5, ___, kB7, kB8, kB9, kBA, kBB, kBC, kBD, kBE, kBF, kBG, ___, kBI, ___, ___, ___, ___, ___, ___, ___ }, \
- { ___, ___, ___, ___, ___, kC5, kC6, kC7, ___, ___, ___, ___, ___, kCD, ___, kCF, kCG, ___, kCI, kCJ, ___, ___, ___, ___, ___, ___ }, \
- { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ } \
-}
-
-#define LAYOUT_iso( \
- k00, k01, k02, k03, k04, k10, k11, k12, k13, k20, k21, k22, k23, k24, k3K, k3L, k3M, \
- k85, k86, k87, k88, k89, k8A, k8B, k8C, k8D, k8E, k8F, k8G, k8H, k8I, k4K, k4L, k4M, \
- k95, k96, k97, k98, k99, k9A, k9B, k9C, k9D, k9E, k9F, k9G, k9H, k5K, k5L, k5M, \
- kA5, kA6, kA7, kA8, kA9, kAA, kAB, kAC, kAD, kAE, kAF, kAG, kAI, k9J, \
- kB5, kB6, kB7, kB8, kB9, kBA, kBB, kBC, kBD, kBE, kBF, kBG, kBI, k6O, \
- kC5, kC6, kC7, kCD, kCF, kCG, kCI, kCJ, k7N, k7O, k7P \
-) { \
- { k00, k01, k02, k03, k04, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
- { k10, k11, k12, k13, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
- { k20, k21, k22, k23, k24, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
- { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k3K, k3L, k3M, ___, ___, ___ }, \
- { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k4K, k4L, k4M, ___, ___, ___ }, \
- { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k5K, k5L, k5M, ___, ___, ___ }, \
- { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k6O, ___ }, \
- { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k7N, k7O, k7P }, \
- { ___, ___, ___, ___, ___, k85, k86, k87, k88, k89, k8A, k8B, k8C, k8D, k8E, k8F, k8G, k8H, k8I, ___, ___, ___, ___, ___, ___, ___ }, \
- { ___, ___, ___, ___, ___, k95, k96, k97, k98, k99, k9A, k9B, k9C, k9D, k9E, k9F, k9G, k9H, ___, k9J, ___, ___, ___, ___, ___, ___ }, \
- { ___, ___, ___, ___, ___, kA5, kA6, kA7, kA8, kA9, kAA, kAB, kAC, kAD, kAE, kAF, kAG, ___, kAI, ___, ___, ___, ___, ___, ___, ___ }, \
- { ___, ___, ___, ___, ___, kB5, kB6, kB7, kB8, kB9, kBA, kBB, kBC, kBD, kBE, kBF, kBG, ___, kBI, ___, ___, ___, ___, ___, ___, ___ }, \
- { ___, ___, ___, ___, ___, kC5, kC6, kC7, ___, ___, ___, ___, ___, kCD, ___, kCF, kCG, ___, kCI, kCJ, ___, ___, ___, ___, ___, ___ }, \
- { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ } \
-}
-
-#define LAYOUT_jis( \
- k00, k01, k02, k03, k04, k10, k11, k12, k13, k20, k21, k22, k23, k24, k3K, k3L, k3M, \
- k85, k86, k87, k88, k89, k8A, k8B, k8C, k8D, k8E, k8F, k8G, k8H, k8I, k8J, k4K, k4L, k4M, \
- k95, k96, k97, k98, k99, k9A, k9B, k9C, k9D, k9E, k9F, k9G, k9H, k5K, k5L, k5M, \
- kA5, kA6, kA7, kA8, kA9, kAA, kAB, kAC, kAD, kAE, kAF, kAG, kAI, k9J, \
- kB5, kB7, kB8, kB9, kBA, kBB, kBC, kBD, kBE, kBF, kBG, kBI, kBJ, k6O, \
- kC5, kC6, kC7, kC8, kC9, kCD, kCE, kCF, kCG, kCI, kCJ, k7N, k7O, k7P \
-) { \
- { k00, k01, k02, k03, k04, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
- { k10, k11, k12, k13, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
- { k20, k21, k22, k23, k24, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
- { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k3K, k3L, k3M, ___, ___, ___ }, \
- { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k4K, k4L, k4M, ___, ___, ___ }, \
- { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k5K, k5L, k5M, ___, ___, ___ }, \
- { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k6O, ___ }, \
- { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k7N, k7O, k7P }, \
- { ___, ___, ___, ___, ___, k85, k86, k87, k88, k89, k8A, k8B, k8C, k8D, k8E, k8F, k8G, k8H, k8I, k8J, ___, ___, ___, ___, ___, ___ }, \
- { ___, ___, ___, ___, ___, k95, k96, k97, k98, k99, k9A, k9B, k9C, k9D, k9E, k9F, k9G, k9H, ___, k9J, ___, ___, ___, ___, ___, ___ }, \
- { ___, ___, ___, ___, ___, kA5, kA6, kA7, kA8, kA9, kAA, kAB, kAC, kAD, kAE, kAF, kAG, ___, kAI, ___, ___, ___, ___, ___, ___, ___ }, \
- { ___, ___, ___, ___, ___, kB5, ___, kB7, kB8, kB9, kBA, kBB, kBC, kBD, kBE, kBF, kBG, ___, kBI, kBJ, ___, ___, ___, ___, ___, ___ }, \
- { ___, ___, ___, ___, ___, kC5, kC6, kC7, kC8, kC9, ___, ___, ___, kCD, kCE, kCF, kCG, ___, kCI, kCJ, ___, ___, ___, ___, ___, ___ }, \
- { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ } \
-}
-
-#define LAYOUT_all( \
- k00, k01, k02, k03, k04, k10, k11, k12, k13, k20, k21, k22, k23, k24, k3K, k3L, k3M, \
- k85, k86, k87, k88, k89, k8A, k8B, k8C, k8D, k8E, k8F, k8G, k8H, k8I, k8J, k4K, k4L, k4M, \
- k95, k96, k97, k98, k99, k9A, k9B, k9C, k9D, k9E, k9F, k9G, k9H, k9J, k5K, k5L, k5M, \
- kA5, kA6, kA7, kA8, kA9, kAA, kAB, kAC, kAD, kAE, kAF, kAG, kAI, \
- kB5, kB6, kB7, kB8, kB9, kBA, kBB, kBC, kBD, kBE, kBF, kBG, kBI, kBJ, k6O, \
- kC5, kC6, kC7, kC8, kC9, kCD, kCE, kCF, kCG, kCI, kCJ, k7N, k7O, k7P, \
- kD0, kD1 \
-) { \
- { k00, k01, k02, k03, k04, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
- { k10, k11, k12, k13, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
- { k20, k21, k22, k23, k24, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
- { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k3K, k3L, k3M, ___, ___, ___ }, \
- { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k4K, k4L, k4M, ___, ___, ___ }, \
- { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k5K, k5L, k5M, ___, ___, ___ }, \
- { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k6O, ___ }, \
- { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k7N, k7O, k7P }, \
- { ___, ___, ___, ___, ___, k85, k86, k87, k88, k89, k8A, k8B, k8C, k8D, k8E, k8F, k8G, k8H, k8I, k8J, ___, ___, ___, ___, ___, ___ }, \
- { ___, ___, ___, ___, ___, k95, k96, k97, k98, k99, k9A, k9B, k9C, k9D, k9E, k9F, k9G, k9H, ___, k9J, ___, ___, ___, ___, ___, ___ }, \
- { ___, ___, ___, ___, ___, kA5, kA6, kA7, kA8, kA9, kAA, kAB, kAC, kAD, kAE, kAF, kAG, ___, kAI, ___, ___, ___, ___, ___, ___, ___ }, \
- { ___, ___, ___, ___, ___, kB5, kB6, kB7, kB8, kB9, kBA, kBB, kBC, kBD, kBE, kBF, kBG, ___, kBI, kBJ, ___, ___, ___, ___, ___, ___ }, \
- { ___, ___, ___, ___, ___, kC5, kC6, kC7, kC8, kC9, ___, ___, ___, kCD, kCE, kCF, kCG, ___, kCI, kCJ, ___, ___, ___, ___, ___, ___ }, \
- { kD0, kD1, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ } \
-}