diff options
Diffstat (limited to 'keyboards/mechlovin')
110 files changed, 184 insertions, 1199 deletions
diff --git a/keyboards/mechlovin/adelais/adelais.c b/keyboards/mechlovin/adelais/adelais.c index da954bce04..5758bb7322 100644 --- a/keyboards/mechlovin/adelais/adelais.c +++ b/keyboards/mechlovin/adelais/adelais.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "adelais.h" +#include "quantum.h" #ifdef RGBLIGHT_ENABLE void keyboard_post_init_kb(void) { diff --git a/keyboards/mechlovin/adelais/adelais.h b/keyboards/mechlovin/adelais/adelais.h deleted file mode 100644 index 6c3980a090..0000000000 --- a/keyboards/mechlovin/adelais/adelais.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2020 Team Mechlovin - * - * 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" - -#ifdef KEYBOARD_mechlovin_adelais_rgb_led_rev1 - #include "rev1.h" -#elif KEYBOARD_mechlovin_adelais_rgb_led_rev2 - #include "rev2.h" -#elif KEYBOARD_mechlovin_adelais_rgb_led_rev3 - #include "rev3.h" -#elif KEYBOARD_mechlovin_adelais_standard_led_arm_rev2 - #include "rev2.h" -#elif KEYBOARD_mechlovin_adelais_standard_led_arm_rev3 - #include "rev3.h" -#elif KEYBOARD_mechlovin_adelais_standard_led_arm_rev4 - #include "rev4.h" -#elif KEYBOARD_mechlovin_adelais_standard_led_avr_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/mechlovin/adelais/rgb_led/config.h b/keyboards/mechlovin/adelais/rgb_led/config.h deleted file mode 100644 index 2ec0afd47b..0000000000 --- a/keyboards/mechlovin/adelais/rgb_led/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* -Copyright 2020 Team Mechlovin' - -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 - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h index f668bd88ed..658e29ccf3 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h +++ b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h @@ -1,8 +1,5 @@ #pragma once -#define MATRIX_ROW_PINS { B1, A0, C13, A1, A2} -#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A15 } - #define RGB_DI_PIN A7 #define RGB_MATRIX_LED_COUNT 91 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json index f098bdbf95..81adcf57e4 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json +++ b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json @@ -3,6 +3,11 @@ "usb": { "pid": "0xAEC1" }, + "matrix_pins": { + "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B8", "B4", "B5", "B3", "C14", "A15"], + "rows": ["B1", "A0", "C13", "A1", "A2"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "board": "QMK_PROTON_C", "bootloader": "stm32-dfu", diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.c b/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.c index 490599c43a..a86b1e5dd5 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.c +++ b/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "adelais.h" +#include "rev1.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h index d9d75a4b9e..ac91d0f950 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h +++ b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h @@ -1,8 +1,5 @@ #pragma once -#define MATRIX_ROW_PINS { B1, A0, C13, A1, A2} -#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A7 } - #define RGB_DI_PIN A15 #define RGBLED_NUM 23 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json index 7dcd0f1765..afb0b3d017 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json +++ b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json @@ -3,6 +3,11 @@ "usb": { "pid": "0xAEC2" }, + "matrix_pins": { + "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B8", "B4", "B5", "B3", "C14", "A7"], + "rows": ["B1", "A0", "C13", "A1", "A2"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "A4", "pin_b": "A3"} diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c b/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c index 20b4b69114..78bca55b8e 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c +++ b/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "adelais.h" +#include "rev2.h" #ifdef RGB_MATRIX_ENABLE const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h index 7457fd50a7..d3e4fc6ba1 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h +++ b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h @@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define MATRIX_ROW_PINS { A4, A3, C13, A1, A2} -#define MATRIX_COL_PINS { B10, B11, B2, B1, B0, A6, A5, A10, A9, A15, B3, B4, B5, B8, B9 } - #ifdef RGBLIGHT_ENABLE #define RGB_DI_PIN A7 #define WS2812_SPI SPID1 // default: SPID1 diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json index 3f83750e3a..d44e6b2371 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json +++ b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json @@ -3,6 +3,11 @@ "usb": { "pid": "0xAEC3" }, + "matrix_pins": { + "cols": ["B10", "B11", "B2", "B1", "B0", "A6", "A5", "A10", "A9", "A15", "B3", "B4", "B5", "B8", "B9"], + "rows": ["A4", "A3", "C13", "A1", "A2"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B12", "pin_b": "B13"} diff --git a/keyboards/mechlovin/adelais/standard_led/arm/config.h b/keyboards/mechlovin/adelais/standard_led/arm/config.h index e1081a9560..fc7e2ad9b6 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/config.h +++ b/keyboards/mechlovin/adelais/standard_led/arm/config.h @@ -17,12 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define MATRIX_ROW_PINS { B1, A0, C13, A1, A2} -#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A15 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 3 diff --git a/keyboards/mechlovin/adelais/standard_led/arm/info.json b/keyboards/mechlovin/adelais/standard_led/arm/info.json index a5f20190d1..2c4386a862 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/info.json +++ b/keyboards/mechlovin/adelais/standard_led/arm/info.json @@ -1,5 +1,10 @@ { "keyboard_name": "Adelais", + "matrix_pins": { + "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B8", "B4", "B5", "B3", "C14", "A15"], + "rows": ["B1", "A0", "C13", "A1", "A2"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B0", "breathing": true diff --git a/keyboards/mechlovin/delphine/config.h b/keyboards/mechlovin/delphine/config.h deleted file mode 100644 index 768ea4744f..0000000000 --- a/keyboards/mechlovin/delphine/config.h +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright 2020 Team Mechlovin' - -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 - - -/* - * 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, F1, F4, F5, F6, D3 } -#define MATRIX_COL_PINS { F7, D7, D6, D2 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/mechlovin/delphine/delphine.c b/keyboards/mechlovin/delphine/delphine.c deleted file mode 100644 index 8e33b6603c..0000000000 --- a/keyboards/mechlovin/delphine/delphine.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Team Mechlovin' - * - * 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 "delphine.h" diff --git a/keyboards/mechlovin/delphine/info.json b/keyboards/mechlovin/delphine/info.json index 4495943544..7e53ebf464 100644 --- a/keyboards/mechlovin/delphine/info.json +++ b/keyboards/mechlovin/delphine/info.json @@ -6,6 +6,11 @@ "usb": { "vid": "0x4D4C" }, + "matrix_pins": { + "cols": ["F7", "D7", "D6", "D2"], + "rows": ["F0", "F1", "F4", "F5", "F6", "D3"] + }, + "diode_direction": "COL2ROW", "indicators": { "num_lock": "B5" }, diff --git a/keyboards/mechlovin/delphine/rgb_led/rgb_led.c b/keyboards/mechlovin/delphine/rgb_led/rgb_led.c index 3e02735cdf..02a011ba4b 100644 --- a/keyboards/mechlovin/delphine/rgb_led/rgb_led.c +++ b/keyboards/mechlovin/delphine/rgb_led/rgb_led.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "rgb_led.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/mechlovin/delphine/rgb_led/rgb_led.h b/keyboards/mechlovin/delphine/rgb_led/rgb_led.h deleted file mode 100644 index 60d5817344..0000000000 --- a/keyboards/mechlovin/delphine/rgb_led/rgb_led.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2020 Team Mechlovin' - * - * 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" diff --git a/keyboards/mechlovin/foundation/config.h b/keyboards/mechlovin/foundation/config.h index 951eab595b..0cf3af4a8a 100644 --- a/keyboards/mechlovin/foundation/config.h +++ b/keyboards/mechlovin/foundation/config.h @@ -17,24 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS { B12, B13, B14, A8, A2 } -#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A15, B9, B8, B7, B6, B5, B4, B3} - -/* - * 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) - * - */ - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B15 #ifdef RGB_DI_PIN # define RGBLED_NUM 22 diff --git a/keyboards/mechlovin/foundation/foundation.c b/keyboards/mechlovin/foundation/foundation.c deleted file mode 100644 index 12d3e848d7..0000000000 --- a/keyboards/mechlovin/foundation/foundation.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 Mechlovin' Studio - * - * 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 "foundation.h" diff --git a/keyboards/mechlovin/foundation/foundation.h b/keyboards/mechlovin/foundation/foundation.h index 0444817bbf..717e9f3b16 100644 --- a/keyboards/mechlovin/foundation/foundation.h +++ b/keyboards/mechlovin/foundation/foundation.h @@ -27,7 +27,7 @@ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \ { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H }, \ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, KC_NO, KC_NO }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, KC_NO, KC_NO, K3G, KC_NO }, \ + { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, KC_NO, K3G, KC_NO }, \ { K40, K41, K42, K43, KC_NO, KC_NO, KC_NO, K47, KC_NO, KC_NO, KC_NO, K4B, K4C, K4D, K4E, K4F, K4G, K4H }, \ } diff --git a/keyboards/mechlovin/foundation/info.json b/keyboards/mechlovin/foundation/info.json index bb7491ff19..5fac5b9aa6 100644 --- a/keyboards/mechlovin/foundation/info.json +++ b/keyboards/mechlovin/foundation/info.json @@ -8,6 +8,11 @@ "pid": "0x0180", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A15", "B9", "B8", "B7", "B6", "B5", "B4", "B3"], + "rows": ["B12", "B13", "B14", "A8", "A2"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "C13", "pin_b": "C14"} diff --git a/keyboards/mechlovin/hannah60rgb/config.h b/keyboards/mechlovin/hannah60rgb/config.h deleted file mode 100644 index b10cdfb013..0000000000 --- a/keyboards/mechlovin/hannah60rgb/config.h +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright 2020 Mechlovin' - -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 - - -/* - * 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 { A4, A5, A3, A2, A1 } -#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A0, C15, B4, B5, B3, C13, C14 } - -#define DIODE_DIRECTION COL2ROW
\ No newline at end of file diff --git a/keyboards/mechlovin/hannah60rgb/hannah60rgb.h b/keyboards/mechlovin/hannah60rgb/hannah60rgb.h deleted file mode 100644 index 9944b12284..0000000000 --- a/keyboards/mechlovin/hannah60rgb/hannah60rgb.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2019 Mechlovin - * - * 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_mechlovin_hannah60rgb_rev1) - #include "rev1.h" -#elif defined(KEYBOARD_mechlovin_hannah60rgb_rev2) - #include "rev2.h" -#endif diff --git a/keyboards/mechlovin/hannah60rgb/rev1/info.json b/keyboards/mechlovin/hannah60rgb/rev1/info.json index 2ed43a3fc2..f0e2f9a41a 100644 --- a/keyboards/mechlovin/hannah60rgb/rev1/info.json +++ b/keyboards/mechlovin/hannah60rgb/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x6001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14"], + "rows": ["A4", "A5", "A3", "A2", "A1"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/mechlovin/hannah60rgb/rev1/rev1.c b/keyboards/mechlovin/hannah60rgb/rev1/rev1.c index b61ac10b14..d8bad04c4f 100644 --- a/keyboards/mechlovin/hannah60rgb/rev1/rev1.c +++ b/keyboards/mechlovin/hannah60rgb/rev1/rev1.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "hannah60rgb.h" +#include "rev1.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/mechlovin/hannah60rgb/rev2/info.json b/keyboards/mechlovin/hannah60rgb/rev2/info.json index 798e67ee78..f66b378aae 100644 --- a/keyboards/mechlovin/hannah60rgb/rev2/info.json +++ b/keyboards/mechlovin/hannah60rgb/rev2/info.json @@ -8,6 +8,11 @@ "pid": "0x6002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14"], + "rows": ["A4", "A5", "A3", "A2", "A1"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/mechlovin/hannah65/config.h b/keyboards/mechlovin/hannah65/config.h index e96bc8bc85..1686c861fb 100644 --- a/keyboards/mechlovin/hannah65/config.h +++ b/keyboards/mechlovin/hannah65/config.h @@ -17,21 +17,5 @@ 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 { A4, A5, A3, A2, A1 } -#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A0, C15, B4, B5, B3, C13, C14, A13 } - -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD4 #define BACKLIGHT_PWM_CHANNEL 3 diff --git a/keyboards/mechlovin/hannah65/hannah65.c b/keyboards/mechlovin/hannah65/hannah65.c deleted file mode 100644 index 92e0917ebe..0000000000 --- a/keyboards/mechlovin/hannah65/hannah65.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Team Mechlovin - * - * 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 "hannah65.h" diff --git a/keyboards/mechlovin/hannah65/hannah65.h b/keyboards/mechlovin/hannah65/hannah65.h deleted file mode 100644 index 99da5a2a1a..0000000000 --- a/keyboards/mechlovin/hannah65/hannah65.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2020 Team Mechlovin - * - * 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_mechlovin_hannah65_rev1) -# include "rev1.h" -#endif
\ No newline at end of file diff --git a/keyboards/mechlovin/hannah65/info.json b/keyboards/mechlovin/hannah65/info.json index 74ae965fb7..88a3f39719 100644 --- a/keyboards/mechlovin/hannah65/info.json +++ b/keyboards/mechlovin/hannah65/info.json @@ -3,6 +3,11 @@ "pin": "B8", "breathing": true }, + "matrix_pins": { + "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14", "A13"], + "rows": ["A4", "A5", "A3", "A2", "A1"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B9", "on_state": 0 diff --git a/keyboards/mechlovin/hannah910/config.h b/keyboards/mechlovin/hannah910/config.h index be1d769e67..0b9d78276a 100644 --- a/keyboards/mechlovin/hannah910/config.h +++ b/keyboards/mechlovin/hannah910/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 { B5, B6, D3, C6, C7 } -#define MATRIX_COL_PINS { E6, B1, B3, F0, F1, F4, F5, F6, F7, D5, D4, B4, D6, D7, B0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #define RGBLIGHT_LIMIT_VAL 255 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/mechlovin/hannah910/hannah910.c b/keyboards/mechlovin/hannah910/hannah910.c index fa5b04ea76..0208e16348 100644 --- a/keyboards/mechlovin/hannah910/hannah910.c +++ b/keyboards/mechlovin/hannah910/hannah910.c @@ -13,7 +13,7 @@ * 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 "hannah910.h" +#include "quantum.h" void led_init_ports(void) { setPinOutput(B2); diff --git a/keyboards/mechlovin/hannah910/hannah910.h b/keyboards/mechlovin/hannah910/hannah910.h deleted file mode 100644 index 2cc38d0690..0000000000 --- a/keyboards/mechlovin/hannah910/hannah910.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2019 Mechlovin - * - * 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" - -#ifdef KEYBOARD_mechlovin_hannah910_rev1 - #include "rev1.h" -#elif KEYBOARD_mechlovin_hannah910_rev2 - #include "rev2.h" -#elif KEYBOARD_mechlovin_hannah910_rev3 - #include "rev3.h" -#endif diff --git a/keyboards/mechlovin/hannah910/rev1/info.json b/keyboards/mechlovin/hannah910/rev1/info.json index ae5f966622..3ddc706922 100644 --- a/keyboards/mechlovin/hannah910/rev1/info.json +++ b/keyboards/mechlovin/hannah910/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x9101", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"], + "rows": ["B5", "B6", "D3", "C6", "C7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "breathing": true diff --git a/keyboards/mechlovin/hannah910/rev2/info.json b/keyboards/mechlovin/hannah910/rev2/info.json index cfb43e786c..dc59167ddb 100644 --- a/keyboards/mechlovin/hannah910/rev2/info.json +++ b/keyboards/mechlovin/hannah910/rev2/info.json @@ -8,6 +8,11 @@ "pid": "0x9102", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"], + "rows": ["B5", "B6", "D3", "C6", "C7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "breathing": true diff --git a/keyboards/mechlovin/hannah910/rev3/info.json b/keyboards/mechlovin/hannah910/rev3/info.json index 14219cb9b6..ccb9088232 100644 --- a/keyboards/mechlovin/hannah910/rev3/info.json +++ b/keyboards/mechlovin/hannah910/rev3/info.json @@ -8,6 +8,11 @@ "pid": "0x9103", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"], + "rows": ["B5", "B6", "D3", "C6", "C7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "breathing": true diff --git a/keyboards/mechlovin/hex4b/config.h b/keyboards/mechlovin/hex4b/config.h deleted file mode 100644 index 028be1fb52..0000000000 --- a/keyboards/mechlovin/hex4b/config.h +++ /dev/null @@ -1,33 +0,0 @@ -/* -Copyright 2020 Team Mechlovin - -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 - - -/* - * 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) - * - */ - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/mechlovin/hex4b/hex4b.c b/keyboards/mechlovin/hex4b/hex4b.c deleted file mode 100644 index fb8c4aef16..0000000000 --- a/keyboards/mechlovin/hex4b/hex4b.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Team Mechlovin - * - * 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 "hex4b.h" diff --git a/keyboards/mechlovin/hex4b/rev1/config.h b/keyboards/mechlovin/hex4b/rev1/config.h deleted file mode 100644 index 1baf1aa2ea..0000000000 --- a/keyboards/mechlovin/hex4b/rev1/config.h +++ /dev/null @@ -1,33 +0,0 @@ -/* -Copyright 2020 Team Mechlovin - -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 - - -/* - * 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 { B7, A2, A1, A3, A4, A5 } -#define MATRIX_COL_PINS { B6, B5, B3, B2, B1, B0, A0, A6, A7, C7, C6, C5, C4, D1, D0 } diff --git a/keyboards/mechlovin/hex4b/rev1/info.json b/keyboards/mechlovin/hex4b/rev1/info.json index cec380a91f..1e9a7d5776 100644 --- a/keyboards/mechlovin/hex4b/rev1/info.json +++ b/keyboards/mechlovin/hex4b/rev1/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B5", "B3", "B2", "B1", "B0", "A0", "A6", "A7", "C7", "C6", "C5", "C4", "D1", "D0"], + "rows": ["B7", "A2", "A1", "A3", "A4", "A5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4", "levels": 5, diff --git a/keyboards/mechlovin/hex4b/rev2/config.h b/keyboards/mechlovin/hex4b/rev2/config.h index c0486dd0b7..14dfffbed3 100644 --- a/keyboards/mechlovin/hex4b/rev2/config.h +++ b/keyboards/mechlovin/hex4b/rev2/config.h @@ -17,19 +17,4 @@ 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 { A4, B12, B13, B14, B15, A1 } -#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A5, A3, C13, B7, B6, B5, B4, B3 } - #define BACKLIGHT_PWM_DRIVER PWMD4 diff --git a/keyboards/mechlovin/hex4b/rev2/info.json b/keyboards/mechlovin/hex4b/rev2/info.json index 7d9a2cb40a..8609be01c3 100644 --- a/keyboards/mechlovin/hex4b/rev2/info.json +++ b/keyboards/mechlovin/hex4b/rev2/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A3", "C13", "B7", "B6", "B5", "B4", "B3"], + "rows": ["A4", "B12", "B13", "B14", "B15", "A1"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B8", "levels": 5, diff --git a/keyboards/mechlovin/hex6c/config.h b/keyboards/mechlovin/hex6c/config.h index b0791490a2..a22137acf7 100644 --- a/keyboards/mechlovin/hex6c/config.h +++ b/keyboards/mechlovin/hex6c/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 { A10, B13, B12, B11, C14, C15 } -#define MATRIX_COL_PINS { A13, A14, A1, A0, C13, B9, B4, B7, B8, B5, B6, A9, A5, A6, A7, B1, B2, B10, B3, B14, B15 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 3 diff --git a/keyboards/mechlovin/hex6c/hex6c.c b/keyboards/mechlovin/hex6c/hex6c.c deleted file mode 100644 index 255121dc19..0000000000 --- a/keyboards/mechlovin/hex6c/hex6c.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Mechlovin' Studio - * - * 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 "hex6c.h" diff --git a/keyboards/mechlovin/hex6c/info.json b/keyboards/mechlovin/hex6c/info.json index 387043bde6..2e82a83785 100644 --- a/keyboards/mechlovin/hex6c/info.json +++ b/keyboards/mechlovin/hex6c/info.json @@ -8,6 +8,11 @@ "pid": "0x6C01", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A13", "A14", "A1", "A0", "C13", "B9", "B4", "B7", "B8", "B5", "B6", "A9", "A5", "A6", "A7", "B1", "B2", "B10", "B3", "B14", "B15"], + "rows": ["A10", "B13", "B12", "B11", "C14", "C15"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "A15", "pin_b": "A2"} diff --git a/keyboards/mechlovin/infinity87/infinity87.c b/keyboards/mechlovin/infinity87/infinity87.c deleted file mode 100644 index 434e796091..0000000000 --- a/keyboards/mechlovin/infinity87/infinity87.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Team Mechlovin' - * - * 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 "infinity87.h" diff --git a/keyboards/mechlovin/infinity87/infinity87.h b/keyboards/mechlovin/infinity87/infinity87.h deleted file mode 100644 index b7b00bef40..0000000000 --- a/keyboards/mechlovin/infinity87/infinity87.h +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2020 Team Mechlovin' - * - * 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" diff --git a/keyboards/mechlovin/infinity87/rev1/config.h b/keyboards/mechlovin/infinity87/rev1/config.h index e03ee6dded..2265fff2d1 100644 --- a/keyboards/mechlovin/infinity87/rev1/config.h +++ b/keyboards/mechlovin/infinity87/rev1/config.h @@ -16,10 +16,5 @@ #pragma once -#define MATRIX_ROW_PINS { A10, B13, B12, B11, C14, C15 } -#define MATRIX_COL_PINS { C13, B9, B4, B7, B8, B5, B6, A9, A5, A6, A7, B1, B2, B10, B3, B14, B15 } - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 3 - -#define DIODE_DIRECTION COL2ROW
\ No newline at end of file diff --git a/keyboards/mechlovin/infinity87/rev1/info.json b/keyboards/mechlovin/infinity87/rev1/info.json index be094e09ae..dbe7cb83f9 100644 --- a/keyboards/mechlovin/infinity87/rev1/info.json +++ b/keyboards/mechlovin/infinity87/rev1/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["C13", "B9", "B4", "B7", "B8", "B5", "B6", "A9", "A5", "A6", "A7", "B1", "B2", "B10", "B3", "B14", "B15"], + "rows": ["A10", "B13", "B12", "B11", "C14", "C15"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B0", "breathing": true diff --git a/keyboards/mechlovin/infinity87/rev1/rev1.c b/keyboards/mechlovin/infinity87/rev1/rev1.c deleted file mode 100644 index c65ff19838..0000000000 --- a/keyboards/mechlovin/infinity87/rev1/rev1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Team Mechlovin' - * - * 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 "rev1.h" diff --git a/keyboards/mechlovin/infinity87/rev1/rev1.h b/keyboards/mechlovin/infinity87/rev1/rev1.h deleted file mode 100644 index 167ed6940a..0000000000 --- a/keyboards/mechlovin/infinity87/rev1/rev1.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 Mechlovin' Studio - * - * 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" diff --git a/keyboards/mechlovin/infinity87/rev2/rev2.c b/keyboards/mechlovin/infinity87/rev2/rev2.c deleted file mode 100644 index ab9ecbf6fc..0000000000 --- a/keyboards/mechlovin/infinity87/rev2/rev2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Team Mechlovin' - * - * 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 "rev2.h"
\ No newline at end of file diff --git a/keyboards/mechlovin/infinity87/rev2/rev2.h b/keyboards/mechlovin/infinity87/rev2/rev2.h deleted file mode 100644 index 16cdf9ed85..0000000000 --- a/keyboards/mechlovin/infinity87/rev2/rev2.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2020 Team Mechlovin - * - * 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" diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/config.h b/keyboards/mechlovin/infinity87/rgb_rev1/config.h index a609587210..10fc42f830 100644 --- a/keyboards/mechlovin/infinity87/rgb_rev1/config.h +++ b/keyboards/mechlovin/infinity87/rgb_rev1/config.h @@ -16,12 +16,6 @@ #pragma once -#define MATRIX_ROW_PINS { A10, A13, A14, C13, A4, A3 } -#define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A9, B11, B10, B2, B1, B0, A7, A6, A5, A2, A1, A0 } - - -#define DIODE_DIRECTION COL2ROW - //rgb matrix setting // This is a 7-bit address, that gets left-shifted and bit 0 // set to 0 for write, 1 for read (as per I2C protocol) diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/info.json b/keyboards/mechlovin/infinity87/rgb_rev1/info.json index 604fa512ed..332606561c 100644 --- a/keyboards/mechlovin/infinity87/rgb_rev1/info.json +++ b/keyboards/mechlovin/infinity87/rgb_rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x8710", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B12", "B13", "B14", "B15", "A8", "A9", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A2", "A1", "A0"], + "rows": ["A10", "A13", "A14", "C13", "A4", "A3"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c b/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c index 210fb843b3..c10d47d191 100644 --- a/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c +++ b/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "rgb_rev1.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.h b/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.h deleted file mode 100644 index 16cdf9ed85..0000000000 --- a/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2020 Team Mechlovin - * - * 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" diff --git a/keyboards/mechlovin/infinity88/config.h b/keyboards/mechlovin/infinity88/config.h index 11ae35100b..1fda2d3097 100644 --- a/keyboards/mechlovin/infinity88/config.h +++ b/keyboards/mechlovin/infinity88/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) - * - */ -#define MATRIX_ROW_PINS { A10, B13, B12, B11, C14, C15 } -#define MATRIX_COL_PINS { C13, B9, B4, B7, B8, B5, B6, A9, A5, A6, A7,B1, B2, B10, B3, B14, B15 } - -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 3 diff --git a/keyboards/mechlovin/infinity88/infinity88.c b/keyboards/mechlovin/infinity88/infinity88.c deleted file mode 100644 index 4d352358a7..0000000000 --- a/keyboards/mechlovin/infinity88/infinity88.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Team Mechlovin - * - * 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 "infinity88.h" diff --git a/keyboards/mechlovin/infinity88/info.json b/keyboards/mechlovin/infinity88/info.json index 37ccd27537..e9b25efaa9 100644 --- a/keyboards/mechlovin/infinity88/info.json +++ b/keyboards/mechlovin/infinity88/info.json @@ -8,6 +8,11 @@ "pid": "0x8802", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C13", "B9", "B4", "B7", "B8", "B5", "B6", "A9", "A5", "A6", "A7", "B1", "B2", "B10", "B3", "B14", "B15"], + "rows": ["A10", "B13", "B12", "B11", "C14", "C15"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B0", "breathing": true diff --git a/keyboards/mechlovin/infinityce/config.h b/keyboards/mechlovin/infinityce/config.h index e0900333cd..a8a1936209 100644 --- a/keyboards/mechlovin/infinityce/config.h +++ b/keyboards/mechlovin/infinityce/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS { D7, D6, B6, B1, C6, C7 } -#define MATRIX_COL_PINS { B5, B4, B0, D5, D4, D1, D0, E6, F7, F6, F5, F4, F1, F0, B2, D3, D2} - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #define RGBLED_NUM 31 #define RGBLIGHT_LIMIT_VAL 255 diff --git a/keyboards/mechlovin/infinityce/info.json b/keyboards/mechlovin/infinityce/info.json index 1ab5cad305..332be74aff 100644 --- a/keyboards/mechlovin/infinityce/info.json +++ b/keyboards/mechlovin/infinityce/info.json @@ -8,6 +8,11 @@ "pid": "0x8801", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "B4", "B0", "D5", "D4", "D1", "D0", "E6", "F7", "F6", "F5", "F4", "F1", "F0", "B2", "D3", "D2"], + "rows": ["D7", "D6", "B6", "B1", "C6", "C7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "breathing": true diff --git a/keyboards/mechlovin/jay60/config.h b/keyboards/mechlovin/jay60/config.h index afc0a4af7d..d685b92631 100644 --- a/keyboards/mechlovin/jay60/config.h +++ b/keyboards/mechlovin/jay60/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 { C2, C1, C0, D7, A1 } -#define MATRIX_COL_PINS { B6, B5, B3, B2, B1, B0, A0, A6, A7, C7, C6, C5, C4, C3 } - -/* 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/mechlovin/jay60/info.json b/keyboards/mechlovin/jay60/info.json index f64b25c9e7..f06f4b2fea 100644 --- a/keyboards/mechlovin/jay60/info.json +++ b/keyboards/mechlovin/jay60/info.json @@ -8,6 +8,11 @@ "pid": "0x0600", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B5", "B3", "B2", "B1", "B0", "A0", "A6", "A7", "C7", "C6", "C5", "C4", "C3"], + "rows": ["C2", "C1", "C0", "D7", "A1"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "D4" }, diff --git a/keyboards/mechlovin/jay60/jay60.c b/keyboards/mechlovin/jay60/jay60.c deleted file mode 100644 index 9571c1375a..0000000000 --- a/keyboards/mechlovin/jay60/jay60.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Mechlovin' - * - * 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 "jay60.h" diff --git a/keyboards/mechlovin/kanu/config.h b/keyboards/mechlovin/kanu/config.h index 6a6dc97744..bb94525e06 100644 --- a/keyboards/mechlovin/kanu/config.h +++ b/keyboards/mechlovin/kanu/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 { B5, B6, D3, C6, C7 } -#define MATRIX_COL_PINS { E6, B1, B3, F0, F1, F4, F5, F6, F7, D5, D4, B4, D6, D7, B0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #define RGBLED_NUM 6 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/mechlovin/kanu/info.json b/keyboards/mechlovin/kanu/info.json index 628a78e1a5..ac86aaa269 100644 --- a/keyboards/mechlovin/kanu/info.json +++ b/keyboards/mechlovin/kanu/info.json @@ -8,6 +8,11 @@ "pid": "0x4B4E", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"], + "rows": ["B5", "B6", "D3", "C6", "C7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "breathing": true diff --git a/keyboards/mechlovin/kay60/config.h b/keyboards/mechlovin/kay60/config.h index b05cc594e4..aadc6fcaaa 100644 --- a/keyboards/mechlovin/kay60/config.h +++ b/keyboards/mechlovin/kay60/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 { D5, D3, D2, B1, B5} -#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B2, B3, B7, B4, D7, D6, D4 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN # define RGBLED_NUM 22 diff --git a/keyboards/mechlovin/kay60/info.json b/keyboards/mechlovin/kay60/info.json index a12cb83719..39c7083afd 100644 --- a/keyboards/mechlovin/kay60/info.json +++ b/keyboards/mechlovin/kay60/info.json @@ -8,6 +8,11 @@ "pid": "0x0601", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B2", "B3", "B7", "B4", "D7", "D6", "D4"], + "rows": ["D5", "D3", "D2", "B1", "B5"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B0" }, diff --git a/keyboards/mechlovin/kay60/kay60.c b/keyboards/mechlovin/kay60/kay60.c deleted file mode 100644 index 61d968e48c..0000000000 --- a/keyboards/mechlovin/kay60/kay60.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Mechlovin' - * - * 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 "kay60.h" diff --git a/keyboards/mechlovin/kay65/config.h b/keyboards/mechlovin/kay65/config.h index d3cacf757a..c6168d930f 100644 --- a/keyboards/mechlovin/kay65/config.h +++ b/keyboards/mechlovin/kay65/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 { B7, D3, D5, D4, C6 } -#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, C7, E6, B0, D2, D1, D0, B3, B2, B1 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN # define RGBLED_NUM 24 diff --git a/keyboards/mechlovin/kay65/info.json b/keyboards/mechlovin/kay65/info.json index 3bfc5c66e5..f827f435ed 100644 --- a/keyboards/mechlovin/kay65/info.json +++ b/keyboards/mechlovin/kay65/info.json @@ -8,6 +8,11 @@ "pid": "0x6502", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "C7", "E6", "B0", "D2", "D1", "D0", "B3", "B2", "B1"], + "rows": ["B7", "D3", "D5", "D4", "C6"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "D6", "on_state": 0 diff --git a/keyboards/mechlovin/mechlovin9/config.h b/keyboards/mechlovin/mechlovin9/config.h deleted file mode 100644 index 94a281c2f8..0000000000 --- a/keyboards/mechlovin/mechlovin9/config.h +++ /dev/null @@ -1,21 +0,0 @@ - -/* -Copyright 2021 Mechlovin' Studio - -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 - - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/mechlovin/mechlovin9/mechlovin9.c b/keyboards/mechlovin/mechlovin9/mechlovin9.c deleted file mode 100644 index a5a8b6c0fe..0000000000 --- a/keyboards/mechlovin/mechlovin9/mechlovin9.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Mechlovin' Studio - * - * 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 "mechlovin9.h" diff --git a/keyboards/mechlovin/mechlovin9/rev1/config.h b/keyboards/mechlovin/mechlovin9/rev1/config.h index c5e997d425..3686536dfb 100644 --- a/keyboards/mechlovin/mechlovin9/rev1/config.h +++ b/keyboards/mechlovin/mechlovin9/rev1/config.h @@ -17,18 +17,5 @@ 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 { A4, A5, A3, A2, A1 } -#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A0, C15, B4, B5, B3, C13, C14, A13 } - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 3 diff --git a/keyboards/mechlovin/mechlovin9/rev1/info.json b/keyboards/mechlovin/mechlovin9/rev1/info.json index 66b4a3c2ed..14fd177986 100644 --- a/keyboards/mechlovin/mechlovin9/rev1/info.json +++ b/keyboards/mechlovin/mechlovin9/rev1/info.json @@ -4,6 +4,11 @@ "pid": "0x6509", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14", "A13"], + "rows": ["A4", "A5", "A3", "A2", "A1"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B8", "breathing": true diff --git a/keyboards/mechlovin/mechlovin9/rev2/config.h b/keyboards/mechlovin/mechlovin9/rev2/config.h deleted file mode 100644 index f550a2e39a..0000000000 --- a/keyboards/mechlovin/mechlovin9/rev2/config.h +++ /dev/null @@ -1,31 +0,0 @@ -/* -Copyright 2020 Team Mechlovin' - -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 - -/* - * 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 { A0, A1, A2, A3, A4 } -#define MATRIX_COL_PINS { B2, B1, B0, B3, B4, B5, D0, D1, D5, D6, D7, C0, C3, C2, C1 } diff --git a/keyboards/mechlovin/mechlovin9/rev2/info.json b/keyboards/mechlovin/mechlovin9/rev2/info.json index c0e94e7638..52ac4d0c29 100644 --- a/keyboards/mechlovin/mechlovin9/rev2/info.json +++ b/keyboards/mechlovin/mechlovin9/rev2/info.json @@ -4,6 +4,11 @@ "pid": "0x6509", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["B2", "B1", "B0", "B3", "B4", "B5", "D0", "D1", "D5", "D6", "D7", "C0", "C3", "C2", "C1"], + "rows": ["A0", "A1", "A2", "A3", "A4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4", "breathing": true diff --git a/keyboards/mechlovin/olly/octagon/config.h b/keyboards/mechlovin/olly/octagon/config.h index 89e8a32d4f..a193206552 100644 --- a/keyboards/mechlovin/olly/octagon/config.h +++ b/keyboards/mechlovin/olly/octagon/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -#define MATRIX_ROW_PINS { B0, B12, A6, A5, A4, A3 } -#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B2, B1, A15, B3, B9, B8, B7, B6, B5, B4 } - #ifdef RGBLIGHT_ENABLE #define RGB_DI_PIN A7 #define RGBLED_NUM 26 diff --git a/keyboards/mechlovin/olly/octagon/info.json b/keyboards/mechlovin/olly/octagon/info.json index 9adec5281c..117239c476 100644 --- a/keyboards/mechlovin/olly/octagon/info.json +++ b/keyboards/mechlovin/olly/octagon/info.json @@ -8,6 +8,11 @@ "pid": "0xD750", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B2", "B1", "A15", "B3", "B9", "B8", "B7", "B6", "B5", "B4"], + "rows": ["B0", "B12", "A6", "A5", "A4", "A3"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F103", "bootloader": "stm32duino", "layout_aliases": { diff --git a/keyboards/mechlovin/olly/orion/config.h b/keyboards/mechlovin/olly/orion/config.h index 225795d3c0..44e13fa7f2 100644 --- a/keyboards/mechlovin/olly/orion/config.h +++ b/keyboards/mechlovin/olly/orion/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 { A8, A9, A10, B11, C13, C14 } -#define MATRIX_COL_PINS { B14, B13, B12, B2, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0, A15, B3, B4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - #ifdef RGBLIGHT_ENABLE # define RGB_DI_PIN B15 # define RGBLED_NUM 24 diff --git a/keyboards/mechlovin/olly/orion/info.json b/keyboards/mechlovin/olly/orion/info.json index 89433dfd1b..de4ed5e986 100644 --- a/keyboards/mechlovin/olly/orion/info.json +++ b/keyboards/mechlovin/olly/orion/info.json @@ -8,6 +8,11 @@ "pid": "0xD870", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B14", "B13", "B12", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "A15", "B3", "B4"], + "rows": ["A8", "A9", "A10", "B11", "C13", "C14"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "B10", "num_lock": "A13", diff --git a/keyboards/mechlovin/pisces/config.h b/keyboards/mechlovin/pisces/config.h index 1540505bad..75887406ac 100644 --- a/keyboards/mechlovin/pisces/config.h +++ b/keyboards/mechlovin/pisces/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) - * - */ -#define MATRIX_ROW_PINS { B0, F0, F5, F6, F7 } -#define MATRIX_COL_PINS { E6, B1, B3, D0, D1, D2, D3, D5, F4, F1, D4, D6, D7, B4, B5 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 12 diff --git a/keyboards/mechlovin/pisces/info.json b/keyboards/mechlovin/pisces/info.json index 19246528e7..133bbbea7a 100644 --- a/keyboards/mechlovin/pisces/info.json +++ b/keyboards/mechlovin/pisces/info.json @@ -8,6 +8,11 @@ "pid": "0x6501", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "B1", "B3", "D0", "D1", "D2", "D3", "D5", "F4", "F1", "D4", "D6", "D7", "B4", "B5"], + "rows": ["B0", "F0", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, diff --git a/keyboards/mechlovin/pisces/pisces.c b/keyboards/mechlovin/pisces/pisces.c deleted file mode 100644 index b43bf2aaa4..0000000000 --- a/keyboards/mechlovin/pisces/pisces.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Team Mechlovin' - * - * 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 "pisces.h" diff --git a/keyboards/mechlovin/serratus/serratus.c b/keyboards/mechlovin/serratus/serratus.c deleted file mode 100644 index b396e57bf5..0000000000 --- a/keyboards/mechlovin/serratus/serratus.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 mechlovin - * - * 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 "serratus.h" diff --git a/keyboards/mechlovin/th1800/config.h b/keyboards/mechlovin/th1800/config.h deleted file mode 100644 index 0dca95dfee..0000000000 --- a/keyboards/mechlovin/th1800/config.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright 2020 Team Mechlovin - -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 - - -/* - * 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 { B6, B7, D0, D1, D5, D6 } -#define MATRIX_COL_PINS { A3, D7, C0, C1, C2, C3, C4, C5, C6, C7, A7, A6, A5, A4, B3, B2, B0, B1 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/mechlovin/th1800/info.json b/keyboards/mechlovin/th1800/info.json index 02efb8dc03..d42f6dbef6 100644 --- a/keyboards/mechlovin/th1800/info.json +++ b/keyboards/mechlovin/th1800/info.json @@ -8,6 +8,11 @@ "pid": "0x1800", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A3", "D7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4", "B3", "B2", "B0", "B1"], + "rows": ["B6", "B7", "D0", "D1", "D5", "D6"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "A0", "num_lock": "A2", diff --git a/keyboards/mechlovin/th1800/th1800.c b/keyboards/mechlovin/th1800/th1800.c deleted file mode 100644 index f27b244c41..0000000000 --- a/keyboards/mechlovin/th1800/th1800.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Team Mechlovin - * - * 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 "th1800.h" diff --git a/keyboards/mechlovin/tmkl/config.h b/keyboards/mechlovin/tmkl/config.h index 54cd52de76..e604c6bcfa 100644 --- a/keyboards/mechlovin/tmkl/config.h +++ b/keyboards/mechlovin/tmkl/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) - * - */ -#define MATRIX_ROW_PINS { A8, A4, A5, A3, A2, A1 } -#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A0, C15, B4, B5, B3, C13, C14 } - -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 3 diff --git a/keyboards/mechlovin/tmkl/info.json b/keyboards/mechlovin/tmkl/info.json index 5cdd06aa12..d6be668d13 100644 --- a/keyboards/mechlovin/tmkl/info.json +++ b/keyboards/mechlovin/tmkl/info.json @@ -7,6 +7,11 @@ "pid": "0xC601", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14"], + "rows": ["A8", "A4", "A5", "A3", "A2", "A1"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B8", "breathing": true diff --git a/keyboards/mechlovin/tmkl/tmkl.c b/keyboards/mechlovin/tmkl/tmkl.c deleted file mode 100644 index 22c4d3f0b8..0000000000 --- a/keyboards/mechlovin/tmkl/tmkl.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Team Mechlovin' - * - * 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 "tmkl.h"
\ No newline at end of file diff --git a/keyboards/mechlovin/tmkl/tmkl.h b/keyboards/mechlovin/tmkl/tmkl.h index d31f61012a..3d30e61d89 100644 --- a/keyboards/mechlovin/tmkl/tmkl.h +++ b/keyboards/mechlovin/tmkl/tmkl.h @@ -30,6 +30,6 @@ { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \ { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \ - { K40, KC_NO, K42, K43, K44, K45, K46, K47, K48, K49, KC_NO, K4B, K4C, K4D }, \ + { K40, KC_NO, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D }, \ { K50, K51, K52, KC_NO, KC_NO, KC_NO, K56, KC_NO, KC_NO, KC_NO, KC_NO, K5B, K5C, K5D }, \ } diff --git a/keyboards/mechlovin/zed60/config.h b/keyboards/mechlovin/zed60/config.h index 17467fd9fe..ff9aea4a02 100644 --- a/keyboards/mechlovin/zed60/config.h +++ b/keyboards/mechlovin/zed60/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 { B10, B2, B1, B0, A2 } -#define MATRIX_COL_PINS { A10, A3, A9, A8, B15, B14, B13, B12, B5, B4, B3, A15, B7, B6 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #ifdef RGBLIGHT_ENABLE #define RGB_DI_PIN A7 #define RGBLED_NUM 22 diff --git a/keyboards/mechlovin/zed60/info.json b/keyboards/mechlovin/zed60/info.json index 3c0c450c69..fd1c52d07d 100644 --- a/keyboards/mechlovin/zed60/info.json +++ b/keyboards/mechlovin/zed60/info.json @@ -8,6 +8,11 @@ "pid": "0x0602", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A10", "A3", "A9", "A8", "B15", "B14", "B13", "B12", "B5", "B4", "B3", "A15", "B7", "B6"], + "rows": ["B10", "B2", "B1", "B0", "A2"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "A4" }, diff --git a/keyboards/mechlovin/zed60/zed60.c b/keyboards/mechlovin/zed60/zed60.c deleted file mode 100644 index fb0c44ec3d..0000000000 --- a/keyboards/mechlovin/zed60/zed60.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 Mechlovin' Studio - * - * 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 "zed60.h" diff --git a/keyboards/mechlovin/zed65/config.h b/keyboards/mechlovin/zed65/config.h deleted file mode 100644 index 40392b609a..0000000000 --- a/keyboards/mechlovin/zed65/config.h +++ /dev/null @@ -1,48 +0,0 @@ -/* -Copyright 2022 Mechlovin' - -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 - - -/* - * 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) - * - */ -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/mechlovin/zed65/mono_led/config.h b/keyboards/mechlovin/zed65/mono_led/config.h index 233d2b8fd0..9f8d4f46f5 100644 --- a/keyboards/mechlovin/zed65/mono_led/config.h +++ b/keyboards/mechlovin/zed65/mono_led/config.h @@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS { B12, A6, A5, A4, A3 } -#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B2, B1, A15, B3, B9, B8, B7, B6, B5, B4 } - - #ifdef LED_MATRIX_ENABLE // This is a 7-bit address, that gets left-shifted and bit 0 // set to 0 for write, 1 for read (as per I2C protocol) diff --git a/keyboards/mechlovin/zed65/mono_led/info.json b/keyboards/mechlovin/zed65/mono_led/info.json index 75fcb44ae3..e27910459c 100644 --- a/keyboards/mechlovin/zed65/mono_led/info.json +++ b/keyboards/mechlovin/zed65/mono_led/info.json @@ -8,6 +8,11 @@ "pid": "0x6503", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B2", "B1", "A15", "B3", "B9", "B8", "B7", "B6", "B5", "B4"], + "rows": ["B12", "A6", "A5", "A4", "A3"] + }, + "diode_direction": "COL2ROW", "layouts": { "LAYOUT_all": { "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"0,10", "x":10, "y":0}, {"label":"0,11", "x":11, "y":0}, {"label":"0,12", "x":12, "y":0}, {"label":"0,13", "x":13, "y":0}, {"label":"0,14", "x":14, "y":0}, {"label":"0,15", "x":15, "y":0}, {"label":"1,0", "x":0, "y":1, "w":1.5}, {"label":"1,1", "x":1.5, "y":1}, {"label":"1,2", "x":2.5, "y":1}, {"label":"1,3", "x":3.5, "y":1}, {"label":"1,4", "x":4.5, "y":1}, {"label":"1,5", "x":5.5, "y":1}, {"label":"1,6", "x":6.5, "y":1}, {"label":"1,7", "x":7.5, "y":1}, {"label":"1,8", "x":8.5, "y":1}, {"label":"1,9", "x":9.5, "y":1}, {"label":"1,10", "x":10.5, "y":1}, {"label":"1,11", "x":11.5, "y":1}, {"label":"1,12", "x":12.5, "y":1}, {"label":"1,14", "x":13.5, "y":1, "w":1.5}, {"label":"1,15", "x":15, "y":1}, {"label":"2,0", "x":0, "y":2, "w":1.75}, {"label":"2,1", "x":1.75, "y":2}, {"label":"2,2", "x":2.75, "y":2}, {"label":"2,3", "x":3.75, "y":2}, {"label":"2,4", "x":4.75, "y":2}, {"label":"2,5", "x":5.75, "y":2}, {"label":"2,6", "x":6.75, "y":2}, {"label":"2,7", "x":7.75, "y":2}, {"label":"2,8", "x":8.75, "y":2}, {"label":"2,9", "x":9.75, "y":2}, {"label":"2,10", "x":10.75, "y":2}, {"label":"2,11", "x":11.75, "y":2}, {"label":"2,12", "x":12.75, "y":2}, {"label":"2,13", "x":13.75, "y":2, "w":1.25}, {"label":"2,15", "x":15, "y":2}, {"label":"3,0", "x":0, "y":3, "w":1.25}, {"label":"3,1", "x":1.25, "y":3}, {"label":"3,2", "x":2.25, "y":3}, {"label":"3,3", "x":3.25, "y":3}, {"label":"3,4", "x":4.25, "y":3}, {"label":"3,5", "x":5.25, "y":3}, {"label":"3,6", "x":6.25, "y":3}, {"label":"3,7", "x":7.25, "y":3}, {"label":"3,8", "x":8.25, "y":3}, {"label":"3,9", "x":9.25, "y":3}, {"label":"3,10", "x":10.25, "y":3}, {"label":"3,11", "x":11.25, "y":3}, {"label":"3,12", "x":12.25, "y":3, "w":1.75}, {"label":"3,14", "x":14, "y":3}, {"label":"3,15", "x":15, "y":3}, {"label":"4,0", "x":0, "y":4, "w":1.25}, {"label":"4,1", "x":1.25, "y":4, "w":1.25}, {"label":"4,2", "x":2.5, "y":4, "w":1.25}, {"label":"4,6", "x":3.75, "y":4, "w":6.25}, {"label":"4,10", "x":10, "y":4, "w":1.25}, {"label":"4,11", "x":11.25, "y":4, "w":1.25}, {"label":"4,13", "x":13, "y":4}, {"label":"4,14", "x":14, "y":4}, {"label":"4,15", "x":15, "y":4}] diff --git a/keyboards/mechlovin/zed65/no_backlight/cor65/config.h b/keyboards/mechlovin/zed65/no_backlight/cor65/config.h deleted file mode 100644 index 890026c2fc..0000000000 --- a/keyboards/mechlovin/zed65/no_backlight/cor65/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2022 Mechlovin' - -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 - - -#define MATRIX_ROW_PINS { B12, B13, B14, B15, A1 } -#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A6, A5, A4, A3, A2, C13, B7, B6, B5, B4, B3 } diff --git a/keyboards/mechlovin/zed65/no_backlight/cor65/cor65.c b/keyboards/mechlovin/zed65/no_backlight/cor65/cor65.c deleted file mode 100644 index 632a595ece..0000000000 --- a/keyboards/mechlovin/zed65/no_backlight/cor65/cor65.c +++ /dev/null @@ -1,19 +0,0 @@ -/* -Copyright 2022 Mechlovin' - -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 "cor65.h" - diff --git a/keyboards/mechlovin/zed65/no_backlight/cor65/info.json b/keyboards/mechlovin/zed65/no_backlight/cor65/info.json index 2f0ea4817f..06777fa219 100644 --- a/keyboards/mechlovin/zed65/no_backlight/cor65/info.json +++ b/keyboards/mechlovin/zed65/no_backlight/cor65/info.json @@ -8,6 +8,11 @@ "pid": "0x6504", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B11", "B10", "B2", "B1", "B0", "A6", "A5", "A4", "A3", "A2", "C13", "B7", "B6", "B5", "B4", "B3"], + "rows": ["B12", "B13", "B14", "B15", "A1"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B9", "on_state": 0 diff --git a/keyboards/mechlovin/zed65/no_backlight/retro66/config.h b/keyboards/mechlovin/zed65/no_backlight/retro66/config.h index 4739a7c2b1..6786e3b953 100644 --- a/keyboards/mechlovin/zed65/no_backlight/retro66/config.h +++ b/keyboards/mechlovin/zed65/no_backlight/retro66/config.h @@ -17,8 +17,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS { B13, B14, A8, A1, A0 } -#define MATRIX_COL_PINS { B11, B12, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2, B3, A15, B5 } - #define TAP_CODE_DELAY 10
\ No newline at end of file diff --git a/keyboards/mechlovin/zed65/no_backlight/retro66/info.json b/keyboards/mechlovin/zed65/no_backlight/retro66/info.json index f14d88910b..a014cfb554 100644 --- a/keyboards/mechlovin/zed65/no_backlight/retro66/info.json +++ b/keyboards/mechlovin/zed65/no_backlight/retro66/info.json @@ -8,6 +8,11 @@ "pid": "0x6601", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B11", "B12", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "B3", "A15", "B5"], + "rows": ["B13", "B14", "A8", "A1", "A0"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B4", "pin_b": "B8"}, diff --git a/keyboards/mechlovin/zed65/no_backlight/retro66/retro66.c b/keyboards/mechlovin/zed65/no_backlight/retro66/retro66.c deleted file mode 100644 index ffdf09db28..0000000000 --- a/keyboards/mechlovin/zed65/no_backlight/retro66/retro66.c +++ /dev/null @@ -1,19 +0,0 @@ -/* -Copyright 2022 Mechlovin' - -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 "retro66.h" - diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h index 67c1ffb2d6..7c9062f319 100644 --- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h +++ b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h @@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS { B13, B14, A8, A1, A0 } -#define MATRIX_COL_PINS { B11, B12, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2, B3, A15, B5 } - - #ifdef RGBLIGHT_ENABLE #define RGB_DI_PIN B15 #define RGBLED_NUM 24 diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json index e023f83396..518c781713 100644 --- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json +++ b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json @@ -8,6 +8,11 @@ "pid": "0x6602", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B11", "B12", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "B3", "A15", "B5"], + "rows": ["B13", "B14", "A8", "A1", "A0"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "C14" }, diff --git a/keyboards/mechlovin/zed65/zed65.c b/keyboards/mechlovin/zed65/zed65.c deleted file mode 100644 index 289c98d068..0000000000 --- a/keyboards/mechlovin/zed65/zed65.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2022 Mechlovin' - -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 "zed65.h" diff --git a/keyboards/mechlovin/zed65/zed65.h b/keyboards/mechlovin/zed65/zed65.h deleted file mode 100644 index 85bd4eb3d2..0000000000 --- a/keyboards/mechlovin/zed65/zed65.h +++ /dev/null @@ -1,30 +0,0 @@ -/* -Copyright 2022 Mechlovin' - -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" - -#ifdef KEYBOARD_mechlovin_zed65_no_backlight_retro66 - #include "retro66.h" -#elif KEYBOARD_mechlovin_zed65_no_backlight_wearhaus66 - #include "wearhaus66.h" -#elif KEYBOARD_mechlovin_zed65_no_backlight_cor65 - #include "cor65.h" -#elif KEYBOARD_mechlovin_zed65_mono_led - #include "mono_led.h" -#endif |