diff options
Diffstat (limited to 'keyboards/maple_computing')
29 files changed, 116 insertions, 225 deletions
diff --git a/keyboards/maple_computing/6ball/info.json b/keyboards/maple_computing/6ball/keyboard.json index 56531d6fa2..3f125c75c4 100644 --- a/keyboards/maple_computing/6ball/info.json +++ b/keyboards/maple_computing/6ball/keyboard.json @@ -26,6 +26,16 @@ "ws2812": { "pin": "F7" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true, + "unicode": true + }, "matrix_pins": { "cols": ["F4", "D4", "B5", "B6", "B2", "F6"], "rows": ["F5"] diff --git a/keyboards/maple_computing/6ball/rules.mk b/keyboards/maple_computing/6ball/rules.mk deleted file mode 100644 index a73f2bd693..0000000000 --- a/keyboards/maple_computing/6ball/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -UNICODE_ENABLE = yes # Unicode -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. diff --git a/keyboards/maple_computing/c39/info.json b/keyboards/maple_computing/c39/keyboard.json index 8a70fe365e..de4cbc6aeb 100755 --- a/keyboards/maple_computing/c39/info.json +++ b/keyboards/maple_computing/c39/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xCA39", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D7", "E6", "C6", "D2", "D3"], "rows": ["D1", "B4", "B5"] diff --git a/keyboards/maple_computing/c39/rules.mk b/keyboards/maple_computing/c39/rules.mk deleted file mode 100755 index 3328e87188..0000000000 --- a/keyboards/maple_computing/c39/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # RGB Enable / Disable diff --git a/keyboards/maple_computing/christmas_tree/info.json b/keyboards/maple_computing/christmas_tree/info.json deleted file mode 100644 index e675f2f932..0000000000 --- a/keyboards/maple_computing/christmas_tree/info.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "keyboard_name": "Christmas Tree", - "manufacturer": "Maple Computing", - "url": "https://www.reddit.com/r/MechanicalKeyboards/comments/7cqxpf/gb_christmas_tree_pcb_gb_now_live/", - "maintainer": "That-Canadian", - "usb": { - "vid": "0xFEED", - "pid": "0x3070" - }, - "matrix_pins": { - "cols": ["D1"], - "rows": ["D3", "F4", "D0", "F6", "F5", "D4"] - }, - "diode_direction": "COL2ROW", - "backlight": { - "driver": "timer", - "pin": "D2" - }, - "processor": "atmega32u4", - "bootloader": "caterina", - "layouts": { - "LAYOUT": { - "layout": [ - {"matrix": [0, 0], "x": 1, "y": 0}, - - {"matrix": [1, 0], "x": 0.5, "y": 1}, - {"matrix": [2, 0], "x": 1.5, "y": 1}, - - {"matrix": [3, 0], "x": 0, "y": 2}, - {"matrix": [4, 0], "x": 1, "y": 2}, - {"matrix": [5, 0], "x": 2, "y": 2} - ] - } - } -} diff --git a/keyboards/maple_computing/christmas_tree/rules.mk b/keyboards/maple_computing/christmas_tree/rules.mk index 54ee848437..3a6633cf56 100644 --- a/keyboards/maple_computing/christmas_tree/rules.mk +++ b/keyboards/maple_computing/christmas_tree/rules.mk @@ -1,14 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - DEFAULT_FOLDER = maple_computing/christmas_tree/v2017 diff --git a/keyboards/maple_computing/christmas_tree/v2017/info.json b/keyboards/maple_computing/christmas_tree/v2017/info.json deleted file mode 100644 index 6d00c2519f..0000000000 --- a/keyboards/maple_computing/christmas_tree/v2017/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "usb": { - "device_version": "20.1.7" - } -} diff --git a/keyboards/maple_computing/christmas_tree/v2017/keyboard.json b/keyboards/maple_computing/christmas_tree/v2017/keyboard.json new file mode 100644 index 0000000000..dd54b78f5d --- /dev/null +++ b/keyboards/maple_computing/christmas_tree/v2017/keyboard.json @@ -0,0 +1,45 @@ +{ + "keyboard_name": "Christmas Tree", + "manufacturer": "Maple Computing", + "url": "https://www.reddit.com/r/MechanicalKeyboards/comments/7cqxpf/gb_christmas_tree_pcb_gb_now_live/", + "maintainer": "That-Canadian", + "usb": { + "vid": "0xFEED", + "pid": "0x3070", + "device_version": "20.1.7" + }, + "processor": "atmega32u4", + "bootloader": "caterina", + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, + "matrix_pins": { + "cols": ["D1"], + "rows": ["D3", "F4", "D0", "F6", "F5", "D4"] + }, + "diode_direction": "COL2ROW", + "backlight": { + "driver": "timer", + "pin": "D2" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [ 0, 0 ], "x": 1, "y": 0}, + + {"matrix": [ 1, 0 ], "x": 0.5, "y": 1}, + {"matrix": [ 2, 0 ], "x": 1.5, "y": 1}, + + {"matrix": [ 3, 0 ], "x": 0, "y": 2}, + {"matrix": [ 4, 0 ], "x": 1, "y": 2}, + {"matrix": [ 5, 0 ], "x": 2, "y": 2} + ] + } + } +} diff --git a/keyboards/maple_computing/christmas_tree/v2017/rules.mk b/keyboards/maple_computing/christmas_tree/v2017/rules.mk deleted file mode 100644 index 184a1f2247..0000000000 --- a/keyboards/maple_computing/christmas_tree/v2017/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -AUDIO_ENABLE = no # Audio output
\ No newline at end of file diff --git a/keyboards/maple_computing/ivy/rev1/info.json b/keyboards/maple_computing/ivy/rev1/keyboard.json index de89abee75..a4c5cdcce3 100644 --- a/keyboards/maple_computing/ivy/rev1/info.json +++ b/keyboards/maple_computing/ivy/rev1/keyboard.json @@ -19,6 +19,12 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "backlight": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/maple_computing/ivy/rev1/rules.mk b/keyboards/maple_computing/ivy/rev1/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/maple_computing/ivy/rev1/rules.mk +++ /dev/null diff --git a/keyboards/maple_computing/ivy/rules.mk b/keyboards/maple_computing/ivy/rules.mk index 49af313aeb..2665d44abd 100644 --- a/keyboards/maple_computing/ivy/rules.mk +++ b/keyboards/maple_computing/ivy/rules.mk @@ -1,14 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - DEFAULT_FOLDER = maple_computing/ivy/rev1 diff --git a/keyboards/maple_computing/jnao/config.h b/keyboards/maple_computing/jnao/config.h deleted file mode 100644 index c2949ab3a7..0000000000 --- a/keyboards/maple_computing/jnao/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2012 Jun Wako <[email protected]> - -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 - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - diff --git a/keyboards/maple_computing/jnao/info.json b/keyboards/maple_computing/jnao/keyboard.json index 73ddf107ec..97b51a7680 100644 --- a/keyboards/maple_computing/jnao/info.json +++ b/keyboards/maple_computing/jnao/keyboard.json @@ -19,6 +19,20 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "command": true, + "backlight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["ortho_5x12", "ortho_4x12"], "layouts": { "LAYOUT_ortho_5x12": { diff --git a/keyboards/maple_computing/jnao/rules.mk b/keyboards/maple_computing/jnao/rules.mk index a18e35e796..09057bea54 100644 --- a/keyboards/maple_computing/jnao/rules.mk +++ b/keyboards/maple_computing/jnao/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - # Disable unsupported hardware RGBLIGHT_SUPPORTED = no AUDIO_SUPPORTED = no diff --git a/keyboards/maple_computing/launchpad/rev1/info.json b/keyboards/maple_computing/launchpad/rev1/keyboard.json index a846dd83f5..7308c49670 100644 --- a/keyboards/maple_computing/launchpad/rev1/info.json +++ b/keyboards/maple_computing/launchpad/rev1/keyboard.json @@ -33,6 +33,12 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "nkro": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/maple_computing/launchpad/rev1/rules.mk b/keyboards/maple_computing/launchpad/rev1/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/maple_computing/launchpad/rev1/rules.mk +++ /dev/null diff --git a/keyboards/maple_computing/launchpad/rules.mk b/keyboards/maple_computing/launchpad/rules.mk index 42b694f918..8c35a608a6 100644 --- a/keyboards/maple_computing/launchpad/rules.mk +++ b/keyboards/maple_computing/launchpad/rules.mk @@ -1,14 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - DEFAULT_FOLDER = maple_computing/launchpad/rev1 diff --git a/keyboards/maple_computing/lets_split_eh/lets_split_eh.c b/keyboards/maple_computing/lets_split_eh/eh/eh.c index 37e8b3ab9b..37e8b3ab9b 100644 --- a/keyboards/maple_computing/lets_split_eh/lets_split_eh.c +++ b/keyboards/maple_computing/lets_split_eh/eh/eh.c diff --git a/keyboards/maple_computing/lets_split_eh/eh/info.json b/keyboards/maple_computing/lets_split_eh/eh/keyboard.json index 2b77267da8..f40b15098f 100644 --- a/keyboards/maple_computing/lets_split_eh/eh/info.json +++ b/keyboards/maple_computing/lets_split_eh/eh/keyboard.json @@ -36,10 +36,19 @@ "pin": "B2" }, "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "community_layouts": ["ortho_4x12"], "layout_aliases": { "LAYOUT": "LAYOUT_ortho_4x12" diff --git a/keyboards/maple_computing/lets_split_eh/eh/rules.mk b/keyboards/maple_computing/lets_split_eh/eh/rules.mk index 0c7e1cb04e..271780b75e 100644 --- a/keyboards/maple_computing/lets_split_eh/eh/rules.mk +++ b/keyboards/maple_computing/lets_split_eh/eh/rules.mk @@ -1,5 +1,2 @@ -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes - # Disable unsupported hardware AUDIO_SUPPORTED = no diff --git a/keyboards/maple_computing/lets_split_eh/rules.mk b/keyboards/maple_computing/lets_split_eh/rules.mk index 4c5d9f9e5d..9bae45fde8 100644 --- a/keyboards/maple_computing/lets_split_eh/rules.mk +++ b/keyboards/maple_computing/lets_split_eh/rules.mk @@ -1,16 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = maple_computing/lets_split_eh/eh diff --git a/keyboards/maple_computing/minidox/keymaps/default/keymap.c b/keyboards/maple_computing/minidox/keymaps/default/keymap.c index d71e5b6e55..93a8e7025e 100644 --- a/keyboards/maple_computing/minidox/keymaps/default/keymap.c +++ b/keyboards/maple_computing/minidox/keymaps/default/keymap.c @@ -13,8 +13,7 @@ enum layer_names { }; enum custom_keycodes { - QWERTY = SAFE_RANGE, - LOWER, + LOWER = SAFE_RANGE, RAISE, ADJUST, }; @@ -109,27 +108,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT_split_3x5_3( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, TSKMGR, CALTDEL, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; -void persistant_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case QWERTY: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - PLAY_SONG(tone_qwerty); - #endif - persistant_default_layer_set(1UL<<_QWERTY); - } - return false; - break; case LOWER: if (record->event.pressed) { layer_on(_LOWER); diff --git a/keyboards/maple_computing/minidox/rev1/info.json b/keyboards/maple_computing/minidox/rev1/keyboard.json index e42ec5a08d..e7f1e027ae 100644 --- a/keyboards/maple_computing/minidox/rev1/info.json +++ b/keyboards/maple_computing/minidox/rev1/keyboard.json @@ -14,10 +14,17 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true + }, "community_layouts": ["split_3x5_3"], "layout_aliases": { "LAYOUT": "LAYOUT_split_3x5_3" diff --git a/keyboards/maple_computing/minidox/rev1/rules.mk b/keyboards/maple_computing/minidox/rev1/rules.mk deleted file mode 100644 index 7b30c0beff..0000000000 --- a/keyboards/maple_computing/minidox/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -BACKLIGHT_ENABLE = no diff --git a/keyboards/maple_computing/minidox/rules.mk b/keyboards/maple_computing/minidox/rules.mk index 4cf751c493..d5a7f49e40 100644 --- a/keyboards/maple_computing/minidox/rules.mk +++ b/keyboards/maple_computing/minidox/rules.mk @@ -1,16 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = maple_computing/minidox/rev1 diff --git a/keyboards/maple_computing/the_ruler/info.json b/keyboards/maple_computing/the_ruler/keyboard.json index 9ba1355fdd..c38af0a320 100644 --- a/keyboards/maple_computing/the_ruler/info.json +++ b/keyboards/maple_computing/the_ruler/keyboard.json @@ -27,6 +27,15 @@ "ws2812": { "pin": "E6" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D6", "D7", "B4", "B5", "B6", "C6"], "rows": ["C7"] diff --git a/keyboards/maple_computing/the_ruler/keymaps/default/keymap.c b/keyboards/maple_computing/the_ruler/keymaps/default/keymap.c index 87190f0b3f..6ef57fd895 100644 --- a/keyboards/maple_computing/the_ruler/keymaps/default/keymap.c +++ b/keyboards/maple_computing/the_ruler/keymaps/default/keymap.c @@ -9,12 +9,6 @@ #define _FN_1 1 #define _FN_2 2 -enum custom_keycodes { - DEFAULT = SAFE_RANGE, - FN_1, - FN_2 -}; - // Defines for task manager and such #define CALTDEL LCTL(LALT(KC_DEL)) #define TSKMGR LCTL(LSFT(KC_ESC)) @@ -49,15 +43,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; - -void persistant_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - // NONE - } - return true; -} diff --git a/keyboards/maple_computing/the_ruler/rules.mk b/keyboards/maple_computing/the_ruler/rules.mk deleted file mode 100644 index 473689d814..0000000000 --- a/keyboards/maple_computing/the_ruler/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. |