diff options
Diffstat (limited to 'keyboards/maple_computing/minidox')
14 files changed, 56 insertions, 76 deletions
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/keymaps/alairock/config.h b/keyboards/maple_computing/minidox/keymaps/alairock/config.h index e51d11b241..6780e524ab 100644 --- a/keyboards/maple_computing/minidox/keymaps/alairock/config.h +++ b/keyboards/maple_computing/minidox/keymaps/alairock/config.h @@ -27,7 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define EE_HANDS /* ws2812 RGB LED */ -#define RGB_DI_PIN D7 +#define WS2812_DI_PIN D7 #define RGBLED_NUM 8 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/maple_computing/minidox/keymaps/bepo/config.h b/keyboards/maple_computing/minidox/keymaps/bepo/config.h index f2a669ec94..1809262044 100644 --- a/keyboards/maple_computing/minidox/keymaps/bepo/config.h +++ b/keyboards/maple_computing/minidox/keymaps/bepo/config.h @@ -1,4 +1,3 @@ #pragma once #define EE_HANDS -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/maple_computing/minidox/keymaps/dustypomerleau/config.h b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/config.h index 0bb532c663..af4401a4a0 100644 --- a/keyboards/maple_computing/minidox/keymaps/dustypomerleau/config.h +++ b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/config.h @@ -3,7 +3,6 @@ #pragma once #define EE_HANDS -#define IGNORE_MOD_TAP_INTERRUPT #define ONESHOT_TIMEOUT 1000 #define TAPPING_TERM 200 diff --git a/keyboards/maple_computing/minidox/keymaps/khitsule/config.h b/keyboards/maple_computing/minidox/keymaps/khitsule/config.h deleted file mode 100644 index 645e80ee8f..0000000000 --- a/keyboards/maple_computing/minidox/keymaps/khitsule/config.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H - -#define IGNORE_MOD_TAP_INTERRUPT - -#endif diff --git a/keyboards/maple_computing/minidox/keymaps/rsthd_combos/config.h b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/config.h index 37602b9163..98f8d6b071 100644 --- a/keyboards/maple_computing/minidox/keymaps/rsthd_combos/config.h +++ b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/config.h @@ -5,4 +5,3 @@ #define COMBO_COUNT 10 #define COMBO_TERM 100 -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/maple_computing/minidox/keymaps/that_canadian/config.h b/keyboards/maple_computing/minidox/keymaps/that_canadian/config.h index 91ef94841e..d0f15e7d19 100644 --- a/keyboards/maple_computing/minidox/keymaps/that_canadian/config.h +++ b/keyboards/maple_computing/minidox/keymaps/that_canadian/config.h @@ -26,7 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define EE_HANDS /* ws2812 RGB LED */ -#define RGB_DI_PIN D7 +#define WS2812_DI_PIN D7 #define RGBLED_NUM 8 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/maple_computing/minidox/keymaps/xyverz/config.h b/keyboards/maple_computing/minidox/keymaps/xyverz/config.h index ee5aaa8294..fe4212d6c4 100644 --- a/keyboards/maple_computing/minidox/keymaps/xyverz/config.h +++ b/keyboards/maple_computing/minidox/keymaps/xyverz/config.h @@ -26,7 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define EE_HANDS /* ws2812 RGB LED */ -#define RGB_DI_PIN D7 +#define WS2812_DI_PIN D7 #define RGBLED_NUM 8 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING @@ -43,7 +43,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_SAT_STEP 17 #define RGBLIGHT_VAL_STEP 17 -#define IGNORE_MOD_TAP_INTERRUPT #undef PERMISSIVE_HOLD #endif 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..e42ec5a08d 100644 --- a/keyboards/maple_computing/minidox/rev1/info.json +++ b/keyboards/maple_computing/minidox/rev1/info.json @@ -8,15 +8,67 @@ "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" }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["split_3x5_3"], + "layout_aliases": { + "LAYOUT": "LAYOUT_split_3x5_3" + }, "layouts": { "LAYOUT_split_3x5_3": { - "layout": [{"x":0, "y":0.375}, {"x":1, "y":0.125}, {"x":2, "y":0}, {"x":3, "y":0.125}, {"x":4, "y":0.25}, {"x":7, "y":0.25}, {"x":8, "y":0.125}, {"x":9, "y":0}, {"x":10, "y":0.125}, {"x":11, "y":0.375}, {"x":0, "y":1.375}, {"x":1, "y":1.125}, {"x":2, "y":1}, {"x":3, "y":1.125}, {"x":4, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.125}, {"x":9, "y":1}, {"x":10, "y":1.125}, {"x":11, "y":1.375}, {"x":0, "y":2.375}, {"x":1, "y":2.125}, {"x":2, "y":2}, {"x":3, "y":2.125}, {"x":4, "y":2.25}, {"x":7, "y":2.25}, {"x":8, "y":2.125}, {"x":9, "y":2}, {"x":10, "y":2.125}, {"x":11, "y":2.375}, {"x":2.5, "y":4.75}, {"x":3.5, "y":4.75}, {"x":4.5, "y":3.75, "h":2}, {"x":6.5, "y":3.75, "h":2}, {"x":7.5, "y":4.75}, {"x":8.5, "y":4.75}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [0, 1], "x": 1, "y": 0.125}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.125}, + {"matrix": [0, 4], "x": 4, "y": 0.25}, + + {"matrix": [4, 4], "x": 7, "y": 0.25}, + {"matrix": [4, 3], "x": 8, "y": 0.125}, + {"matrix": [4, 2], "x": 9, "y": 0}, + {"matrix": [4, 1], "x": 10, "y": 0.125}, + {"matrix": [4, 0], "x": 11, "y": 0.375}, + + {"matrix": [1, 0], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.125}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.125}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + + {"matrix": [5, 4], "x": 7, "y": 1.25}, + {"matrix": [5, 3], "x": 8, "y": 1.125}, + {"matrix": [5, 2], "x": 9, "y": 1}, + {"matrix": [5, 1], "x": 10, "y": 1.125}, + {"matrix": [5, 0], "x": 11, "y": 1.375}, + + {"matrix": [2, 0], "x": 0, "y": 2.375}, + {"matrix": [2, 1], "x": 1, "y": 2.125}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.125}, + {"matrix": [2, 4], "x": 4, "y": 2.25}, + + {"matrix": [6, 4], "x": 7, "y": 2.25}, + {"matrix": [6, 3], "x": 8, "y": 2.125}, + {"matrix": [6, 2], "x": 9, "y": 2}, + {"matrix": [6, 1], "x": 10, "y": 2.125}, + {"matrix": [6, 0], "x": 11, "y": 2.375}, + + {"matrix": [3, 2], "x": 2.5, "y": 4.75}, + {"matrix": [3, 3], "x": 3.5, "y": 4.75}, + {"matrix": [3, 4], "x": 4.5, "y": 3.75, "h": 2}, + + {"matrix": [7, 4], "x": 6.5, "y": 3.75, "h": 2}, + {"matrix": [7, 3], "x": 7.5, "y": 4.75}, + {"matrix": [7, 2], "x": 8.5, "y": 4.75} + ] } } } 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/minidox/rev1/rev1.h b/keyboards/maple_computing/minidox/rev1/rev1.h deleted file mode 100644 index bb8bd64666..0000000000 --- a/keyboards/maple_computing/minidox/rev1/rev1.h +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once - -#include "quantum.h" - -// readability -#define ___ KC_NO - -#define LAYOUT_split_3x5_3( \ - k01, k02, k03, k04, k05, k45, k44, k43, k42, k41, \ - k11, k12, k13, k14, k15, k55, k54, k53, k52, k51, \ - k21, k22, k23, k24, k25, k65, k64, k63, k62, k61, \ - k33, k34, k35, k75, k74, k73 \ - ) \ - { \ - { k01, k02, k03, k04, k05 }, \ - { k11, k12, k13, k14, k15 }, \ - { k21, k22, k23, k24, k25 }, \ - { ___, ___, k33, k34, k35 }, \ - { k41, k42, k43, k44, k45 }, \ - { k51, k52, k53, k54, k55 }, \ - { k61, k62, k63, k64, k65 }, \ - { ___, ___, k73, k74, k75 } \ - } - -#define LAYOUT LAYOUT_split_3x5_3 |