diff options
Diffstat (limited to 'keyboards/dailycraft')
30 files changed, 48 insertions, 414 deletions
diff --git a/keyboards/dailycraft/bat43/bat43.c b/keyboards/dailycraft/bat43/bat43.c deleted file mode 100644 index 5d52c672b6..0000000000 --- a/keyboards/dailycraft/bat43/bat43.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 yfuku - * - * 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 "bat43.h" diff --git a/keyboards/dailycraft/bat43/bat43.h b/keyboards/dailycraft/bat43/bat43.h deleted file mode 100644 index 046788a0a1..0000000000 --- a/keyboards/dailycraft/bat43/bat43.h +++ /dev/null @@ -1,10 +0,0 @@ -#pragma once - -#ifdef KEYBOARD_dailycraft_bat43_rev1 - #include "rev1.h" -#endif -#ifdef KEYBOARD_dailycraft_bat43_rev2 - #include "rev2.h" -#endif - -#include "quantum.h" diff --git a/keyboards/dailycraft/bat43/config.h b/keyboards/dailycraft/bat43/config.h deleted file mode 100644 index 55fc373ea8..0000000000 --- a/keyboards/dailycraft/bat43/config.h +++ /dev/null @@ -1,51 +0,0 @@ -/* -Copyright 2020 yfuku - -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 { E6, D7, C6, D4, F7, F6, F5, F4 } -#define MATRIX_COL_PINS { B6, B2, B3, B1, B5, B4 } - -/* 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/dailycraft/bat43/info.json b/keyboards/dailycraft/bat43/info.json index e60001252d..93d7ca1423 100644 --- a/keyboards/dailycraft/bat43/info.json +++ b/keyboards/dailycraft/bat43/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1", "B5", "B4"], + "rows": ["E6", "D7", "C6", "D4", "F7", "F6", "F5", "F4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/dailycraft/bat43/rev1/rev1.c b/keyboards/dailycraft/bat43/rev1/rev1.c deleted file mode 100644 index cff7598740..0000000000 --- a/keyboards/dailycraft/bat43/rev1/rev1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 yfuku - * - * 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/dailycraft/bat43/rev2/rev2.c b/keyboards/dailycraft/bat43/rev2/rev2.c deleted file mode 100644 index cffc0acd32..0000000000 --- a/keyboards/dailycraft/bat43/rev2/rev2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 yfuku - * - * 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" diff --git a/keyboards/dailycraft/claw44/claw44.c b/keyboards/dailycraft/claw44/claw44.c deleted file mode 100644 index d87103065c..0000000000 --- a/keyboards/dailycraft/claw44/claw44.c +++ /dev/null @@ -1 +0,0 @@ -#include "claw44.h" diff --git a/keyboards/dailycraft/claw44/claw44.h b/keyboards/dailycraft/claw44/claw44.h deleted file mode 100644 index 76ecda6e90..0000000000 --- a/keyboards/dailycraft/claw44/claw44.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#ifdef KEYBOARD_dailycraft_claw44_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/dailycraft/claw44/rev1/config.h b/keyboards/dailycraft/claw44/rev1/config.h deleted file mode 100644 index 13e3177b0e..0000000000 --- a/keyboards/dailycraft/claw44/rev1/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako <wakojun@gmail.com> -Copyright 2015 Jack Humbert - -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 { D4, C6, D7, E6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 } -#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/dailycraft/claw44/rev1/info.json b/keyboards/dailycraft/claw44/rev1/info.json index 1168d21fa6..9173f12edc 100644 --- a/keyboards/dailycraft/claw44/rev1/info.json +++ b/keyboards/dailycraft/claw44/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3"], + "rows": ["D4", "C6", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, @@ -21,8 +26,8 @@ {"label":"L02", "x":2, "y":0.35}, {"label":"L03", "x":3, "y":0}, {"label":"L04", "x":4, "y":0.05}, - {"label":"L05", "x":5, "y":0.10}, - {"label":"R00", "x":11.5, "y":0.10}, + {"label":"L05", "x":5, "y":0.1}, + {"label":"R00", "x":11.5, "y":0.1}, {"label":"R01", "x":12.5, "y":0.05}, {"label":"R02", "x":13.5, "y":0}, {"label":"R03", "x":14.5, "y":0.35}, @@ -33,8 +38,8 @@ {"label":"L12", "x":2, "y":1.35}, {"label":"L13", "x":3, "y":1}, {"label":"L14", "x":4, "y":1.05}, - {"label":"L15", "x":5, "y":1.10}, - {"label":"R10", "x":11.5, "y":1.10}, + {"label":"L15", "x":5, "y":1.1}, + {"label":"R10", "x":11.5, "y":1.1}, {"label":"R11", "x":12.5, "y":1.05}, {"label":"R12", "x":13.5, "y":1}, {"label":"R13", "x":14.5, "y":1.35}, @@ -45,20 +50,20 @@ {"label":"L22", "x":2, "y":2.35}, {"label":"L23", "x":3, "y":2}, {"label":"L24", "x":4, "y":2.05}, - {"label":"L25", "x":5, "y":2.10}, - {"label":"R20", "x":11.5, "y":2.10}, + {"label":"L25", "x":5, "y":2.1}, + {"label":"R20", "x":11.5, "y":2.1}, {"label":"R21", "x":12.5, "y":2.05}, {"label":"R22", "x":13.5, "y":2}, {"label":"R23", "x":14.5, "y":2.35}, {"label":"R24", "x":15.5, "y":3.03}, {"label":"R25", "x":16.5, "y":3.18}, {"label":"L30", "x":4, "y":3.05}, - {"label":"L31", "x":5, "y":3.10}, - {"label":"L32", "x":6, "y":3.20, "w":1.25}, - {"label":"L33", "x":7.25, "y":3.50}, - {"label":"R30", "x":9.25, "y":3.50}, - {"label":"R31", "x":10.25, "y":3.20, "w":1.25}, - {"label":"R32", "x":11.5, "y":3.10}, + {"label":"L31", "x":5, "y":3.1}, + {"label":"L32", "x":6, "y":3.2, "w":1.25}, + {"label":"L33", "x":7.25, "y":3.5}, + {"label":"R30", "x":9.25, "y":3.5}, + {"label":"R31", "x":10.25, "y":3.2, "w":1.25}, + {"label":"R32", "x":11.5, "y":3.1}, {"label":"R33", "x":12.5, "y":3.05} ] } diff --git a/keyboards/dailycraft/claw44/rev1/rev1.c b/keyboards/dailycraft/claw44/rev1/rev1.c deleted file mode 100644 index 520a869e57..0000000000 --- a/keyboards/dailycraft/claw44/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "rev1.h" diff --git a/keyboards/dailycraft/sandbox/rev1/config.h b/keyboards/dailycraft/sandbox/rev1/config.h index 11c2825ca9..7da6e3f1bf 100644 --- a/keyboards/dailycraft/sandbox/rev1/config.h +++ b/keyboards/dailycraft/sandbox/rev1/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, B4 } -#define MATRIX_COL_PINS { F7, B1, B3, B2, B6 } - -/* 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/dailycraft/sandbox/rev1/info.json b/keyboards/dailycraft/sandbox/rev1/info.json index 9dcf988997..032023388d 100644 --- a/keyboards/dailycraft/sandbox/rev1/info.json +++ b/keyboards/dailycraft/sandbox/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x0009", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "B1", "B3", "B2", "B6"], + "rows": ["B5", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/dailycraft/sandbox/rev1/rev1.c b/keyboards/dailycraft/sandbox/rev1/rev1.c deleted file mode 100644 index dccf24c746..0000000000 --- a/keyboards/dailycraft/sandbox/rev1/rev1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 yfuku - * - * 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/dailycraft/sandbox/rev2/config.h b/keyboards/dailycraft/sandbox/rev2/config.h index 11c2825ca9..7da6e3f1bf 100644 --- a/keyboards/dailycraft/sandbox/rev2/config.h +++ b/keyboards/dailycraft/sandbox/rev2/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, B4 } -#define MATRIX_COL_PINS { F7, B1, B3, B2, B6 } - -/* 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/dailycraft/sandbox/rev2/info.json b/keyboards/dailycraft/sandbox/rev2/info.json index c0fd7745d0..e20a1a2692 100644 --- a/keyboards/dailycraft/sandbox/rev2/info.json +++ b/keyboards/dailycraft/sandbox/rev2/info.json @@ -8,6 +8,11 @@ "pid": "0x0011", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "B1", "B3", "B2", "B6"], + "rows": ["B5", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/dailycraft/sandbox/rev2/rev2.c b/keyboards/dailycraft/sandbox/rev2/rev2.c deleted file mode 100644 index 96aa6cd314..0000000000 --- a/keyboards/dailycraft/sandbox/rev2/rev2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 yfuku - * - * 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" diff --git a/keyboards/dailycraft/sandbox/sandbox.c b/keyboards/dailycraft/sandbox/sandbox.c index 0b576a8291..51a9f88a6d 100644 --- a/keyboards/dailycraft/sandbox/sandbox.c +++ b/keyboards/dailycraft/sandbox/sandbox.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "sandbox.h" +#include "quantum.h" #ifdef OLED_ENABLE bool oled_task_kb(void) { diff --git a/keyboards/dailycraft/sandbox/sandbox.h b/keyboards/dailycraft/sandbox/sandbox.h deleted file mode 100644 index e9c9ff99c3..0000000000 --- a/keyboards/dailycraft/sandbox/sandbox.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2021 yfuku - * - * 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_dailycraft_sandbox_rev1 -# include "rev1.h" -#endif -#ifdef KEYBOARD_dailycraft_sandbox_rev2 -# include "rev2.h" -#endif diff --git a/keyboards/dailycraft/wings42/rev1/config.h b/keyboards/dailycraft/wings42/rev1/config.h index b4ec32ba1d..7da6e3f1bf 100644 --- a/keyboards/dailycraft/wings42/rev1/config.h +++ b/keyboards/dailycraft/wings42/rev1/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 { D4, C6, D7, E6 } -#define MATRIX_COL_PINS { B3, B1, F7, F6, F5, F4 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/dailycraft/wings42/rev1/info.json b/keyboards/dailycraft/wings42/rev1/info.json index 6a5e5040d5..04bb07c0bc 100644 --- a/keyboards/dailycraft/wings42/rev1/info.json +++ b/keyboards/dailycraft/wings42/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["D4", "C6", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/dailycraft/wings42/rev1/rev1.c b/keyboards/dailycraft/wings42/rev1/rev1.c deleted file mode 100644 index dccf24c746..0000000000 --- a/keyboards/dailycraft/wings42/rev1/rev1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 yfuku - * - * 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/dailycraft/wings42/rev1_extkeys/config.h b/keyboards/dailycraft/wings42/rev1_extkeys/config.h index d2067fbb52..7da6e3f1bf 100644 --- a/keyboards/dailycraft/wings42/rev1_extkeys/config.h +++ b/keyboards/dailycraft/wings42/rev1_extkeys/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 { D4, C6, D7, E6, B2, B4 } -#define MATRIX_COL_PINS { B3, B1, F7, F6, F5, F4, B6, B5 } - -/* 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/dailycraft/wings42/rev1_extkeys/info.json b/keyboards/dailycraft/wings42/rev1_extkeys/info.json index 51184b3ebd..164e770172 100644 --- a/keyboards/dailycraft/wings42/rev1_extkeys/info.json +++ b/keyboards/dailycraft/wings42/rev1_extkeys/info.json @@ -8,6 +8,11 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B3", "B1", "F7", "F6", "F5", "F4", "B6", "B5"], + "rows": ["D4", "C6", "D7", "E6", "B2", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/rev1_extkeys.c b/keyboards/dailycraft/wings42/rev1_extkeys/rev1_extkeys.c deleted file mode 100644 index 3d0d203704..0000000000 --- a/keyboards/dailycraft/wings42/rev1_extkeys/rev1_extkeys.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 yfuku - * - * 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_extkeys.h" diff --git a/keyboards/dailycraft/wings42/rev2/config.h b/keyboards/dailycraft/wings42/rev2/config.h index bd115ee140..7da6e3f1bf 100644 --- a/keyboards/dailycraft/wings42/rev2/config.h +++ b/keyboards/dailycraft/wings42/rev2/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 { D4, C6, D7, E6, NO_PIN } -#define MATRIX_COL_PINS { B3, B1, F7, F6, F5, F4 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/dailycraft/wings42/rev2/info.json b/keyboards/dailycraft/wings42/rev2/info.json index bd8e97916a..f80dcd0dfe 100644 --- a/keyboards/dailycraft/wings42/rev2/info.json +++ b/keyboards/dailycraft/wings42/rev2/info.json @@ -8,6 +8,11 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["D4", "C6", "D7", "E6", null] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/dailycraft/wings42/rev2/rev2.c b/keyboards/dailycraft/wings42/rev2/rev2.c deleted file mode 100644 index 96aa6cd314..0000000000 --- a/keyboards/dailycraft/wings42/rev2/rev2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 yfuku - * - * 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" diff --git a/keyboards/dailycraft/wings42/wings42.c b/keyboards/dailycraft/wings42/wings42.c deleted file mode 100644 index 824b6cfbb6..0000000000 --- a/keyboards/dailycraft/wings42/wings42.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 yfuku - * - * 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 "wings42.h" diff --git a/keyboards/dailycraft/wings42/wings42.h b/keyboards/dailycraft/wings42/wings42.h deleted file mode 100644 index d839f04884..0000000000 --- a/keyboards/dailycraft/wings42/wings42.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2021 yfuku - * - * 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_dailycraft_wings42_rev1 -# include "rev1.h" -#endif -#ifdef KEYBOARD_dailycraft_wings42_rev1_extkeys -# include "rev1_extkeys.h" -#endif -#ifdef KEYBOARD_dailycraft_wings42_rev2 -# include "rev2.h" -#endif - |