diff options
Diffstat (limited to 'keyboards/p3d')
| -rw-r--r-- | keyboards/p3d/glitch/config.h | 19 | ||||
| -rw-r--r-- | keyboards/p3d/glitch/info.json | 147 |
2 files changed, 76 insertions, 90 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/>. #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) - * - */ - -/* A Custom matrix.c is used to poll the port expander C6 shows that the pins are hardwired there */ -#define MATRIX_ROW_PINS { D5, D6, B6, D7, C7, B4, B5, D3, D4, C6 } -#define MATRIX_COL_PINS { B2, D2, B3, B7, F5, F4, F1, F0 } - #define RGB_DI_PIN B1 #define RGBLED_NUM 25 #define RGBLIGHT_EFFECT_BREATHING @@ -46,9 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define USB_MAX_POWER_CONSUMPTION 400 /* 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..ebe7ac6e30 100644 --- a/keyboards/p3d/glitch/info.json +++ b/keyboards/p3d/glitch/info.json @@ -8,6 +8,11 @@ "pid": "0x3568", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "D2", "B3", "B7", "F5", "F4", "F1", "F0"], + "rows": ["D5", "D6", "B6", "D7", "C7", "B4", "B5", "D3", "D4", "C6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F6", "pin_b": "F7", "resolution": 2} @@ -18,81 +23,81 @@ "layouts": { "LAYOUT_all": { "layout": [ - { "label": "ESC", "x": 0.5, "y": 0.5 }, - { "label": "1", "x": 1.5, "y": 0.5 }, - { "label": "2", "x": 3.25, "y": 1.0 }, - { "label": "3", "x": 4.25, "y": 1.0 }, - { "label": "4", "x": 5.25, "y": 1.0 }, - { "label": "5", "x": 6.25, "y": 1.0 }, - { "label": "6", "x": 7.25, "y": 1.0 }, - { "label": "7", "x": 10, "y": 1.0 }, - { "label": "8", "x": 11, "y": 1.0 }, - { "label": "9", "x": 12, "y": 1.0 }, - { "label": "0", "x": 13, "y": 1.0 }, - { "label": "_", "x": 14.5, "y": 0.6 }, - { "label": "+", "x": 15.5, "y": 0.6 }, - { "label": "Back", "x": 16.5, "y": 0.6 }, - { "label": "Del", "x": 17.5, "y": 0.6 }, - { "x": 19.1, "y": 0.1 }, + { "x": 0.5, "y": 0.5 }, + { "x": 1.5, "y": 0.5 }, + { "x": 3.25, "y": 0.5 }, + { "x": 4.25, "y": 0.5 }, + { "x": 5.25, "y": 0.5 }, + { "x": 6.25, "y": 0.5 }, + { "x": 7.25, "y": 0.5 }, + { "x": 10, "y": 0.5 }, + { "x": 11, "y": 0.5 }, + { "x": 12, "y": 0.5 }, + { "x": 13, "y": 0.5 }, + { "x": 14.5, "y": 0.5 }, + { "x": 15.5, "y": 0.5 }, + { "x": 16.5, "y": 0.5 }, + { "x": 17.5, "y": 0.5 }, + { "x": 19, "y": 0 }, - { "label": "TAB", "x": 0.15, "y": 1.5, "w": 1.5 }, - { "label": "Q", "x": 1.65, "y": 1.5 }, - { "label": "W", "x": 3.75, "y": 2.0 }, - { "label": "E", "x": 4.75, "y": 2.0 }, - { "label": "R", "x": 5.75, "y": 2.0 }, - { "label": "T", "x": 6.75, "y": 2.0 }, - { "label": "Y", "x": 9.5, "y": 2.0 }, - { "label": "U", "x": 10.5, "y": 2.0 }, - { "label": "I", "x": 11.5, "y": 2.0 }, - { "label": "O", "x": 12.5, "y": 2.0 }, - { "label": "P", "x": 14.35, "y": 1.6 }, - { "label": "[", "x": 15.35, "y": 1.6 }, - { "label": "]", "x": 16.35, "y": 1.6 }, - { "label": "\\", "x": 17.35, "y": 1.6, "w": 1.5 }, - { "x": 19.1, "y": 1.6 }, + { "x": 0.15, "y": 1.5, "w": 1.5 }, + { "x": 1.65, "y": 1.5 }, + { "x": 3.75, "y": 1.5 }, + { "x": 4.75, "y": 1.5 }, + { "x": 5.75, "y": 1.5 }, + { "x": 6.75, "y": 1.5 }, + { "x": 9.5, "y": 1.5 }, + { "x": 10.5, "y": 1.5 }, + { "x": 11.5, "y": 1.5 }, + { "x": 12.5, "y": 1.5 }, + { "x": 14.25, "y": 1.5 }, + { "x": 15.25, "y": 1.5 }, + { "x": 16.25, "y": 1.5 }, + { "x": 17.25, "y": 1.5, "w": 1.5 }, + { "x": 19, "y": 1.5 }, - { "label": "CAPS", "x": 0.15, "y": 2.5, "w": 1.75 }, - { "label": "A", "x": 1.9, "y": 2.5 }, - { "label": "S", "x": 4, "y": 3.0 }, - { "label": "D", "x": 5, "y": 3.0 }, - { "label": "F", "x": 6, "y": 3.0 }, - { "label": "G", "x": 7, "y": 3.0 }, - { "label": "H", "x": 9.75, "y": 3.0 }, - { "label": "J", "x": 10.75, "y": 3.0 }, - { "label": "K", "x": 11.75, "y": 3.0 }, - { "label": "L", "x": 12.75, "y": 3.0 }, - { "label": ";", "x": 14.6, "y": 2.6 }, - { "label": "'", "x": 15.6, "y": 2.6 }, - { "label": "ENTER", "x": 16.6, "y": 2.6, "w": 2.25 }, - { "x": 19.1, "y": 2.6 }, + { "x": 0.15, "y": 2.5, "w": 1.75 }, + { "x": 1.9, "y": 2.5 }, + { "x": 4, "y": 2.5 }, + { "x": 5, "y": 2.5 }, + { "x": 6, "y": 2.5 }, + { "x": 7, "y": 2.5 }, + { "x": 9.75, "y": 2.5 }, + { "x": 10.75, "y": 2.5 }, + { "x": 11.75, "y": 2.5 }, + { "x": 12.75, "y": 2.5 }, + { "x": 14.5, "y": 2.5 }, + { "x": 15.5, "y": 2.5 }, + { "x": 16.5, "y": 2.5, "w": 2.25 }, + { "x": 19, "y": 2.5 }, - { "label": "SHIFT", "x": 0, "y": 3.5, "w": 2.25 }, - { "label": "Z", "x": 2.25, "y": 3.5 }, - { "label": "X", "x": 4.5, "y": 4.0 }, - { "label": "C", "x": 5.5, "y": 4.0 }, - { "label": "V", "x": 6.5, "y": 4.0 }, - { "label": "B", "x": 7.5, "y": 4.0 }, - { "label": "BEE", "x": 9.25, "y": 4.0 }, - { "label": "N", "x": 10.25, "y": 4.0 }, - { "label": "M", "x": 11.25, "y": 4.0 }, - { "label": ",", "x": 12.25, "y": 4.0 }, - { "label": ".", "x": 14.25, "y": 3.6 }, - { "label": "?", "x": 15.25, "y": 3.6 }, - { "label": "SHIFT", "x": 16.25, "y": 3.6, "w": 1.75 }, - { "label": "UP", "x": 18.25, "y": 3.85 }, - { "x": 19.5, "y": 3.6 }, + { "x": 0, "y": 3.5, "w": 2.25 }, + { "x": 2.25, "y": 3.5 }, + { "x": 4.5, "y": 3.5 }, + { "x": 5.5, "y": 3.5 }, + { "x": 6.5, "y": 3.5 }, + { "x": 7.5, "y": 3.5 }, + { "x": 9.25, "y": 3.5 }, + { "x": 10.25, "y": 3.5 }, + { "x": 11.25, "y": 3.5 }, + { "x": 12.25, "y": 3.5 }, + { "x": 14.25, "y": 3.5 }, + { "x": 15.25, "y": 3.5 }, + { "x": 16.25, "y": 3.5, "w": 1.75 }, + { "x": 18.25, "y": 3.75 }, + { "x": 19.5, "y": 3.5 }, - { "label": "CTRL", "x": 0, "y": 4.5, "w": 1.25 }, - { "label": "WIN", "x": 1.25, "y": 4.5, "w": 1.25 }, - { "x": 4.75, "y": 5.0, "w": 2.75 }, - { "label": "ALT", "x": 7.5, "y": 5.0, "w": 1.25 }, - { "label": "ALT", "x": 9.5, "y": 5.0, "w": 1.25 }, - { "x": 10.75, "y": 5.0, "w": 2.25 }, - { "label": "WIN", "x": 15, "y": 4.6 }, - { "label": "CTRL", "x": 16, "y": 4.6 }, - { "label": "LEFT", "x": 17.25, "y": 4.85 }, - { "label": "DOWN", "x": 18.25, "y": 4.85 }, - { "label": "RIGHT", "x": 19.25, "y": 4.85 } + { "x": 0, "y": 4.5, "w": 1.25 }, + { "x": 1.25, "y": 4.5, "w": 1.25 }, + { "x": 4.75, "y": 4.5, "w": 2.75 }, + { "x": 7.5, "y": 4.5, "w": 1.25 }, + { "x": 9.5, "y": 4.5, "w": 1.25 }, + { "x": 10.75, "y": 4.5, "w": 2.25 }, + { "x": 15, "y": 4.5 }, + { "x": 16, "y": 4.5 }, + { "x": 17.25, "y": 4.75 }, + { "x": 18.25, "y": 4.75 }, + { "x": 19.25, "y": 4.75 } ] } } |