diff options
Diffstat (limited to 'keyboards/drhigsby')
| -rw-r--r-- | keyboards/drhigsby/bkf/bkf.c | 16 | ||||
| -rw-r--r-- | keyboards/drhigsby/bkf/config.h | 19 | ||||
| -rw-r--r-- | keyboards/drhigsby/bkf/info.json | 5 | ||||
| -rw-r--r-- | keyboards/drhigsby/dubba175/config.h | 19 | ||||
| -rw-r--r-- | keyboards/drhigsby/dubba175/dubba175.c | 16 | ||||
| -rw-r--r-- | keyboards/drhigsby/dubba175/info.json | 5 | ||||
| -rw-r--r-- | keyboards/drhigsby/ogurec/config.h | 19 | ||||
| -rw-r--r-- | keyboards/drhigsby/ogurec/info.json | 88 | ||||
| -rw-r--r-- | keyboards/drhigsby/ogurec/keymaps/dack/config.h | 1 | ||||
| -rw-r--r-- | keyboards/drhigsby/ogurec/left_pm/info.json | 87 | ||||
| -rw-r--r-- | keyboards/drhigsby/ogurec/left_pm/left_pm.h | 49 | ||||
| -rw-r--r-- | keyboards/drhigsby/ogurec/ogurec.c | 16 | ||||
| -rw-r--r-- | keyboards/drhigsby/ogurec/ogurec.h | 24 | ||||
| -rw-r--r-- | keyboards/drhigsby/ogurec/right_pm/info.json | 87 | ||||
| -rw-r--r-- | keyboards/drhigsby/ogurec/right_pm/right_pm.h | 49 | ||||
| -rw-r--r-- | keyboards/drhigsby/packrat/config.h | 19 | ||||
| -rw-r--r-- | keyboards/drhigsby/packrat/info.json | 5 | ||||
| -rw-r--r-- | keyboards/drhigsby/packrat/packrat.c | 12 |
18 files changed, 195 insertions, 341 deletions
diff --git a/keyboards/drhigsby/bkf/bkf.c b/keyboards/drhigsby/bkf/bkf.c deleted file mode 100644 index 6df3ed56f6..0000000000 --- a/keyboards/drhigsby/bkf/bkf.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 drhigsby - * - * 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 "bkf.h" diff --git a/keyboards/drhigsby/bkf/config.h b/keyboards/drhigsby/bkf/config.h index e13ed8af9d..44c0166125 100644 --- a/keyboards/drhigsby/bkf/config.h +++ b/keyboards/drhigsby/bkf/config.h @@ -15,25 +15,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) - * - */ - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F6, F7, B1, B3 } -#define MATRIX_COL_PINS { B6, B2, D3, D2, D1, D0, D4, C6, D7, E6, B4, B5 } - -/* 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 */ diff --git a/keyboards/drhigsby/bkf/info.json b/keyboards/drhigsby/bkf/info.json index 49a56a2786..d2a22b3d20 100644 --- a/keyboards/drhigsby/bkf/info.json +++ b/keyboards/drhigsby/bkf/info.json @@ -8,6 +8,11 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B2", "D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F6", "F7", "B1", "B3"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F4", "pin_b": "F5"} diff --git a/keyboards/drhigsby/dubba175/config.h b/keyboards/drhigsby/dubba175/config.h index 5de87b2fa1..7cfb519fe9 100644 --- a/keyboards/drhigsby/dubba175/config.h +++ b/keyboards/drhigsby/dubba175/config.h @@ -15,25 +15,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) - * - */ - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B1, B3, B2, B5 } -#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B6 } - -/* 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 */ diff --git a/keyboards/drhigsby/dubba175/dubba175.c b/keyboards/drhigsby/dubba175/dubba175.c deleted file mode 100644 index 066e772fa2..0000000000 --- a/keyboards/drhigsby/dubba175/dubba175.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 drhigsby - * - * 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 "dubba175.h"
\ No newline at end of file diff --git a/keyboards/drhigsby/dubba175/info.json b/keyboards/drhigsby/dubba175/info.json index e9ea824c5f..6e24721cf9 100644 --- a/keyboards/drhigsby/dubba175/info.json +++ b/keyboards/drhigsby/dubba175/info.json @@ -8,6 +8,11 @@ "pid": "0x0420", "device_version": "4.2.0" }, + "matrix_pins": { + "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B6"], + "rows": ["B1", "B3", "B2", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/drhigsby/ogurec/config.h b/keyboards/drhigsby/ogurec/config.h index b59942ed24..44c0166125 100644 --- a/keyboards/drhigsby/ogurec/config.h +++ b/keyboards/drhigsby/ogurec/config.h @@ -15,25 +15,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) - * - */ - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F6, B6, B2 } -#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5, F4, F5 } - -/* 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 */ diff --git a/keyboards/drhigsby/ogurec/info.json b/keyboards/drhigsby/ogurec/info.json index 31e8816a46..3f28e87826 100644 --- a/keyboards/drhigsby/ogurec/info.json +++ b/keyboards/drhigsby/ogurec/info.json @@ -8,87 +8,11 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5"], + "rows": ["F6", "B6", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", - "bootloader": "caterina", - "layouts": { - "LAYOUT_ortho_3x12": { - "layout": [ - {"label":"Q", "x":0, "y":0}, - {"label":"W", "x":1, "y":0}, - {"label":"E", "x":2, "y":0}, - {"label":"R", "x":3, "y":0}, - {"label":"T", "x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"label":"Y", "x":7, "y":0}, - {"label":"U", "x":8, "y":0}, - {"label":"I", "x":9, "y":0}, - {"label":"O", "x":10, "y":0}, - {"label":"P", "x":11, "y":0}, - {"label":"A", "x":0, "y":1}, - {"label":"S", "x":1, "y":1}, - {"label":"D", "x":2, "y":1}, - {"label":"F", "x":3, "y":1}, - {"label":"G", "x":4, "y":1}, - {"x":5, "y":1}, - {"x":6, "y":1}, - {"label":"H", "x":7, "y":1}, - {"label":"J", "x":8, "y":1}, - {"label":"K", "x":9, "y":1}, - {"label":"L", "x":10, "y":1}, - {"label":"\"", "x":11, "y":1}, - {"label":"Z", "x":0, "y":2}, - {"label":"X", "x":1, "y":2}, - {"label":"C", "x":2, "y":2}, - {"label":"V", "x":3, "y":2}, - {"label":"B", "x":4, "y":2}, - {"x":5, "y":2}, - {"x":6, "y":2}, - {"label":"N", "x":7, "y":2}, - {"label":"M", "x":8, "y":2}, - {"label":"<", "x":9, "y":2}, - {"label":">", "x":10, "y":2}, - {"label":"?", "x":11, "y":2}] - }, - - "LAYOUT_ortho_3x12_1x2uC": { - "layout": [ - {"label":"Q", "x":0, "y":0}, - {"label":"W", "x":1, "y":0}, - {"label":"E", "x":2, "y":0}, - {"label":"R", "x":3, "y":0}, - {"label":"T", "x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"label":"Y", "x":7, "y":0}, - {"label":"U", "x":8, "y":0}, - {"label":"I", "x":9, "y":0}, - {"label":"O", "x":10, "y":0}, - {"label":"P", "x":11, "y":0}, - {"label":"A", "x":0, "y":1}, - {"label":"S", "x":1, "y":1}, - {"label":"D", "x":2, "y":1}, - {"label":"F", "x":3, "y":1}, - {"label":"G", "x":4, "y":1}, - {"x":5, "y":1}, - {"x":6, "y":1}, - {"label":"H", "x":7, "y":1}, - {"label":"J", "x":8, "y":1}, - {"label":"K", "x":9, "y":1}, - {"label":"L", "x":10, "y":1}, - {"label":"\"", "x":11, "y":1}, - {"label":"Z", "x":0, "y":2}, - {"label":"X", "x":1, "y":2}, - {"label":"C", "x":2, "y":2}, - {"label":"V", "x":3, "y":2}, - {"label":"B", "x":4, "y":2}, - {"x":5, "y":2, "w":2}, - {"label":"N", "x":7, "y":2}, - {"label":"M", "x":8, "y":2}, - {"label":"<", "x":9, "y":2}, - {"label":">", "x":10, "y":2}, - {"label":"?", "x":11, "y":2}] - } - - } + "bootloader": "caterina" } diff --git a/keyboards/drhigsby/ogurec/keymaps/dack/config.h b/keyboards/drhigsby/ogurec/keymaps/dack/config.h index af5d55bf6e..cadd53a971 100644 --- a/keyboards/drhigsby/ogurec/keymaps/dack/config.h +++ b/keyboards/drhigsby/ogurec/keymaps/dack/config.h @@ -14,6 +14,5 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TERM 230 #define TAPPING_TERM_PER_KEY diff --git a/keyboards/drhigsby/ogurec/left_pm/info.json b/keyboards/drhigsby/ogurec/left_pm/info.json new file mode 100644 index 0000000000..4563c99b1c --- /dev/null +++ b/keyboards/drhigsby/ogurec/left_pm/info.json @@ -0,0 +1,87 @@ +{ + "layouts": { + "LAYOUT_ortho_3x12": { + "layout": [ + {"matrix": [0, 11], "x": 0, "y": 0}, + {"matrix": [0, 10], "x": 1, "y": 0}, + {"matrix": [0, 9], "x": 2, "y": 0}, + {"matrix": [0, 8], "x": 3, "y": 0}, + {"matrix": [0, 7], "x": 4, "y": 0}, + {"matrix": [0, 6], "x": 5, "y": 0}, + {"matrix": [0, 5], "x": 6, "y": 0}, + {"matrix": [0, 4], "x": 7, "y": 0}, + {"matrix": [0, 3], "x": 8, "y": 0}, + {"matrix": [0, 2], "x": 9, "y": 0}, + {"matrix": [0, 1], "x": 10, "y": 0}, + {"matrix": [0, 0], "x": 11, "y": 0}, + + {"matrix": [1, 11], "x": 0, "y": 1}, + {"matrix": [1, 10], "x": 1, "y": 1}, + {"matrix": [1, 9], "x": 2, "y": 1}, + {"matrix": [1, 8], "x": 3, "y": 1}, + {"matrix": [1, 7], "x": 4, "y": 1}, + {"matrix": [1, 6], "x": 5, "y": 1}, + {"matrix": [1, 5], "x": 6, "y": 1}, + {"matrix": [1, 4], "x": 7, "y": 1}, + {"matrix": [1, 3], "x": 8, "y": 1}, + {"matrix": [1, 2], "x": 9, "y": 1}, + {"matrix": [1, 1], "x": 10, "y": 1}, + {"matrix": [1, 0], "x": 11, "y": 1}, + + {"matrix": [2, 11], "x": 0, "y": 2}, + {"matrix": [2, 10], "x": 1, "y": 2}, + {"matrix": [2, 9], "x": 2, "y": 2}, + {"matrix": [2, 8], "x": 3, "y": 2}, + {"matrix": [2, 7], "x": 4, "y": 2}, + {"matrix": [2, 6], "x": 5, "y": 2}, + {"matrix": [2, 5], "x": 6, "y": 2}, + {"matrix": [2, 4], "x": 7, "y": 2}, + {"matrix": [2, 3], "x": 8, "y": 2}, + {"matrix": [2, 2], "x": 9, "y": 2}, + {"matrix": [2, 1], "x": 10, "y": 2}, + {"matrix": [2, 0], "x": 11, "y": 2} + ] + }, + "LAYOUT_ortho_3x12_1x2uC": { + "layout": [ + {"matrix": [0, 11], "x": 0, "y": 0}, + {"matrix": [0, 10], "x": 1, "y": 0}, + {"matrix": [0, 9], "x": 2, "y": 0}, + {"matrix": [0, 8], "x": 3, "y": 0}, + {"matrix": [0, 7], "x": 4, "y": 0}, + {"matrix": [0, 6], "x": 5, "y": 0}, + {"matrix": [0, 5], "x": 6, "y": 0}, + {"matrix": [0, 4], "x": 7, "y": 0}, + {"matrix": [0, 3], "x": 8, "y": 0}, + {"matrix": [0, 2], "x": 9, "y": 0}, + {"matrix": [0, 1], "x": 10, "y": 0}, + {"matrix": [0, 0], "x": 11, "y": 0}, + + {"matrix": [1, 11], "x": 0, "y": 1}, + {"matrix": [1, 10], "x": 1, "y": 1}, + {"matrix": [1, 9], "x": 2, "y": 1}, + {"matrix": [1, 8], "x": 3, "y": 1}, + {"matrix": [1, 7], "x": 4, "y": 1}, + {"matrix": [1, 6], "x": 5, "y": 1}, + {"matrix": [1, 5], "x": 6, "y": 1}, + {"matrix": [1, 4], "x": 7, "y": 1}, + {"matrix": [1, 3], "x": 8, "y": 1}, + {"matrix": [1, 2], "x": 9, "y": 1}, + {"matrix": [1, 1], "x": 10, "y": 1}, + {"matrix": [1, 0], "x": 11, "y": 1}, + + {"matrix": [2, 11], "x": 0, "y": 2}, + {"matrix": [2, 10], "x": 1, "y": 2}, + {"matrix": [2, 9], "x": 2, "y": 2}, + {"matrix": [2, 8], "x": 3, "y": 2}, + {"matrix": [2, 7], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2, "w": 2}, + {"matrix": [2, 4], "x": 7, "y": 2}, + {"matrix": [2, 3], "x": 8, "y": 2}, + {"matrix": [2, 2], "x": 9, "y": 2}, + {"matrix": [2, 1], "x": 10, "y": 2}, + {"matrix": [2, 0], "x": 11, "y": 2} + ] + } + } +} diff --git a/keyboards/drhigsby/ogurec/left_pm/left_pm.h b/keyboards/drhigsby/ogurec/left_pm/left_pm.h deleted file mode 100644 index ecf87a2a49..0000000000 --- a/keyboards/drhigsby/ogurec/left_pm/left_pm.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright 2021 drhigsby - * - * 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 "ogurec.h" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define LAYOUT_ortho_3x12( \ - k011, k010, k009, k008, k007, k006, k005, k004, k003, k002, k001, k000, \ - k111, k110, k109, k108, k107, k106, k105, k104, k103, k102, k101, k100, \ - k211, k210, k209, k208, k207, k206, k205, k204, k203, k202, k201, k200 \ -) \ -{ \ - { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011 }, \ - { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111 }, \ - { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211 } \ -} - -#define LAYOUT_ortho_3x12_1x2uC( \ - k011, k010, k009, k008, k007, k006, k005, k004, k003, k002, k001, k000, \ - k111, k110, k109, k108, k107, k106, k105, k104, k103, k102, k101, k100, \ - k211, k210, k209, k208, k207, k205, k204, k203, k202, k201, k200 \ -) \ -{ \ - { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011 }, \ - { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111 }, \ - { k200, k201, k202, k203, k204, k205, KC_NO, k207, k208, k209, k210, k211 } \ -} diff --git a/keyboards/drhigsby/ogurec/ogurec.c b/keyboards/drhigsby/ogurec/ogurec.c deleted file mode 100644 index 6b2efa56b6..0000000000 --- a/keyboards/drhigsby/ogurec/ogurec.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 drhigsby - * - * 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 "ogurec.h" diff --git a/keyboards/drhigsby/ogurec/ogurec.h b/keyboards/drhigsby/ogurec/ogurec.h deleted file mode 100644 index 154d5d6cfe..0000000000 --- a/keyboards/drhigsby/ogurec/ogurec.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2021 drhigsby - * - * 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" - -#if defined(KEYBOARD_drhigsby_ogurec_left_pm) -# include "left_pm.h" -#elif defined(KEYBOARD_drhigsby_ogurec_right_pm) -# include "right_pm.h" -#endif diff --git a/keyboards/drhigsby/ogurec/right_pm/info.json b/keyboards/drhigsby/ogurec/right_pm/info.json new file mode 100644 index 0000000000..8006014ea0 --- /dev/null +++ b/keyboards/drhigsby/ogurec/right_pm/info.json @@ -0,0 +1,87 @@ +{ + "layouts": { + "LAYOUT_ortho_3x12": { + "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": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2} + ] + }, + "LAYOUT_ortho_3x12_1x2uC": { + "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": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2, "w": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2} + ] + } + } +} diff --git a/keyboards/drhigsby/ogurec/right_pm/right_pm.h b/keyboards/drhigsby/ogurec/right_pm/right_pm.h deleted file mode 100644 index e413a835bc..0000000000 --- a/keyboards/drhigsby/ogurec/right_pm/right_pm.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright 2021 drhigsby - * - * 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 "ogurec.h" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define LAYOUT_ortho_3x12( \ - k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, \ - k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, \ - k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211 \ -) \ -{ \ - { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011 }, \ - { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111 }, \ - { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211 } \ -} - -#define LAYOUT_ortho_3x12_1x2uC( \ - k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, \ - k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, \ - k200, k201, k202, k203, k204, k205, k207, k208, k209, k210, k211 \ -) \ -{ \ - { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011 }, \ - { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111 }, \ - { k200, k201, k202, k203, k204, k205, KC_NO, k207, k208, k209, k210, k211 } \ -} diff --git a/keyboards/drhigsby/packrat/config.h b/keyboards/drhigsby/packrat/config.h index 5700fad7d2..44c0166125 100644 --- a/keyboards/drhigsby/packrat/config.h +++ b/keyboards/drhigsby/packrat/config.h @@ -15,25 +15,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) - * - */ - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F7, B1, B6, B2 } -#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5, B3 } - -/* 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 */ diff --git a/keyboards/drhigsby/packrat/info.json b/keyboards/drhigsby/packrat/info.json index b9f9246701..0525824da3 100644 --- a/keyboards/drhigsby/packrat/info.json +++ b/keyboards/drhigsby/packrat/info.json @@ -8,6 +8,11 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B3"], + "rows": ["F7", "B1", "B6", "B2"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F5", "pin_b": "F4"} diff --git a/keyboards/drhigsby/packrat/packrat.c b/keyboards/drhigsby/packrat/packrat.c index 0f4a479956..dc8f3b41b4 100644 --- a/keyboards/drhigsby/packrat/packrat.c +++ b/keyboards/drhigsby/packrat/packrat.c @@ -14,15 +14,3 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "packrat.h" - -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { return false; } - if (index == 0) { - if (clockwise) { - tap_code_delay(KC_VOLU, 10); - } else { - tap_code_delay(KC_VOLD, 10); - } - } - return true; -} |