diff options
Diffstat (limited to 'keyboards/keyhive')
29 files changed, 55 insertions, 227 deletions
diff --git a/keyboards/keyhive/absinthe/absinthe.c b/keyboards/keyhive/absinthe/absinthe.c deleted file mode 100644 index 502139ed0c..0000000000 --- a/keyboards/keyhive/absinthe/absinthe.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 cfbender - * - * 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 "absinthe.h" diff --git a/keyboards/keyhive/absinthe/config.h b/keyboards/keyhive/absinthe/config.h index 0c7fe33f6b..f33378524b 100644 --- a/keyboards/keyhive/absinthe/config.h +++ b/keyboards/keyhive/absinthe/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, D1, B6, D4, C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, D3, D0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B0 #ifdef RGB_DI_PIN #define RGBLED_NUM 32 diff --git a/keyboards/keyhive/absinthe/info.json b/keyboards/keyhive/absinthe/info.json index 336707f239..c57f0ef84e 100644 --- a/keyboards/keyhive/absinthe/info.json +++ b/keyboards/keyhive/absinthe/info.json @@ -8,6 +8,11 @@ "pid": "0xFEED", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "D3", "D0"], + "rows": ["D2", "D1", "B6", "D4", "C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B7", "pin_b": "D5"} diff --git a/keyboards/keyhive/ergosaurus/config.h b/keyboards/keyhive/ergosaurus/config.h index 6bd579b332..aded22bc7e 100644 --- a/keyboards/keyhive/ergosaurus/config.h +++ b/keyboards/keyhive/ergosaurus/config.h @@ -17,25 +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 \ - { B5, B4, E6, D4, F6, D3, D2, F4, F5 } -#define MATRIX_COL_PINS \ - { D7, C6, D0, D1, F7, B1, B3, B2 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #ifdef RGBLIGHT_ENABLE # define RGB_DI_PIN B6 #define RGBLED_NUM 32 diff --git a/keyboards/keyhive/ergosaurus/ergosaurus.c b/keyboards/keyhive/ergosaurus/ergosaurus.c deleted file mode 100644 index 4c31455128..0000000000 --- a/keyboards/keyhive/ergosaurus/ergosaurus.c +++ /dev/null @@ -1,17 +0,0 @@ - -/* Copyright 2019 cfbender - * - * 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 "ergosaurus.h" diff --git a/keyboards/keyhive/ergosaurus/info.json b/keyboards/keyhive/ergosaurus/info.json index 872ba2d76b..f9e3944fec 100644 --- a/keyboards/keyhive/ergosaurus/info.json +++ b/keyboards/keyhive/ergosaurus/info.json @@ -7,6 +7,11 @@ "pid": "0xE590", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D7", "C6", "D0", "D1", "F7", "B1", "B3", "B2"], + "rows": ["B5", "B4", "E6", "D4", "F6", "D3", "D2", "F4", "F5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["alice_split_bs"], diff --git a/keyboards/keyhive/lattice60/config.h b/keyboards/keyhive/lattice60/config.h index 345dfa5c2e..bf9e7337c2 100644 --- a/keyboards/keyhive/lattice60/config.h +++ b/keyboards/keyhive/lattice60/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 { B2, B3, B4, B5, C0, C1, C2, C3 } -#define MATRIX_COL_PINS { D7, D6, B0, D5, D1, D4, D0, B1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* 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/keyhive/lattice60/info.json b/keyboards/keyhive/lattice60/info.json index 345bd4b8e1..d3a0383ec8 100644 --- a/keyboards/keyhive/lattice60/info.json +++ b/keyboards/keyhive/lattice60/info.json @@ -8,6 +8,11 @@ "pid": "0x27DB", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D7", "D6", "B0", "D5", "D1", "D4", "D0", "B1"], + "rows": ["B2", "B3", "B4", "B5", "C0", "C1", "C2", "C3"] + }, + "diode_direction": "ROW2COL", "processor": "atmega328p", "bootloader": "usbasploader", "community_layouts": ["60_hhkb"], diff --git a/keyboards/keyhive/maypad/config.h b/keyboards/keyhive/maypad/config.h index 2922e9ef12..26e1d21dc4 100644 --- a/keyboards/keyhive/maypad/config.h +++ b/keyboards/keyhive/maypad/config.h @@ -14,23 +14,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 { C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F6, F7, B1, B3 } - -/* 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/keyhive/maypad/info.json b/keyboards/keyhive/maypad/info.json index be72cb07f9..f34f6398f6 100644 --- a/keyboards/keyhive/maypad/info.json +++ b/keyboards/keyhive/maypad/info.json @@ -8,6 +8,11 @@ "pid": "0x4D50", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "F7", "B1", "B3"], + "rows": ["C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_5x4", "numpad_5x4"], diff --git a/keyboards/keyhive/maypad/maypad.c b/keyboards/keyhive/maypad/maypad.c deleted file mode 100644 index 426575b3d2..0000000000 --- a/keyboards/keyhive/maypad/maypad.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 codybender - * - * 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 "maypad.h" diff --git a/keyboards/keyhive/navi10/rev0/config.h b/keyboards/keyhive/navi10/rev0/config.h index d6129ce2ed..2e0110934b 100644 --- a/keyboards/keyhive/navi10/rev0/config.h +++ b/keyboards/keyhive/navi10/rev0/config.h @@ -17,16 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS \ - { B6, B2, B3, B4 } -#define MATRIX_COL_PINS \ - { D1, D0, F6 } - -/* 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/keyhive/navi10/rev0/info.json b/keyboards/keyhive/navi10/rev0/info.json index e1dda21feb..c721a3f390 100644 --- a/keyboards/keyhive/navi10/rev0/info.json +++ b/keyboards/keyhive/navi10/rev0/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D0", "F6"], + "rows": ["B6", "B2", "B3", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/keyhive/navi10/rev2/config.h b/keyboards/keyhive/navi10/rev2/config.h index 0b7c4cf002..2e0110934b 100644 --- a/keyboards/keyhive/navi10/rev2/config.h +++ b/keyboards/keyhive/navi10/rev2/config.h @@ -17,16 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS \ - { B6, B2, B3, B4 } -#define MATRIX_COL_PINS \ - { D4, C6, B1 } - -/* 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/keyhive/navi10/rev2/info.json b/keyboards/keyhive/navi10/rev2/info.json index 1b44b7d70f..a0e51a3fb8 100644 --- a/keyboards/keyhive/navi10/rev2/info.json +++ b/keyboards/keyhive/navi10/rev2/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["D4", "C6", "B1"], + "rows": ["B6", "B2", "B3", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/keyhive/navi10/rev3/config.h b/keyboards/keyhive/navi10/rev3/config.h index 93ce1cdc42..2e0110934b 100644 --- a/keyboards/keyhive/navi10/rev3/config.h +++ b/keyboards/keyhive/navi10/rev3/config.h @@ -17,16 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS \ - { B6, B2, B3, B4 } -#define MATRIX_COL_PINS \ - { D4, E6, B1 } - -/* 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/keyhive/navi10/rev3/info.json b/keyboards/keyhive/navi10/rev3/info.json index 2d7d9f1f84..704ca05e91 100644 --- a/keyboards/keyhive/navi10/rev3/info.json +++ b/keyboards/keyhive/navi10/rev3/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["D4", "E6", "B1"], + "rows": ["B6", "B2", "B3", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/keyhive/opus/config.h b/keyboards/keyhive/opus/config.h index 42cc507df9..ae2fa676f6 100644 --- a/keyboards/keyhive/opus/config.h +++ b/keyboards/keyhive/opus/config.h @@ -16,13 +16,6 @@ #pragma once - -/* PCB pin-out */ -#define MATRIX_ROW_PINS {B1, B3, B2, B6} -#define MATRIX_COL_PINS {D1, D0, D4, C6, D7, E6, B4, B5, F4, F5, F6, F7} - -#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/keyhive/opus/info.json b/keyboards/keyhive/opus/info.json index f3ce5cec58..fd508c1003 100644 --- a/keyboards/keyhive/opus/info.json +++ b/keyboards/keyhive/opus/info.json @@ -7,6 +7,11 @@ "pid": "0x4F50", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5", "F6", "F7"], + "rows": ["B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/keyhive/opus/opus.c b/keyboards/keyhive/opus/opus.c deleted file mode 100644 index 5a188cf8a0..0000000000 --- a/keyboards/keyhive/opus/opus.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 rtwayland - * - * 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 "opus.h" diff --git a/keyboards/keyhive/smallice/config.h b/keyboards/keyhive/smallice/config.h index b3114e4011..450f080684 100644 --- a/keyboards/keyhive/smallice/config.h +++ b/keyboards/keyhive/smallice/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 { B0, B6, B5, B4 } -#define MATRIX_COL_PINS { C7, C6, F7, F6, F5, F4, F1, D4, D6, D7, D0, D1, D2, D3, D5 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B7 #ifdef RGB_DI_PIN # define RGBLED_NUM 12 diff --git a/keyboards/keyhive/smallice/info.json b/keyboards/keyhive/smallice/info.json index 39bdd4d09a..476411a004 100644 --- a/keyboards/keyhive/smallice/info.json +++ b/keyboards/keyhive/smallice/info.json @@ -8,6 +8,11 @@ "pid": "0x5341", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "F7", "F6", "F5", "F4", "F1", "D4", "D6", "D7", "D0", "D1", "D2", "D3", "D5"], + "rows": ["B0", "B6", "B5", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/keyhive/smallice/smallice.c b/keyboards/keyhive/smallice/smallice.c deleted file mode 100644 index c7d65e27ab..0000000000 --- a/keyboards/keyhive/smallice/smallice.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 armastardo / quark - * - * 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 "smallice.h" diff --git a/keyboards/keyhive/southpole/config.h b/keyboards/keyhive/southpole/config.h index 91718d741f..b44dfaac52 100644 --- a/keyboards/keyhive/southpole/config.h +++ b/keyboards/keyhive/southpole/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D2, D3, C6, C7, D5 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D0, D1, F0, F1, F4, F5, F6, F7, B6, B5, B4, D7, D6, D4, 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 diff --git a/keyboards/keyhive/southpole/info.json b/keyboards/keyhive/southpole/info.json index 0c06a2be3b..8228647362 100644 --- a/keyboards/keyhive/southpole/info.json +++ b/keyboards/keyhive/southpole/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6", "D4", "E6"], + "rows": ["D2", "D3", "C6", "C7", "D5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay", "layouts": { diff --git a/keyboards/keyhive/southpole/southpole.c b/keyboards/keyhive/southpole/southpole.c deleted file mode 100644 index f345893fb5..0000000000 --- a/keyboards/keyhive/southpole/southpole.c +++ /dev/null @@ -1 +0,0 @@ -#include "southpole.h" diff --git a/keyboards/keyhive/ut472/config.h b/keyboards/keyhive/ut472/config.h index 5e00d17106..e96f645d6a 100644 --- a/keyboards/keyhive/ut472/config.h +++ b/keyboards/keyhive/ut472/config.h @@ -16,15 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D1, D2, D3, D4 } -#define MATRIX_COL_PINS { C4, C5, B7, B6, B5, B4, B3, B2, B1, B0, D6, D5 } - - -/* 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/keyhive/ut472/info.json b/keyboards/keyhive/ut472/info.json index de93aeef6d..d80901cf50 100644 --- a/keyboards/keyhive/ut472/info.json +++ b/keyboards/keyhive/ut472/info.json @@ -8,6 +8,11 @@ "pid": "0x0472", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["C4", "C5", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", "D6", "D5"], + "rows": ["D1", "D2", "D3", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/keyhive/ut472/ut472.c b/keyboards/keyhive/ut472/ut472.c deleted file mode 100644 index 637922171a..0000000000 --- a/keyboards/keyhive/ut472/ut472.c +++ /dev/null @@ -1 +0,0 @@ -#include "ut472.h" |