summaryrefslogtreecommitdiff
path: root/keyboards/cherrybstudio/cb87v2
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/cherrybstudio/cb87v2')
-rw-r--r--keyboards/cherrybstudio/cb87v2/cb87v2.c14
-rw-r--r--keyboards/cherrybstudio/cb87v2/cb87v2.h36
-rw-r--r--keyboards/cherrybstudio/cb87v2/config.h21
-rw-r--r--keyboards/cherrybstudio/cb87v2/info.json208
4 files changed, 115 insertions, 164 deletions
diff --git a/keyboards/cherrybstudio/cb87v2/cb87v2.c b/keyboards/cherrybstudio/cb87v2/cb87v2.c
deleted file mode 100644
index 8d2fbba409..0000000000
--- a/keyboards/cherrybstudio/cb87v2/cb87v2.c
+++ /dev/null
@@ -1,14 +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/>.
-*/
-
-#include "cb87v2.h"
diff --git a/keyboards/cherrybstudio/cb87v2/cb87v2.h b/keyboards/cherrybstudio/cb87v2/cb87v2.h
deleted file mode 100644
index 9f60aa6b51..0000000000
--- a/keyboards/cherrybstudio/cb87v2/cb87v2.h
+++ /dev/null
@@ -1,36 +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,K008, K009, K100, K101, K102, K103, K104, K105, \
- K106, K107, K108, K109, K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K300, K301, K302, K303, \
- K304, K305, K306, K307, K308, K309, K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K500, \
- K501, K502, K503, K504, K505, K506, K507, K508, K509, K600, K601, K602, K603, K604, \
- K605, K606, K607, K608, K609, K700, K701, K702, K703, K704, K705, K706, K707, K708, K709, \
- K800, K801, K802, K803, K804, K805, K806, K807, K808, K809, K900, K901, K902 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, }, \
- { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, }, \
- { K500, K501, K502, K503, K504, K505, K506, K507, K508, K509, }, \
- { K600, K601, K602, K603, K604, K605, K606, K607, K608, K609, }, \
- { K700, K701, K702, K703, K704, K705, K706, K707, K708, K709, }, \
- { K800, K801, K802, K803, K804, K805, K806, K807, K808, K809, }, \
- { K900, K901, K902 } \
-}
diff --git a/keyboards/cherrybstudio/cb87v2/config.h b/keyboards/cherrybstudio/cb87v2/config.h
index 55b8bc4bee..4c66b113e7 100644
--- a/keyboards/cherrybstudio/cb87v2/config.h
+++ b/keyboards/cherrybstudio/cb87v2/config.h
@@ -13,26 +13,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)
- *
- * 0 1 2 3 4 5 6 7 8 9
-*/
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, D0, D1, D2, D3, F6 }
-#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, F5, C6, C7, F7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -47,4 +27,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/cherrybstudio/cb87v2/info.json b/keyboards/cherrybstudio/cb87v2/info.json
index 45aea95248..a356a47df1 100644
--- a/keyboards/cherrybstudio/cb87v2/info.json
+++ b/keyboards/cherrybstudio/cb87v2/info.json
@@ -8,6 +8,11 @@
"pid": "0x8788",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "F5", "C6", "C7", "F7"],
+ "rows": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "F6"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B6"
},
@@ -16,104 +21,121 @@
"scroll_lock": "F4",
"on_state": 0
},
+ "ws2812": {
+ "pin": "E6"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_all": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"F1", "x":2, "y":0},
- {"label":"F2", "x":3, "y":0},
- {"label":"F3", "x":4, "y":0},
- {"label":"F4", "x":5, "y":0},
- {"label":"F5", "x":6.5, "y":0},
- {"label":"F6", "x":7.5, "y":0},
- {"label":"F7", "x":8.5, "y":0},
- {"label":"F8", "x":9.5, "y":0},
- {"label":"F9", "x":11, "y":0},
- {"label":"F10", "x":12, "y":0},
- {"label":"F11", "x":13, "y":0},
- {"label":"F12", "x":14, "y":0},
- {"label":"PrtSc", "x":15.25, "y":0},
- {"label":"Scroll Lock", "x":16.25, "y":0},
- {"label":"Pause", "x":17.25, "y":0},
- {"label":"~", "x":0, "y":1.25},
- {"label":"!", "x":1, "y":1.25},
- {"label":"@", "x":2, "y":1.25},
- {"label":"#", "x":3, "y":1.25},
- {"label":"$", "x":4, "y":1.25},
- {"label":"%", "x":5, "y":1.25},
- {"label":"^", "x":6, "y":1.25},
- {"label":"&", "x":7, "y":1.25},
- {"label":"*", "x":8, "y":1.25},
- {"label":"(", "x":9, "y":1.25},
- {"label":")", "x":10, "y":1.25},
- {"label":"_", "x":11, "y":1.25},
- {"label":"+", "x":12, "y":1.25},
- {"label":"Backspace", "x":13, "y":1.25},
- {"label":"Backspace", "x":14, "y":1.25},
- {"label":"Insert", "x":15.25, "y":1.25},
- {"label":"Home", "x":16.25, "y":1.25},
- {"label":"PgUp", "x":17.25, "y":1.25},
- {"label":"Tab", "x":0, "y":2.25, "w":1.5},
- {"label":"Q", "x":1.5, "y":2.25},
- {"label":"W", "x":2.5, "y":2.25},
- {"label":"E", "x":3.5, "y":2.25},
- {"label":"R", "x":4.5, "y":2.25},
- {"label":"T", "x":5.5, "y":2.25},
- {"label":"Y", "x":6.5, "y":2.25},
- {"label":"U", "x":7.5, "y":2.25},
- {"label":"I", "x":8.5, "y":2.25},
- {"label":"O", "x":9.5, "y":2.25},
- {"label":"P", "x":10.5, "y":2.25},
- {"label":"{", "x":11.5, "y":2.25},
- {"label":"}", "x":12.5, "y":2.25},
- {"label":"|", "x":13.5, "y":2.25, "w":1.5},
- {"label":"Delete", "x":15.25, "y":2.25},
- {"label":"End", "x":16.25, "y":2.25},
- {"label":"PgDn", "x":17.25, "y":2.25},
- {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
- {"label":"A", "x":1.75, "y":3.25},
- {"label":"S", "x":2.75, "y":3.25},
- {"label":"D", "x":3.75, "y":3.25},
- {"label":"F", "x":4.75, "y":3.25},
- {"label":"G", "x":5.75, "y":3.25},
- {"label":"H", "x":6.75, "y":3.25},
- {"label":"J", "x":7.75, "y":3.25},
- {"label":"K", "x":8.75, "y":3.25},
- {"label":"L", "x":9.75, "y":3.25},
- {"label":":", "x":10.75, "y":3.25},
- {"label":"\"", "x":11.75, "y":3.25},
- {"label":"ISO~", "x":12.75, "y":3.25},
- {"label":"Enter", "x":13.75, "y":3.25, "w":1.25},
- {"label":"lShift", "x":0, "y":4.25, "w":1.25},
- {"label":"ISO|", "x":1.25, "y":4.25},
- {"label":"Z", "x":2.25, "y":4.25},
- {"label":"X", "x":3.25, "y":4.25},
- {"label":"C", "x":4.25, "y":4.25},
- {"label":"V", "x":5.25, "y":4.25},
- {"label":"B", "x":6.25, "y":4.25},
- {"label":"N", "x":7.25, "y":4.25},
- {"label":"M", "x":8.25, "y":4.25},
- {"label":"<", "x":9.25, "y":4.25},
- {"label":">", "x":10.25, "y":4.25},
- {"label":"?", "x":11.25, "y":4.25},
- {"label":"rShift", "x":12.25, "y":4.25, "w":1.75},
- {"label":"rshift", "x":14, "y":4.25},
- {"label":"up", "x":16.25, "y":4.25},
- {"label":"lCtrl", "x":0, "y":5.25, "w":1.25},
- {"label":"lWin", "x":1.25, "y":5.25, "w":1.25},
- {"label":"lAlt", "x":2.5, "y":5.25, "w":1.25},
- {"label":"space", "x":3.75, "y":5.25, "w":2.25},
- {"label":"space", "x":6, "y":5.25, "w":1.25},
- {"label":"space", "x":7.25, "y":5.25, "w":2.75},
- {"label":"rAlt", "x":10, "y":5.25, "w":1.25},
- {"label":"rWin", "x":11.25, "y":5.25, "w":1.25},
- {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
- {"label":"rCtrl", "x":13.75, "y":5.25, "w":1.25},
- {"label":"left", "x":15.25, "y":5.25},
- {"label":"down", "x":16.25, "y":5.25},
- {"label":"right", "x":17.25, "y":5.25}]
+ {"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": [0, 9], "x": 11, "y": 0},
+ {"matrix": [1, 0], "x": 12, "y": 0},
+ {"matrix": [1, 1], "x": 13, "y": 0},
+ {"matrix": [1, 2], "x": 14, "y": 0},
+
+ {"matrix": [1, 3], "x": 15.25, "y": 0},
+ {"matrix": [1, 4], "x": 16.25, "y": 0},
+ {"matrix": [1, 5], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 6], "x": 0, "y": 1.25},
+ {"matrix": [1, 7], "x": 1, "y": 1.25},
+ {"matrix": [1, 8], "x": 2, "y": 1.25},
+ {"matrix": [1, 9], "x": 3, "y": 1.25},
+ {"matrix": [2, 0], "x": 4, "y": 1.25},
+ {"matrix": [2, 1], "x": 5, "y": 1.25},
+ {"matrix": [2, 2], "x": 6, "y": 1.25},
+ {"matrix": [2, 3], "x": 7, "y": 1.25},
+ {"matrix": [2, 4], "x": 8, "y": 1.25},
+ {"matrix": [2, 5], "x": 9, "y": 1.25},
+ {"matrix": [2, 6], "x": 10, "y": 1.25},
+ {"matrix": [2, 7], "x": 11, "y": 1.25},
+ {"matrix": [2, 8], "x": 12, "y": 1.25},
+ {"matrix": [2, 9], "x": 13, "y": 1.25},
+ {"matrix": [3, 0], "x": 14, "y": 1.25},
+
+ {"matrix": [3, 1], "x": 15.25, "y": 1.25},
+ {"matrix": [3, 2], "x": 16.25, "y": 1.25},
+ {"matrix": [3, 3], "x": 17.25, "y": 1.25},
+
+ {"matrix": [3, 4], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [3, 5], "x": 1.5, "y": 2.25},
+ {"matrix": [3, 6], "x": 2.5, "y": 2.25},
+ {"matrix": [3, 7], "x": 3.5, "y": 2.25},
+ {"matrix": [3, 8], "x": 4.5, "y": 2.25},
+ {"matrix": [3, 9], "x": 5.5, "y": 2.25},
+ {"matrix": [4, 0], "x": 6.5, "y": 2.25},
+ {"matrix": [4, 1], "x": 7.5, "y": 2.25},
+ {"matrix": [4, 2], "x": 8.5, "y": 2.25},
+ {"matrix": [4, 3], "x": 9.5, "y": 2.25},
+ {"matrix": [4, 4], "x": 10.5, "y": 2.25},
+ {"matrix": [4, 5], "x": 11.5, "y": 2.25},
+ {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+ {"matrix": [4, 7], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [4, 8], "x": 15.25, "y": 2.25},
+ {"matrix": [4, 9], "x": 16.25, "y": 2.25},
+ {"matrix": [5, 0], "x": 17.25, "y": 2.25},
+
+ {"matrix": [5, 1], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [5, 2], "x": 1.75, "y": 3.25},
+ {"matrix": [5, 3], "x": 2.75, "y": 3.25},
+ {"matrix": [5, 4], "x": 3.75, "y": 3.25},
+ {"matrix": [5, 5], "x": 4.75, "y": 3.25},
+ {"matrix": [5, 6], "x": 5.75, "y": 3.25},
+ {"matrix": [5, 7], "x": 6.75, "y": 3.25},
+ {"matrix": [5, 8], "x": 7.75, "y": 3.25},
+ {"matrix": [5, 9], "x": 8.75, "y": 3.25},
+ {"matrix": [6, 0], "x": 9.75, "y": 3.25},
+ {"matrix": [6, 1], "x": 10.75, "y": 3.25},
+ {"matrix": [6, 2], "x": 11.75, "y": 3.25},
+ {"matrix": [6, 3], "x": 12.75, "y": 3.25},
+ {"matrix": [6, 4], "x": 13.75, "y": 3.25, "w": 1.25},
+
+ {"matrix": [6, 5], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [6, 6], "x": 1.25, "y": 4.25},
+ {"matrix": [6, 7], "x": 2.25, "y": 4.25},
+ {"matrix": [6, 8], "x": 3.25, "y": 4.25},
+ {"matrix": [6, 9], "x": 4.25, "y": 4.25},
+ {"matrix": [7, 0], "x": 5.25, "y": 4.25},
+ {"matrix": [7, 1], "x": 6.25, "y": 4.25},
+ {"matrix": [7, 2], "x": 7.25, "y": 4.25},
+ {"matrix": [7, 3], "x": 8.25, "y": 4.25},
+ {"matrix": [7, 4], "x": 9.25, "y": 4.25},
+ {"matrix": [7, 5], "x": 10.25, "y": 4.25},
+ {"matrix": [7, 6], "x": 11.25, "y": 4.25},
+ {"matrix": [7, 7], "x": 12.25, "y": 4.25, "w": 1.75},
+ {"matrix": [7, 8], "x": 14, "y": 4.25},
+
+ {"matrix": [7, 9], "x": 16.25, "y": 4.25},
+
+ {"matrix": [8, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [8, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [8, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [8, 3], "x": 3.75, "y": 5.25, "w": 2.25},
+ {"matrix": [8, 4], "x": 6, "y": 5.25, "w": 1.25},
+ {"matrix": [8, 5], "x": 7.25, "y": 5.25, "w": 2.75},
+ {"matrix": [8, 6], "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [8, 7], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [8, 8], "x": 12.5, "y": 5.25, "w": 1.25},
+ {"matrix": [8, 9], "x": 13.75, "y": 5.25, "w": 1.25},
+
+ {"matrix": [9, 0], "x": 15.25, "y": 5.25},
+ {"matrix": [9, 1], "x": 16.25, "y": 5.25},
+ {"matrix": [9, 2], "x": 17.25, "y": 5.25}
+ ]
}
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-01 04:58:43 +0000