diff options
Diffstat (limited to 'keyboards/thevankeyboards')
23 files changed, 170 insertions, 231 deletions
diff --git a/keyboards/thevankeyboards/bananasplit/bananasplit.c b/keyboards/thevankeyboards/bananasplit/bananasplit.c deleted file mode 100644 index 88917cb74d..0000000000 --- a/keyboards/thevankeyboards/bananasplit/bananasplit.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 MechMerlin <mechmerlin@gmail.com> - * - * 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 "bananasplit.h" diff --git a/keyboards/thevankeyboards/bananasplit/config.h b/keyboards/thevankeyboards/bananasplit/config.h index ab5f20d40a..d9dc5a8401 100644 --- a/keyboards/thevankeyboards/bananasplit/config.h +++ b/keyboards/thevankeyboards/bananasplit/config.h @@ -17,12 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS { B0, B2, B4, B5, B6 } -#define MATRIX_COL_PINS { F5, B1, F0, F1, F4, B3, D7, D6, D4, D5, D3, D2, D1, D0 } - -#define DIODE_DIRECTION ROW2COL - #define TAPPING_TERM 175 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/thevankeyboards/bananasplit/info.json b/keyboards/thevankeyboards/bananasplit/info.json index 1824e945cf..925331a581 100644 --- a/keyboards/thevankeyboards/bananasplit/info.json +++ b/keyboards/thevankeyboards/bananasplit/info.json @@ -8,6 +8,11 @@ "pid": "0x8870", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "B1", "F0", "F1", "F4", "B3", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], + "rows": ["B0", "B2", "B4", "B5", "B6"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B7" }, diff --git a/keyboards/thevankeyboards/caravan/caravan.c b/keyboards/thevankeyboards/caravan/caravan.c deleted file mode 100644 index c4fa14f0c1..0000000000 --- a/keyboards/thevankeyboards/caravan/caravan.c +++ /dev/null @@ -1 +0,0 @@ -#include "caravan.h" diff --git a/keyboards/thevankeyboards/caravan/caravan.h b/keyboards/thevankeyboards/caravan/caravan.h deleted file mode 100644 index 43bd846ab6..0000000000 --- a/keyboards/thevankeyboards/caravan/caravan.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ - K30, K31, K32, K33, K37, K38, K39, K3B \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \ - { K30, K31, K32, K33, KC_NO, KC_NO, KC_NO, K37, K38, K39, KC_NO, K3B } \ -} diff --git a/keyboards/thevankeyboards/caravan/config.h b/keyboards/thevankeyboards/caravan/config.h index 5f2d34cd5b..5070f05156 100644 --- a/keyboards/thevankeyboards/caravan/config.h +++ b/keyboards/thevankeyboards/caravan/config.h @@ -17,12 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define MATRIX_ROW_PINS { B0, B1, B2, B3 } -#define MATRIX_COL_PINS { F1, F4, F5, B4, B5, B6, B7, D2, D3, D5, D4, D6 } - -/* 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/thevankeyboards/caravan/info.json b/keyboards/thevankeyboards/caravan/info.json index 43a1f7ed70..781580bd86 100644 --- a/keyboards/thevankeyboards/caravan/info.json +++ b/keyboards/thevankeyboards/caravan/info.json @@ -8,55 +8,67 @@ "pid": "0x8844", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F1", "F4", "F5", "B4", "B5", "B6", "B7", "D2", "D3", "D5", "D4", "D6"], + "rows": ["B0", "B1", "B2", "B3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ - {"label":"K00", "x":0, "y":0}, - {"label":"K01", "x":1, "y":0}, - {"label":"K02", "x":2, "y":0}, - {"label":"K03", "x":3, "y":0}, - {"label":"K04", "x":4, "y":0}, - {"label":"K05", "x":5, "y":0}, - {"label":"K06", "x":7, "y":0}, - {"label":"K07", "x":8, "y":0}, - {"label":"K08", "x":9, "y":0}, - {"label":"K09", "x":10, "y":0}, - {"label":"K0A", "x":11, "y":0}, - {"label":"K0B", "x":12, "y":0, "w":1.75}, - {"label":"K10", "x":0, "y":1, "w":1.25}, - {"label":"K11", "x":1.25, "y":1}, - {"label":"K12", "x":2.25, "y":1}, - {"label":"K13", "x":3.25, "y":1}, - {"label":"K14", "x":4.25, "y":1}, - {"label":"K15", "x":5.25, "y":1}, - {"label":"K16", "x":7.25, "y":1}, - {"label":"K17", "x":8.25, "y":1}, - {"label":"K18", "x":9.25, "y":1}, - {"label":"K19", "x":10.25, "y":1}, - {"label":"K1A", "x":11.25, "y":1}, - {"label":"K1B", "x":12.25, "y":1, "w":1.5}, - {"label":"K20", "x":0, "y":2, "w":1.75}, - {"label":"K21", "x":1.75, "y":2}, - {"label":"K22", "x":2.75, "y":2}, - {"label":"K23", "x":3.75, "y":2}, - {"label":"K24", "x":4.75, "y":2}, - {"label":"K25", "x":5.75, "y":2}, - {"label":"K26", "x":7.75, "y":2}, - {"label":"K27", "x":8.75, "y":2}, - {"label":"K28", "x":9.75, "y":2}, - {"label":"K29", "x":10.75, "y":2}, - {"label":"K2A", "x":11.75, "y":2}, - {"label":"K2B", "x":12.75, "y":2}, - {"label":"K30", "x":0, "y":3, "w":1.25}, - {"label":"K31", "x":1.25, "y":3, "w":1.5}, - {"label":"K32", "x":2.75, "y":3, "w":1.25}, - {"label":"K33", "x":4, "y":3, "w":2.25}, - {"label":"K37", "x":7.25, "y":3, "w":2}, - {"label":"K38", "x":9.25, "y":3, "w":1.25}, - {"label":"K39", "x":10.5, "y":3, "w":1.5}, - {"label":"K3B", "x":12, "y":3, "w":1.75} + {"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": 7, "y": 0}, + {"matrix": [0, 7], "x": 8, "y": 0}, + {"matrix": [0, 8], "x": 9, "y": 0}, + {"matrix": [0, 9], "x": 10, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0, "w": 1.75}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + + {"matrix": [1, 6], "x": 7.25, "y": 1}, + {"matrix": [1, 7], "x": 8.25, "y": 1}, + {"matrix": [1, 8], "x": 9.25, "y": 1}, + {"matrix": [1, 9], "x": 10.25, "y": 1}, + {"matrix": [1, 10], "x": 11.25, "y": 1}, + {"matrix": [1, 11], "x": 12.25, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + + {"matrix": [2, 6], "x": 7.75, "y": 2}, + {"matrix": [2, 7], "x": 8.75, "y": 2}, + {"matrix": [2, 8], "x": 9.75, "y": 2}, + {"matrix": [2, 9], "x": 10.75, "y": 2}, + {"matrix": [2, 10], "x": 11.75, "y": 2}, + {"matrix": [2, 11], "x": 12.75, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3, "w": 1.25}, + {"matrix": [3, 3], "x": 4, "y": 3, "w": 2.25}, + + {"matrix": [3, 7], "x": 7.25, "y": 3, "w": 2}, + {"matrix": [3, 8], "x": 9.25, "y": 3, "w": 1.25}, + {"matrix": [3, 9], "x": 10.5, "y": 3, "w": 1.5}, + {"matrix": [3, 11], "x": 12, "y": 3, "w": 1.75} ] } } diff --git a/keyboards/thevankeyboards/jetvan/config.h b/keyboards/thevankeyboards/jetvan/config.h index 8d0b2668e7..e8aca5e862 100644 --- a/keyboards/thevankeyboards/jetvan/config.h +++ b/keyboards/thevankeyboards/jetvan/config.h @@ -17,32 +17,12 @@ 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) - * -*/ - -// Checked with Eagle Schematic -#define MATRIX_ROW_PINS { D7, B5, F7, D4 } -#define MATRIX_COL_PINS { D2, D3, D5, D6, B4, B6, F6, F5, F4, F1, F0, 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 */ #define LOCKING_RESYNC_ENABLE /* Define RGB Underglow */ -#define RGB_DI_PIN D0 #define RGBLED_NUM 10 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/thevankeyboards/jetvan/info.json b/keyboards/thevankeyboards/jetvan/info.json index 022ac65f5c..80281fef1f 100644 --- a/keyboards/thevankeyboards/jetvan/info.json +++ b/keyboards/thevankeyboards/jetvan/info.json @@ -8,15 +8,65 @@ "pid": "0x8858", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D0" + }, + "matrix_pins": { + "cols": ["D2", "D3", "D5", "D6", "B4", "B6", "F6", "F5", "F4", "F1", "F0", "B3"], + "rows": ["D7", "B5", "F7", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", - "bootloader": "atmel-dfu" + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ - {"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":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0, "w":1.75}, - {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":1.5}, - {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, - {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3, "w":1.25}, {"x":3.5, "w":6.25, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3} + {"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, "w": 1.75}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 10], "x": 10.25, "y": 1}, + {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25}, + {"matrix": [3, 7], "x": 3.5, "y": 3, "w": 6.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3}, + {"matrix": [3, 10], "x": 10.75, "y": 3}, + {"matrix": [3, 11], "x": 11.75, "y": 3} ] } } diff --git a/keyboards/thevankeyboards/jetvan/jetvan.c b/keyboards/thevankeyboards/jetvan/jetvan.c deleted file mode 100644 index 750c200afd..0000000000 --- a/keyboards/thevankeyboards/jetvan/jetvan.c +++ /dev/null @@ -1,14 +0,0 @@ -/* -Copyright 2020 <terry@terrymathews.net> -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 "jetvan.h" diff --git a/keyboards/thevankeyboards/jetvan/jetvan.h b/keyboards/thevankeyboards/jetvan/jetvan.h deleted file mode 100644 index 4e1e00e4f1..0000000000 --- a/keyboards/thevankeyboards/jetvan/jetvan.h +++ /dev/null @@ -1,29 +0,0 @@ -/* -Copyright 2020 <terry@terrymathews.net> -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" - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ - K30, K31, K32, K37, K39, K3A, K3B \ -){ \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \ - { K30, K31, K32, KC_NO, KC_NO, KC_NO, KC_NO, K37, KC_NO, K39, K3A, K3B } \ -} diff --git a/keyboards/thevankeyboards/minivan/config.h b/keyboards/thevankeyboards/minivan/config.h index f75e8e7ced..44b61b7458 100644 --- a/keyboards/thevankeyboards/minivan/config.h +++ b/keyboards/thevankeyboards/minivan/config.h @@ -17,29 +17,11 @@ 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 { D7, B5, F7, D4 } -#define MATRIX_COL_PINS { D2, D3, D5, D6, B4, B6, F6, F5, F4, F1, F0, 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 */ #define LOCKING_RESYNC_ENABLE /* RGB Setup */ -#define RGB_DI_PIN D0 #define RGBLED_NUM 3 #define RGBLIGHT_SLEEP diff --git a/keyboards/thevankeyboards/minivan/info.json b/keyboards/thevankeyboards/minivan/info.json index 563bcc73ed..be95cdaf5a 100644 --- a/keyboards/thevankeyboards/minivan/info.json +++ b/keyboards/thevankeyboards/minivan/info.json @@ -8,6 +8,14 @@ "pid": "0x8844", "device_version": "0.0.2" }, + "ws2812": { + "pin": "D0" + }, + "matrix_pins": { + "cols": ["D2", "D3", "D5", "D6", "B4", "B6", "F6", "F5", "F4", "F1", "F0", "B3"], + "rows": ["D7", "B5", "F7", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/thevankeyboards/minivan/keymaps/budi/config.h b/keyboards/thevankeyboards/minivan/keymaps/budi/config.h index dc36b73808..e6c4f24877 100644 --- a/keyboards/thevankeyboards/minivan/keymaps/budi/config.h +++ b/keyboards/thevankeyboards/minivan/keymaps/budi/config.h @@ -17,6 +17,5 @@ #define MOUSEKEY_WHEEL_TIME_TO_MAX 120 #define TAPPING_TOGGLE 1 #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT #define FORCE_NKRO #endif diff --git a/keyboards/thevankeyboards/minivan/keymaps/core/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/core/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/thevankeyboards/minivan/keymaps/core/rules.mk +++ /dev/null diff --git a/keyboards/thevankeyboards/minivan/keymaps/halvves/config.h b/keyboards/thevankeyboards/minivan/keymaps/halvves/config.h index c6404f8ce5..958b0cdaf5 100644 --- a/keyboards/thevankeyboards/minivan/keymaps/halvves/config.h +++ b/keyboards/thevankeyboards/minivan/keymaps/halvves/config.h @@ -14,7 +14,7 @@ #endif #ifdef RGBLIGHT_ENABLE - #define RGB_DI_PIN D0 + #define WS2812_DI_PIN D0 #define RGBLED_NUM 3 #define RGBLIGHT_EFFECT_BREATHING #endif diff --git a/keyboards/thevankeyboards/minivan/keymaps/hvp/config.h b/keyboards/thevankeyboards/minivan/keymaps/hvp/config.h index cd2aa46c44..8b64f40337 100644 --- a/keyboards/thevankeyboards/minivan/keymaps/hvp/config.h +++ b/keyboards/thevankeyboards/minivan/keymaps/hvp/config.h @@ -1,5 +1,4 @@ #pragma once #define TAPPING_TERM 150 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD
\ No newline at end of file diff --git a/keyboards/thevankeyboards/minivan/keymaps/like_jis/config.h b/keyboards/thevankeyboards/minivan/keymaps/like_jis/config.h index 4c4e6d37b5..49d7d463aa 100644 --- a/keyboards/thevankeyboards/minivan/keymaps/like_jis/config.h +++ b/keyboards/thevankeyboards/minivan/keymaps/like_jis/config.h @@ -2,7 +2,6 @@ // place overrides here #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TERM_PER_KEY #ifdef MOUSEKEY_ENABLE @@ -37,7 +36,7 @@ // LED Setting: if you have KUMO you can use RGBLIGHT_ENABLE = yes #ifdef RGBLIGHT_ENABLE - #define RGB_DI_PIN D0 + #define WS2812_DI_PIN D0 #define RGBLIGHT_TIMER #define RGBLED_NUM 3 #endif diff --git a/keyboards/thevankeyboards/minivan/minivan.c b/keyboards/thevankeyboards/minivan/minivan.c deleted file mode 100644 index 19996f9208..0000000000 --- a/keyboards/thevankeyboards/minivan/minivan.c +++ /dev/null @@ -1 +0,0 @@ -#include "minivan.h" diff --git a/keyboards/thevankeyboards/roadkit/config.h b/keyboards/thevankeyboards/roadkit/config.h index ea9b30cab7..b9449c4714 100644 --- a/keyboards/thevankeyboards/roadkit/config.h +++ b/keyboards/thevankeyboards/roadkit/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 { F0, F5, D7, B4 } -#define MATRIX_COL_PINS { F1, F4, D6, D4 } - -/* 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/thevankeyboards/roadkit/info.json b/keyboards/thevankeyboards/roadkit/info.json index 7f71bb7abd..9323281a32 100644 --- a/keyboards/thevankeyboards/roadkit/info.json +++ b/keyboards/thevankeyboards/roadkit/info.json @@ -8,15 +8,57 @@ "pid": "0x8846", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F1", "F4", "D6", "D4"], + "rows": ["F0", "F5", "D7", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["numpad_4x4", "ortho_4x4"], "layouts": { "LAYOUT_numpad_4x4": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0, "h":2}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2, "h":2}, {"x":0, "y":3, "w":2}, {"x":2, "y":3}] + "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, "h": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "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, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2}, + {"matrix": [3, 2], "x": 2, "y": 3} + ] }, "LAYOUT_ortho_4x4": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}] + "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": [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": [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": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3} + ] } } } diff --git a/keyboards/thevankeyboards/roadkit/roadkit.c b/keyboards/thevankeyboards/roadkit/roadkit.c deleted file mode 100644 index 0f3d7f6916..0000000000 --- a/keyboards/thevankeyboards/roadkit/roadkit.c +++ /dev/null @@ -1 +0,0 @@ -#include "roadkit.h" diff --git a/keyboards/thevankeyboards/roadkit/roadkit.h b/keyboards/thevankeyboards/roadkit/roadkit.h deleted file mode 100644 index f367c88ff4..0000000000 --- a/keyboards/thevankeyboards/roadkit/roadkit.h +++ /dev/null @@ -1,30 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -// This is a shortcut to help you visually see your layout. -#define LAYOUT_numpad_4x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, \ - k20, k21, k22, k23, \ - k30, k32 \ -) { \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, XXX }, \ - { k20, k21, k22, k23 }, \ - { k30, XXX, k32, XXX } \ -} - -#define LAYOUT_ortho_4x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33 \ -) { \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, k33 } \ -} |