diff options
Diffstat (limited to 'keyboards/maple_computing')
47 files changed, 265 insertions, 430 deletions
diff --git a/keyboards/maple_computing/6ball/6ball.c b/keyboards/maple_computing/6ball/6ball.c deleted file mode 100644 index 1eddde9ba5..0000000000 --- a/keyboards/maple_computing/6ball/6ball.c +++ /dev/null @@ -1 +0,0 @@ -#include "6ball.h" diff --git a/keyboards/maple_computing/6ball/config.h b/keyboards/maple_computing/6ball/config.h index 4eaec15ad2..6f4decad61 100644 --- a/keyboards/maple_computing/6ball/config.h +++ b/keyboards/maple_computing/6ball/config.h @@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* pin-out */ -#define MATRIX_ROW_PINS { F5 } -#define MATRIX_COL_PINS { F4, D4, B5, B6, B2, F6 } - /* ws2812 RGB LED */ #define RGB_DI_PIN F7 @@ -37,7 +32,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_EFFECT_TWINKLE #define RGBLED_NUM 6 // Number of LEDs -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define TAPPING_TERM 200 diff --git a/keyboards/maple_computing/6ball/info.json b/keyboards/maple_computing/6ball/info.json index 21df7d9dda..38f127cffc 100644 --- a/keyboards/maple_computing/6ball/info.json +++ b/keyboards/maple_computing/6ball/info.json @@ -8,6 +8,11 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "D4", "B5", "B6", "B2", "F6"], + "rows": ["F5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/maple_computing/c39/c39.c b/keyboards/maple_computing/c39/c39.c deleted file mode 100755 index 78ecae5a32..0000000000 --- a/keyboards/maple_computing/c39/c39.c +++ /dev/null @@ -1 +0,0 @@ -#include "c39.h" diff --git a/keyboards/maple_computing/c39/c39.h b/keyboards/maple_computing/c39/c39.h deleted file mode 100755 index 797dd1ef77..0000000000 --- a/keyboards/maple_computing/c39/c39.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define ___ KC_NO - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C \ - ) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C } \ -} - -#define LAYOUT_ortho_3x13 LAYOUT diff --git a/keyboards/maple_computing/c39/config.h b/keyboards/maple_computing/c39/config.h deleted file mode 100755 index 1b11bc5ce9..0000000000 --- a/keyboards/maple_computing/c39/config.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2012 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - - -#define MATRIX_ROW_PINS { D1, B4, B5 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D7, E6, C6, D2, D3 } - -/* COL2ROW or 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/maple_computing/c39/info.json b/keyboards/maple_computing/c39/info.json index 370f21ad09..4b673c575a 100755 --- a/keyboards/maple_computing/c39/info.json +++ b/keyboards/maple_computing/c39/info.json @@ -8,11 +8,61 @@ "pid": "0xCA39", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D7", "E6", "C6", "D2", "D3"], + "rows": ["D1", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_3x13" + }, "layouts": { - "LAYOUT": { - "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Back", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"M1", "x":11.25, "y":0}, {"label":"M2", "x":12.25, "y":0}, {"label":"A", "x":0, "y":1}, {"label":"S", "x":1, "y":1}, {"label":"D", "x":2, "y":1}, {"label":"F", "x":3, "y":1}, {"label":"G", "x":4, "y":1}, {"label":"Enter", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"M3", "x":11.25, "y":1}, {"label":"M4", "x":12.25, "y":1}, {"label":"Z", "x":0, "y":2}, {"label":"X", "x":1, "y":2}, {"label":"C", "x":2, "y":2}, {"label":"V", "x":3, "y":2}, {"label":"B", "x":4, "y":2}, {"label":"Fn", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":"<", "x":8, "y":2}, {"label":">", "x":9, "y":2}, {"label":"?", "x":10, "y":2}, {"label":"M5", "x":11.25, "y":2}, {"label":"M6", "x":12.25, "y":2}] + "LAYOUT_ortho_3x13": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11.25, "y": 0}, + {"matrix": [0, 12], "x": 12.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11.25, "y": 1}, + {"matrix": [1, 12], "x": 12.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11.25, "y": 2}, + {"matrix": [2, 12], "x": 12.25, "y": 2} + ] } } } diff --git a/keyboards/maple_computing/christmas_tree/christmas_tree.c b/keyboards/maple_computing/christmas_tree/christmas_tree.c deleted file mode 100644 index c03670a3a5..0000000000 --- a/keyboards/maple_computing/christmas_tree/christmas_tree.c +++ /dev/null @@ -1 +0,0 @@ -#include "christmas_tree.h" diff --git a/keyboards/maple_computing/christmas_tree/config.h b/keyboards/maple_computing/christmas_tree/config.h index 40c2ce1f48..5070f05156 100644 --- a/keyboards/maple_computing/christmas_tree/config.h +++ b/keyboards/maple_computing/christmas_tree/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* Planck PCB default pin-out */ -#define MATRIX_ROW_PINS { D3, F4, D0, F6, F5, D4 } -#define MATRIX_COL_PINS { D1 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/maple_computing/christmas_tree/info.json b/keyboards/maple_computing/christmas_tree/info.json index d60dabe1df..3ef81f9fd3 100644 --- a/keyboards/maple_computing/christmas_tree/info.json +++ b/keyboards/maple_computing/christmas_tree/info.json @@ -7,6 +7,11 @@ "vid": "0xFEED", "pid": "0x3070" }, + "matrix_pins": { + "cols": ["D1"], + "rows": ["D3", "F4", "D0", "F6", "F5", "D4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D2" }, diff --git a/keyboards/maple_computing/christmas_tree/v2017/v2017.c b/keyboards/maple_computing/christmas_tree/v2017/v2017.c deleted file mode 100644 index 22067e5367..0000000000 --- a/keyboards/maple_computing/christmas_tree/v2017/v2017.c +++ /dev/null @@ -1 +0,0 @@ -#include "v2017.h"
\ No newline at end of file diff --git a/keyboards/maple_computing/christmas_tree/v2017/v2017.h b/keyboards/maple_computing/christmas_tree/v2017/v2017.h deleted file mode 100644 index f779c0ed47..0000000000 --- a/keyboards/maple_computing/christmas_tree/v2017/v2017.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "christmas_tree.h" diff --git a/keyboards/maple_computing/ivy/ivy.c b/keyboards/maple_computing/ivy/ivy.c deleted file mode 100644 index 007ef67253..0000000000 --- a/keyboards/maple_computing/ivy/ivy.c +++ /dev/null @@ -1 +0,0 @@ -#include "ivy.h" diff --git a/keyboards/maple_computing/ivy/ivy.h b/keyboards/maple_computing/ivy/ivy.h deleted file mode 100644 index 645c5e0ef7..0000000000 --- a/keyboards/maple_computing/ivy/ivy.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#ifdef KEYBOARD_maple_computing_ivy_rev1 - #include "rev1.h" -#endif - -#include "quantum.h" diff --git a/keyboards/maple_computing/ivy/rev1/config.h b/keyboards/maple_computing/ivy/rev1/config.h deleted file mode 100644 index 902f807051..0000000000 --- a/keyboards/maple_computing/ivy/rev1/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2012 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -/* Let's Macro V2 pin-out */ -#define MATRIX_ROW_PINS { F1, B2, D3 } -#define MATRIX_COL_PINS { F5, B3, D5 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/maple_computing/ivy/rev1/info.json b/keyboards/maple_computing/ivy/rev1/info.json index 19109ca73f..e9cf604e19 100644 --- a/keyboards/maple_computing/ivy/rev1/info.json +++ b/keyboards/maple_computing/ivy/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x6012", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "B3", "D5"], + "rows": ["F1", "B2", "D3"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D2" }, diff --git a/keyboards/maple_computing/ivy/rev1/rev1.c b/keyboards/maple_computing/ivy/rev1/rev1.c deleted file mode 100644 index 007ef67253..0000000000 --- a/keyboards/maple_computing/ivy/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "ivy.h" diff --git a/keyboards/maple_computing/ivy/rev1/rev1.h b/keyboards/maple_computing/ivy/rev1/rev1.h index ac338368ed..444224d2b6 100644 --- a/keyboards/maple_computing/ivy/rev1/rev1.h +++ b/keyboards/maple_computing/ivy/rev1/rev1.h @@ -1,6 +1,6 @@ #pragma once -#include "ivy.h" +#include "quantum.h" #define LAYOUT( \ K00, \ diff --git a/keyboards/maple_computing/jnao/config.h b/keyboards/maple_computing/jnao/config.h index 24942e7a51..c2949ab3a7 100644 --- a/keyboards/maple_computing/jnao/config.h +++ b/keyboards/maple_computing/jnao/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS { E6, F0, F5, F6, F7 } -#define MATRIX_COL_PINS { F1, F4, B1, B2, B3, B7, D1, D2, D4, D6, D7, B4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/maple_computing/jnao/info.json b/keyboards/maple_computing/jnao/info.json index afa5a8674e..f1e753017f 100644 --- a/keyboards/maple_computing/jnao/info.json +++ b/keyboards/maple_computing/jnao/info.json @@ -8,6 +8,11 @@ "pid": "0x6017", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F1", "F4", "B1", "B2", "B3", "B7", "D1", "D2", "D4", "D6", "D7", "B4"], + "rows": ["E6", "F0", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D0" }, @@ -17,118 +22,125 @@ "layouts": { "LAYOUT_ortho_5x12": { "layout": [ - {"label":"`", "x":0, "y":0}, - {"label":"1", "x":1, "y":0}, - {"label":"2", "x":2, "y":0}, - {"label":"3", "x":3, "y":0}, - {"label":"4", "x":4, "y":0}, - {"label":"5", "x":5, "y":0}, - {"label":"6", "x":6, "y":0}, - {"label":"7", "x":7, "y":0}, - {"label":"8", "x":8, "y":0}, - {"label":"9", "x":9, "y":0}, - {"label":"0", "x":10, "y":0}, - {"label":"Backspace", "x":11, "y":0}, - {"label":"Tab", "x":0, "y":1}, - {"label":"Q", "x":1, "y":1}, - {"label":"W", "x":2, "y":1}, - {"label":"E", "x":3, "y":1}, - {"label":"R", "x":4, "y":1}, - {"label":"T", "x":5, "y":1}, - {"label":"Y", "x":6, "y":1}, - {"label":"U", "x":7, "y":1}, - {"label":"I", "x":8, "y":1}, - {"label":"O", "x":9, "y":1}, - {"label":"P", "x":10, "y":1}, - {"label":"Delete", "x":11, "y":1}, - {"label":"Esc", "x":0, "y":2}, - {"label":"A", "x":1, "y":2}, - {"label":"S", "x":2, "y":2}, - {"label":"D", "x":3, "y":2}, - {"label":"F", "x":4, "y":2}, - {"label":"G", "x":5, "y":2}, - {"label":"H", "x":6, "y":2}, - {"label":"J", "x":7, "y":2}, - {"label":"K", "x":8, "y":2}, - {"label":"L", "x":9, "y":2}, - {"label":";", "x":10, "y":2}, - {"label":"'", "x":11, "y":2}, - {"label":"Shift", "x":0, "y":3}, - {"label":"Z", "x":1, "y":3}, - {"label":"X", "x":2, "y":3}, - {"label":"C", "x":3, "y":3}, - {"label":"V", "x":4, "y":3}, - {"label":"B", "x":5, "y":3}, - {"label":"N", "x":6, "y":3}, - {"label":"M", "x":7, "y":3}, - {"label":",", "x":8, "y":3}, - {"label":".", "x":9, "y":3}, - {"label":"/", "x":10, "y":3}, - {"label":"Enter", "x":11, "y":3}, - {"label":"Fn", "x":0, "y":4}, - {"label":"Ctrl", "x":1, "y":4}, - {"label":"Alt", "x":2, "y":4}, - {"label":"Meta", "x":3, "y":4}, - {"label":"Lower", "x":4, "y":4}, - {"label":"Space", "x":5, "y":4}, - {"label":"Space", "x":6, "y":4}, - {"label":"Raise", "x":7, "y":4}, - {"label":"Left", "x":8, "y":4}, - {"label":"Down", "x":9, "y":4}, - {"label":"Up", "x":10, "y":4}, - {"label":"Right", "x":11, "y":4} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4}, + {"matrix": [4, 6], "x": 6, "y": 4}, + {"matrix": [4, 7], "x": 7, "y": 4}, + {"matrix": [4, 8], "x": 8, "y": 4}, + {"matrix": [4, 9], "x": 9, "y": 4}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4} ] }, "LAYOUT_ortho_4x12": { "layout": [ - {"label":"Tab", "x":0, "y":0}, - {"label":"Q", "x":1, "y":0}, - {"label":"W", "x":2, "y":0}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0}, - {"label":"T", "x":5, "y":0}, - {"label":"Y", "x":6, "y":0}, - {"label":"U", "x":7, "y":0}, - {"label":"I", "x":8, "y":0}, - {"label":"O", "x":9, "y":0}, - {"label":"P", "x":10, "y":0}, - {"label":"Delete", "x":11, "y":0}, - {"label":"Esc", "x":0, "y":1}, - {"label":"A", "x":1, "y":1}, - {"label":"S", "x":2, "y":1}, - {"label":"D", "x":3, "y":1}, - {"label":"F", "x":4, "y":1}, - {"label":"G", "x":5, "y":1}, - {"label":"H", "x":6, "y":1}, - {"label":"J", "x":7, "y":1}, - {"label":"K", "x":8, "y":1}, - {"label":"L", "x":9, "y":1}, - {"label":";", "x":10, "y":1}, - {"label":"'", "x":11, "y":1}, - {"label":"Shift", "x":0, "y":2}, - {"label":"Z", "x":1, "y":2}, - {"label":"X", "x":2, "y":2}, - {"label":"C", "x":3, "y":2}, - {"label":"V", "x":4, "y":2}, - {"label":"B", "x":5, "y":2}, - {"label":"N", "x":6, "y":2}, - {"label":"M", "x":7, "y":2}, - {"label":",", "x":8, "y":2}, - {"label":".", "x":9, "y":2}, - {"label":"/", "x":10, "y":2}, - {"label":"Enter", "x":11, "y":2}, - {"label":"Fn", "x":0, "y":3}, - {"label":"Ctrl", "x":1, "y":3}, - {"label":"Alt", "x":2, "y":3}, - {"label":"Meta", "x":3, "y":3}, - {"label":"Lower", "x":4, "y":3}, - {"label":"Space", "x":5, "y":3}, - {"label":"Space", "x":6, "y":3}, - {"label":"Raise", "x":7, "y":3}, - {"label":"Left", "x":8, "y":3}, - {"label":"Down", "x":9, "y":3}, - {"label":"Up", "x":10, "y":3}, - {"label":"Right", "x":11, "y":3} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3} ] } } diff --git a/keyboards/maple_computing/jnao/jnao.c b/keyboards/maple_computing/jnao/jnao.c deleted file mode 100644 index 8a49c747a1..0000000000 --- a/keyboards/maple_computing/jnao/jnao.c +++ /dev/null @@ -1 +0,0 @@ -#include "jnao.h" diff --git a/keyboards/maple_computing/jnao/jnao.h b/keyboards/maple_computing/jnao/jnao.h deleted file mode 100644 index 357a025f91..0000000000 --- a/keyboards/maple_computing/jnao/jnao.h +++ /dev/null @@ -1,32 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_ortho_5x12( \ - k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, \ - k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, \ - k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, \ - k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, \ - k41, k42, k43, k44, k45, k46, k47, k48, k49, k410, k411, k412 \ -) \ -{ \ - { k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012 }, \ - { k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112 }, \ - { k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212 }, \ - { k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312 }, \ - { k41, k42, k43, k44, k45, k46, k47, k48, k49, k410, k411, k412 } \ -} - -#define LAYOUT_ortho_4x12( \ - k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, \ - k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, \ - k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, \ - k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312 \ -) \ -{ \ - {k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012}, \ - {k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112}, \ - {k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212}, \ - {k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312}, \ - {KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO} \ -} diff --git a/keyboards/maple_computing/launchpad/keymaps/brandonschlack/config.h b/keyboards/maple_computing/launchpad/keymaps/brandonschlack/config.h index 6aaf996e57..b68a1ee51e 100644 --- a/keyboards/maple_computing/launchpad/keymaps/brandonschlack/config.h +++ b/keyboards/maple_computing/launchpad/keymaps/brandonschlack/config.h @@ -16,12 +16,10 @@ #pragma once /* Underlight Configuration */ -#ifdef RGB_DI_PIN #undef RGB_DI_PIN #define RGB_DI_PIN F4 #undef RGBLED_NUM #define RGBLED_NUM 2 // Number of LEDs -#endif #define RGBLIGHT_EFFECT_BREATHING // Only have Breathing Animation #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 diff --git a/keyboards/maple_computing/launchpad/launchpad.c b/keyboards/maple_computing/launchpad/launchpad.c deleted file mode 100644 index cc2812a76c..0000000000 --- a/keyboards/maple_computing/launchpad/launchpad.c +++ /dev/null @@ -1 +0,0 @@ -#include "launchpad.h" diff --git a/keyboards/maple_computing/launchpad/launchpad.h b/keyboards/maple_computing/launchpad/launchpad.h deleted file mode 100644 index f2a1b40588..0000000000 --- a/keyboards/maple_computing/launchpad/launchpad.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#if defined(KEYBOARD_maple_computing_launchpad_rev1) -# include "rev1.h" -#endif - -#include "quantum.h" diff --git a/keyboards/maple_computing/launchpad/rev1/config.h b/keyboards/maple_computing/launchpad/rev1/config.h index cd0ea962c2..aecb3f02bd 100644 --- a/keyboards/maple_computing/launchpad/rev1/config.h +++ b/keyboards/maple_computing/launchpad/rev1/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "../config.h" - -/* Let's Macro V2 pin-out */ -#define MATRIX_ROW_PINS { C6, B1, B3, D7 } -#define MATRIX_COL_PINS { D2, F7 } - -#define DIODE_DIRECTION COL2ROW - #define RGBLED_NUM 10 #define RGB_DI_PIN F6 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/maple_computing/launchpad/rev1/info.json b/keyboards/maple_computing/launchpad/rev1/info.json index 8ae1835b69..49f4c16bc9 100644 --- a/keyboards/maple_computing/launchpad/rev1/info.json +++ b/keyboards/maple_computing/launchpad/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x6007", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "F7"], + "rows": ["C6", "B1", "B3", "D7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/maple_computing/launchpad/rev1/rev1.c b/keyboards/maple_computing/launchpad/rev1/rev1.c deleted file mode 100644 index cc2812a76c..0000000000 --- a/keyboards/maple_computing/launchpad/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "launchpad.h" diff --git a/keyboards/maple_computing/launchpad/rev1/rev1.h b/keyboards/maple_computing/launchpad/rev1/rev1.h index 2ea6e7e775..54d72d5e54 100644 --- a/keyboards/maple_computing/launchpad/rev1/rev1.h +++ b/keyboards/maple_computing/launchpad/rev1/rev1.h @@ -1,7 +1,5 @@ #pragma once -#include "../launchpad.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/maple_computing/lets_split_eh/eh/config.h b/keyboards/maple_computing/lets_split_eh/eh/config.h index 55d2428db0..0a12b77265 100644 --- a/keyboards/maple_computing/lets_split_eh/eh/config.h +++ b/keyboards/maple_computing/lets_split_eh/eh/config.h @@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* Let's Split EH? pin-out */ -#define MATRIX_ROW_PINS { B1, B3, D7, B4 } -#define MATRIX_COL_PINS { F4, F5, C6, B6, B5, D5 } - -#define DIODE_DIRECTION COL2ROW - /* ws2812 RGB LED */ #define RGB_DI_PIN B2 #define RGBLED_NUM 12 // Number of LEDs (each hand) diff --git a/keyboards/maple_computing/lets_split_eh/eh/eh.c b/keyboards/maple_computing/lets_split_eh/eh/eh.c deleted file mode 100644 index d5a312085d..0000000000 --- a/keyboards/maple_computing/lets_split_eh/eh/eh.c +++ /dev/null @@ -1 +0,0 @@ -#include "lets_split_eh.h" diff --git a/keyboards/maple_computing/lets_split_eh/eh/eh.h b/keyboards/maple_computing/lets_split_eh/eh/eh.h deleted file mode 100644 index ff37229787..0000000000 --- a/keyboards/maple_computing/lets_split_eh/eh/eh.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "lets_split_eh.h" - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { R30, R31, R32, R33, R34, R35 } \ - } - -#define LAYOUT_ortho_4x12 LAYOUT diff --git a/keyboards/maple_computing/lets_split_eh/eh/info.json b/keyboards/maple_computing/lets_split_eh/eh/info.json index 4574b10b64..73a0f5651f 100644 --- a/keyboards/maple_computing/lets_split_eh/eh/info.json +++ b/keyboards/maple_computing/lets_split_eh/eh/info.json @@ -8,6 +8,11 @@ "pid": "0xE401", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["F4", "F5", "C6", "B6", "B5", "D5"], + "rows": ["B1", "B3", "D7", "B4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, @@ -17,60 +22,67 @@ "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12"], + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_4x12" + }, "layouts": { - "LAYOUT": { + "LAYOUT_ortho_4x12": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + + {"matrix": [4, 0], "x": 7, "y": 0}, + {"matrix": [4, 1], "x": 8, "y": 0}, + {"matrix": [4, 2], "x": 9, "y": 0}, + {"matrix": [4, 3], "x": 10, "y": 0}, + {"matrix": [4, 4], "x": 11, "y": 0}, + {"matrix": [4, 5], "x": 12, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + + {"matrix": [5, 0], "x": 7, "y": 1}, + {"matrix": [5, 1], "x": 8, "y": 1}, + {"matrix": [5, 2], "x": 9, "y": 1}, + {"matrix": [5, 3], "x": 10, "y": 1}, + {"matrix": [5, 4], "x": 11, "y": 1}, + {"matrix": [5, 5], "x": 12, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":7, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - {"x":12, "y":1}, + {"matrix": [6, 0], "x": 7, "y": 2}, + {"matrix": [6, 1], "x": 8, "y": 2}, + {"matrix": [6, 2], "x": 9, "y": 2}, + {"matrix": [6, 3], "x": 10, "y": 2}, + {"matrix": [6, 4], "x": 11, "y": 2}, + {"matrix": [6, 5], "x": 12, "y": 2}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":7, "y":2}, - {"x":8, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":4, "y":3}, - {"x":5, "y":3}, - {"x":7, "y":3}, - {"x":8, "y":3}, - {"x":9, "y":3}, - {"x":10, "y":3}, - {"x":11, "y":3}, - {"x":12, "y":3} + {"matrix": [7, 0], "x": 7, "y": 3}, + {"matrix": [7, 1], "x": 8, "y": 3}, + {"matrix": [7, 2], "x": 9, "y": 3}, + {"matrix": [7, 3], "x": 10, "y": 3}, + {"matrix": [7, 4], "x": 11, "y": 3}, + {"matrix": [7, 5], "x": 12, "y": 3} ] } } diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/rules.mk b/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/rules.mk +++ /dev/null diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/mikethetiger/rules.mk b/keyboards/maple_computing/lets_split_eh/keymaps/mikethetiger/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/maple_computing/lets_split_eh/keymaps/mikethetiger/rules.mk +++ /dev/null diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/that_canadian/rules.mk b/keyboards/maple_computing/lets_split_eh/keymaps/that_canadian/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/maple_computing/lets_split_eh/keymaps/that_canadian/rules.mk +++ /dev/null diff --git a/keyboards/maple_computing/lets_split_eh/lets_split_eh.c b/keyboards/maple_computing/lets_split_eh/lets_split_eh.c index 37075aa67d..37e8b3ab9b 100644 --- a/keyboards/maple_computing/lets_split_eh/lets_split_eh.c +++ b/keyboards/maple_computing/lets_split_eh/lets_split_eh.c @@ -1,4 +1,4 @@ -#include "lets_split_eh.h" +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) diff --git a/keyboards/maple_computing/lets_split_eh/lets_split_eh.h b/keyboards/maple_computing/lets_split_eh/lets_split_eh.h deleted file mode 100644 index aae072e0b6..0000000000 --- a/keyboards/maple_computing/lets_split_eh/lets_split_eh.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_maple_computing_lets_split_eh_eh - #include "eh.h" -#endif diff --git a/keyboards/maple_computing/minidox/config.h b/keyboards/maple_computing/minidox/config.h index cc2f0c8379..c59b7d33b1 100644 --- a/keyboards/maple_computing/minidox/config.h +++ b/keyboards/maple_computing/minidox/config.h @@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/maple_computing/minidox/minidox.c b/keyboards/maple_computing/minidox/minidox.c deleted file mode 100644 index b4bffbb3e4..0000000000 --- a/keyboards/maple_computing/minidox/minidox.c +++ /dev/null @@ -1 +0,0 @@ -#include "minidox.h"
\ No newline at end of file diff --git a/keyboards/maple_computing/minidox/minidox.h b/keyboards/maple_computing/minidox/minidox.h deleted file mode 100644 index bae36b5560..0000000000 --- a/keyboards/maple_computing/minidox/minidox.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#ifdef KEYBOARD_maple_computing_minidox_rev1 - #include "rev1.h" -#endif - -#include "quantum.h" diff --git a/keyboards/maple_computing/minidox/rev1/config.h b/keyboards/maple_computing/minidox/rev1/config.h deleted file mode 100644 index 26979e4edc..0000000000 --- a/keyboards/maple_computing/minidox/rev1/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2012 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { B2, B6, B4, B5 } -#define MATRIX_COL_PINS { F4, D3, D2, D1, D4 } - -//#define EE_HANDS diff --git a/keyboards/maple_computing/minidox/rev1/info.json b/keyboards/maple_computing/minidox/rev1/info.json index 83794bb116..9d1e2b806f 100644 --- a/keyboards/maple_computing/minidox/rev1/info.json +++ b/keyboards/maple_computing/minidox/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "D3", "D2", "D1", "D4"], + "rows": ["B2", "B6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/maple_computing/minidox/rev1/rev1.c b/keyboards/maple_computing/minidox/rev1/rev1.c deleted file mode 100644 index 72b473933e..0000000000 --- a/keyboards/maple_computing/minidox/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "minidox.h" diff --git a/keyboards/maple_computing/the_ruler/config.h b/keyboards/maple_computing/the_ruler/config.h index 53e7bfe55f..d6c805d7c5 100644 --- a/keyboards/maple_computing/the_ruler/config.h +++ b/keyboards/maple_computing/the_ruler/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 { C7 } -#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, C6} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/maple_computing/the_ruler/info.json b/keyboards/maple_computing/the_ruler/info.json index 69347412ce..fd4de0bcbf 100644 --- a/keyboards/maple_computing/the_ruler/info.json +++ b/keyboards/maple_computing/the_ruler/info.json @@ -8,6 +8,11 @@ "pid": "0x6007", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D6", "D7", "B4", "B5", "B6", "C6"], + "rows": ["C7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/maple_computing/the_ruler/the_ruler.c b/keyboards/maple_computing/the_ruler/the_ruler.c deleted file mode 100644 index 29a8248924..0000000000 --- a/keyboards/maple_computing/the_ruler/the_ruler.c +++ /dev/null @@ -1 +0,0 @@ -#include "the_ruler.h" |