summaryrefslogtreecommitdiff
path: root/keyboards/cherrybstudio/cb65
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-04-15 21:08:15 +1000
committerGitHub <noreply@github.com>2023-04-15 21:08:15 +1000
commit172a40686b84af7f887350a20c526855c7f7649c (patch)
tree435d6c9a8b06edff988deaa00964629d81d55d64 /keyboards/cherrybstudio/cb65
parenta84528f85392ccab60fd7130fecb83972539367f (diff)
Move single `LAYOUT_all`s to data driven (#20430)
Diffstat (limited to 'keyboards/cherrybstudio/cb65')
-rw-r--r--keyboards/cherrybstudio/cb65/cb65.h35
-rw-r--r--keyboards/cherrybstudio/cb65/info.json145
2 files changed, 75 insertions, 105 deletions
diff --git a/keyboards/cherrybstudio/cb65/cb65.h b/keyboards/cherrybstudio/cb65/cb65.h
deleted file mode 100644
index c17df211da..0000000000
--- a/keyboards/cherrybstudio/cb65/cb65.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-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_all( \
- K000, K001, K002, K003, K004, K005, K006, K007, K100, K101, K102, K103, K104, K105, K106, K107, \
- K200, K201, K202, K203, K204, K205, K206, K207, K300, K301, K302, K303, K304, K305, K306, \
- K307, K400, K401, K402, K403, K404, K405, K406, K407, K500, K501, K502, K503, K504, K505, \
- K506, K507, K600, K601, K602, K603, K604, K605, K606, K607, K700, K701, K702, K703, K704, \
- K705, K706, K707, K800, K801, K802, K803, K804, K805 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307 }, \
- { K400, K401, K402, K403, K404, K405, K406, K407 }, \
- { K500, K501, K502, K503, K504, K505, K506, K507 }, \
- { K600, K601, K602, K603, K604, K605, K606, K607 }, \
- { K700, K701, K702, K703, K704, K705, K706, K707 }, \
- { K800, K801, K802, K803, K804, K805 } \
-}
-
diff --git a/keyboards/cherrybstudio/cb65/info.json b/keyboards/cherrybstudio/cb65/info.json
index 8360bf3a06..2d3ce3a2b7 100644
--- a/keyboards/cherrybstudio/cb65/info.json
+++ b/keyboards/cherrybstudio/cb65/info.json
@@ -26,76 +26,81 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
- {"x":4, "y":0},
- {"x":5, "y":0},
- {"x":6, "y":0},
- {"x":7, "y":0},
- {"x":8, "y":0},
- {"x":9, "y":0},
- {"x":10, "y":0},
- {"x":11, "y":0},
- {"x":12, "y":0},
- {"x":13, "y":0},
- {"x":14, "y":0},
- {"x":15, "y":0},
- {"x":0, "y":1, "w":1.5},
- {"x":1.5, "y":1},
- {"x":2.5, "y":1},
- {"x":3.5, "y":1},
- {"x":4.5, "y":1},
- {"x":5.5, "y":1},
- {"x":6.5, "y":1},
- {"x":7.5, "y":1},
- {"x":8.5, "y":1},
- {"x":9.5, "y":1},
- {"x":10.5, "y":1},
- {"x":11.5, "y":1},
- {"x":12.5, "y":1},
- {"x":13.5, "y":1, "w":1.5},
- {"x":15, "y":1},
- {"x":0, "y":2, "w":1.75},
- {"x":1.75, "y":2},
- {"x":2.75, "y":2},
- {"x":3.75, "y":2},
- {"x":4.75, "y":2},
- {"x":5.75, "y":2},
- {"x":6.75, "y":2},
- {"x":7.75, "y":2},
- {"x":8.75, "y":2},
- {"x":9.75, "y":2},
- {"x":10.75, "y":2},
- {"x":11.75, "y":2},
- {"x":12.75, "y":2},
- {"x":13.75, "y":2, "w":1.25},
- {"x":15, "y":2},
- {"x":0, "y":3, "w":1.25},
- {"x":1.25, "y":3},
- {"x":2.25, "y":3},
- {"x":3.25, "y":3},
- {"x":4.25, "y":3},
- {"x":5.25, "y":3},
- {"x":6.25, "y":3},
- {"x":7.25, "y":3},
- {"x":8.25, "y":3},
- {"x":9.25, "y":3},
- {"x":10.25, "y":3},
- {"x":11.25, "y":3},
- {"x":12.25, "y":3, "w":1.75},
- {"x":14, "y":3},
- {"x":15, "y":3},
- {"x":0, "y":4, "w":1.25},
- {"x":1.25, "y":4, "w":1.25},
- {"x":2.5, "y":4, "w":1.25},
- {"x":3.75, "y":4, "w":6.25},
- {"x":10, "y":4, "w":1.25},
- {"x":11.25, "y":4, "w":1.25},
- {"x":13, "y":4},
- {"x":14, "y":4},
- {"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": [1, 0], "x": 8, "y": 0},
+ {"matrix": [1, 1], "x": 9, "y": 0},
+ {"matrix": [1, 2], "x": 10, "y": 0},
+ {"matrix": [1, 3], "x": 11, "y": 0},
+ {"matrix": [1, 4], "x": 12, "y": 0},
+ {"matrix": [1, 5], "x": 13, "y": 0},
+ {"matrix": [1, 6], "x": 14, "y": 0},
+ {"matrix": [1, 7], "x": 15, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 1},
+ {"matrix": [2, 2], "x": 2.5, "y": 1},
+ {"matrix": [2, 3], "x": 3.5, "y": 1},
+ {"matrix": [2, 4], "x": 4.5, "y": 1},
+ {"matrix": [2, 5], "x": 5.5, "y": 1},
+ {"matrix": [2, 6], "x": 6.5, "y": 1},
+ {"matrix": [2, 7], "x": 7.5, "y": 1},
+ {"matrix": [3, 0], "x": 8.5, "y": 1},
+ {"matrix": [3, 1], "x": 9.5, "y": 1},
+ {"matrix": [3, 2], "x": 10.5, "y": 1},
+ {"matrix": [3, 3], "x": 11.5, "y": 1},
+ {"matrix": [3, 4], "x": 12.5, "y": 1},
+ {"matrix": [3, 5], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [3, 6], "x": 15, "y": 1},
+
+ {"matrix": [3, 7], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [4, 0], "x": 1.75, "y": 2},
+ {"matrix": [4, 1], "x": 2.75, "y": 2},
+ {"matrix": [4, 2], "x": 3.75, "y": 2},
+ {"matrix": [4, 3], "x": 4.75, "y": 2},
+ {"matrix": [4, 4], "x": 5.75, "y": 2},
+ {"matrix": [4, 5], "x": 6.75, "y": 2},
+ {"matrix": [4, 6], "x": 7.75, "y": 2},
+ {"matrix": [4, 7], "x": 8.75, "y": 2},
+ {"matrix": [5, 0], "x": 9.75, "y": 2},
+ {"matrix": [5, 1], "x": 10.75, "y": 2},
+ {"matrix": [5, 2], "x": 11.75, "y": 2},
+ {"matrix": [5, 3], "x": 12.75, "y": 2},
+ {"matrix": [5, 4], "x": 13.75, "y": 2, "w": 1.25},
+ {"matrix": [5, 5], "x": 15, "y": 2},
+
+ {"matrix": [5, 6], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [5, 7], "x": 1.25, "y": 3},
+ {"matrix": [6, 0], "x": 2.25, "y": 3},
+ {"matrix": [6, 1], "x": 3.25, "y": 3},
+ {"matrix": [6, 2], "x": 4.25, "y": 3},
+ {"matrix": [6, 3], "x": 5.25, "y": 3},
+ {"matrix": [6, 4], "x": 6.25, "y": 3},
+ {"matrix": [6, 5], "x": 7.25, "y": 3},
+ {"matrix": [6, 6], "x": 8.25, "y": 3},
+ {"matrix": [6, 7], "x": 9.25, "y": 3},
+ {"matrix": [7, 0], "x": 10.25, "y": 3},
+ {"matrix": [7, 1], "x": 11.25, "y": 3},
+ {"matrix": [7, 2], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [7, 3], "x": 14, "y": 3},
+ {"matrix": [7, 4], "x": 15, "y": 3},
+
+ {"matrix": [7, 5], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [7, 6], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [7, 7], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [8, 0], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [8, 1], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [8, 2], "x": 11.25, "y": 4, "w": 1.25},
+
+ {"matrix": [8, 3], "x": 13, "y": 4},
+ {"matrix": [8, 4], "x": 14, "y": 4},
+ {"matrix": [8, 5], "x": 15, "y": 4}
]
}
}