diff options
Diffstat (limited to 'keyboards/40percentclub')
61 files changed, 387 insertions, 832 deletions
diff --git a/keyboards/40percentclub/25/config.h b/keyboards/40percentclub/25/config.h index 20ecf94708..1710ba42ee 100644 --- a/keyboards/40percentclub/25/config.h +++ b/keyboards/40percentclub/25/config.h @@ -21,11 +21,6 @@ //#define MASTER_RIGHT //#define EE_HANDS -/* 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 - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/40percentclub/25/info.json b/keyboards/40percentclub/25/keyboard.json index b5ab2c0cbd..aede80ef17 100644 --- a/keyboards/40percentclub/25/info.json +++ b/keyboards/40percentclub/25/keyboard.json @@ -13,7 +13,21 @@ "rows": ["D4", "C6", "D7", "E6", "B4"] }, "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/40percentclub/25/rules.mk b/keyboards/40percentclub/25/rules.mk deleted file mode 100644 index 25d4c40051..0000000000 --- a/keyboards/40percentclub/25/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # 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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -# Enable generic behavior for split boards -SPLIT_KEYBOARD = yes diff --git a/keyboards/40percentclub/4pack/config.h b/keyboards/40percentclub/4pack/config.h deleted file mode 100644 index b0cf6b6f6a..0000000000 --- a/keyboards/40percentclub/4pack/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Arda Kilicdagi - -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 - -/* - * 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/40percentclub/4pack/info.json b/keyboards/40percentclub/4pack/keyboard.json index 31d4559883..a114e97dbb 100644 --- a/keyboards/40percentclub/4pack/info.json +++ b/keyboards/40percentclub/4pack/keyboard.json @@ -14,6 +14,21 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "direct": [ ["E6", "D7", "C6", "D4"] diff --git a/keyboards/40percentclub/4pack/rules.mk b/keyboards/40percentclub/4pack/rules.mk deleted file mode 100644 index ffd7289e96..0000000000 --- a/keyboards/40percentclub/4pack/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# 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 -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/40percentclub/4x4/config.h b/keyboards/40percentclub/4x4/config.h deleted file mode 100644 index 7caa265c1a..0000000000 --- a/keyboards/40percentclub/4x4/config.h +++ /dev/null @@ -1,24 +0,0 @@ - - -#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 - -/* - * 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/40percentclub/4x4/info.json b/keyboards/40percentclub/4x4/keyboard.json index aa5e039637..735a3865da 100644 --- a/keyboards/40percentclub/4x4/info.json +++ b/keyboards/40percentclub/4x4/keyboard.json @@ -15,6 +15,19 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["ortho_4x4", "ortho_4x12"], "layouts": { "LAYOUT_ortho_4x4": { diff --git a/keyboards/40percentclub/4x4/rules.mk b/keyboards/40percentclub/4x4/rules.mk index dfb1a682dc..1605120646 100644 --- a/keyboards/40percentclub/4x4/rules.mk +++ b/keyboards/40percentclub/4x4/rules.mk @@ -1,15 +1,3 @@ -# 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 - # Disable unsupported hardware RGBLIGHT_SUPPORTED = no AUDIO_SUPPORTED = no diff --git a/keyboards/40percentclub/5x5/config.h b/keyboards/40percentclub/5x5/config.h deleted file mode 100644 index 7caa265c1a..0000000000 --- a/keyboards/40percentclub/5x5/config.h +++ /dev/null @@ -1,24 +0,0 @@ - - -#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 - -/* - * 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/40percentclub/5x5/info.json b/keyboards/40percentclub/5x5/keyboard.json index 3ebc123c9b..039d9fe47b 100644 --- a/keyboards/40percentclub/5x5/info.json +++ b/keyboards/40percentclub/5x5/keyboard.json @@ -8,6 +8,20 @@ "pid": "0x05B5", "device_version": "1.0.0" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D7", "E6", "B4", "B5", "B6", "B7", "D6", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B1"], "rows": ["B2", "D1", "D0", "D4", "C6"] diff --git a/keyboards/40percentclub/5x5/rules.mk b/keyboards/40percentclub/5x5/rules.mk deleted file mode 100644 index cb3f21e824..0000000000 --- a/keyboards/40percentclub/5x5/rules.mk +++ /dev/null @@ -1,11 +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 RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/40percentclub/6lit/config.h b/keyboards/40percentclub/6lit/config.h index 20ecf94708..1710ba42ee 100644 --- a/keyboards/40percentclub/6lit/config.h +++ b/keyboards/40percentclub/6lit/config.h @@ -21,11 +21,6 @@ //#define MASTER_RIGHT //#define EE_HANDS -/* 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 - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/40percentclub/6lit/info.json b/keyboards/40percentclub/6lit/keyboard.json index 00e91edb42..06ffc890d2 100644 --- a/keyboards/40percentclub/6lit/info.json +++ b/keyboards/40percentclub/6lit/keyboard.json @@ -13,7 +13,21 @@ "rows": ["D7", "E6"] }, "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/40percentclub/6lit/rules.mk b/keyboards/40percentclub/6lit/rules.mk deleted file mode 100644 index 25d4c40051..0000000000 --- a/keyboards/40percentclub/6lit/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # 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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -# Enable generic behavior for split boards -SPLIT_KEYBOARD = yes diff --git a/keyboards/40percentclub/foobar/config.h b/keyboards/40percentclub/foobar/config.h index 20ecf94708..1710ba42ee 100644 --- a/keyboards/40percentclub/foobar/config.h +++ b/keyboards/40percentclub/foobar/config.h @@ -21,11 +21,6 @@ //#define MASTER_RIGHT //#define EE_HANDS -/* 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 - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/40percentclub/foobar/info.json b/keyboards/40percentclub/foobar/keyboard.json index 89fc4d11a0..0a2769e04a 100644 --- a/keyboards/40percentclub/foobar/info.json +++ b/keyboards/40percentclub/foobar/keyboard.json @@ -13,7 +13,21 @@ "rows": ["D7", "E6", "B4"] }, "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/40percentclub/foobar/rules.mk b/keyboards/40percentclub/foobar/rules.mk deleted file mode 100644 index 25d4c40051..0000000000 --- a/keyboards/40percentclub/foobar/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # 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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -# Enable generic behavior for split boards -SPLIT_KEYBOARD = yes diff --git a/keyboards/40percentclub/half_n_half/config.h b/keyboards/40percentclub/half_n_half/config.h deleted file mode 100644 index 8b4ccf1479..0000000000 --- a/keyboards/40percentclub/half_n_half/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Boy_314 - -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 - -/* - * 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/40percentclub/half_n_half/info.json b/keyboards/40percentclub/half_n_half/keyboard.json index 8174e639c2..3e0c646a50 100644 --- a/keyboards/40percentclub/half_n_half/info.json +++ b/keyboards/40percentclub/half_n_half/keyboard.json @@ -13,7 +13,21 @@ "rows": ["D4", "C6", "D7", "E6"] }, "diode_direction": "COL2ROW", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/40percentclub/half_n_half/rules.mk b/keyboards/40percentclub/half_n_half/rules.mk deleted file mode 100644 index 8ee80d039b..0000000000 --- a/keyboards/40percentclub/half_n_half/rules.mk +++ /dev/null @@ -1,15 +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 -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -# Enable generic behavior for split boards -SPLIT_KEYBOARD = yes diff --git a/keyboards/40percentclub/i75/config.h b/keyboards/40percentclub/i75/config.h deleted file mode 100644 index 0fe9b9df21..0000000000 --- a/keyboards/40percentclub/i75/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2018 - * - * 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 - -/* - * 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/40percentclub/i75/info.json b/keyboards/40percentclub/i75/info.json index 8661257d6b..a7124adec2 100644 --- a/keyboards/40percentclub/i75/info.json +++ b/keyboards/40percentclub/i75/info.json @@ -1,11 +1,110 @@ { - "keyboard_name": "i75", - "manufacturer": "di0ib", - "url": "", - "maintainer": "qmk", - "usb": { - "vid": "0x4025", - "pid": "0x0A0C", - "device_version": "1.7.5" - } + "keyboard_name": "i75", + "manufacturer": "di0ib", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0x4025", + "pid": "0x0A0C", + "device_version": "1.7.5" + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, + "community_layouts": ["ortho_5x15"], + "layouts": { + "LAYOUT_ortho_5x15": { + "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": [1, 0], "x": 9, "y": 0}, + {"matrix": [1, 1], "x": 10, "y": 0}, + {"matrix": [1, 2], "x": 11, "y": 0}, + {"matrix": [1, 3], "x": 12, "y": 0}, + {"matrix": [1, 4], "x": 13, "y": 0}, + {"matrix": [1, 5], "x": 14, "y": 0}, + + {"matrix": [1, 6], "x": 0, "y": 1}, + {"matrix": [1, 7], "x": 1, "y": 1}, + {"matrix": [1, 8], "x": 2, "y": 1}, + {"matrix": [2, 0], "x": 3, "y": 1}, + {"matrix": [2, 1], "x": 4, "y": 1}, + {"matrix": [2, 2], "x": 5, "y": 1}, + {"matrix": [2, 3], "x": 6, "y": 1}, + {"matrix": [2, 4], "x": 7, "y": 1}, + {"matrix": [2, 5], "x": 8, "y": 1}, + {"matrix": [2, 6], "x": 9, "y": 1}, + {"matrix": [2, 7], "x": 10, "y": 1}, + {"matrix": [2, 8], "x": 11, "y": 1}, + {"matrix": [3, 0], "x": 12, "y": 1}, + {"matrix": [3, 1], "x": 13, "y": 1}, + {"matrix": [3, 2], "x": 14, "y": 1}, + + {"matrix": [3, 3], "x": 0, "y": 2}, + {"matrix": [3, 4], "x": 1, "y": 2}, + {"matrix": [3, 5], "x": 2, "y": 2}, + {"matrix": [3, 6], "x": 3, "y": 2}, + {"matrix": [3, 7], "x": 4, "y": 2}, + {"matrix": [3, 8], "x": 5, "y": 2}, + {"matrix": [4, 0], "x": 6, "y": 2}, + {"matrix": [4, 1], "x": 7, "y": 2}, + {"matrix": [4, 2], "x": 8, "y": 2}, + {"matrix": [4, 3], "x": 9, "y": 2}, + {"matrix": [4, 4], "x": 10, "y": 2}, + {"matrix": [4, 5], "x": 11, "y": 2}, + {"matrix": [4, 6], "x": 12, "y": 2}, + {"matrix": [4, 7], "x": 13, "y": 2}, + {"matrix": [4, 8], "x": 14, "y": 2}, + + {"matrix": [5, 0], "x": 0, "y": 3}, + {"matrix": [5, 1], "x": 1, "y": 3}, + {"matrix": [5, 2], "x": 2, "y": 3}, + {"matrix": [5, 3], "x": 3, "y": 3}, + {"matrix": [5, 4], "x": 4, "y": 3}, + {"matrix": [5, 5], "x": 5, "y": 3}, + {"matrix": [5, 6], "x": 6, "y": 3}, + {"matrix": [5, 7], "x": 7, "y": 3}, + {"matrix": [5, 8], "x": 8, "y": 3}, + {"matrix": [6, 0], "x": 9, "y": 3}, + {"matrix": [6, 1], "x": 10, "y": 3}, + {"matrix": [6, 2], "x": 11, "y": 3}, + {"matrix": [6, 3], "x": 12, "y": 3}, + {"matrix": [6, 4], "x": 13, "y": 3}, + {"matrix": [6, 5], "x": 14, "y": 3}, + + {"matrix": [6, 6], "x": 0, "y": 4}, + {"matrix": [6, 7], "x": 1, "y": 4}, + {"matrix": [6, 8], "x": 2, "y": 4}, + {"matrix": [7, 0], "x": 3, "y": 4}, + {"matrix": [7, 1], "x": 4, "y": 4}, + {"matrix": [7, 2], "x": 5, "y": 4}, + {"matrix": [7, 3], "x": 6, "y": 4}, + {"matrix": [7, 4], "x": 7, "y": 4}, + {"matrix": [7, 5], "x": 8, "y": 4}, + {"matrix": [7, 6], "x": 9, "y": 4}, + {"matrix": [7, 7], "x": 10, "y": 4}, + {"matrix": [7, 8], "x": 11, "y": 4}, + {"matrix": [8, 0], "x": 12, "y": 4}, + {"matrix": [8, 1], "x": 13, "y": 4}, + {"matrix": [8, 2], "x": 14, "y": 4} + ] + } + } } diff --git a/keyboards/40percentclub/i75/promicro/info.json b/keyboards/40percentclub/i75/promicro/info.json deleted file mode 100644 index 4c3f44469c..0000000000 --- a/keyboards/40percentclub/i75/promicro/info.json +++ /dev/null @@ -1,95 +0,0 @@ -{ - "matrix_pins": { - "cols": ["B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], - "rows": ["B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"] - }, - "diode_direction": "COL2ROW", - "processor": "atmega32u4", - "bootloader": "caterina", - "community_layouts": ["ortho_5x15"], - "layouts": { - "LAYOUT_ortho_5x15": { - "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": [1, 0], "x": 9, "y": 0}, - {"matrix": [1, 1], "x": 10, "y": 0}, - {"matrix": [1, 2], "x": 11, "y": 0}, - {"matrix": [1, 3], "x": 12, "y": 0}, - {"matrix": [1, 4], "x": 13, "y": 0}, - {"matrix": [1, 5], "x": 14, "y": 0}, - - {"matrix": [1, 6], "x": 0, "y": 1}, - {"matrix": [1, 7], "x": 1, "y": 1}, - {"matrix": [1, 8], "x": 2, "y": 1}, - {"matrix": [2, 0], "x": 3, "y": 1}, - {"matrix": [2, 1], "x": 4, "y": 1}, - {"matrix": [2, 2], "x": 5, "y": 1}, - {"matrix": [2, 3], "x": 6, "y": 1}, - {"matrix": [2, 4], "x": 7, "y": 1}, - {"matrix": [2, 5], "x": 8, "y": 1}, - {"matrix": [2, 6], "x": 9, "y": 1}, - {"matrix": [2, 7], "x": 10, "y": 1}, - {"matrix": [2, 8], "x": 11, "y": 1}, - {"matrix": [3, 0], "x": 12, "y": 1}, - {"matrix": [3, 1], "x": 13, "y": 1}, - {"matrix": [3, 2], "x": 14, "y": 1}, - - {"matrix": [3, 3], "x": 0, "y": 2}, - {"matrix": [3, 4], "x": 1, "y": 2}, - {"matrix": [3, 5], "x": 2, "y": 2}, - {"matrix": [3, 6], "x": 3, "y": 2}, - {"matrix": [3, 7], "x": 4, "y": 2}, - {"matrix": [3, 8], "x": 5, "y": 2}, - {"matrix": [4, 0], "x": 6, "y": 2}, - {"matrix": [4, 1], "x": 7, "y": 2}, - {"matrix": [4, 2], "x": 8, "y": 2}, - {"matrix": [4, 3], "x": 9, "y": 2}, - {"matrix": [4, 4], "x": 10, "y": 2}, - {"matrix": [4, 5], "x": 11, "y": 2}, - {"matrix": [4, 6], "x": 12, "y": 2}, - {"matrix": [4, 7], "x": 13, "y": 2}, - {"matrix": [4, 8], "x": 14, "y": 2}, - - {"matrix": [5, 0], "x": 0, "y": 3}, - {"matrix": [5, 1], "x": 1, "y": 3}, - {"matrix": [5, 2], "x": 2, "y": 3}, - {"matrix": [5, 3], "x": 3, "y": 3}, - {"matrix": [5, 4], "x": 4, "y": 3}, - {"matrix": [5, 5], "x": 5, "y": 3}, - {"matrix": [5, 6], "x": 6, "y": 3}, - {"matrix": [5, 7], "x": 7, "y": 3}, - {"matrix": [5, 8], "x": 8, "y": 3}, - {"matrix": [6, 0], "x": 9, "y": 3}, - {"matrix": [6, 1], "x": 10, "y": 3}, - {"matrix": [6, 2], "x": 11, "y": 3}, - {"matrix": [6, 3], "x": 12, "y": 3}, - {"matrix": [6, 4], "x": 13, "y": 3}, - {"matrix": [6, 5], "x": 14, "y": 3}, - - {"matrix": [6, 6], "x": 0, "y": 4}, - {"matrix": [6, 7], "x": 1, "y": 4}, - {"matrix": [6, 8], "x": 2, "y": 4}, - {"matrix": [7, 0], "x": 3, "y": 4}, - {"matrix": [7, 1], "x": 4, "y": 4}, - {"matrix": [7, 2], "x": 5, "y": 4}, - {"matrix": [7, 3], "x": 6, "y": 4}, - {"matrix": [7, 4], "x": 7, "y": 4}, - {"matrix": [7, 5], "x": 8, "y": 4}, - {"matrix": [7, 6], "x": 9, "y": 4}, - {"matrix": [7, 7], "x": 10, "y": 4}, - {"matrix": [7, 8], "x": 11, "y": 4}, - {"matrix": [8, 0], "x": 12, "y": 4}, - {"matrix": [8, 1], "x": 13, "y": 4}, - {"matrix": [8, 2], "x": 14, "y": 4} - ] - } - } -} diff --git a/keyboards/40percentclub/i75/promicro/keyboard.json b/keyboards/40percentclub/i75/promicro/keyboard.json new file mode 100644 index 0000000000..933c4f8616 --- /dev/null +++ b/keyboards/40percentclub/i75/promicro/keyboard.json @@ -0,0 +1,9 @@ +{ + "matrix_pins": { + "cols": ["B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"] + }, + "diode_direction": "COL2ROW", + "processor": "atmega32u4", + "bootloader": "caterina" +} diff --git a/keyboards/40percentclub/i75/promicro/rules.mk b/keyboards/40percentclub/i75/promicro/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/40percentclub/i75/promicro/rules.mk +++ /dev/null diff --git a/keyboards/40percentclub/i75/rules.mk b/keyboards/40percentclub/i75/rules.mk index fc3d70f756..48b0427550 100644 --- a/keyboards/40percentclub/i75/rules.mk +++ b/keyboards/40percentclub/i75/rules.mk @@ -1,14 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # 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 -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - DEFAULT_FOLDER = 40percentclub/i75/promicro diff --git a/keyboards/40percentclub/i75/teensy2/info.json b/keyboards/40percentclub/i75/teensy2/info.json deleted file mode 100644 index cc441a1096..0000000000 --- a/keyboards/40percentclub/i75/teensy2/info.json +++ /dev/null @@ -1,95 +0,0 @@ -{ - "matrix_pins": { - "cols": ["C6", "C7", "D6", "D7", "B5", "B6", "F7", "F6", "F5"], - "rows": ["D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1", "B0"] - }, - "diode_direction": "COL2ROW", - "processor": "atmega32u4", - "bootloader": "halfkay", - "community_layouts": ["ortho_5x15"], - "layouts": { - "LAYOUT_ortho_5x15": { - "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": [1, 0], "x": 9, "y": 0}, - {"matrix": [1, 1], "x": 10, "y": 0}, - {"matrix": [1, 2], "x": 11, "y": 0}, - {"matrix": [1, 3], "x": 12, "y": 0}, - {"matrix": [1, 4], "x": 13, "y": 0}, - {"matrix": [1, 5], "x": 14, "y": 0}, - - {"matrix": [1, 6], "x": 0, "y": 1}, - {"matrix": [1, 7], "x": 1, "y": 1}, - {"matrix": [1, 8], "x": 2, "y": 1}, - {"matrix": [2, 0], "x": 3, "y": 1}, - {"matrix": [2, 1], "x": 4, "y": 1}, - {"matrix": [2, 2], "x": 5, "y": 1}, - {"matrix": [2, 3], "x": 6, "y": 1}, - {"matrix": [2, 4], "x": 7, "y": 1}, - {"matrix": [2, 5], "x": 8, "y": 1}, - {"matrix": [2, 6], "x": 9, "y": 1}, - {"matrix": [2, 7], "x": 10, "y": 1}, - {"matrix": [2, 8], "x": 11, "y": 1}, - {"matrix": [3, 0], "x": 12, "y": 1}, - {"matrix": [3, 1], "x": 13, "y": 1}, - {"matrix": [3, 2], "x": 14, "y": 1}, - - {"matrix": [3, 3], "x": 0, "y": 2}, - {"matrix": [3, 4], "x": 1, "y": 2}, - {"matrix": [3, 5], "x": 2, "y": 2}, - {"matrix": [3, 6], "x": 3, "y": 2}, - {"matrix": [3, 7], "x": 4, "y": 2}, - {"matrix": [3, 8], "x": 5, "y": 2}, - {"matrix": [4, 0], "x": 6, "y": 2}, - {"matrix": [4, 1], "x": 7, "y": 2}, - {"matrix": [4, 2], "x": 8, "y": 2}, - {"matrix": [4, 3], "x": 9, "y": 2}, - {"matrix": [4, 4], "x": 10, "y": 2}, - {"matrix": [4, 5], "x": 11, "y": 2}, - {"matrix": [4, 6], "x": 12, "y": 2}, - {"matrix": [4, 7], "x": 13, "y": 2}, - {"matrix": [4, 8], "x": 14, "y": 2}, - - {"matrix": [5, 0], "x": 0, "y": 3}, - {"matrix": [5, 1], "x": 1, "y": 3}, - {"matrix": [5, 2], "x": 2, "y": 3}, - {"matrix": [5, 3], "x": 3, "y": 3}, - {"matrix": [5, 4], "x": 4, "y": 3}, - {"matrix": [5, 5], "x": 5, "y": 3}, - {"matrix": [5, 6], "x": 6, "y": 3}, - {"matrix": [5, 7], "x": 7, "y": 3}, - {"matrix": [5, 8], "x": 8, "y": 3}, - {"matrix": [6, 0], "x": 9, "y": 3}, - {"matrix": [6, 1], "x": 10, "y": 3}, - {"matrix": [6, 2], "x": 11, "y": 3}, - {"matrix": [6, 3], "x": 12, "y": 3}, - {"matrix": [6, 4], "x": 13, "y": 3}, - {"matrix": [6, 5], "x": 14, "y": 3}, - - {"matrix": [6, 6], "x": 0, "y": 4}, - {"matrix": [6, 7], "x": 1, "y": 4}, - {"matrix": [6, 8], "x": 2, "y": 4}, - {"matrix": [7, 0], "x": 3, "y": 4}, - {"matrix": [7, 1], "x": 4, "y": 4}, - {"matrix": [7, 2], "x": 5, "y": 4}, - {"matrix": [7, 3], "x": 6, "y": 4}, - {"matrix": [7, 4], "x": 7, "y": 4}, - {"matrix": [7, 5], "x": 8, "y": 4}, - {"matrix": [7, 6], "x": 9, "y": 4}, - {"matrix": [7, 7], "x": 10, "y": 4}, - {"matrix": [7, 8], "x": 11, "y": 4}, - {"matrix": [8, 0], "x": 12, "y": 4}, - {"matrix": [8, 1], "x": 13, "y": 4}, - {"matrix": [8, 2], "x": 14, "y": 4} - ] - } - } -} diff --git a/keyboards/40percentclub/i75/teensy2/keyboard.json b/keyboards/40percentclub/i75/teensy2/keyboard.json new file mode 100644 index 0000000000..2296a57828 --- /dev/null +++ b/keyboards/40percentclub/i75/teensy2/keyboard.json @@ -0,0 +1,9 @@ +{ + "matrix_pins": { + "cols": ["C6", "C7", "D6", "D7", "B5", "B6", "F7", "F6", "F5"], + "rows": ["D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1", "B0"] + }, + "diode_direction": "COL2ROW", + "processor": "atmega32u4", + "bootloader": "halfkay" +} diff --git a/keyboards/40percentclub/i75/teensy2/rules.mk b/keyboards/40percentclub/i75/teensy2/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/40percentclub/i75/teensy2/rules.mk +++ /dev/null diff --git a/keyboards/40percentclub/luddite/config.h b/keyboards/40percentclub/luddite/config.h deleted file mode 100644 index 5f36081323..0000000000 --- a/keyboards/40percentclub/luddite/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/40percentclub/luddite/info.json b/keyboards/40percentclub/luddite/keyboard.json index a8c8c13b2a..a9f79d7369 100644 --- a/keyboards/40percentclub/luddite/info.json +++ b/keyboards/40percentclub/luddite/keyboard.json @@ -8,6 +8,22 @@ "pid": "0x4C55", "device_version": "10.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6"] diff --git a/keyboards/40percentclub/luddite/rules.mk b/keyboards/40percentclub/luddite/rules.mk deleted file mode 100644 index ca7b02cbdd..0000000000 --- a/keyboards/40percentclub/luddite/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # 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 = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no -RGBLIGHT_ENABLE = yes diff --git a/keyboards/40percentclub/mf68/config.h b/keyboards/40percentclub/mf68/config.h deleted file mode 100644 index b9449c4714..0000000000 --- a/keyboards/40percentclub/mf68/config.h +++ /dev/null @@ -1,39 +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 - -/* - * 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/40percentclub/mf68/info.json b/keyboards/40percentclub/mf68/keyboard.json index 7218573856..45585d5e47 100644 --- a/keyboards/40percentclub/mf68/info.json +++ b/keyboards/40percentclub/mf68/keyboard.json @@ -8,6 +8,21 @@ "pid": "0x4D68", "device_version": "1.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4"], "rows": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"] diff --git a/keyboards/40percentclub/mf68/rules.mk b/keyboards/40percentclub/mf68/rules.mk deleted file mode 100644 index b325f3f0c7..0000000000 --- a/keyboards/40percentclub/mf68/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # 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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/40percentclub/nano/info.json b/keyboards/40percentclub/nano/keyboard.json index 4cfd3a9a29..547aed16f9 100644 --- a/keyboards/40percentclub/nano/info.json +++ b/keyboards/40percentclub/nano/keyboard.json @@ -28,6 +28,16 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true, + "unicode": true + }, "matrix_pins": { "direct": [ ["F4", "F5", "F6", "F7"], diff --git a/keyboards/40percentclub/nano/rules.mk b/keyboards/40percentclub/nano/rules.mk deleted file mode 100644 index a73f2bd693..0000000000 --- a/keyboards/40percentclub/nano/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/40percentclub/nein/config.h b/keyboards/40percentclub/nein/config.h deleted file mode 100644 index c30966d9d2..0000000000 --- a/keyboards/40percentclub/nein/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2019 - * - * 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 - -/* - * 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/40percentclub/nein/info.json b/keyboards/40percentclub/nein/keyboard.json index 0712923e49..9e1711f71e 100644 --- a/keyboards/40percentclub/nein/info.json +++ b/keyboards/40percentclub/nein/keyboard.json @@ -10,6 +10,20 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "direct": [ ["F4", "F5", "F6"], diff --git a/keyboards/40percentclub/nein/rules.mk b/keyboards/40percentclub/nein/rules.mk deleted file mode 100644 index 3b6a1809db..0000000000 --- a/keyboards/40percentclub/nein/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # 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 -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/40percentclub/nori/config.h b/keyboards/40percentclub/nori/config.h deleted file mode 100644 index 0fe9b9df21..0000000000 --- a/keyboards/40percentclub/nori/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2018 - * - * 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 - -/* - * 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/40percentclub/nori/info.json b/keyboards/40percentclub/nori/keyboard.json index 214d1da2a0..968e74e19e 100644 --- a/keyboards/40percentclub/nori/info.json +++ b/keyboards/40percentclub/nori/keyboard.json @@ -13,6 +13,21 @@ "rows": ["D3", "D2", "D1", "D0"] }, "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "backlight": { "pin": "B5" }, diff --git a/keyboards/40percentclub/nori/rules.mk b/keyboards/40percentclub/nori/rules.mk index 926fffda12..271780b75e 100644 --- a/keyboards/40percentclub/nori/rules.mk +++ b/keyboards/40percentclub/nori/rules.mk @@ -1,15 +1,2 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # 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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - # Disable unsupported hardware AUDIO_SUPPORTED = no diff --git a/keyboards/40percentclub/polyandry/config.h b/keyboards/40percentclub/polyandry/config.h deleted file mode 100644 index e3cac2cbfa..0000000000 --- a/keyboards/40percentclub/polyandry/config.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2021 - * - * 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 - -//more detailed config options start below: - -/* 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 - -/* - * 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/40percentclub/polyandry/info.json b/keyboards/40percentclub/polyandry/info.json index 63420adf86..49b8bedbe3 100644 --- a/keyboards/40percentclub/polyandry/info.json +++ b/keyboards/40percentclub/polyandry/info.json @@ -3,9 +3,44 @@ "manufacturer": "di0ib", "url": "", "maintainer": "QMK", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "usb": { "vid": "0x4025", "pid": "0x6060", "device_version": "0.0.1" + }, + "layouts": { + "LAYOUT_ortho_4x3": { + "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": 0, "y": 1}, + {"matrix": [0, 4], "x": 1, "y": 1}, + {"matrix": [0, 5], "x": 2, "y": 1}, + + {"matrix": [0, 6], "x": 0, "y": 2}, + {"matrix": [0, 7], "x": 1, "y": 2}, + {"matrix": [0, 8], "x": 2, "y": 2}, + + {"matrix": [0, 9], "x": 0, "y": 3}, + {"matrix": [0, 10], "x": 1, "y": 3}, + {"matrix": [0, 11], "x": 2, "y": 3} + ] + } } } diff --git a/keyboards/40percentclub/polyandry/promicro/info.json b/keyboards/40percentclub/polyandry/promicro/info.json deleted file mode 100644 index 8a8cd98794..0000000000 --- a/keyboards/40percentclub/polyandry/promicro/info.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "matrix_pins": { - "cols": ["D1", "D0", "D4", "C6", "E6", "B4", "F4", "F5", "F6", "F7", "B3", "B2"], - "rows": ["D7"] - }, - "diode_direction": "COL2ROW", - "processor": "atmega32u4", - "bootloader": "caterina", - "layouts": { - "LAYOUT_ortho_4x3": { - "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": 0, "y": 1}, - {"matrix": [0, 4], "x": 1, "y": 1}, - {"matrix": [0, 5], "x": 2, "y": 1}, - - {"matrix": [0, 6], "x": 0, "y": 2}, - {"matrix": [0, 7], "x": 1, "y": 2}, - {"matrix": [0, 8], "x": 2, "y": 2}, - - {"matrix": [0, 9], "x": 0, "y": 3}, - {"matrix": [0, 10], "x": 1, "y": 3}, - {"matrix": [0, 11], "x": 2, "y": 3} - ] - } - } -} diff --git a/keyboards/40percentclub/polyandry/promicro/keyboard.json b/keyboards/40percentclub/polyandry/promicro/keyboard.json new file mode 100644 index 0000000000..a8169c93dd --- /dev/null +++ b/keyboards/40percentclub/polyandry/promicro/keyboard.json @@ -0,0 +1,9 @@ +{ + "matrix_pins": { + "cols": ["D1", "D0", "D4", "C6", "E6", "B4", "F4", "F5", "F6", "F7", "B3", "B2"], + "rows": ["D7"] + }, + "diode_direction": "COL2ROW", + "processor": "atmega32u4", + "bootloader": "caterina" +} diff --git a/keyboards/40percentclub/polyandry/promicro/rules.mk b/keyboards/40percentclub/polyandry/promicro/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/40percentclub/polyandry/promicro/rules.mk +++ /dev/null diff --git a/keyboards/40percentclub/polyandry/rules.mk b/keyboards/40percentclub/polyandry/rules.mk index 039076f59e..3064c8202c 100644 --- a/keyboards/40percentclub/polyandry/rules.mk +++ b/keyboards/40percentclub/polyandry/rules.mk @@ -1,14 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # 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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - DEFAULT_FOLDER = 40percentclub/polyandry/promicro diff --git a/keyboards/40percentclub/polyandry/teensy2/info.json b/keyboards/40percentclub/polyandry/teensy2/info.json deleted file mode 100644 index 33fd1d71df..0000000000 --- a/keyboards/40percentclub/polyandry/teensy2/info.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "matrix_pins": { - "cols": ["B7", "D0", "D1", "D2", "C6", "C7", "F6", "F7", "B6", "B5", "D7", "D6"], - "rows": ["D3"] - }, - "diode_direction": "COL2ROW", - "processor": "atmega32u4", - "bootloader": "halfkay", - "layouts": { - "LAYOUT_ortho_4x3": { - "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": 0, "y": 1}, - {"matrix": [0, 4], "x": 1, "y": 1}, - {"matrix": [0, 5], "x": 2, "y": 1}, - - {"matrix": [0, 6], "x": 0, "y": 2}, - {"matrix": [0, 7], "x": 1, "y": 2}, - {"matrix": [0, 8], "x": 2, "y": 2}, - - {"matrix": [0, 9], "x": 0, "y": 3}, - {"matrix": [0, 10], "x": 1, "y": 3}, - {"matrix": [0, 11], "x": 2, "y": 3} - ] - } - } -} diff --git a/keyboards/40percentclub/polyandry/teensy2/keyboard.json b/keyboards/40percentclub/polyandry/teensy2/keyboard.json new file mode 100644 index 0000000000..0a870332b2 --- /dev/null +++ b/keyboards/40percentclub/polyandry/teensy2/keyboard.json @@ -0,0 +1,9 @@ +{ + "matrix_pins": { + "cols": ["B7", "D0", "D1", "D2", "C6", "C7", "F6", "F7", "B6", "B5", "D7", "D6"], + "rows": ["D3"] + }, + "diode_direction": "COL2ROW", + "processor": "atmega32u4", + "bootloader": "halfkay" +} diff --git a/keyboards/40percentclub/polyandry/teensy2/rules.mk b/keyboards/40percentclub/polyandry/teensy2/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/40percentclub/polyandry/teensy2/rules.mk +++ /dev/null diff --git a/keyboards/40percentclub/sixpack/info.json b/keyboards/40percentclub/sixpack/keyboard.json index cd4864fbd1..059c9de091 100644 --- a/keyboards/40percentclub/sixpack/info.json +++ b/keyboards/40percentclub/sixpack/keyboard.json @@ -21,6 +21,15 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "direct": [ ["D4", "C6", "D7"], diff --git a/keyboards/40percentclub/sixpack/rules.mk b/keyboards/40percentclub/sixpack/rules.mk deleted file mode 100644 index 254b0bc7bd..0000000000 --- a/keyboards/40percentclub/sixpack/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # 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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/40percentclub/tomato/config.h b/keyboards/40percentclub/tomato/config.h deleted file mode 100644 index b46d357dd0..0000000000 --- a/keyboards/40percentclub/tomato/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* eliminate lag on space cadet mods */ -#define PERMISSIVE_HOLD diff --git a/keyboards/40percentclub/tomato/info.json b/keyboards/40percentclub/tomato/keyboard.json index eabe354568..c0b526cbc6 100644 --- a/keyboards/40percentclub/tomato/info.json +++ b/keyboards/40percentclub/tomato/keyboard.json @@ -28,6 +28,24 @@ "ws2812": { "pin": "B5" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, + "qmk": { + "locking": { + "enabled": false, + "resync": true + } + }, + "tapping": { + "permissive_hold": true + }, "matrix_pins": { "cols": ["B4", "E6", "D7", "C6", "D4", "D0"], "rows": ["F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/40percentclub/tomato/rules.mk b/keyboards/40percentclub/tomato/rules.mk deleted file mode 100644 index d781d36d3b..0000000000 --- a/keyboards/40percentclub/tomato/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # 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 -RGBLIGHT_ENABLE = yes diff --git a/keyboards/40percentclub/ut47/config.h b/keyboards/40percentclub/ut47/config.h index 8f5756d150..f0182a59f8 100644 --- a/keyboards/40percentclub/ut47/config.h +++ b/keyboards/40percentclub/ut47/config.h @@ -28,10 +28,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* 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 */ -#define LOCKING_RESYNC_ENABLE - /* Enable GNAP matrix serial output */ #define GNAP_ENABLE diff --git a/keyboards/40percentclub/ut47/info.json b/keyboards/40percentclub/ut47/keyboard.json index 668f277f40..62e4a940a1 100644 --- a/keyboards/40percentclub/ut47/info.json +++ b/keyboards/40percentclub/ut47/keyboard.json @@ -10,6 +10,19 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/40percentclub/ut47/rules.mk b/keyboards/40percentclub/ut47/rules.mk index 6ba6aa5f6f..5480f61b9b 100644 --- a/keyboards/40percentclub/ut47/rules.mk +++ b/keyboards/40percentclub/ut47/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # 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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output - -# custom matrix setup CUSTOM_MATRIX = yes SRC += matrix.c UART_DRIVER_REQUIRED = yes |