summaryrefslogtreecommitdiff
path: root/keyboards/p3d
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-03-11 00:00:24 +1100
committerGitHub <noreply@github.com>2023-03-11 00:00:24 +1100
commit9e64300e67720a5468c2585391250ca5579b311b (patch)
treed8c471bb33cd5d0e38e90d925d69b3c6b3cb2d59 /keyboards/p3d
parentdd086a51d82a574a55eb3b89e8943301d72296f3 (diff)
Move matrix config to info.json, part 4 (#20001)
Diffstat (limited to 'keyboards/p3d')
-rw-r--r--keyboards/p3d/glitch/config.h19
-rw-r--r--keyboards/p3d/glitch/info.json5
2 files changed, 5 insertions, 19 deletions
diff --git a/keyboards/p3d/glitch/config.h b/keyboards/p3d/glitch/config.h
index 961897c4d6..a8026b4d17 100644
--- a/keyboards/p3d/glitch/config.h
+++ b/keyboards/p3d/glitch/config.h
@@ -17,22 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
17 17
18#pragma once 18#pragma once
19 19
20
21/*
22 * Keyboard Matrix Assignments
23 *
24 * Change this to how you wired your keyboard
25 * COLS: AVR pins used for columns, left to right
26 * ROWS: AVR pins used for rows, top to bottom
27 * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
28 * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
29 *
30 */
31
32/* A Custom matrix.c is used to poll the port expander C6 shows that the pins are hardwired there */
33#define MATRIX_ROW_PINS { D5, D6, B6, D7, C7, B4, B5, D3, D4, C6 }
34#define MATRIX_COL_PINS { B2, D2, B3, B7, F5, F4, F1, F0 }
35
36#define RGB_DI_PIN B1 20#define RGB_DI_PIN B1
37#define RGBLED_NUM 25 21#define RGBLED_NUM 25
38#define RGBLIGHT_EFFECT_BREATHING 22#define RGBLIGHT_EFFECT_BREATHING
@@ -46,9 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
46#define RGBLIGHT_EFFECT_ALTERNATING 30#define RGBLIGHT_EFFECT_ALTERNATING
47#define RGBLIGHT_EFFECT_TWINKLE 31#define RGBLIGHT_EFFECT_TWINKLE
48 32
49/* COL2ROW, ROW2COL*/
50#define DIODE_DIRECTION COL2ROW
51
52#define USB_MAX_POWER_CONSUMPTION 400 33#define USB_MAX_POWER_CONSUMPTION 400
53 34
54/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ 35/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/p3d/glitch/info.json b/keyboards/p3d/glitch/info.json
index 9aee029a07..d4e3df24a7 100644
--- a/keyboards/p3d/glitch/info.json
+++ b/keyboards/p3d/glitch/info.json
@@ -8,6 +8,11 @@
8 "pid": "0x3568", 8 "pid": "0x3568",
9 "device_version": "0.0.1" 9 "device_version": "0.0.1"
10 }, 10 },
11 "matrix_pins": {
12 "cols": ["B2", "D2", "B3", "B7", "F5", "F4", "F1", "F0"],
13 "rows": ["D5", "D6", "B6", "D7", "C7", "B4", "B5", "D3", "D4", "C6"]
14 },
15 "diode_direction": "COL2ROW",
11 "encoder": { 16 "encoder": {
12 "rotary": [ 17 "rotary": [
13 {"pin_a": "F6", "pin_b": "F7", "resolution": 2} 18 {"pin_a": "F6", "pin_b": "F7", "resolution": 2}