diff options
Diffstat (limited to 'keyboards/keyprez')
| -rw-r--r-- | keyboards/keyprez/bison/config.h | 17 | ||||
| -rw-r--r-- | keyboards/keyprez/bison/info.json | 533 | ||||
| -rw-r--r-- | keyboards/keyprez/corgi/config.h | 11 | ||||
| -rw-r--r-- | keyboards/keyprez/corgi/corgi.c | 17 | ||||
| -rw-r--r-- | keyboards/keyprez/corgi/info.json | 5 | ||||
| -rw-r--r-- | keyboards/keyprez/rhino/config.h | 17 | ||||
| -rw-r--r-- | keyboards/keyprez/rhino/info.json | 5 | ||||
| -rw-r--r-- | keyboards/keyprez/unicorn/config.h | 18 | ||||
| -rw-r--r-- | keyboards/keyprez/unicorn/info.json | 13 |
9 files changed, 291 insertions, 345 deletions
diff --git a/keyboards/keyprez/bison/config.h b/keyboards/keyprez/bison/config.h index ba68e0d976..c4bb34279d 100644 --- a/keyboards/keyprez/bison/config.h +++ b/keyboards/keyprez/bison/config.h @@ -17,23 +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) - * - */ -#define MATRIX_ROW_PINS { D2, F7, B1, B3, D7 } -#define MATRIX_COL_PINS { D3, E6, B2, B4, D4, F6, F5, F4 } - -/* COL2ROW, 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 */ diff --git a/keyboards/keyprez/bison/info.json b/keyboards/keyprez/bison/info.json index a18beb8305..bc67710d03 100644 --- a/keyboards/keyprez/bison/info.json +++ b/keyboards/keyprez/bison/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "E6", "B2", "B4", "D4", "F6", "F5", "F4"], + "rows": ["D2", "F7", "B1", "B3", "D7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B6", "pin_b": "B5"} @@ -28,301 +33,301 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "F1", "x": 0, "y": 0}, - {"label": "F2", "x": 1, "y": 0}, - {"label": "~", "x": 2, "y": 0}, - {"label": "1", "x": 3, "y": 0}, - {"label": "2", "x": 4, "y": 0}, - {"label": "3", "x": 5, "y": 0}, - {"label": "4", "x": 6, "y": 0}, - {"label": "5", "x": 7, "y": 0}, - {"label": "6", "x": 10, "y": 0}, - {"label": "7", "x": 11, "y": 0}, - {"label": "8", "x": 12, "y": 0}, - {"label": "9", "x": 13, "y": 0}, - {"label": "0", "x": 14, "y": 0}, - {"label": "-", "x": 15, "y": 0}, - {"label": "=", "x": 16, "y": 0}, - {"label": "Del", "x": 17, "y": 0}, + {"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": 10, "y": 0}, + {"x": 11, "y": 0}, + {"x": 12, "y": 0}, + {"x": 13, "y": 0}, + {"x": 14, "y": 0}, + {"x": 15, "y": 0}, + {"x": 16, "y": 0}, + {"x": 17, "y": 0}, - {"label": "F3", "x": 0, "y": 1}, - {"label": "F4", "x": 1, "y": 1}, - {"label": "Tab", "x": 2, "y": 1}, - {"label": "Q", "x": 3, "y": 1}, - {"label": "W", "x": 4, "y": 1}, - {"label": "E", "x": 5, "y": 1}, - {"label": "R", "x": 6, "y": 1}, - {"label": "T", "x": 7, "y": 1}, - {"label": "Y", "x": 10, "y": 1}, - {"label": "U", "x": 11, "y": 1}, - {"label": "I", "x": 12, "y": 1}, - {"label": "O", "x": 13, "y": 1}, - {"label": "P", "x": 14, "y": 1}, - {"label": "[", "x": 15, "y": 1}, - {"label": "]", "x": 16, "y": 1}, - {"label": "\\", "x": 17, "y": 1}, + {"x": 0, "y": 1}, + {"x": 1, "y": 1}, + {"x": 2, "y": 1}, + {"x": 3, "y": 1}, + {"x": 4, "y": 1}, + {"x": 5, "y": 1}, + {"x": 6, "y": 1}, + {"x": 7, "y": 1}, + {"x": 10, "y": 1}, + {"x": 11, "y": 1}, + {"x": 12, "y": 1}, + {"x": 13, "y": 1}, + {"x": 14, "y": 1}, + {"x": 15, "y": 1}, + {"x": 16, "y": 1}, + {"x": 17, "y": 1}, - {"label": "F5", "x": 0, "y": 2}, - {"label": "F6", "x": 1, "y": 2}, - {"label": "Esc", "x": 2, "y": 2}, - {"label": "A", "x": 3, "y": 2}, - {"label": "S", "x": 4, "y": 2}, - {"label": "D", "x": 5, "y": 2}, - {"label": "F", "x": 6, "y": 2}, - {"label": "G", "x": 7, "y": 2}, - {"label": "H", "x": 10, "y": 2}, - {"label": "J", "x": 11, "y": 2}, - {"label": "K", "x": 12, "y": 2}, - {"label": "L", "x": 13, "y": 2}, - {"label": ";", "x": 14, "y": 2}, - {"label": "'", "x": 15, "y": 2}, - {"label": "BS", "x": 16, "y": 2}, - {"label": "FN", "x": 17, "y": 2}, + {"x": 0, "y": 2}, + {"x": 1, "y": 2}, + {"x": 2, "y": 2}, + {"x": 3, "y": 2}, + {"x": 4, "y": 2}, + {"x": 5, "y": 2}, + {"x": 6, "y": 2}, + {"x": 7, "y": 2}, + {"x": 10, "y": 2}, + {"x": 11, "y": 2}, + {"x": 12, "y": 2}, + {"x": 13, "y": 2}, + {"x": 14, "y": 2}, + {"x": 15, "y": 2}, + {"x": 16, "y": 2}, + {"x": 17, "y": 2}, - {"label": "F7", "x": 0, "y": 3}, - {"label": "F8", "x": 1, "y": 3}, - {"label": "Shift", "x": 2, "y": 3}, - {"label": "Z", "x": 3, "y": 3}, - {"label": "X", "x": 4, "y": 3}, - {"label": "C", "x": 5, "y": 3}, - {"label": "V", "x": 6, "y": 3}, - {"label": "B", "x": 7, "y": 3}, - {"label": "Mute", "x": 8, "y": 3}, - {"label": "MPLY", "x": 9, "y": 3}, - {"label": "N", "x": 10, "y": 3}, - {"label": "M", "x": 11, "y": 3}, - {"label": ",", "x": 12, "y": 3}, - {"label": ".", "x": 13, "y": 3}, - {"label": "/", "x": 14, "y": 3}, - {"label": "Enter", "x": 15, "y": 3}, - {"label": "Home", "x": 16, "y": 3}, - {"label": "End", "x": 17, "y": 3}, + {"x": 0, "y": 3}, + {"x": 1, "y": 3}, + {"x": 2, "y": 3}, + {"x": 3, "y": 3}, + {"x": 4, "y": 3}, + {"x": 5, "y": 3}, + {"x": 6, "y": 3}, + {"x": 7, "y": 3}, + {"x": 8, "y": 3}, + {"x": 9, "y": 3}, + {"x": 10, "y": 3}, + {"x": 11, "y": 3}, + {"x": 12, "y": 3}, + {"x": 13, "y": 3}, + {"x": 14, "y": 3}, + {"x": 15, "y": 3}, + {"x": 16, "y": 3}, + {"x": 17, "y": 3}, - {"label": "OS", "x": 3.75, "y": 4}, - {"label": "Alt", "x": 4.75, "y": 4}, - {"label": "Lower", "x": 5.75, "y": 4}, - {"label": "BS", "x": 6.75, "y": 4, "w": 1.5}, - {"label": "", "x": 9.75, "y": 4, "w": 1.5}, - {"label": "Raise", "x": 11.25, "y": 4}, - {"label": "Alt", "x": 12.25, "y": 4}, - {"label": "OS", "x": 13.25, "y": 4} + {"x": 3.75, "y": 4}, + {"x": 4.75, "y": 4}, + {"x": 5.75, "y": 4}, + {"x": 6.75, "y": 4, "w": 1.5}, + {"x": 9.75, "y": 4, "w": 1.5}, + {"x": 11.25, "y": 4}, + {"x": 12.25, "y": 4}, + {"x": 13.25, "y": 4} ] }, "LAYOUT_6_8": { "layout": [ - {"label": "~", "x": 2, "y": 0}, - {"label": "1", "x": 3, "y": 0}, - {"label": "2", "x": 4, "y": 0}, - {"label": "3", "x": 5, "y": 0}, - {"label": "4", "x": 6, "y": 0}, - {"label": "5", "x": 7, "y": 0}, - {"label": "6", "x": 10, "y": 0}, - {"label": "7", "x": 11, "y": 0}, - {"label": "8", "x": 12, "y": 0}, - {"label": "9", "x": 13, "y": 0}, - {"label": "0", "x": 14, "y": 0}, - {"label": "-", "x": 15, "y": 0}, - {"label": "=", "x": 16, "y": 0}, - {"label": "Del", "x": 17, "y": 0}, + {"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": 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}, - {"label": "Tab", "x": 2, "y": 1}, - {"label": "Q", "x": 3, "y": 1}, - {"label": "W", "x": 4, "y": 1}, - {"label": "E", "x": 5, "y": 1}, - {"label": "R", "x": 6, "y": 1}, - {"label": "T", "x": 7, "y": 1}, - {"label": "Y", "x": 10, "y": 1}, - {"label": "U", "x": 11, "y": 1}, - {"label": "I", "x": 12, "y": 1}, - {"label": "O", "x": 13, "y": 1}, - {"label": "P", "x": 14, "y": 1}, - {"label": "[", "x": 15, "y": 1}, - {"label": "]", "x": 16, "y": 1}, - {"label": "\\", "x": 17, "y": 1}, + {"x": 0, "y": 1}, + {"x": 1, "y": 1}, + {"x": 2, "y": 1}, + {"x": 3, "y": 1}, + {"x": 4, "y": 1}, + {"x": 5, "y": 1}, + {"x": 8, "y": 1}, + {"x": 9, "y": 1}, + {"x": 10, "y": 1}, + {"x": 11, "y": 1}, + {"x": 12, "y": 1}, + {"x": 13, "y": 1}, + {"x": 14, "y": 1}, + {"x": 15, "y": 1}, - {"label": "Esc", "x": 2, "y": 2}, - {"label": "A", "x": 3, "y": 2}, - {"label": "S", "x": 4, "y": 2}, - {"label": "D", "x": 5, "y": 2}, - {"label": "F", "x": 6, "y": 2}, - {"label": "G", "x": 7, "y": 2}, - {"label": "H", "x": 10, "y": 2}, - {"label": "J", "x": 11, "y": 2}, - {"label": "K", "x": 12, "y": 2}, - {"label": "L", "x": 13, "y": 2}, - {"label": ";", "x": 14, "y": 2}, - {"label": "'", "x": 15, "y": 2}, - {"label": "BS", "x": 16, "y": 2}, - {"label": "FN", "x": 17, "y": 2}, + {"x": 0, "y": 2}, + {"x": 1, "y": 2}, + {"x": 2, "y": 2}, + {"x": 3, "y": 2}, + {"x": 4, "y": 2}, + {"x": 5, "y": 2}, + {"x": 8, "y": 2}, + {"x": 9, "y": 2}, + {"x": 10, "y": 2}, + {"x": 11, "y": 2}, + {"x": 12, "y": 2}, + {"x": 13, "y": 2}, + {"x": 14, "y": 2}, + {"x": 15, "y": 2}, - {"label": "Shift", "x": 2, "y": 3}, - {"label": "Z", "x": 3, "y": 3}, - {"label": "X", "x": 4, "y": 3}, - {"label": "C", "x": 5, "y": 3}, - {"label": "V", "x": 6, "y": 3}, - {"label": "B", "x": 7, "y": 3}, - {"label": "Mute", "x": 8, "y": 3}, - {"label": "MPLY", "x": 9, "y": 3}, - {"label": "N", "x": 10, "y": 3}, - {"label": "M", "x": 11, "y": 3}, - {"label": ",", "x": 12, "y": 3}, - {"label": ".", "x": 13, "y": 3}, - {"label": "/", "x": 14, "y": 3}, - {"label": "Enter", "x": 15, "y": 3}, - {"label": "Home", "x": 16, "y": 3}, - {"label": "End", "x": 17, "y": 3}, + {"x": 0, "y": 3}, + {"x": 1, "y": 3}, + {"x": 2, "y": 3}, + {"x": 3, "y": 3}, + {"x": 4, "y": 3}, + {"x": 5, "y": 3}, + {"x": 6, "y": 3}, + {"x": 7, "y": 3}, + {"x": 8, "y": 3}, + {"x": 9, "y": 3}, + {"x": 10, "y": 3}, + {"x": 11, "y": 3}, + {"x": 12, "y": 3}, + {"x": 13, "y": 3}, + {"x": 14, "y": 3}, + {"x": 15, "y": 3}, - {"label": "OS", "x": 3.75, "y": 4}, - {"label": "Alt", "x": 4.75, "y": 4}, - {"label": "Lower", "x": 5.75, "y": 4}, - {"label": "BS", "x": 6.75, "y": 4, "w": 1.5}, - {"label": "", "x": 9.75, "y": 4, "w": 1.5}, - {"label": "Raise", "x": 11.25, "y": 4}, - {"label": "Alt", "x": 12.25, "y": 4}, - {"label": "OS", "x": 13.25, "y": 4} + {"x": 1.75, "y": 4}, + {"x": 2.75, "y": 4}, + {"x": 3.75, "y": 4}, + {"x": 4.75, "y": 4, "w": 1.5}, + {"x": 7.75, "y": 4, "w": 1.5}, + {"x": 9.25, "y": 4}, + {"x": 10.25, "y": 4}, + {"x": 11.25, "y": 4} ] }, "LAYOUT_8_6": { "layout": [ - {"label": "F1", "x": 0, "y": 0}, - {"label": "F2", "x": 1, "y": 0}, - {"label": "~", "x": 2, "y": 0}, - {"label": "1", "x": 3, "y": 0}, - {"label": "2", "x": 4, "y": 0}, - {"label": "3", "x": 5, "y": 0}, - {"label": "4", "x": 6, "y": 0}, - {"label": "5", "x": 7, "y": 0}, - {"label": "6", "x": 10, "y": 0}, - {"label": "7", "x": 11, "y": 0}, - {"label": "8", "x": 12, "y": 0}, - {"label": "9", "x": 13, "y": 0}, - {"label": "0", "x": 14, "y": 0}, - {"label": "Del", "x": 15, "y": 0}, + {"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": 10, "y": 0}, + {"x": 11, "y": 0}, + {"x": 12, "y": 0}, + {"x": 13, "y": 0}, + {"x": 14, "y": 0}, + {"x": 15, "y": 0}, - {"label": "F3", "x": 0, "y": 1}, - {"label": "F4", "x": 1, "y": 1}, - {"label": "Tab", "x": 2, "y": 1}, - {"label": "Q", "x": 3, "y": 1}, - {"label": "W", "x": 4, "y": 1}, - {"label": "E", "x": 5, "y": 1}, - {"label": "R", "x": 6, "y": 1}, - {"label": "T", "x": 7, "y": 1}, - {"label": "Y", "x": 10, "y": 1}, - {"label": "U", "x": 11, "y": 1}, - {"label": "I", "x": 12, "y": 1}, - {"label": "O", "x": 13, "y": 1}, - {"label": "P", "x": 14, "y": 1}, - {"label": "BS", "x": 15, "y": 1}, + {"x": 0, "y": 1}, + {"x": 1, "y": 1}, + {"x": 2, "y": 1}, + {"x": 3, "y": 1}, + {"x": 4, "y": 1}, + {"x": 5, "y": 1}, + {"x": 6, "y": 1}, + {"x": 7, "y": 1}, + {"x": 10, "y": 1}, + {"x": 11, "y": 1}, + {"x": 12, "y": 1}, + {"x": 13, "y": 1}, + {"x": 14, "y": 1}, + {"x": 15, "y": 1}, - {"label": "F5", "x": 0, "y": 2}, - {"label": "F6", "x": 1, "y": 2}, - {"label": "Esc", "x": 2, "y": 2}, - {"label": "A", "x": 3, "y": 2}, - {"label": "S", "x": 4, "y": 2}, - {"label": "D", "x": 5, "y": 2}, - {"label": "F", "x": 6, "y": 2}, - {"label": "G", "x": 7, "y": 2}, - {"label": "H", "x": 10, "y": 2}, - {"label": "J", "x": 11, "y": 2}, - {"label": "K", "x": 12, "y": 2}, - {"label": "L", "x": 13, "y": 2}, - {"label": ";", "x": 14, "y": 2}, - {"label": "'", "x": 15, "y": 2}, + {"x": 0, "y": 2}, + {"x": 1, "y": 2}, + {"x": 2, "y": 2}, + {"x": 3, "y": 2}, + {"x": 4, "y": 2}, + {"x": 5, "y": 2}, + {"x": 6, "y": 2}, + {"x": 7, "y": 2}, + {"x": 10, "y": 2}, + {"x": 11, "y": 2}, + {"x": 12, "y": 2}, + {"x": 13, "y": 2}, + {"x": 14, "y": 2}, + {"x": 15, "y": 2}, - {"label": "F7", "x": 0, "y": 3}, - {"label": "F8", "x": 1, "y": 3}, - {"label": "Shift", "x": 2, "y": 3}, - {"label": "Z", "x": 3, "y": 3}, - {"label": "X", "x": 4, "y": 3}, - {"label": "C", "x": 5, "y": 3}, - {"label": "V", "x": 6, "y": 3}, - {"label": "B", "x": 7, "y": 3}, - {"label": "Mute", "x": 8, "y": 3}, - {"label": "MPLY", "x": 9, "y": 3}, - {"label": "N", "x": 10, "y": 3}, - {"label": "M", "x": 11, "y": 3}, - {"label": ",", "x": 12, "y": 3}, - {"label": ".", "x": 13, "y": 3}, - {"label": "/", "x": 14, "y": 3}, - {"label": "Enter", "x": 15, "y": 3}, + {"x": 0, "y": 3}, + {"x": 1, "y": 3}, + {"x": 2, "y": 3}, + {"x": 3, "y": 3}, + {"x": 4, "y": 3}, + {"x": 5, "y": 3}, + {"x": 6, "y": 3}, + {"x": 7, "y": 3}, + {"x": 8, "y": 3}, + {"x": 9, "y": 3}, + {"x": 10, "y": 3}, + {"x": 11, "y": 3}, + {"x": 12, "y": 3}, + {"x": 13, "y": 3}, + {"x": 14, "y": 3}, + {"x": 15, "y": 3}, - {"label": "OS", "x": 3.75, "y": 4}, - {"label": "Alt", "x": 4.75, "y": 4}, - {"label": "Lower", "x": 5.75, "y": 4}, - {"label": "BS", "x": 6.75, "y": 4, "w": 1.5}, - {"label": "", "x": 9.75, "y": 4, "w": 1.5}, - {"label": "Raise", "x": 11.25, "y": 4}, - {"label": "Alt", "x": 12.25, "y": 4}, - {"label": "FN", "x": 13.25, "y": 4} + {"x": 3.75, "y": 4}, + {"x": 4.75, "y": 4}, + {"x": 5.75, "y": 4}, + {"x": 6.75, "y": 4, "w": 1.5}, + {"x": 9.75, "y": 4, "w": 1.5}, + {"x": 11.25, "y": 4}, + {"x": 12.25, "y": 4}, + {"x": 13.25, "y": 4} ] }, "LAYOUT_6_6": { "layout": [ - {"label": "~", "x": 2, "y": 0}, - {"label": "1", "x": 3, "y": 0}, - {"label": "2", "x": 4, "y": 0}, - {"label": "3", "x": 5, "y": 0}, - {"label": "4", "x": 6, "y": 0}, - {"label": "5", "x": 7, "y": 0}, - {"label": "6", "x": 10, "y": 0}, - {"label": "7", "x": 11, "y": 0}, - {"label": "8", "x": 12, "y": 0}, - {"label": "9", "x": 13, "y": 0}, - {"label": "0", "x": 14, "y": 0}, - {"label": "Del", "x": 15, "y": 0}, + {"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": 8, "y": 0}, + {"x": 9, "y": 0}, + {"x": 10, "y": 0}, + {"x": 11, "y": 0}, + {"x": 12, "y": 0}, + {"x": 13, "y": 0}, - {"label": "Tab", "x": 2, "y": 1}, - {"label": "Q", "x": 3, "y": 1}, - {"label": "W", "x": 4, "y": 1}, - {"label": "E", "x": 5, "y": 1}, - {"label": "R", "x": 6, "y": 1}, - {"label": "T", "x": 7, "y": 1}, - {"label": "Y", "x": 10, "y": 1}, - {"label": "U", "x": 11, "y": 1}, - {"label": "I", "x": 12, "y": 1}, - {"label": "O", "x": 13, "y": 1}, - {"label": "P", "x": 14, "y": 1}, - {"label": "BS", "x": 15, "y": 1}, + {"x": 0, "y": 1}, + {"x": 1, "y": 1}, + {"x": 2, "y": 1}, + {"x": 3, "y": 1}, + {"x": 4, "y": 1}, + {"x": 5, "y": 1}, + {"x": 8, "y": 1}, + {"x": 9, "y": 1}, + {"x": 10, "y": 1}, + {"x": 11, "y": 1}, + {"x": 12, "y": 1}, + {"x": 13, "y": 1}, - {"label": "Esc", "x": 2, "y": 2}, - {"label": "A", "x": 3, "y": 2}, - {"label": "S", "x": 4, "y": 2}, - {"label": "D", "x": 5, "y": 2}, - {"label": "F", "x": 6, "y": 2}, - {"label": "G", "x": 7, "y": 2}, - {"label": "H", "x": 10, "y": 2}, - {"label": "J", "x": 11, "y": 2}, - {"label": "K", "x": 12, "y": 2}, - {"label": "L", "x": 13, "y": 2}, - {"label": ";", "x": 14, "y": 2}, - {"label": "'", "x": 15, "y": 2}, + {"x": 0, "y": 2}, + {"x": 1, "y": 2}, + {"x": 2, "y": 2}, + {"x": 3, "y": 2}, + {"x": 4, "y": 2}, + {"x": 5, "y": 2}, + {"x": 8, "y": 2}, + {"x": 9, "y": 2}, + {"x": 10, "y": 2}, + {"x": 11, "y": 2}, + {"x": 12, "y": 2}, + {"x": 13, "y": 2}, - {"label": "Shift", "x": 2, "y": 3}, - {"label": "Z", "x": 3, "y": 3}, - {"label": "X", "x": 4, "y": 3}, - {"label": "C", "x": 5, "y": 3}, - {"label": "V", "x": 6, "y": 3}, - {"label": "B", "x": 7, "y": 3}, - {"label": "Mute", "x": 8, "y": 3}, - {"label": "MPLY", "x": 9, "y": 3}, - {"label": "N", "x": 10, "y": 3}, - {"label": "M", "x": 11, "y": 3}, - {"label": ",", "x": 12, "y": 3}, - {"label": ".", "x": 13, "y": 3}, - {"label": "/", "x": 14, "y": 3}, - {"label": "Enter", "x": 15, "y": 3}, + {"x": 0, "y": 3}, + {"x": 1, "y": 3}, + {"x": 2, "y": 3}, + {"x": 3, "y": 3}, + {"x": 4, "y": 3}, + {"x": 5, "y": 3}, + {"x": 6, "y": 3}, + {"x": 7, "y": 3}, + {"x": 8, "y": 3}, + {"x": 9, "y": 3}, + {"x": 10, "y": 3}, + {"x": 11, "y": 3}, + {"x": 12, "y": 3}, + {"x": 13, "y": 3}, - {"label": "OS", "x": 3.75, "y": 4}, - {"label": "Alt", "x": 4.75, "y": 4}, - {"label": "Lower", "x": 5.75, "y": 4}, - {"label": "BS", "x": 6.75, "y": 4, "w": 1.5}, - {"label": "", "x": 9.75, "y": 4, "w": 1.5}, - {"label": "Raise", "x": 11.25, "y": 4}, - {"label": "Alt", "x": 12.25, "y": 4}, - {"label": "FN", "x": 13.25, "y": 4} + {"x": 1.75, "y": 4}, + {"x": 2.75, "y": 4}, + {"x": 3.75, "y": 4}, + {"x": 4.75, "y": 4, "w": 1.5}, + {"x": 7.75, "y": 4, "w": 1.5}, + {"x": 9.25, "y": 4}, + {"x": 10.25, "y": 4}, + {"x": 11.25, "y": 4} ] } } diff --git a/keyboards/keyprez/corgi/config.h b/keyboards/keyprez/corgi/config.h index 081e14372d..b04e4a036e 100644 --- a/keyboards/keyprez/corgi/config.h +++ b/keyboards/keyprez/corgi/config.h @@ -17,17 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - */ -#define MATRIX_ROW_PINS { F5, F7, B2, B6, F4, F6, B1, B3 } -#define MATRIX_COL_PINS { B5, B4, E6, D7, C6, D2, B7 } - -/* COL2ROW, 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 */ diff --git a/keyboards/keyprez/corgi/corgi.c b/keyboards/keyprez/corgi/corgi.c deleted file mode 100644 index ba64134de9..0000000000 --- a/keyboards/keyprez/corgi/corgi.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Christian Sandven - * - * 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 "corgi.h" diff --git a/keyboards/keyprez/corgi/info.json b/keyboards/keyprez/corgi/info.json index f130ae5919..3c952fec99 100644 --- a/keyboards/keyprez/corgi/info.json +++ b/keyboards/keyprez/corgi/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "B4", "E6", "D7", "C6", "D2", "B7"], + "rows": ["F5", "F7", "B2", "B6", "F4", "F6", "B1", "B3"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D3", "pin_b": "D4"} diff --git a/keyboards/keyprez/rhino/config.h b/keyboards/keyprez/rhino/config.h index 3ea5c1384d..ce59f90c35 100644 --- a/keyboards/keyprez/rhino/config.h +++ b/keyboards/keyprez/rhino/config.h @@ -17,23 +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) - * - */ -#define MATRIX_ROW_PINS { B3, B2, B6, B1, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { D3, D2, D4, D7, E6, B4, B5 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define AUDIO_PIN C6 #define MUSIC_MAP diff --git a/keyboards/keyprez/rhino/info.json b/keyboards/keyprez/rhino/info.json index f92ce7b0b2..4abcf1e3ad 100644 --- a/keyboards/keyprez/rhino/info.json +++ b/keyboards/keyprez/rhino/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D2", "D4", "D7", "E6", "B4", "B5"], + "rows": ["B3", "B2", "B6", "B1", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D1", "pin_b": "D0"} diff --git a/keyboards/keyprez/unicorn/config.h b/keyboards/keyprez/unicorn/config.h index 80747b54be..76a8890108 100644 --- a/keyboards/keyprez/unicorn/config.h +++ b/keyboards/keyprez/unicorn/config.h @@ -3,25 +3,7 @@ #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 MASTER_RIGHT -#define MATRIX_ROW_PINS { F4, D3, F6, F7, B1, B3 } -#define MATRIX_COL_PINS { F5, B2, B5, D7, B4, B6, E6, D4 } -#define MATRIX_ROW_PINS_RIGHT { F4, B2, F6, F7, B1, B3 } -#define MATRIX_COL_PINS_RIGHT { F5, D3, B5, D7, B4, B6, E6, C6 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/keyprez/unicorn/info.json b/keyboards/keyprez/unicorn/info.json index e3afebbc0f..610413af8a 100644 --- a/keyboards/keyprez/unicorn/info.json +++ b/keyboards/keyprez/unicorn/info.json @@ -8,13 +8,24 @@ "pid": "0x7563", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "B2", "B5", "D7", "B4", "B6", "E6", "D4"], + "rows": ["F4", "D3", "F6", "F7", "B1", "B3"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D2", "pin_b": "D4"} ] }, "split": { - "soft_serial_pin": "D0" + "soft_serial_pin": "D0", + "matrix_pins": { + "right": { + "cols": ["F5", "D3", "B5", "D7", "B4", "B6", "E6", "C6"], + "rows": ["F4", "B2", "F6", "F7", "B1", "B3"] + } + } }, "processor": "atmega32u4", "bootloader": "caterina", |