summaryrefslogtreecommitdiff
path: root/keyboards/dtisaac
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/dtisaac')
-rw-r--r--keyboards/dtisaac/cg108/cg108.c17
-rw-r--r--keyboards/dtisaac/cg108/cg108.h49
-rw-r--r--keyboards/dtisaac/cg108/config.h18
-rw-r--r--keyboards/dtisaac/cg108/info.json262
-rw-r--r--keyboards/dtisaac/dosa40rgb/config.h18
-rw-r--r--keyboards/dtisaac/dosa40rgb/dosa40rgb.c2
-rw-r--r--keyboards/dtisaac/dosa40rgb/dosa40rgb.h40
-rw-r--r--keyboards/dtisaac/dosa40rgb/info.json98
-rw-r--r--keyboards/dtisaac/dosa40rgb/rules.mk1
-rw-r--r--keyboards/dtisaac/dtisaac01/config.h35
-rw-r--r--keyboards/dtisaac/dtisaac01/dtisaac01.c17
-rw-r--r--keyboards/dtisaac/dtisaac01/dtisaac01.h49
-rw-r--r--keyboards/dtisaac/dtisaac01/info.json192
13 files changed, 305 insertions, 493 deletions
diff --git a/keyboards/dtisaac/cg108/cg108.c b/keyboards/dtisaac/cg108/cg108.c
deleted file mode 100644
index c2a7254aa8..0000000000
--- a/keyboards/dtisaac/cg108/cg108.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 DTIsaac
- *
- * 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 "cg108.h"
diff --git a/keyboards/dtisaac/cg108/cg108.h b/keyboards/dtisaac/cg108/cg108.h
deleted file mode 100644
index 3532193392..0000000000
--- a/keyboards/dtisaac/cg108/cg108.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2021 DTIsaac
- *
- * 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.
- */
-// default keymap: all 117 keys with ANSI Enter
-#define LAYOUT( \
- K000, K001, K002, K003, K300, K301, K302, K303, K306, K307, K308, K309, K310, K004, K005, K006, K007, K008, K009, K010, \
- K100, K101, K102, K103, K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K104, K105, K106, K107, K108, K109, K110, \
- K200, K201, K202, K203, K500, K501, K502, K503, K505, K506, K507, K508, K509, K510, K204, K205, K206, K207, K208, K209, K210, \
- K800, K801, K802, K803, K600, K601, K602, K603, K606, K607, K608, K609, K610, K807, K808, K809, K810, \
- K900, K901, K902, K903, K700, K701, K702, K703, K705, K706, K707, K708, K709, K710, K906, K907, K908, K909, K910, \
- KA00, KA01, KA02, KA03, K804, K805, K806, K604, K605, K904, K905, KA04, KA05, KA06, KA07, KA08, KA09, KA10 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210 }, \
- { K300, K301, K302, K303, KC_NO, KC_NO, K306, K307, K308, K309, K310 }, \
- { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410 }, \
- { K500, K501, K502, K503, KC_NO, K505, K506, K507, K508, K509, K510 }, \
- { K600, K601, K602, K603, K604, K605, K606, K607, K608, K609, K610 }, \
- { K700, K701, K702, K703, KC_NO, K705, K706, K707, K708, K709, K710 }, \
- { K800, K801, K802, K803, K804, K805, K806, K807, K808, K809, K810 }, \
- { K900, K901, K902, K903, K904, K905, K906, K907, K908, K909, K910 }, \
- { KA00, KA01, KA02, KA03, KA04, KA05, KA06, KA07, KA08, KA09, KA10 } \
-}
diff --git a/keyboards/dtisaac/cg108/config.h b/keyboards/dtisaac/cg108/config.h
index fb60cba345..d39c818a73 100644
--- a/keyboards/dtisaac/cg108/config.h
+++ b/keyboards/dtisaac/cg108/config.h
@@ -17,24 +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)
- *
- */
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F4, F1, F0, F5, F6, F7, D4, D5, D3, D2, D0 }
-#define MATRIX_COL_PINS { C7, C6, B4, D7, B3, B2, B0, E6, B1, D1, D6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/dtisaac/cg108/info.json b/keyboards/dtisaac/cg108/info.json
index d386e9148a..c657c029eb 100644
--- a/keyboards/dtisaac/cg108/info.json
+++ b/keyboards/dtisaac/cg108/info.json
@@ -8,6 +8,11 @@
"pid": "0x4973",
"device_version": "0.0.2"
},
+ "matrix_pins": {
+ "cols": ["C7", "C6", "B4", "D7", "B3", "B2", "B0", "E6", "B1", "D1", "D6"],
+ "rows": ["F4", "F1", "F0", "F5", "F6", "F7", "D4", "D5", "D3", "D2", "D0"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "B6",
"num_lock": "B5",
@@ -16,127 +21,146 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
- "layouts": {
+ "layouts": {
"LAYOUT": {
"layout": [
- {"label":"K000", "x":0, "y":0},
- {"label":"K001", "x":2, "y":0},
- {"label":"K002", "x":3, "y":0},
- {"label":"K003", "x":4, "y":0},
- {"label":"K300", "x":5, "y":0},
- {"label":"K301", "x":6.5, "y":0},
- {"label":"K302", "x":7.5, "y":0},
- {"label":"K303", "x":8.5, "y":0},
- {"label":"K306", "x":9.5, "y":0},
- {"label":"K307", "x":11, "y":0},
- {"label":"K308", "x":12, "y":0},
- {"label":"K309", "x":13, "y":0},
- {"label":"K310", "x":14, "y":0},
- {"label":"K004", "x":15.25, "y":0},
- {"label":"K005", "x":16.25, "y":0},
- {"label":"K006", "x":17.25, "y":0},
- {"label":"K007", "x":18.5, "y":0},
- {"label":"K008", "x":19.5, "y":0},
- {"label":"K009", "x":20.5, "y":0},
- {"label":"K010", "x":21.5, "y":0},
- {"label":"K100", "x":0, "y":1.5},
- {"label":"K101", "x":1, "y":1.5},
- {"label":"K102", "x":2, "y":1.5},
- {"label":"K103", "x":3, "y":1.5},
- {"label":"K400", "x":4, "y":1.5},
- {"label":"K401", "x":5, "y":1.5},
- {"label":"K402", "x":6, "y":1.5},
- {"label":"K403", "x":7, "y":1.5},
- {"label":"K404", "x":8, "y":1.5},
- {"label":"K405", "x":9, "y":1.5},
- {"label":"K406", "x":10, "y":1.5},
- {"label":"K407", "x":11, "y":1.5},
- {"label":"K408", "x":12, "y":1.5},
- {"label":"K409", "x":13, "y":1.5},
- {"label":"K410", "x":14, "y":1.5},
- {"label":"K104", "x":15.25, "y":1.5},
- {"label":"K105", "x":16.25, "y":1.5},
- {"label":"K106", "x":17.25, "y":1.5},
- {"label":"K107", "x":18.5, "y":1.5},
- {"label":"K108", "x":19.5, "y":1.5},
- {"label":"K109", "x":20.5, "y":1.5},
- {"label":"K110", "x":21.5, "y":1.5},
- {"label":"K200", "x":0, "y":2.5, "w":1.5},
- {"label":"K201", "x":1.5, "y":2.5},
- {"label":"K202", "x":2.5, "y":2.5},
- {"label":"K203", "x":3.5, "y":2.5},
- {"label":"K500", "x":4.5, "y":2.5},
- {"label":"K501", "x":5.5, "y":2.5},
- {"label":"K502", "x":6.5, "y":2.5},
- {"label":"K503", "x":7.5, "y":2.5},
- {"label":"K505", "x":8.5, "y":2.5},
- {"label":"K506", "x":9.5, "y":2.5},
- {"label":"K507", "x":10.5, "y":2.5},
- {"label":"K508", "x":11.5, "y":2.5},
- {"label":"K509", "x":12.5, "y":2.5},
- {"label":"K510", "x":13.5, "y":2.5, "w":1.5},
- {"label":"K204", "x":15.25, "y":2.5},
- {"label":"K205", "x":16.25, "y":2.5},
- {"label":"K206", "x":17.25, "y":2.5},
- {"label":"K207", "x":18.5, "y":2.5},
- {"label":"K208", "x":19.5, "y":2.5},
- {"label":"K209", "x":20.5, "y":2.5},
- {"label":"K210", "x":21.5, "y":2.5},
- {"label":"K800", "x":0, "y":3.5, "w":1.75},
- {"label":"K801", "x":1.75, "y":3.5},
- {"label":"K802", "x":2.75, "y":3.5},
- {"label":"K803", "x":3.75, "y":3.5},
- {"label":"K600", "x":4.75, "y":3.5},
- {"label":"K601", "x":5.75, "y":3.5},
- {"label":"K602", "x":6.75, "y":3.5},
- {"label":"K603", "x":7.75, "y":3.5},
- {"label":"K606", "x":8.75, "y":3.5},
- {"label":"K607", "x":9.75, "y":3.5},
- {"label":"K608", "x":10.75, "y":3.5},
- {"label":"K609", "x":11.75, "y":3.5},
- {"label":"K610", "x":12.75, "y":3.5, "w":2.25},
- {"label":"K807", "x":18.5, "y":3.5},
- {"label":"K808", "x":19.5, "y":3.5},
- {"label":"K809", "x":20.5, "y":3.5},
- {"label":"K810", "x":21.5, "y":3.5},
- {"label":"K900", "x":0, "y":4.5, "w":1.25},
- {"label":"K901", "x":1.25, "y":4.5},
- {"label":"K902", "x":2.25, "y":4.5},
- {"label":"K903", "x":3.25, "y":4.5},
- {"label":"K700", "x":4.25, "y":4.5},
- {"label":"K701", "x":5.25, "y":4.5},
- {"label":"K702", "x":6.25, "y":4.5},
- {"label":"K703", "x":7.25, "y":4.5},
- {"label":"K705", "x":8.25, "y":4.5},
- {"label":"K706", "x":9.25, "y":4.5},
- {"label":"K707", "x":10.25, "y":4.5},
- {"label":"K708", "x":11.25, "y":4.5},
- {"label":"K709", "x":12.25, "y":4.5, "w":1.75},
- {"label":"K710", "x":14, "y":4.5},
- {"label":"K906", "x":16.25, "y":4.5},
- {"label":"K907", "x":18.5, "y":4.5},
- {"label":"K908", "x":19.5, "y":4.5},
- {"label":"K909", "x":20.5, "y":4.5},
- {"label":"K910", "x":21.5, "y":4.5},
- {"label":"KA00", "x":0, "y":5.5, "w":1.5},
- {"label":"KA01", "x":1.5, "y":5.5},
- {"label":"KA02", "x":2.5, "y":5.5, "w":1.5},
- {"label":"KA03", "x":4, "y":5.5},
- {"label":"K804", "x":5, "y":5.5, "w":2},
- {"label":"K805", "x":7, "y":5.5},
- {"label":"K806", "x":8, "y":5.5, "w":2},
- {"label":"K604", "x":10, "y":5.5},
- {"label":"K605", "x":11, "y":5.5, "w":1.5},
- {"label":"K904", "x":12.5, "y":5.5},
- {"label":"K905", "x":13.5, "y":5.5, "w":1.5},
- {"label":"KA04", "x":15.25, "y":5.5},
- {"label":"KA05", "x":16.25, "y":5.5},
- {"label":"KA06", "x":17.25, "y":5.5},
- {"label":"KA07", "x":18.5, "y":5.5},
- {"label":"KA08", "x":19.5, "y":5.5},
- {"label":"KA09", "x":20.5, "y":5.5},
- {"label":"KA10", "x":21.5, "y":5.5}
- ]
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [3, 0], "x": 5, "y": 0},
+
+ {"matrix": [3, 1], "x": 6.5, "y": 0},
+ {"matrix": [3, 2], "x": 7.5, "y": 0},
+ {"matrix": [3, 3], "x": 8.5, "y": 0},
+ {"matrix": [3, 6], "x": 9.5, "y": 0},
+
+ {"matrix": [3, 7], "x": 11, "y": 0},
+ {"matrix": [3, 8], "x": 12, "y": 0},
+ {"matrix": [3, 9], "x": 13, "y": 0},
+ {"matrix": [3, 10], "x": 14, "y": 0},
+
+ {"matrix": [0, 4], "x": 15.25, "y": 0},
+ {"matrix": [0, 5], "x": 16.25, "y": 0},
+ {"matrix": [0, 6], "x": 17.25, "y": 0},
+
+ {"matrix": [0, 7], "x": 18.5, "y": 0},
+ {"matrix": [0, 8], "x": 19.5, "y": 0},
+ {"matrix": [0, 9], "x": 20.5, "y": 0},
+ {"matrix": [0, 10], "x": 21.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [4, 0], "x": 4, "y": 1.5},
+ {"matrix": [4, 1], "x": 5, "y": 1.5},
+ {"matrix": [4, 2], "x": 6, "y": 1.5},
+ {"matrix": [4, 3], "x": 7, "y": 1.5},
+ {"matrix": [4, 4], "x": 8, "y": 1.5},
+ {"matrix": [4, 5], "x": 9, "y": 1.5},
+ {"matrix": [4, 6], "x": 10, "y": 1.5},
+ {"matrix": [4, 7], "x": 11, "y": 1.5},
+ {"matrix": [4, 8], "x": 12, "y": 1.5},
+ {"matrix": [4, 9], "x": 13, "y": 1.5},
+ {"matrix": [4, 10], "x": 14, "y": 1.5},
+
+ {"matrix": [1, 4], "x": 15.25, "y": 1.5},
+ {"matrix": [1, 5], "x": 16.25, "y": 1.5},
+ {"matrix": [1, 6], "x": 17.25, "y": 1.5},
+
+ {"matrix": [1, 7], "x": 18.5, "y": 1.5},
+ {"matrix": [1, 8], "x": 19.5, "y": 1.5},
+ {"matrix": [1, 9], "x": 20.5, "y": 1.5},
+ {"matrix": [1, 10], "x": 21.5, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [5, 0], "x": 4.5, "y": 2.5},
+ {"matrix": [5, 1], "x": 5.5, "y": 2.5},
+ {"matrix": [5, 2], "x": 6.5, "y": 2.5},
+ {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+ {"matrix": [5, 5], "x": 8.5, "y": 2.5},
+ {"matrix": [5, 6], "x": 9.5, "y": 2.5},
+ {"matrix": [5, 7], "x": 10.5, "y": 2.5},
+ {"matrix": [5, 8], "x": 11.5, "y": 2.5},
+ {"matrix": [5, 9], "x": 12.5, "y": 2.5},
+ {"matrix": [5, 10], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"matrix": [2, 4], "x": 15.25, "y": 2.5},
+ {"matrix": [2, 5], "x": 16.25, "y": 2.5},
+ {"matrix": [2, 6], "x": 17.25, "y": 2.5},
+
+ {"matrix": [2, 7], "x": 18.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 19.5, "y": 2.5},
+ {"matrix": [2, 9], "x": 20.5, "y": 2.5},
+ {"matrix": [2, 10], "x": 21.5, "y": 2.5},
+
+ {"matrix": [8, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [8, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [8, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [8, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [6, 0], "x": 4.75, "y": 3.5},
+ {"matrix": [6, 1], "x": 5.75, "y": 3.5},
+ {"matrix": [6, 2], "x": 6.75, "y": 3.5},
+ {"matrix": [6, 3], "x": 7.75, "y": 3.5},
+ {"matrix": [6, 6], "x": 8.75, "y": 3.5},
+ {"matrix": [6, 7], "x": 9.75, "y": 3.5},
+ {"matrix": [6, 8], "x": 10.75, "y": 3.5},
+ {"matrix": [6, 9], "x": 11.75, "y": 3.5},
+ {"matrix": [6, 10], "x": 12.75, "y": 3.5, "w": 2.25},
+
+ {"matrix": [8, 7], "x": 18.5, "y": 3.5},
+ {"matrix": [8, 8], "x": 19.5, "y": 3.5},
+ {"matrix": [8, 9], "x": 20.5, "y": 3.5},
+ {"matrix": [8, 10], "x": 21.5, "y": 3.5},
+
+ {"matrix": [9, 0], "x": 0, "y": 4.5, "w": 1.25},
+ {"matrix": [9, 1], "x": 1.25, "y": 4.5},
+ {"matrix": [9, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [9, 3], "x": 3.25, "y": 4.5},
+ {"matrix": [7, 0], "x": 4.25, "y": 4.5},
+ {"matrix": [7, 1], "x": 5.25, "y": 4.5},
+ {"matrix": [7, 2], "x": 6.25, "y": 4.5},
+ {"matrix": [7, 3], "x": 7.25, "y": 4.5},
+ {"matrix": [7, 5], "x": 8.25, "y": 4.5},
+ {"matrix": [7, 6], "x": 9.25, "y": 4.5},
+ {"matrix": [7, 7], "x": 10.25, "y": 4.5},
+ {"matrix": [7, 8], "x": 11.25, "y": 4.5},
+ {"matrix": [7, 9], "x": 12.25, "y": 4.5, "w": 1.75},
+ {"matrix": [7, 10], "x": 14, "y": 4.5},
+
+ {"matrix": [9, 6], "x": 16.25, "y": 4.5},
+
+ {"matrix": [9, 7], "x": 18.5, "y": 4.5},
+ {"matrix": [9, 8], "x": 19.5, "y": 4.5},
+ {"matrix": [9, 9], "x": 20.5, "y": 4.5},
+ {"matrix": [9, 10], "x": 21.5, "y": 4.5},
+
+ {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5},
+ {"matrix": [10, 1], "x": 1.5, "y": 5.5},
+ {"matrix": [10, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+ {"matrix": [10, 3], "x": 4, "y": 5.5},
+ {"matrix": [8, 4], "x": 5, "y": 5.5, "w": 2},
+ {"matrix": [8, 5], "x": 7, "y": 5.5},
+ {"matrix": [8, 6], "x": 8, "y": 5.5, "w": 2},
+ {"matrix": [6, 4], "x": 10, "y": 5.5},
+ {"matrix": [6, 5], "x": 11, "y": 5.5, "w": 1.5},
+ {"matrix": [9, 4], "x": 12.5, "y": 5.5},
+ {"matrix": [9, 5], "x": 13.5, "y": 5.5, "w": 1.5},
+
+ {"matrix": [10, 4], "x": 15.25, "y": 5.5},
+ {"matrix": [10, 5], "x": 16.25, "y": 5.5},
+ {"matrix": [10, 6], "x": 17.25, "y": 5.5},
+
+ {"matrix": [10, 7], "x": 18.5, "y": 5.5},
+ {"matrix": [10, 8], "x": 19.5, "y": 5.5},
+ {"matrix": [10, 9], "x": 20.5, "y": 5.5},
+ {"matrix": [10, 10], "x": 21.5, "y": 5.5}
+ ]
}
}
}
diff --git a/keyboards/dtisaac/dosa40rgb/config.h b/keyboards/dtisaac/dosa40rgb/config.h
index 12402c7d3f..0ad383a688 100644
--- a/keyboards/dtisaac/dosa40rgb/config.h
+++ b/keyboards/dtisaac/dosa40rgb/config.h
@@ -17,25 +17,7 @@ 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 { B7, D7, F1, F0 }
-#define MATRIX_COL_PINS { D1, D6, D3, D2, B6, C6, C7, F7, F6, F5, F4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#ifdef RGB_MATRIX_ENABLE
-#define RGB_DI_PIN D0
#define RGB_MATRIX_LED_COUNT 42
#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
diff --git a/keyboards/dtisaac/dosa40rgb/dosa40rgb.c b/keyboards/dtisaac/dosa40rgb/dosa40rgb.c
index c46bfc291d..35ae8eb018 100644
--- a/keyboards/dtisaac/dosa40rgb/dosa40rgb.c
+++ b/keyboards/dtisaac/dosa40rgb/dosa40rgb.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "dosa40rgb.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
diff --git a/keyboards/dtisaac/dosa40rgb/dosa40rgb.h b/keyboards/dtisaac/dosa40rgb/dosa40rgb.h
deleted file mode 100644
index 659e42f8f2..0000000000
--- a/keyboards/dtisaac/dosa40rgb/dosa40rgb.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2021 DTIsaac
- *
- * 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 LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k41, \
- k11, k12, k13, k14, k15, k16, k17, k18, k19, k20, k21, \
- k22, k23, k24, k25, k26, k27, k28, k29, k30, k31, k32, \
- k33, k34, k35, k36, k37, k38, k39, k40 \
-) \
-{ \
- {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10}, \
- {k11, k12, k13, k14, k15, k16, k17, k18, k19, k20, k21}, \
- {k22, k23, k24, k25, k26, k27, k28, k29, k30, k31, k32}, \
- {k33, k34, k35, KC_NO,k36, KC_NO, k37, k38, k39, k40, k41}, \
-}
diff --git a/keyboards/dtisaac/dosa40rgb/info.json b/keyboards/dtisaac/dosa40rgb/info.json
index 286396776e..63243c494d 100644
--- a/keyboards/dtisaac/dosa40rgb/info.json
+++ b/keyboards/dtisaac/dosa40rgb/info.json
@@ -8,53 +8,67 @@
"pid": "0x4973",
"device_version": "0.0.4"
},
+ "ws2812": {
+ "pin": "D0"
+ },
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
+ "matrix_pins": {
+ "cols": ["D1", "D6", "D3", "D2", "B6", "C6", "C7", "F7", "F6", "F5", "F4"],
+ "rows": ["B7", "D7", "F1", "F0"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "lufa-dfu",
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"Q", "x":1, "y":0},
- {"label":"W", "x":2, "y":0},
- {"label":"E", "x":3, "y":0},
- {"label":"R", "x":4, "y":0},
- {"label":"T", "x":5, "y":0},
- {"label":"Y", "x":6, "y":0},
- {"label":"U", "x":7, "y":0},
- {"label":"I", "x":8, "y":0},
- {"label":"O", "x":9, "y":0},
- {"label":"P", "x":10, "y":0},
- {"label":"BSPC", "x":11, "y":0},
- {"label":"Caps Lock", "x":0, "y":1, "w":1.5},
- {"label":"A", "x":1.5, "y":1},
- {"label":"S", "x":2.5, "y":1},
- {"label":"D", "x":3.5, "y":1},
- {"label":"F", "x":4.5, "y":1},
- {"label":"G", "x":5.5, "y":1},
- {"label":"H", "x":6.5, "y":1},
- {"label":"J", "x":7.5, "y":1},
- {"label":"K", "x":8.5, "y":1},
- {"label":"L", "x":9.5, "y":1},
- {"label":"Enter", "x":10.5, "y":1, "w":1.5},
- {"label":"Shift", "x":0, "y":2, "w":1.75},
- {"label":"Z", "x":1.75, "y":2},
- {"label":"X", "x":2.75, "y":2},
- {"label":"C", "x":3.75, "y":2},
- {"label":"V", "x":4.75, "y":2},
- {"label":"B", "x":5.75, "y":2},
- {"label":"N", "x":6.75, "y":2},
- {"label":"M", "x":7.75, "y":2},
- {"label":",", "x":8.75, "y":2},
- {"label":".", "x":9.75, "y":2},
- {"label":"Shift", "x":10.75, "y":2, "w":1.25},
- {"label":"Ctrl", "x":0, "y":3, "w":1.25},
- {"label":"Win", "x":1.25, "y":3, "w":1},
- {"label":"Alt", "x":2.25, "y":3, "w":1.25},
- {"label":"Space", "x":3.5, "y":3, "w":2.25},
- {"label":"Space", "x":5.75, "y":3, "w":2.75},
- {"label":"App", "x":8.5, "y":3, "w":1.25},
- {"label":"Fn", "x":9.75, "y":3, "w":1},
- {"label":"Ctrl", "x":10.75, "y":3, "w":1.25}
+ {"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": [3, 10], "x": 11, "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, "w": 1.5},
+
+ {"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, "w": 1.25},
+
+ {"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, "w": 1.25},
+ {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 6], "x": 5.75, "y": 3, "w": 2.75},
+ {"matrix": [3, 7], "x": 8.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 8], "x": 9.75, "y": 3},
+ {"matrix": [3, 9], "x": 10.75, "y": 3, "w": 1.25}
]
}
}
diff --git a/keyboards/dtisaac/dosa40rgb/rules.mk b/keyboards/dtisaac/dosa40rgb/rules.mk
index c3b1c4ef11..5cc9ef68e4 100644
--- a/keyboards/dtisaac/dosa40rgb/rules.mk
+++ b/keyboards/dtisaac/dosa40rgb/rules.mk
@@ -13,6 +13,5 @@ AUDIO_ENABLE = no # Audio output
BLUETOOTH_ENABLE = yes # Enable Bluetooth
BLUETOOTH_DRIVER = BluefruitLE
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
LTO_ENABLE = yes
diff --git a/keyboards/dtisaac/dtisaac01/config.h b/keyboards/dtisaac/dtisaac01/config.h
deleted file mode 100644
index aa0f99f104..0000000000
--- a/keyboards/dtisaac/dtisaac01/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2021 DTIsaac
-
-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 { F7, F6, F5, F4, F1, B4, D2, B2, B1, B3, D4, D6 }
-#define MATRIX_COL_PINS { C7, C6, D0, B5, F0, D7, B0, B7, D1 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/dtisaac/dtisaac01/dtisaac01.c b/keyboards/dtisaac/dtisaac01/dtisaac01.c
deleted file mode 100644
index b11920280f..0000000000
--- a/keyboards/dtisaac/dtisaac01/dtisaac01.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 DTIsaac
- *
- * 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 "dtisaac01.h"
diff --git a/keyboards/dtisaac/dtisaac01/dtisaac01.h b/keyboards/dtisaac/dtisaac01/dtisaac01.h
deleted file mode 100644
index e017c65700..0000000000
--- a/keyboards/dtisaac/dtisaac01/dtisaac01.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2021 DTIsaac
- *
- * 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 LAYOUT( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K058, K061, K062, K063, K064, K065, K066, \
- K010, K011, K012, K013, K014, K015, K016, K017, K018, K068, K060, K071, K072, K073, K074, K075, K076, \
- K020, K021, K022, K023, K024, K025, K026, K027, K028, K078, K070, K081, K082, K083, K084, K085, K086, \
- K030, K031, K032, K033, K034, K035, K036, K037, K038, K088, K080, K091, K093, \
- K040, K042, K043, K044, K045, K046, K047, K048, K098, K090, K101, K103, K105, \
- K050, K051, K052, K056, K100, K111, K112, K113, K114, K115, K116 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008 }, \
- { K010, K011, K012, K013, K014, K015, K016, K017, K018 }, \
- { K020, K021, K022, K023, K024, K025, K026, K027, K028 }, \
- { K030, K031, K032, K033, K034, K035, K036, K037, K038 }, \
- { K040, KC_NO, K042, K043, K044, K045, K046, K047, K048 }, \
- { K050, K051, K052, KC_NO, KC_NO, KC_NO, K056, KC_NO, K058 }, \
- { K060, K061, K062, K063, K064, K065, K066, KC_NO, K068 }, \
- { K070, K071, K072, K073, K074, K075, K076, KC_NO, K078 }, \
- { K080, K081, K082, K083, K084, K085, K086, KC_NO, K088 }, \
- { K090, K091, KC_NO, K093, KC_NO, KC_NO, KC_NO, KC_NO, K098 }, \
- { K100, K101, KC_NO, K103, KC_NO, K105, KC_NO, KC_NO, KC_NO }, \
- { KC_NO, K111, K112, K113, K114, K115, K116, KC_NO, KC_NO } \
-}
diff --git a/keyboards/dtisaac/dtisaac01/info.json b/keyboards/dtisaac/dtisaac01/info.json
index bbbc5ede5d..8894e261be 100644
--- a/keyboards/dtisaac/dtisaac01/info.json
+++ b/keyboards/dtisaac/dtisaac01/info.json
@@ -8,6 +8,11 @@
"pid": "0x4973",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["C7", "C6", "D0", "B5", "F0", "D7", "B0", "B7", "D1"],
+ "rows": ["F7", "F6", "F5", "F4", "F1", "B4", "D2", "B2", "B1", "B3", "D4", "D6"]
+ },
+ "diode_direction": "ROW2COL",
"backlight": {
"pin": "B6",
"breathing": true
@@ -22,93 +27,106 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"K000", "x":0, "y":0},
- {"label":"K001", "x":2, "y":0},
- {"label":"K002", "x":3, "y":0},
- {"label":"K003", "x":4, "y":0},
- {"label":"K004", "x":5, "y":0},
- {"label":"K005", "x":6.5, "y":0},
- {"label":"K006", "x":7.5, "y":0},
- {"label":"K007", "x":8.5, "y":0},
- {"label":"K008", "x":9.5, "y":0},
- {"label":"K058", "x":11, "y":0},
- {"label":"K061", "x":12, "y":0},
- {"label":"K062", "x":13, "y":0},
- {"label":"K063", "x":14, "y":0},
- {"label":"K064", "x":15.25, "y":0},
- {"label":"K065", "x":16.25, "y":0},
- {"label":"K066", "x":17.25, "y":0},
- {"label":"K010", "x":0, "y":1.5},
- {"label":"K011", "x":1, "y":1.5},
- {"label":"K012", "x":2, "y":1.5},
- {"label":"K013", "x":3, "y":1.5},
- {"label":"K014", "x":4, "y":1.5},
- {"label":"K015", "x":5, "y":1.5},
- {"label":"K016", "x":6, "y":1.5},
- {"label":"K017", "x":7, "y":1.5},
- {"label":"K018", "x":8, "y":1.5},
- {"label":"K068", "x":9, "y":1.5},
- {"label":"K060", "x":10, "y":1.5},
- {"label":"K071", "x":11, "y":1.5},
- {"label":"K072", "x":12, "y":1.5},
- {"label":"K073", "x":13, "y":1.5, "w":2},
- {"label":"K074", "x":15.25, "y":1.5},
- {"label":"K075", "x":16.25, "y":1.5},
- {"label":"K076", "x":17.25, "y":1.5},
- {"label":"K020", "x":0, "y":2.5, "w":1.5},
- {"label":"K021", "x":1.5, "y":2.5},
- {"label":"K022", "x":2.5, "y":2.5},
- {"label":"K023", "x":3.5, "y":2.5},
- {"label":"K024", "x":4.5, "y":2.5},
- {"label":"K025", "x":5.5, "y":2.5},
- {"label":"K026", "x":6.5, "y":2.5},
- {"label":"K027", "x":7.5, "y":2.5},
- {"label":"K028", "x":8.5, "y":2.5},
- {"label":"K078", "x":9.5, "y":2.5},
- {"label":"K070", "x":10.5, "y":2.5},
- {"label":"K081", "x":11.5, "y":2.5},
- {"label":"K082", "x":12.5, "y":2.5},
- {"label":"K083", "x":13.5, "y":2.5, "w":1.5},
- {"label":"K084", "x":15.25, "y":2.5},
- {"label":"K085", "x":16.25, "y":2.5},
- {"label":"K086", "x":17.25, "y":2.5},
- {"label":"K030", "x":0, "y":3.5, "w":1.75},
- {"label":"K031", "x":1.75, "y":3.5},
- {"label":"K032", "x":2.75, "y":3.5},
- {"label":"K033", "x":3.75, "y":3.5},
- {"label":"K034", "x":4.75, "y":3.5},
- {"label":"K035", "x":5.75, "y":3.5},
- {"label":"K036", "x":6.75, "y":3.5},
- {"label":"K037", "x":7.75, "y":3.5},
- {"label":"K038", "x":8.75, "y":3.5},
- {"label":"K088", "x":9.75, "y":3.5},
- {"label":"K080", "x":10.75, "y":3.5},
- {"label":"K091", "x":11.75, "y":3.5},
- {"label":"K093", "x":12.75, "y":3.5, "w":2.25},
- {"label":"K040", "x":0, "y":4.5, "w":2.25},
- {"label":"K042", "x":2.25, "y":4.5},
- {"label":"K043", "x":3.25, "y":4.5},
- {"label":"K044", "x":4.25, "y":4.5},
- {"label":"K045", "x":5.25, "y":4.5},
- {"label":"K046", "x":6.25, "y":4.5},
- {"label":"K047", "x":7.25, "y":4.5},
- {"label":"K048", "x":8.25, "y":4.5},
- {"label":"K098", "x":9.25, "y":4.5},
- {"label":"K090", "x":10.25, "y":4.5},
- {"label":"K101", "x":11.25, "y":4.5},
- {"label":"K103", "x":12.25, "y":4.5, "w":2.75},
- {"label":"K105", "x":16.25, "y":4.5},
- {"label":"K050", "x":0, "y":5.5, "w":1.25},
- {"label":"K051", "x":1.25, "y":5.5, "w":1.25},
- {"label":"K052", "x":2.5, "y":5.5, "w":1.25},
- {"label":"K056", "x":3.75, "y":5.5, "w":6.25},
- {"label":"K100", "x":10, "y":5.5, "w":1.25},
- {"label":"K111", "x":11.25, "y":5.5, "w":1.25},
- {"label":"K112", "x":12.5, "y":5.5, "w":1.25},
- {"label":"K113", "x":13.75, "y":5.5, "w":1.25},
- {"label":"K114", "x":15.25, "y":5.5},
- {"label":"K115", "x":16.25, "y":5.5},
- {"label":"K116", "x":17.25, "y":5.5}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+ {"matrix": [5, 8], "x": 11, "y": 0},
+ {"matrix": [6, 1], "x": 12, "y": 0},
+ {"matrix": [6, 2], "x": 13, "y": 0},
+ {"matrix": [6, 3], "x": 14, "y": 0},
+
+ {"matrix": [6, 4], "x": 15.25, "y": 0},
+ {"matrix": [6, 5], "x": 16.25, "y": 0},
+ {"matrix": [6, 6], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [6, 8], "x": 9, "y": 1.5},
+ {"matrix": [6, 0], "x": 10, "y": 1.5},
+ {"matrix": [7, 1], "x": 11, "y": 1.5},
+ {"matrix": [7, 2], "x": 12, "y": 1.5},
+ {"matrix": [7, 3], "x": 13, "y": 1.5, "w": 2},
+
+ {"matrix": [7, 4], "x": 15.25, "y": 1.5},
+ {"matrix": [7, 5], "x": 16.25, "y": 1.5},
+ {"matrix": [7, 6], "x": 17.25, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [7, 8], "x": 9.5, "y": 2.5},
+ {"matrix": [7, 0], "x": 10.5, "y": 2.5},
+ {"matrix": [8, 1], "x": 11.5, "y": 2.5},
+ {"matrix": [8, 2], "x": 12.5, "y": 2.5},
+ {"matrix": [8, 3], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"matrix": [8, 4], "x": 15.25, "y": 2.5},
+ {"matrix": [8, 5], "x": 16.25, "y": 2.5},
+ {"matrix": [8, 6], "x": 17.25, "y": 2.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [8, 8], "x": 9.75, "y": 3.5},
+ {"matrix": [8, 0], "x": 10.75, "y": 3.5},
+ {"matrix": [9, 1], "x": 11.75, "y": 3.5},
+ {"matrix": [9, 3], "x": 12.75, "y": 3.5, "w": 2.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+ {"matrix": [9, 8], "x": 9.25, "y": 4.5},
+ {"matrix": [9, 0], "x": 10.25, "y": 4.5},
+ {"matrix": [10, 1], "x": 11.25, "y": 4.5},
+ {"matrix": [10, 3], "x": 12.25, "y": 4.5, "w": 2.75},
+
+ {"matrix": [10, 5], "x": 16.25, "y": 4.5},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [10, 0], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [11, 1], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [11, 2], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [11, 3], "x": 13.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [11, 4], "x": 15.25, "y": 5.5},
+ {"matrix": [11, 5], "x": 16.25, "y": 5.5},
+ {"matrix": [11, 6], "x": 17.25, "y": 5.5}
]
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-03 05:13:26 +0000