summaryrefslogtreecommitdiff
path: root/keyboards/playkbtw
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/playkbtw')
-rw-r--r--keyboards/playkbtw/ca66/ca66.c1
-rw-r--r--keyboards/playkbtw/ca66/ca66.h17
-rw-r--r--keyboards/playkbtw/ca66/config.h11
-rw-r--r--keyboards/playkbtw/ca66/info.json92
-rw-r--r--keyboards/playkbtw/helen80/config.h19
-rw-r--r--keyboards/playkbtw/helen80/helen80.c17
-rw-r--r--keyboards/playkbtw/helen80/helen80.h35
-rw-r--r--keyboards/playkbtw/helen80/info.json195
-rw-r--r--keyboards/playkbtw/pk60/config.h11
-rw-r--r--keyboards/playkbtw/pk60/info.json8
-rw-r--r--keyboards/playkbtw/pk60/pk60.c1
-rw-r--r--keyboards/playkbtw/pk64rgb/config.h20
-rw-r--r--keyboards/playkbtw/pk64rgb/info.json11
-rw-r--r--keyboards/playkbtw/pk64rgb/rules.mk1
14 files changed, 218 insertions, 221 deletions
diff --git a/keyboards/playkbtw/ca66/ca66.c b/keyboards/playkbtw/ca66/ca66.c
deleted file mode 100644
index 91f4826f99..0000000000
--- a/keyboards/playkbtw/ca66/ca66.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "ca66.h"
diff --git a/keyboards/playkbtw/ca66/ca66.h b/keyboards/playkbtw/ca66/ca66.h
deleted file mode 100644
index e52bdea664..0000000000
--- a/keyboards/playkbtw/ca66/ca66.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K114, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K214, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K314, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K414, \
- K401, K402, K403, K404, K406, K408, K409, K410, K411, K412, K413 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO, K214 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
- { KC_NO, K401, K402, K403, K404, KC_NO, K406, KC_NO, K408, K409, K410, K411, K412, K413, K414 } \
-}
diff --git a/keyboards/playkbtw/ca66/config.h b/keyboards/playkbtw/ca66/config.h
index 1c1085c9a1..9bcb20ae88 100644
--- a/keyboards/playkbtw/ca66/config.h
+++ b/keyboards/playkbtw/ca66/config.h
@@ -1,21 +1,11 @@
#pragma once
-
-/* key matrix pins 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14*/
-#define MATRIX_ROW_PINS { F5, F4, F1, B0, B3 }
-#define MATRIX_COL_PINS { F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, F6, B7, E6 }
-
-/* COL2ROW or 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 */
#define LOCKING_RESYNC_ENABLE
-#define RGB_DI_PIN B1
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -30,4 +20,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/playkbtw/ca66/info.json b/keyboards/playkbtw/ca66/info.json
index 809eaa0c39..275d9e011d 100644
--- a/keyboards/playkbtw/ca66/info.json
+++ b/keyboards/playkbtw/ca66/info.json
@@ -8,9 +8,17 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "F6", "B7", "E6"],
+ "rows": ["F5", "F4", "F1", "B0", "B3"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "F0"
},
+ "ws2812": {
+ "pin": "B1"
+ },
"indicators": {
"caps_lock": "D1"
},
@@ -18,7 +26,89 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
- "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.5, "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.5, "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, "w":2.25}, {"x":15.5, "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":15.5, "y":3}, {"x":14.25, "y":3.25}, {"x":0, "y":4, "w":1.25}, {"x":2.25, "y":4}, {"x":3.25, "y":4, "w":1.25}, {"x":4.5, "y":4, "w":2.25}, {"x":6.75, "y":4, "w":2.75}, {"x":9.5, "y":4, "w":1.25}, {"x":10.75, "y":4}, {"x":11.75, "y":4, "w":1.25}, {"x":13.25, "y":4.25}, {"x":14.25, "y":4.25}, {"x":15.25, "y":4.25}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [1, 14], "x": 15.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 14], "x": 15.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 14], "x": 15.5, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+ {"matrix": [3, 13], "x": 15.5, "y": 3},
+
+ {"matrix": [4, 14], "x": 14.25, "y": 3.25},
+
+ {"matrix": [4, 1], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4},
+ {"matrix": [4, 3], "x": 3.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 6.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 9], "x": 10.75, "y": 4},
+ {"matrix": [4, 10], "x": 11.75, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 11], "x": 13.25, "y": 4.25},
+ {"matrix": [4, 12], "x": 14.25, "y": 4.25},
+ {"matrix": [4, 13], "x": 15.25, "y": 4.25}
+ ]
}
}
}
diff --git a/keyboards/playkbtw/helen80/config.h b/keyboards/playkbtw/helen80/config.h
index b91943278f..89199f511e 100644
--- a/keyboards/playkbtw/helen80/config.h
+++ b/keyboards/playkbtw/helen80/config.h
@@ -16,24 +16,6 @@
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { E6, B7, D4, F0, D6, D7 }
-#define MATRIX_COL_PINS { D1, D0, F7, F6, F5, D5, D3, D2, C7, C6, B5, F4, F1, B4, B0 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 87
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -50,4 +32,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/playkbtw/helen80/helen80.c b/keyboards/playkbtw/helen80/helen80.c
deleted file mode 100644
index 0401d92738..0000000000
--- a/keyboards/playkbtw/helen80/helen80.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Play Keyboard
- *
- * 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 "helen80.h"
diff --git a/keyboards/playkbtw/helen80/helen80.h b/keyboards/playkbtw/helen80/helen80.h
deleted file mode 100644
index ffb6275a61..0000000000
--- a/keyboards/playkbtw/helen80/helen80.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 Play Keyboard
- *
- * 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_tkl_ansi( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K3D, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K5B, K5C, K3E, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K5D, K5E, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \
- K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, \
- K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, KC_NO, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, KC_NO, K4C }, \
- { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E }, \
-}
diff --git a/keyboards/playkbtw/helen80/info.json b/keyboards/playkbtw/helen80/info.json
index 2efe949d75..6b68149977 100644
--- a/keyboards/playkbtw/helen80/info.json
+++ b/keyboards/playkbtw/helen80/info.json
@@ -8,104 +8,125 @@
"pid": "0x4845",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D1", "D0", "F7", "F6", "F5", "D5", "D3", "D2", "C7", "C6", "B5", "F4", "F1", "B4", "B0"],
+ "rows": ["E6", "B7", "D4", "F0", "D6", "D7"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "B3",
"scroll_lock": "B2",
"on_state": 0
},
+ "ws2812": {
+ "pin": "E2"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["tkl_ansi"],
"layouts": {
"LAYOUT_tkl_ansi": {
"layout": [
- {"label":"K00 (E6,D1)", "x":0, "y":0},
- {"label":"K01 (E6,D0)", "x":2, "y":0},
- {"label":"K02 (E6,F7)", "x":3, "y":0},
- {"label":"K03 (E6,F6)", "x":4, "y":0},
- {"label":"K04 (E6,F5)", "x":5, "y":0},
- {"label":"K05 (E6,D5)", "x":6.5, "y":0},
- {"label":"K06 (E6,D3)", "x":7.5, "y":0},
- {"label":"K07 (E6,D2)", "x":8.5, "y":0},
- {"label":"K08 (E6,C7)", "x":9.5, "y":0},
- {"label":"K09 (E6,C6)", "x":11, "y":0},
- {"label":"K0A (E6,B5)", "x":12, "y":0},
- {"label":"K0B (E6,F4)", "x":13, "y":0},
- {"label":"K0C (E6,F1)", "x":14, "y":0},
- {"label":"K0D (E6,B4)", "x":15.25, "y":0},
- {"label":"K0E (E6,B0)", "x":16.25, "y":0},
- {"label":"K3D (F0,B4)", "x":17.25, "y":0},
- {"label":"K10 (B7,D1)", "x":0, "y":1.5},
- {"label":"K11 (B7,D0)", "x":1, "y":1.5},
- {"label":"K12 (B7,F7)", "x":2, "y":1.5},
- {"label":"K13 (B7,F6)", "x":3, "y":1.5},
- {"label":"K14 (B7,F5)", "x":4, "y":1.5},
- {"label":"K15 (B7,D5)", "x":5, "y":1.5},
- {"label":"K16 (B7,D3)", "x":6, "y":1.5},
- {"label":"K17 (B7,D2)", "x":7, "y":1.5},
- {"label":"K18 (B7,C7)", "x":8, "y":1.5},
- {"label":"K19 (B7,C6)", "x":9, "y":1.5},
- {"label":"K1A (B7,B5)", "x":10, "y":1.5},
- {"label":"K1B (B7,F4)", "x":11, "y":1.5},
- {"label":"K1C (B7,F1)", "x":12, "y":1.5},
- {"label":"K1E (B7,B0)", "x":13, "y":1.5, "w":2},
- {"label":"K5B (D7,F4)", "x":15.25, "y":1.5},
- {"label":"K5C (D7,F1)", "x":16.25, "y":1.5},
- {"label":"K3E (F0,B0)", "x":17.25, "y":1.5},
- {"label":"K20 (D4,D1)", "x":0, "y":2.5, "w":1.5},
- {"label":"K21 (D4,D0)", "x":1.5, "y":2.5},
- {"label":"K22 (D4,F7)", "x":2.5, "y":2.5},
- {"label":"K23 (D4,F6)", "x":3.5, "y":2.5},
- {"label":"K24 (D4,F5)", "x":4.5, "y":2.5},
- {"label":"K25 (D4,D5)", "x":5.5, "y":2.5},
- {"label":"K26 (D4,D3)", "x":6.5, "y":2.5},
- {"label":"K27 (D4,D2)", "x":7.5, "y":2.5},
- {"label":"K28 (D4,C7)", "x":8.5, "y":2.5},
- {"label":"K29 (D4,C6)", "x":9.5, "y":2.5},
- {"label":"K2A (D4,B5)", "x":10.5, "y":2.5},
- {"label":"K2B (D4,F4)", "x":11.5, "y":2.5},
- {"label":"K2C (D4,F1)", "x":12.5, "y":2.5},
- {"label":"K2D (D4,B4)", "x":13.5, "y":2.5, "w":1.5},
- {"label":"K2E (D4,B0)", "x":15.25, "y":2.5},
- {"label":"K5D (D7,B4)", "x":16.25, "y":2.5},
- {"label":"K5E (D7,B0)", "x":17.25, "y":2.5},
- {"label":"K30 (F0,D1)", "x":0, "y":3.5, "w":1.75},
- {"label":"K31 (F0,D0)", "x":1.75, "y":3.5},
- {"label":"K32 (F0,F7)", "x":2.75, "y":3.5},
- {"label":"K33 (F0,F6)", "x":3.75, "y":3.5},
- {"label":"K34 (F0,F5)", "x":4.75, "y":3.5},
- {"label":"K35 (F0,D5)", "x":5.75, "y":3.5},
- {"label":"K36 (F0,D3)", "x":6.75, "y":3.5},
- {"label":"K37 (F0,D2)", "x":7.75, "y":3.5},
- {"label":"K38 (F0,C7)", "x":8.75, "y":3.5},
- {"label":"K39 (F0,C6)", "x":9.75, "y":3.5},
- {"label":"K3A (F0,B5)", "x":10.75, "y":3.5},
- {"label":"K3B (F0,F4)", "x":11.75, "y":3.5},
- {"label":"K3C (F0,F1)", "x":12.75, "y":3.5, "w":2.25},
- {"label":"K40 (D6,D1)", "x":0, "y":4.5, "w":2.25},
- {"label":"K42 (D6,F7)", "x":2.25, "y":4.5},
- {"label":"K43 (D6,F6)", "x":3.25, "y":4.5},
- {"label":"K44 (D6,F5)", "x":4.25, "y":4.5},
- {"label":"K45 (D6,D5)", "x":5.25, "y":4.5},
- {"label":"K46 (D6,D3)", "x":6.25, "y":4.5},
- {"label":"K47 (D6,D2)", "x":7.25, "y":4.5},
- {"label":"K48 (D6,C7)", "x":8.25, "y":4.5},
- {"label":"K49 (D6,C6)", "x":9.25, "y":4.5},
- {"label":"K4A (D6,B5)", "x":10.25, "y":4.5},
- {"label":"K4B (D6,F4)", "x":11.25, "y":4.5},
- {"label":"K4C (D6,F1)", "x":12.25, "y":4.5, "w":2.75},
- {"label":"K4E (D6,B0)", "x":16.25, "y":4.5},
- {"label":"K50 (D7,D1)", "x":0, "y":5.5, "w":1.25},
- {"label":"K51 (D7,D0)", "x":1.25, "y":5.5, "w":1.25},
- {"label":"K52 (D7,F7)", "x":2.5, "y":5.5, "w":1.25},
- {"label":"K53 (D7,F6)", "x":3.75, "y":5.5, "w":6.25},
- {"label":"K54 (D7,F5)", "x":10, "y":5.5, "w":1.25},
- {"label":"K55 (D7,D5)", "x":11.25, "y":5.5, "w":1.25},
- {"label":"K56 (D7,D3)", "x":12.5, "y":5.5, "w":1.25},
- {"label":"K57 (D7,D2)", "x":13.75, "y":5.5, "w":1.25},
- {"label":"K58 (D7,C7)", "x":15.25, "y":5.5},
- {"label":"K59 (D7,C6)", "x":16.25, "y":5.5},
- {"label":"K5A (D7,B5)", "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": [0, 9], "x": 11, "y": 0},
+ {"matrix": [0, 10], "x": 12, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+ {"matrix": [0, 12], "x": 14, "y": 0},
+
+ {"matrix": [0, 13], "x": 15.25, "y": 0},
+ {"matrix": [0, 14], "x": 16.25, "y": 0},
+ {"matrix": [3, 13], "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": [1, 9], "x": 9, "y": 1.5},
+ {"matrix": [1, 10], "x": 10, "y": 1.5},
+ {"matrix": [1, 11], "x": 11, "y": 1.5},
+ {"matrix": [1, 12], "x": 12, "y": 1.5},
+ {"matrix": [1, 14], "x": 13, "y": 1.5, "w": 2},
+
+ {"matrix": [5, 11], "x": 15.25, "y": 1.5},
+ {"matrix": [5, 12], "x": 16.25, "y": 1.5},
+ {"matrix": [3, 14], "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": [2, 9], "x": 9.5, "y": 2.5},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+ {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+ {"matrix": [5, 13], "x": 16.25, "y": 2.5},
+ {"matrix": [5, 14], "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": [3, 9], "x": 9.75, "y": 3.5},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+ {"matrix": [3, 12], "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": [4, 9], "x": 9.25, "y": 4.5},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+ {"matrix": [4, 14], "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, 3], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 4], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 5], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 6], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 7], "x": 13.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [5, 8], "x": 15.25, "y": 5.5},
+ {"matrix": [5, 9], "x": 16.25, "y": 5.5},
+ {"matrix": [5, 10], "x": 17.25, "y": 5.5}
]
}
}
diff --git a/keyboards/playkbtw/pk60/config.h b/keyboards/playkbtw/pk60/config.h
index 42f15b3352..8471167fcd 100644
--- a/keyboards/playkbtw/pk60/config.h
+++ b/keyboards/playkbtw/pk60/config.h
@@ -1,21 +1,11 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, F7, B5, B4, D7, D6, B3, B2 }
-
-/* COL2ROW or 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 */
#define LOCKING_RESYNC_ENABLE
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -30,4 +20,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/playkbtw/pk60/info.json b/keyboards/playkbtw/pk60/info.json
index 5909204f29..a3cb5549e1 100644
--- a/keyboards/playkbtw/pk60/info.json
+++ b/keyboards/playkbtw/pk60/info.json
@@ -8,10 +8,18 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "F7", "B5", "B4", "D7", "D6", "B3", "B2"],
+ "rows": ["D0", "D1", "D2", "D3", "D5"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B7",
"levels": 5
},
+ "ws2812": {
+ "pin": "E2"
+ },
"indicators": {
"caps_lock": "F4",
"on_state": 0
diff --git a/keyboards/playkbtw/pk60/pk60.c b/keyboards/playkbtw/pk60/pk60.c
deleted file mode 100644
index 909230def2..0000000000
--- a/keyboards/playkbtw/pk60/pk60.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "pk60.h"
diff --git a/keyboards/playkbtw/pk64rgb/config.h b/keyboards/playkbtw/pk64rgb/config.h
index 91cba0f8e3..3b2087c5b8 100644
--- a/keyboards/playkbtw/pk64rgb/config.h
+++ b/keyboards/playkbtw/pk64rgb/config.h
@@ -16,23 +16,6 @@
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D7, D6, D5, D3, D2 }
-#define MATRIX_COL_PINS { B5, B6, C6, C7, F7, F6, F5, F4, F1, F0, B1, B2, B3, B7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
#ifdef RGB_MATRIX_ENABLE
#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
@@ -57,8 +40,6 @@
#define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL
#endif
-#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -73,7 +54,6 @@
# define RGBLIGHT_SAT_STEP 5
# define RGBLIGHT_VAL_STEP 5
# define RGBLIGHT_SLEEP
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/playkbtw/pk64rgb/info.json b/keyboards/playkbtw/pk64rgb/info.json
index 7cb2950d6a..13fc6dd0ea 100644
--- a/keyboards/playkbtw/pk64rgb/info.json
+++ b/keyboards/playkbtw/pk64rgb/info.json
@@ -8,6 +8,17 @@
"pid": "0x3634",
"device_version": "0.0.1"
},
+ "rgb_matrix": {
+ "driver": "IS31FL3733"
+ },
+ "matrix_pins": {
+ "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "B7"],
+ "rows": ["D7", "D6", "D5", "D3", "D2"]
+ },
+ "diode_direction": "COL2ROW",
+ "ws2812": {
+ "pin": "B0"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["64_ansi"],
diff --git a/keyboards/playkbtw/pk64rgb/rules.mk b/keyboards/playkbtw/pk64rgb/rules.mk
index e18aaeaa8a..f199d19d31 100644
--- a/keyboards/playkbtw/pk64rgb/rules.mk
+++ b/keyboards/playkbtw/pk64rgb/rules.mk
@@ -10,7 +10,6 @@ NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
RGB_MATRIX_ENABLE = yes # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3733
AUDIO_ENABLE = no # Audio output
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 09:39:43 +0000