From 76bd5142cfed1fb8e07b9f32fb0b010fbc068fa4 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 30 Mar 2024 06:51:57 -0700 Subject: Data-Driven Keyboard Conversions: 0-9 (#23357) --- keyboards/40percentclub/25/config.h | 5 - keyboards/40percentclub/25/info.json | 119 ----------- keyboards/40percentclub/25/keyboard.json | 133 ++++++++++++ keyboards/40percentclub/25/rules.mk | 15 -- keyboards/40percentclub/4pack/config.h | 39 ---- keyboards/40percentclub/4pack/keyboard.json | 6 + keyboards/40percentclub/4x4/config.h | 24 --- keyboards/40percentclub/4x4/info.json | 209 ------------------- keyboards/40percentclub/4x4/keyboard.json | 222 +++++++++++++++++++++ keyboards/40percentclub/4x4/rules.mk | 12 -- keyboards/40percentclub/5x5/config.h | 24 --- keyboards/40percentclub/5x5/keyboard.json | 6 + keyboards/40percentclub/6lit/config.h | 5 - keyboards/40percentclub/6lit/info.json | 56 ------ keyboards/40percentclub/6lit/keyboard.json | 70 +++++++ keyboards/40percentclub/6lit/rules.mk | 15 -- keyboards/40percentclub/foobar/config.h | 5 - keyboards/40percentclub/foobar/info.json | 85 -------- keyboards/40percentclub/foobar/keyboard.json | 99 +++++++++ keyboards/40percentclub/foobar/rules.mk | 15 -- keyboards/40percentclub/half_n_half/config.h | 39 ---- keyboards/40percentclub/half_n_half/info.json | 78 -------- keyboards/40percentclub/half_n_half/keyboard.json | 92 +++++++++ keyboards/40percentclub/half_n_half/rules.mk | 15 -- keyboards/40percentclub/i75/config.h | 38 ---- keyboards/40percentclub/i75/info.json | 125 ++++++++++-- keyboards/40percentclub/i75/promicro/keyboard.json | 88 +------- keyboards/40percentclub/i75/teensy2/keyboard.json | 88 +------- keyboards/40percentclub/luddite/config.h | 7 - keyboards/40percentclub/luddite/keyboard.json | 6 + keyboards/40percentclub/mf68/config.h | 39 ---- keyboards/40percentclub/mf68/keyboard.json | 6 + keyboards/40percentclub/nein/config.h | 38 ---- keyboards/40percentclub/nein/keyboard.json | 6 + keyboards/40percentclub/nori/config.h | 38 ---- keyboards/40percentclub/nori/info.json | 161 --------------- keyboards/40percentclub/nori/keyboard.json | 176 ++++++++++++++++ keyboards/40percentclub/nori/rules.mk | 13 -- keyboards/40percentclub/polyandry/config.h | 40 ---- keyboards/40percentclub/polyandry/info.json | 27 +++ .../40percentclub/polyandry/promicro/keyboard.json | 23 +-- .../40percentclub/polyandry/teensy2/keyboard.json | 23 +-- keyboards/40percentclub/tomato/config.h | 7 - keyboards/40percentclub/tomato/keyboard.json | 9 + keyboards/40percentclub/ut47/config.h | 5 - keyboards/40percentclub/ut47/info.json | 69 ------- keyboards/40percentclub/ut47/keyboard.json | 82 ++++++++ keyboards/40percentclub/ut47/rules.mk | 13 -- 48 files changed, 1052 insertions(+), 1463 deletions(-) delete mode 100644 keyboards/40percentclub/25/info.json create mode 100644 keyboards/40percentclub/25/keyboard.json delete mode 100644 keyboards/40percentclub/25/rules.mk delete mode 100644 keyboards/40percentclub/4pack/config.h delete mode 100644 keyboards/40percentclub/4x4/config.h delete mode 100644 keyboards/40percentclub/4x4/info.json create mode 100644 keyboards/40percentclub/4x4/keyboard.json delete mode 100644 keyboards/40percentclub/5x5/config.h delete mode 100644 keyboards/40percentclub/6lit/info.json create mode 100644 keyboards/40percentclub/6lit/keyboard.json delete mode 100644 keyboards/40percentclub/6lit/rules.mk delete mode 100644 keyboards/40percentclub/foobar/info.json create mode 100644 keyboards/40percentclub/foobar/keyboard.json delete mode 100644 keyboards/40percentclub/foobar/rules.mk delete mode 100644 keyboards/40percentclub/half_n_half/config.h delete mode 100644 keyboards/40percentclub/half_n_half/info.json create mode 100644 keyboards/40percentclub/half_n_half/keyboard.json delete mode 100644 keyboards/40percentclub/half_n_half/rules.mk delete mode 100644 keyboards/40percentclub/i75/config.h delete mode 100644 keyboards/40percentclub/luddite/config.h delete mode 100644 keyboards/40percentclub/mf68/config.h delete mode 100644 keyboards/40percentclub/nein/config.h delete mode 100644 keyboards/40percentclub/nori/config.h delete mode 100644 keyboards/40percentclub/nori/info.json create mode 100644 keyboards/40percentclub/nori/keyboard.json delete mode 100644 keyboards/40percentclub/polyandry/config.h delete mode 100644 keyboards/40percentclub/tomato/config.h delete mode 100644 keyboards/40percentclub/ut47/info.json create mode 100644 keyboards/40percentclub/ut47/keyboard.json (limited to 'keyboards/40percentclub') 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/info.json deleted file mode 100644 index b5ab2c0cbd..0000000000 --- a/keyboards/40percentclub/25/info.json +++ /dev/null @@ -1,119 +0,0 @@ -{ - "keyboard_name": "The 5x5 Keyboard", - "manufacturer": "di0ib", - "url": "", - "maintainer": "qmk", - "usb": { - "vid": "0x4025", - "pid": "0x0F25", - "device_version": "1.0.0" - }, - "matrix_pins": { - "cols": ["F4", "F5", "F6", "F7", "B1"], - "rows": ["D4", "C6", "D7", "E6", "B4"] - }, - "diode_direction": "COL2ROW", - "split": { - "soft_serial_pin": "D0" - }, - "processor": "atmega32u4", - "bootloader": "caterina", - "community_layouts": ["ortho_5x5", "ortho_5x10"], - "layout_aliases": { - "LAYOUT_macro": "LAYOUT_ortho_5x5", - "LAYOUT_split": "LAYOUT_ortho_5x10" - }, - "layouts": { - "LAYOUT_ortho_5x5": { - "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": [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": [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": [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": [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} - ] - }, - "LAYOUT_ortho_5x10": { - "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": [5, 4], "x": 5, "y": 0}, - {"matrix": [5, 3], "x": 6, "y": 0}, - {"matrix": [5, 2], "x": 7, "y": 0}, - {"matrix": [5, 1], "x": 8, "y": 0}, - {"matrix": [5, 0], "x": 9, "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": [6, 4], "x": 5, "y": 1}, - {"matrix": [6, 3], "x": 6, "y": 1}, - {"matrix": [6, 2], "x": 7, "y": 1}, - {"matrix": [6, 1], "x": 8, "y": 1}, - {"matrix": [6, 0], "x": 9, "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": [7, 4], "x": 5, "y": 2}, - {"matrix": [7, 3], "x": 6, "y": 2}, - {"matrix": [7, 2], "x": 7, "y": 2}, - {"matrix": [7, 1], "x": 8, "y": 2}, - {"matrix": [7, 0], "x": 9, "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": [8, 4], "x": 5, "y": 3}, - {"matrix": [8, 3], "x": 6, "y": 3}, - {"matrix": [8, 2], "x": 7, "y": 3}, - {"matrix": [8, 1], "x": 8, "y": 3}, - {"matrix": [8, 0], "x": 9, "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": [9, 4], "x": 5, "y": 4}, - {"matrix": [9, 3], "x": 6, "y": 4}, - {"matrix": [9, 2], "x": 7, "y": 4}, - {"matrix": [9, 1], "x": 8, "y": 4}, - {"matrix": [9, 0], "x": 9, "y": 4} - ] - } - } -} diff --git a/keyboards/40percentclub/25/keyboard.json b/keyboards/40percentclub/25/keyboard.json new file mode 100644 index 0000000000..aede80ef17 --- /dev/null +++ b/keyboards/40percentclub/25/keyboard.json @@ -0,0 +1,133 @@ +{ + "keyboard_name": "The 5x5 Keyboard", + "manufacturer": "di0ib", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0x4025", + "pid": "0x0F25", + "device_version": "1.0.0" + }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1"], + "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", + "bootloader": "caterina", + "community_layouts": ["ortho_5x5", "ortho_5x10"], + "layout_aliases": { + "LAYOUT_macro": "LAYOUT_ortho_5x5", + "LAYOUT_split": "LAYOUT_ortho_5x10" + }, + "layouts": { + "LAYOUT_ortho_5x5": { + "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": [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": [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": [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": [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} + ] + }, + "LAYOUT_ortho_5x10": { + "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": [5, 4], "x": 5, "y": 0}, + {"matrix": [5, 3], "x": 6, "y": 0}, + {"matrix": [5, 2], "x": 7, "y": 0}, + {"matrix": [5, 1], "x": 8, "y": 0}, + {"matrix": [5, 0], "x": 9, "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": [6, 4], "x": 5, "y": 1}, + {"matrix": [6, 3], "x": 6, "y": 1}, + {"matrix": [6, 2], "x": 7, "y": 1}, + {"matrix": [6, 1], "x": 8, "y": 1}, + {"matrix": [6, 0], "x": 9, "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": [7, 4], "x": 5, "y": 2}, + {"matrix": [7, 3], "x": 6, "y": 2}, + {"matrix": [7, 2], "x": 7, "y": 2}, + {"matrix": [7, 1], "x": 8, "y": 2}, + {"matrix": [7, 0], "x": 9, "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": [8, 4], "x": 5, "y": 3}, + {"matrix": [8, 3], "x": 6, "y": 3}, + {"matrix": [8, 2], "x": 7, "y": 3}, + {"matrix": [8, 1], "x": 8, "y": 3}, + {"matrix": [8, 0], "x": 9, "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": [9, 4], "x": 5, "y": 4}, + {"matrix": [9, 3], "x": 6, "y": 4}, + {"matrix": [9, 2], "x": 7, "y": 4}, + {"matrix": [9, 1], "x": 8, "y": 4}, + {"matrix": [9, 0], "x": 9, "y": 4} + ] + } + } +} 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 . -*/ - -#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/keyboard.json b/keyboards/40percentclub/4pack/keyboard.json index edfd64ad33..a114e97dbb 100644 --- a/keyboards/40percentclub/4pack/keyboard.json +++ b/keyboards/40percentclub/4pack/keyboard.json @@ -23,6 +23,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "direct": [ ["E6", "D7", "C6", "D4"] 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/info.json deleted file mode 100644 index aa5e039637..0000000000 --- a/keyboards/40percentclub/4x4/info.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "keyboard_name": "The 4x4 Keyboard", - "manufacturer": "di0ib", - "url": "", - "maintainer": "qmk", - "usb": { - "vid": "0x4025", - "pid": "0x0A0C", - "device_version": "44.4.4" - }, - "matrix_pins": { - "cols": ["C6", "D7", "E6", "B4", "B5", "B6", "B7", "D6", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B1"], - "rows": ["B2", "D1", "D0", "D4"] - }, - "diode_direction": "COL2ROW", - "processor": "atmega32u4", - "bootloader": "caterina", - "community_layouts": ["ortho_4x4", "ortho_4x12"], - "layouts": { - "LAYOUT_ortho_4x4": { - "layout": [ - {"x": 0, "y": 0, "matrix": [0, 0]}, - {"x": 1, "y": 0, "matrix": [0, 1]}, - {"x": 2, "y": 0, "matrix": [0, 2]}, - {"x": 3, "y": 0, "matrix": [0, 3]}, - - {"x": 0, "y": 1, "matrix": [1, 0]}, - {"x": 1, "y": 1, "matrix": [1, 1]}, - {"x": 2, "y": 1, "matrix": [1, 2]}, - {"x": 3, "y": 1, "matrix": [1, 3]}, - - {"x": 0, "y": 2, "matrix": [2, 0]}, - {"x": 1, "y": 2, "matrix": [2, 1]}, - {"x": 2, "y": 2, "matrix": [2, 2]}, - {"x": 3, "y": 2, "matrix": [2, 3]}, - - {"x": 0, "y": 3, "matrix": [3, 0]}, - {"x": 1, "y": 3, "matrix": [3, 1]}, - {"x": 2, "y": 3, "matrix": [3, 2]}, - {"x": 3, "y": 3, "matrix": [3, 3]} - ] - }, - "LAYOUT_ortho_4x8": { - "layout": [ - {"x": 0, "y": 0, "matrix": [0, 0]}, - {"x": 1, "y": 0, "matrix": [0, 1]}, - {"x": 2, "y": 0, "matrix": [0, 2]}, - {"x": 3, "y": 0, "matrix": [0, 3]}, - {"x": 4, "y": 0, "matrix": [0, 4]}, - {"x": 5, "y": 0, "matrix": [0, 5]}, - {"x": 6, "y": 0, "matrix": [0, 6]}, - {"x": 7, "y": 0, "matrix": [0, 7]}, - - {"x": 0, "y": 1, "matrix": [1, 0]}, - {"x": 1, "y": 1, "matrix": [1, 1]}, - {"x": 2, "y": 1, "matrix": [1, 2]}, - {"x": 3, "y": 1, "matrix": [1, 3]}, - {"x": 4, "y": 1, "matrix": [1, 4]}, - {"x": 5, "y": 1, "matrix": [1, 5]}, - {"x": 6, "y": 1, "matrix": [1, 6]}, - {"x": 7, "y": 1, "matrix": [1, 7]}, - - {"x": 0, "y": 2, "matrix": [2, 0]}, - {"x": 1, "y": 2, "matrix": [2, 1]}, - {"x": 2, "y": 2, "matrix": [2, 2]}, - {"x": 3, "y": 2, "matrix": [2, 3]}, - {"x": 4, "y": 2, "matrix": [2, 4]}, - {"x": 5, "y": 2, "matrix": [2, 5]}, - {"x": 6, "y": 2, "matrix": [2, 6]}, - {"x": 7, "y": 2, "matrix": [2, 7]}, - - {"x": 0, "y": 3, "matrix": [3, 0]}, - {"x": 1, "y": 3, "matrix": [3, 1]}, - {"x": 2, "y": 3, "matrix": [3, 2]}, - {"x": 3, "y": 3, "matrix": [3, 3]}, - {"x": 4, "y": 3, "matrix": [3, 4]}, - {"x": 5, "y": 3, "matrix": [3, 5]}, - {"x": 6, "y": 3, "matrix": [3, 6]}, - {"x": 7, "y": 3, "matrix": [3, 7]} - ] - }, - "LAYOUT_ortho_4x12": { - "layout": [ - {"x": 0, "y": 0, "matrix": [0, 0]}, - {"x": 1, "y": 0, "matrix": [0, 1]}, - {"x": 2, "y": 0, "matrix": [0, 2]}, - {"x": 3, "y": 0, "matrix": [0, 3]}, - {"x": 4, "y": 0, "matrix": [0, 4]}, - {"x": 5, "y": 0, "matrix": [0, 5]}, - {"x": 6, "y": 0, "matrix": [0, 6]}, - {"x": 7, "y": 0, "matrix": [0, 7]}, - {"x": 8, "y": 0, "matrix": [0, 8]}, - {"x": 9, "y": 0, "matrix": [0, 9]}, - {"x": 10, "y": 0, "matrix": [0, 10]}, - {"x": 11, "y": 0, "matrix": [0, 11]}, - - {"x": 0, "y": 1, "matrix": [1, 0]}, - {"x": 1, "y": 1, "matrix": [1, 1]}, - {"x": 2, "y": 1, "matrix": [1, 2]}, - {"x": 3, "y": 1, "matrix": [1, 3]}, - {"x": 4, "y": 1, "matrix": [1, 4]}, - {"x": 5, "y": 1, "matrix": [1, 5]}, - {"x": 6, "y": 1, "matrix": [1, 6]}, - {"x": 7, "y": 1, "matrix": [1, 7]}, - {"x": 8, "y": 1, "matrix": [1, 8]}, - {"x": 9, "y": 1, "matrix": [1, 9]}, - {"x": 10, "y": 1, "matrix": [1, 10]}, - {"x": 11, "y": 1, "matrix": [1, 11]}, - - {"x": 0, "y": 2, "matrix": [2, 0]}, - {"x": 1, "y": 2, "matrix": [2, 1]}, - {"x": 2, "y": 2, "matrix": [2, 2]}, - {"x": 3, "y": 2, "matrix": [2, 3]}, - {"x": 4, "y": 2, "matrix": [2, 4]}, - {"x": 5, "y": 2, "matrix": [2, 5]}, - {"x": 6, "y": 2, "matrix": [2, 6]}, - {"x": 7, "y": 2, "matrix": [2, 7]}, - {"x": 8, "y": 2, "matrix": [2, 8]}, - {"x": 9, "y": 2, "matrix": [2, 9]}, - {"x": 10, "y": 2, "matrix": [2, 10]}, - {"x": 11, "y": 2, "matrix": [2, 11]}, - - {"x": 0, "y": 3, "matrix": [3, 0]}, - {"x": 1, "y": 3, "matrix": [3, 1]}, - {"x": 2, "y": 3, "matrix": [3, 2]}, - {"x": 3, "y": 3, "matrix": [3, 3]}, - {"x": 4, "y": 3, "matrix": [3, 4]}, - {"x": 5, "y": 3, "matrix": [3, 5]}, - {"x": 6, "y": 3, "matrix": [3, 6]}, - {"x": 7, "y": 3, "matrix": [3, 7]}, - {"x": 8, "y": 3, "matrix": [3, 8]}, - {"x": 9, "y": 3, "matrix": [3, 9]}, - {"x": 10, "y": 3, "matrix": [3, 10]}, - {"x": 11, "y": 3, "matrix": [3, 11]} - ] - }, - "LAYOUT_ortho_4x16": { - "layout": [ - {"x": 0, "y": 0, "matrix": [0, 0]}, - {"x": 1, "y": 0, "matrix": [0, 1]}, - {"x": 2, "y": 0, "matrix": [0, 2]}, - {"x": 3, "y": 0, "matrix": [0, 3]}, - {"x": 4, "y": 0, "matrix": [0, 4]}, - {"x": 5, "y": 0, "matrix": [0, 5]}, - {"x": 6, "y": 0, "matrix": [0, 6]}, - {"x": 7, "y": 0, "matrix": [0, 7]}, - {"x": 8, "y": 0, "matrix": [0, 8]}, - {"x": 9, "y": 0, "matrix": [0, 9]}, - {"x": 10, "y": 0, "matrix": [0, 10]}, - {"x": 11, "y": 0, "matrix": [0, 11]}, - {"x": 12, "y": 0, "matrix": [0, 12]}, - {"x": 13, "y": 0, "matrix": [0, 13]}, - {"x": 14, "y": 0, "matrix": [0, 14]}, - {"x": 15, "y": 0, "matrix": [0, 15]}, - - {"x": 0, "y": 1, "matrix": [1, 0]}, - {"x": 1, "y": 1, "matrix": [1, 1]}, - {"x": 2, "y": 1, "matrix": [1, 2]}, - {"x": 3, "y": 1, "matrix": [1, 3]}, - {"x": 4, "y": 1, "matrix": [1, 4]}, - {"x": 5, "y": 1, "matrix": [1, 5]}, - {"x": 6, "y": 1, "matrix": [1, 6]}, - {"x": 7, "y": 1, "matrix": [1, 7]}, - {"x": 8, "y": 1, "matrix": [1, 8]}, - {"x": 9, "y": 1, "matrix": [1, 9]}, - {"x": 10, "y": 1, "matrix": [1, 10]}, - {"x": 11, "y": 1, "matrix": [1, 11]}, - {"x": 12, "y": 1, "matrix": [1, 12]}, - {"x": 13, "y": 1, "matrix": [1, 13]}, - {"x": 14, "y": 1, "matrix": [1, 14]}, - {"x": 15, "y": 1, "matrix": [1, 15]}, - - {"x": 0, "y": 2, "matrix": [2, 0]}, - {"x": 1, "y": 2, "matrix": [2, 1]}, - {"x": 2, "y": 2, "matrix": [2, 2]}, - {"x": 3, "y": 2, "matrix": [2, 3]}, - {"x": 4, "y": 2, "matrix": [2, 4]}, - {"x": 5, "y": 2, "matrix": [2, 5]}, - {"x": 6, "y": 2, "matrix": [2, 6]}, - {"x": 7, "y": 2, "matrix": [2, 7]}, - {"x": 8, "y": 2, "matrix": [2, 8]}, - {"x": 9, "y": 2, "matrix": [2, 9]}, - {"x": 10, "y": 2, "matrix": [2, 10]}, - {"x": 11, "y": 2, "matrix": [2, 11]}, - {"x": 12, "y": 2, "matrix": [2, 12]}, - {"x": 13, "y": 2, "matrix": [2, 13]}, - {"x": 14, "y": 2, "matrix": [2, 14]}, - {"x": 15, "y": 2, "matrix": [2, 15]}, - - {"x": 0, "y": 3, "matrix": [3, 0]}, - {"x": 1, "y": 3, "matrix": [3, 1]}, - {"x": 2, "y": 3, "matrix": [3, 2]}, - {"x": 3, "y": 3, "matrix": [3, 3]}, - {"x": 4, "y": 3, "matrix": [3, 4]}, - {"x": 5, "y": 3, "matrix": [3, 5]}, - {"x": 6, "y": 3, "matrix": [3, 6]}, - {"x": 7, "y": 3, "matrix": [3, 7]}, - {"x": 8, "y": 3, "matrix": [3, 8]}, - {"x": 9, "y": 3, "matrix": [3, 9]}, - {"x": 10, "y": 3, "matrix": [3, 10]}, - {"x": 11, "y": 3, "matrix": [3, 11]}, - {"x": 12, "y": 3, "matrix": [3, 12]}, - {"x": 13, "y": 3, "matrix": [3, 13]}, - {"x": 14, "y": 3, "matrix": [3, 14]}, - {"x": 15, "y": 3, "matrix": [3, 15]} - ] - } - } -} diff --git a/keyboards/40percentclub/4x4/keyboard.json b/keyboards/40percentclub/4x4/keyboard.json new file mode 100644 index 0000000000..735a3865da --- /dev/null +++ b/keyboards/40percentclub/4x4/keyboard.json @@ -0,0 +1,222 @@ +{ + "keyboard_name": "The 4x4 Keyboard", + "manufacturer": "di0ib", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0x4025", + "pid": "0x0A0C", + "device_version": "44.4.4" + }, + "matrix_pins": { + "cols": ["C6", "D7", "E6", "B4", "B5", "B6", "B7", "D6", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B1"], + "rows": ["B2", "D1", "D0", "D4"] + }, + "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": { + "layout": [ + {"x": 0, "y": 0, "matrix": [0, 0]}, + {"x": 1, "y": 0, "matrix": [0, 1]}, + {"x": 2, "y": 0, "matrix": [0, 2]}, + {"x": 3, "y": 0, "matrix": [0, 3]}, + + {"x": 0, "y": 1, "matrix": [1, 0]}, + {"x": 1, "y": 1, "matrix": [1, 1]}, + {"x": 2, "y": 1, "matrix": [1, 2]}, + {"x": 3, "y": 1, "matrix": [1, 3]}, + + {"x": 0, "y": 2, "matrix": [2, 0]}, + {"x": 1, "y": 2, "matrix": [2, 1]}, + {"x": 2, "y": 2, "matrix": [2, 2]}, + {"x": 3, "y": 2, "matrix": [2, 3]}, + + {"x": 0, "y": 3, "matrix": [3, 0]}, + {"x": 1, "y": 3, "matrix": [3, 1]}, + {"x": 2, "y": 3, "matrix": [3, 2]}, + {"x": 3, "y": 3, "matrix": [3, 3]} + ] + }, + "LAYOUT_ortho_4x8": { + "layout": [ + {"x": 0, "y": 0, "matrix": [0, 0]}, + {"x": 1, "y": 0, "matrix": [0, 1]}, + {"x": 2, "y": 0, "matrix": [0, 2]}, + {"x": 3, "y": 0, "matrix": [0, 3]}, + {"x": 4, "y": 0, "matrix": [0, 4]}, + {"x": 5, "y": 0, "matrix": [0, 5]}, + {"x": 6, "y": 0, "matrix": [0, 6]}, + {"x": 7, "y": 0, "matrix": [0, 7]}, + + {"x": 0, "y": 1, "matrix": [1, 0]}, + {"x": 1, "y": 1, "matrix": [1, 1]}, + {"x": 2, "y": 1, "matrix": [1, 2]}, + {"x": 3, "y": 1, "matrix": [1, 3]}, + {"x": 4, "y": 1, "matrix": [1, 4]}, + {"x": 5, "y": 1, "matrix": [1, 5]}, + {"x": 6, "y": 1, "matrix": [1, 6]}, + {"x": 7, "y": 1, "matrix": [1, 7]}, + + {"x": 0, "y": 2, "matrix": [2, 0]}, + {"x": 1, "y": 2, "matrix": [2, 1]}, + {"x": 2, "y": 2, "matrix": [2, 2]}, + {"x": 3, "y": 2, "matrix": [2, 3]}, + {"x": 4, "y": 2, "matrix": [2, 4]}, + {"x": 5, "y": 2, "matrix": [2, 5]}, + {"x": 6, "y": 2, "matrix": [2, 6]}, + {"x": 7, "y": 2, "matrix": [2, 7]}, + + {"x": 0, "y": 3, "matrix": [3, 0]}, + {"x": 1, "y": 3, "matrix": [3, 1]}, + {"x": 2, "y": 3, "matrix": [3, 2]}, + {"x": 3, "y": 3, "matrix": [3, 3]}, + {"x": 4, "y": 3, "matrix": [3, 4]}, + {"x": 5, "y": 3, "matrix": [3, 5]}, + {"x": 6, "y": 3, "matrix": [3, 6]}, + {"x": 7, "y": 3, "matrix": [3, 7]} + ] + }, + "LAYOUT_ortho_4x12": { + "layout": [ + {"x": 0, "y": 0, "matrix": [0, 0]}, + {"x": 1, "y": 0, "matrix": [0, 1]}, + {"x": 2, "y": 0, "matrix": [0, 2]}, + {"x": 3, "y": 0, "matrix": [0, 3]}, + {"x": 4, "y": 0, "matrix": [0, 4]}, + {"x": 5, "y": 0, "matrix": [0, 5]}, + {"x": 6, "y": 0, "matrix": [0, 6]}, + {"x": 7, "y": 0, "matrix": [0, 7]}, + {"x": 8, "y": 0, "matrix": [0, 8]}, + {"x": 9, "y": 0, "matrix": [0, 9]}, + {"x": 10, "y": 0, "matrix": [0, 10]}, + {"x": 11, "y": 0, "matrix": [0, 11]}, + + {"x": 0, "y": 1, "matrix": [1, 0]}, + {"x": 1, "y": 1, "matrix": [1, 1]}, + {"x": 2, "y": 1, "matrix": [1, 2]}, + {"x": 3, "y": 1, "matrix": [1, 3]}, + {"x": 4, "y": 1, "matrix": [1, 4]}, + {"x": 5, "y": 1, "matrix": [1, 5]}, + {"x": 6, "y": 1, "matrix": [1, 6]}, + {"x": 7, "y": 1, "matrix": [1, 7]}, + {"x": 8, "y": 1, "matrix": [1, 8]}, + {"x": 9, "y": 1, "matrix": [1, 9]}, + {"x": 10, "y": 1, "matrix": [1, 10]}, + {"x": 11, "y": 1, "matrix": [1, 11]}, + + {"x": 0, "y": 2, "matrix": [2, 0]}, + {"x": 1, "y": 2, "matrix": [2, 1]}, + {"x": 2, "y": 2, "matrix": [2, 2]}, + {"x": 3, "y": 2, "matrix": [2, 3]}, + {"x": 4, "y": 2, "matrix": [2, 4]}, + {"x": 5, "y": 2, "matrix": [2, 5]}, + {"x": 6, "y": 2, "matrix": [2, 6]}, + {"x": 7, "y": 2, "matrix": [2, 7]}, + {"x": 8, "y": 2, "matrix": [2, 8]}, + {"x": 9, "y": 2, "matrix": [2, 9]}, + {"x": 10, "y": 2, "matrix": [2, 10]}, + {"x": 11, "y": 2, "matrix": [2, 11]}, + + {"x": 0, "y": 3, "matrix": [3, 0]}, + {"x": 1, "y": 3, "matrix": [3, 1]}, + {"x": 2, "y": 3, "matrix": [3, 2]}, + {"x": 3, "y": 3, "matrix": [3, 3]}, + {"x": 4, "y": 3, "matrix": [3, 4]}, + {"x": 5, "y": 3, "matrix": [3, 5]}, + {"x": 6, "y": 3, "matrix": [3, 6]}, + {"x": 7, "y": 3, "matrix": [3, 7]}, + {"x": 8, "y": 3, "matrix": [3, 8]}, + {"x": 9, "y": 3, "matrix": [3, 9]}, + {"x": 10, "y": 3, "matrix": [3, 10]}, + {"x": 11, "y": 3, "matrix": [3, 11]} + ] + }, + "LAYOUT_ortho_4x16": { + "layout": [ + {"x": 0, "y": 0, "matrix": [0, 0]}, + {"x": 1, "y": 0, "matrix": [0, 1]}, + {"x": 2, "y": 0, "matrix": [0, 2]}, + {"x": 3, "y": 0, "matrix": [0, 3]}, + {"x": 4, "y": 0, "matrix": [0, 4]}, + {"x": 5, "y": 0, "matrix": [0, 5]}, + {"x": 6, "y": 0, "matrix": [0, 6]}, + {"x": 7, "y": 0, "matrix": [0, 7]}, + {"x": 8, "y": 0, "matrix": [0, 8]}, + {"x": 9, "y": 0, "matrix": [0, 9]}, + {"x": 10, "y": 0, "matrix": [0, 10]}, + {"x": 11, "y": 0, "matrix": [0, 11]}, + {"x": 12, "y": 0, "matrix": [0, 12]}, + {"x": 13, "y": 0, "matrix": [0, 13]}, + {"x": 14, "y": 0, "matrix": [0, 14]}, + {"x": 15, "y": 0, "matrix": [0, 15]}, + + {"x": 0, "y": 1, "matrix": [1, 0]}, + {"x": 1, "y": 1, "matrix": [1, 1]}, + {"x": 2, "y": 1, "matrix": [1, 2]}, + {"x": 3, "y": 1, "matrix": [1, 3]}, + {"x": 4, "y": 1, "matrix": [1, 4]}, + {"x": 5, "y": 1, "matrix": [1, 5]}, + {"x": 6, "y": 1, "matrix": [1, 6]}, + {"x": 7, "y": 1, "matrix": [1, 7]}, + {"x": 8, "y": 1, "matrix": [1, 8]}, + {"x": 9, "y": 1, "matrix": [1, 9]}, + {"x": 10, "y": 1, "matrix": [1, 10]}, + {"x": 11, "y": 1, "matrix": [1, 11]}, + {"x": 12, "y": 1, "matrix": [1, 12]}, + {"x": 13, "y": 1, "matrix": [1, 13]}, + {"x": 14, "y": 1, "matrix": [1, 14]}, + {"x": 15, "y": 1, "matrix": [1, 15]}, + + {"x": 0, "y": 2, "matrix": [2, 0]}, + {"x": 1, "y": 2, "matrix": [2, 1]}, + {"x": 2, "y": 2, "matrix": [2, 2]}, + {"x": 3, "y": 2, "matrix": [2, 3]}, + {"x": 4, "y": 2, "matrix": [2, 4]}, + {"x": 5, "y": 2, "matrix": [2, 5]}, + {"x": 6, "y": 2, "matrix": [2, 6]}, + {"x": 7, "y": 2, "matrix": [2, 7]}, + {"x": 8, "y": 2, "matrix": [2, 8]}, + {"x": 9, "y": 2, "matrix": [2, 9]}, + {"x": 10, "y": 2, "matrix": [2, 10]}, + {"x": 11, "y": 2, "matrix": [2, 11]}, + {"x": 12, "y": 2, "matrix": [2, 12]}, + {"x": 13, "y": 2, "matrix": [2, 13]}, + {"x": 14, "y": 2, "matrix": [2, 14]}, + {"x": 15, "y": 2, "matrix": [2, 15]}, + + {"x": 0, "y": 3, "matrix": [3, 0]}, + {"x": 1, "y": 3, "matrix": [3, 1]}, + {"x": 2, "y": 3, "matrix": [3, 2]}, + {"x": 3, "y": 3, "matrix": [3, 3]}, + {"x": 4, "y": 3, "matrix": [3, 4]}, + {"x": 5, "y": 3, "matrix": [3, 5]}, + {"x": 6, "y": 3, "matrix": [3, 6]}, + {"x": 7, "y": 3, "matrix": [3, 7]}, + {"x": 8, "y": 3, "matrix": [3, 8]}, + {"x": 9, "y": 3, "matrix": [3, 9]}, + {"x": 10, "y": 3, "matrix": [3, 10]}, + {"x": 11, "y": 3, "matrix": [3, 11]}, + {"x": 12, "y": 3, "matrix": [3, 12]}, + {"x": 13, "y": 3, "matrix": [3, 13]}, + {"x": 14, "y": 3, "matrix": [3, 14]}, + {"x": 15, "y": 3, "matrix": [3, 15]} + ] + } + } +} 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/keyboard.json b/keyboards/40percentclub/5x5/keyboard.json index 0a50d29ffe..039d9fe47b 100644 --- a/keyboards/40percentclub/5x5/keyboard.json +++ b/keyboards/40percentclub/5x5/keyboard.json @@ -16,6 +16,12 @@ "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/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/info.json deleted file mode 100644 index 00e91edb42..0000000000 --- a/keyboards/40percentclub/6lit/info.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "keyboard_name": "The 6lit Macropad", - "manufacturer": "di0ib", - "url": "", - "maintainer": "qmk", - "usb": { - "vid": "0x4025", - "pid": "0x0F61", - "device_version": "1.0.0" - }, - "matrix_pins": { - "cols": ["F6", "F7", "B1"], - "rows": ["D7", "E6"] - }, - "diode_direction": "COL2ROW", - "split": { - "soft_serial_pin": "D0" - }, - "processor": "atmega32u4", - "bootloader": "caterina", - "community_layouts": ["ortho_2x3", "ortho_2x6"], - "layout_aliases": { - "LAYOUT_macro": "LAYOUT_ortho_2x3", - "LAYOUT_split": "LAYOUT_ortho_2x6" - }, - "layouts": { - "LAYOUT_ortho_2x3": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, - {"matrix": [1, 2], "x": 2, "y": 1} - ] - }, - "LAYOUT_ortho_2x6": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [2, 2], "x": 3, "y": 0}, - {"matrix": [2, 1], "x": 4, "y": 0}, - {"matrix": [2, 0], "x": 5, "y": 0}, - - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, - {"matrix": [1, 2], "x": 2, "y": 1}, - {"matrix": [3, 2], "x": 3, "y": 1}, - {"matrix": [3, 1], "x": 4, "y": 1}, - {"matrix": [3, 0], "x": 5, "y": 1} - ] - } - } -} diff --git a/keyboards/40percentclub/6lit/keyboard.json b/keyboards/40percentclub/6lit/keyboard.json new file mode 100644 index 0000000000..06ffc890d2 --- /dev/null +++ b/keyboards/40percentclub/6lit/keyboard.json @@ -0,0 +1,70 @@ +{ + "keyboard_name": "The 6lit Macropad", + "manufacturer": "di0ib", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0x4025", + "pid": "0x0F61", + "device_version": "1.0.0" + }, + "matrix_pins": { + "cols": ["F6", "F7", "B1"], + "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", + "bootloader": "caterina", + "community_layouts": ["ortho_2x3", "ortho_2x6"], + "layout_aliases": { + "LAYOUT_macro": "LAYOUT_ortho_2x3", + "LAYOUT_split": "LAYOUT_ortho_2x6" + }, + "layouts": { + "LAYOUT_ortho_2x3": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1} + ] + }, + "LAYOUT_ortho_2x6": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [2, 2], "x": 3, "y": 0}, + {"matrix": [2, 1], "x": 4, "y": 0}, + {"matrix": [2, 0], "x": 5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [3, 2], "x": 3, "y": 1}, + {"matrix": [3, 1], "x": 4, "y": 1}, + {"matrix": [3, 0], "x": 5, "y": 1} + ] + } + } +} 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/info.json deleted file mode 100644 index 89fc4d11a0..0000000000 --- a/keyboards/40percentclub/foobar/info.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "keyboard_name": "The foobar Keyboard", - "manufacturer": "di0ib", - "url": "", - "maintainer": "qmk", - "usb": { - "vid": "0x4025", - "pid": "0x0F00", - "device_version": "1.0.0" - }, - "matrix_pins": { - "cols": ["F6", "F7", "B1", "B3", "B2"], - "rows": ["D7", "E6", "B4"] - }, - "diode_direction": "COL2ROW", - "split": { - "soft_serial_pin": "D0" - }, - "processor": "atmega32u4", - "bootloader": "caterina", - "community_layouts": ["ortho_3x10"], - "layout_aliases": { - "LAYOUT_macro": "LAYOUT_ortho_3x5", - "LAYOUT_split": "LAYOUT_ortho_3x10" - }, - "layouts": { - "LAYOUT_ortho_3x5": { - "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": [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": [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} - ] - }, - "LAYOUT_ortho_3x10": { - "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": [3, 4], "x": 5, "y": 0}, - {"matrix": [3, 3], "x": 6, "y": 0}, - {"matrix": [3, 2], "x": 7, "y": 0}, - {"matrix": [3, 1], "x": 8, "y": 0}, - {"matrix": [3, 0], "x": 9, "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": [4, 4], "x": 5, "y": 1}, - {"matrix": [4, 3], "x": 6, "y": 1}, - {"matrix": [4, 2], "x": 7, "y": 1}, - {"matrix": [4, 1], "x": 8, "y": 1}, - {"matrix": [4, 0], "x": 9, "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": [5, 4], "x": 5, "y": 2}, - {"matrix": [5, 3], "x": 6, "y": 2}, - {"matrix": [5, 2], "x": 7, "y": 2}, - {"matrix": [5, 1], "x": 8, "y": 2}, - {"matrix": [5, 0], "x": 9, "y": 2} - ] - } - } -} diff --git a/keyboards/40percentclub/foobar/keyboard.json b/keyboards/40percentclub/foobar/keyboard.json new file mode 100644 index 0000000000..0a2769e04a --- /dev/null +++ b/keyboards/40percentclub/foobar/keyboard.json @@ -0,0 +1,99 @@ +{ + "keyboard_name": "The foobar Keyboard", + "manufacturer": "di0ib", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0x4025", + "pid": "0x0F00", + "device_version": "1.0.0" + }, + "matrix_pins": { + "cols": ["F6", "F7", "B1", "B3", "B2"], + "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", + "bootloader": "caterina", + "community_layouts": ["ortho_3x10"], + "layout_aliases": { + "LAYOUT_macro": "LAYOUT_ortho_3x5", + "LAYOUT_split": "LAYOUT_ortho_3x10" + }, + "layouts": { + "LAYOUT_ortho_3x5": { + "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": [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": [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} + ] + }, + "LAYOUT_ortho_3x10": { + "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": [3, 4], "x": 5, "y": 0}, + {"matrix": [3, 3], "x": 6, "y": 0}, + {"matrix": [3, 2], "x": 7, "y": 0}, + {"matrix": [3, 1], "x": 8, "y": 0}, + {"matrix": [3, 0], "x": 9, "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": [4, 4], "x": 5, "y": 1}, + {"matrix": [4, 3], "x": 6, "y": 1}, + {"matrix": [4, 2], "x": 7, "y": 1}, + {"matrix": [4, 1], "x": 8, "y": 1}, + {"matrix": [4, 0], "x": 9, "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": [5, 4], "x": 5, "y": 2}, + {"matrix": [5, 3], "x": 6, "y": 2}, + {"matrix": [5, 2], "x": 7, "y": 2}, + {"matrix": [5, 1], "x": 8, "y": 2}, + {"matrix": [5, 0], "x": 9, "y": 2} + ] + } + } +} 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 . -*/ - -#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/info.json deleted file mode 100644 index 8174e639c2..0000000000 --- a/keyboards/40percentclub/half_n_half/info.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "keyboard_name": "half_n_half", - "manufacturer": "di0ib", - "url": "", - "maintainer": "qmk", - "usb": { - "vid": "0x4025", - "pid": "0x4A1F", - "device_version": "1.0.0" - }, - "matrix_pins": { - "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], - "rows": ["D4", "C6", "D7", "E6"] - }, - "diode_direction": "COL2ROW", - "split": { - "soft_serial_pin": "D0" - }, - "processor": "atmega32u4", - "bootloader": "caterina", - "layouts": { - "LAYOUT": { - "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": [4, 6], "x": 7, "y": 0}, - {"matrix": [4, 5], "x": 8, "y": 0}, - {"matrix": [4, 4], "x": 9, "y": 0}, - {"matrix": [4, 3], "x": 10, "y": 0}, - {"matrix": [4, 2], "x": 11, "y": 0}, - {"matrix": [4, 1], "x": 12, "y": 0}, - {"matrix": [4, 0], "x": 13, "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": [5, 6], "x": 7, "y": 1}, - {"matrix": [5, 5], "x": 8, "y": 1}, - {"matrix": [5, 4], "x": 9, "y": 1}, - {"matrix": [5, 3], "x": 10, "y": 1}, - {"matrix": [5, 2], "x": 11, "y": 1}, - {"matrix": [5, 1], "x": 12, "y": 1}, - {"matrix": [5, 0], "x": 13, "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": [6, 6], "x": 7, "y": 2}, - {"matrix": [6, 5], "x": 8, "y": 2}, - {"matrix": [6, 4], "x": 9, "y": 2}, - {"matrix": [6, 3], "x": 10, "y": 2}, - {"matrix": [6, 2], "x": 11, "y": 2}, - {"matrix": [6, 1], "x": 12, "y": 2}, - {"matrix": [6, 0], "x": 13, "y": 2}, - - {"matrix": [3, 4], "x": 4, "y": 3, "w": 2}, - - {"matrix": [7, 4], "x": 8, "y": 3, "w": 2} - ] - } - } -} diff --git a/keyboards/40percentclub/half_n_half/keyboard.json b/keyboards/40percentclub/half_n_half/keyboard.json new file mode 100644 index 0000000000..3e0c646a50 --- /dev/null +++ b/keyboards/40percentclub/half_n_half/keyboard.json @@ -0,0 +1,92 @@ +{ + "keyboard_name": "half_n_half", + "manufacturer": "di0ib", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0x4025", + "pid": "0x4A1F", + "device_version": "1.0.0" + }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], + "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", + "bootloader": "caterina", + "layouts": { + "LAYOUT": { + "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": [4, 6], "x": 7, "y": 0}, + {"matrix": [4, 5], "x": 8, "y": 0}, + {"matrix": [4, 4], "x": 9, "y": 0}, + {"matrix": [4, 3], "x": 10, "y": 0}, + {"matrix": [4, 2], "x": 11, "y": 0}, + {"matrix": [4, 1], "x": 12, "y": 0}, + {"matrix": [4, 0], "x": 13, "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": [5, 6], "x": 7, "y": 1}, + {"matrix": [5, 5], "x": 8, "y": 1}, + {"matrix": [5, 4], "x": 9, "y": 1}, + {"matrix": [5, 3], "x": 10, "y": 1}, + {"matrix": [5, 2], "x": 11, "y": 1}, + {"matrix": [5, 1], "x": 12, "y": 1}, + {"matrix": [5, 0], "x": 13, "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": [6, 6], "x": 7, "y": 2}, + {"matrix": [6, 5], "x": 8, "y": 2}, + {"matrix": [6, 4], "x": 9, "y": 2}, + {"matrix": [6, 3], "x": 10, "y": 2}, + {"matrix": [6, 2], "x": 11, "y": 2}, + {"matrix": [6, 1], "x": 12, "y": 2}, + {"matrix": [6, 0], "x": 13, "y": 2}, + + {"matrix": [3, 4], "x": 4, "y": 3, "w": 2}, + + {"matrix": [7, 4], "x": 8, "y": 3, "w": 2} + ] + } + } +} 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 . - */ - -#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 f91b054f29..a7124adec2 100644 --- a/keyboards/40percentclub/i75/info.json +++ b/keyboards/40percentclub/i75/info.json @@ -1,19 +1,110 @@ { - "keyboard_name": "i75", - "manufacturer": "di0ib", - "url": "", - "maintainer": "qmk", - "features": { - "bootmagic": true, - "command": true, - "console": true, - "extrakey": true, - "mousekey": true, - "nkro": false - }, - "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/keyboard.json b/keyboards/40percentclub/i75/promicro/keyboard.json index 4c3f44469c..933c4f8616 100644 --- a/keyboards/40percentclub/i75/promicro/keyboard.json +++ b/keyboards/40percentclub/i75/promicro/keyboard.json @@ -5,91 +5,5 @@ }, "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} - ] - } - } + "bootloader": "caterina" } diff --git a/keyboards/40percentclub/i75/teensy2/keyboard.json b/keyboards/40percentclub/i75/teensy2/keyboard.json index cc441a1096..2296a57828 100644 --- a/keyboards/40percentclub/i75/teensy2/keyboard.json +++ b/keyboards/40percentclub/i75/teensy2/keyboard.json @@ -5,91 +5,5 @@ }, "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} - ] - } - } + "bootloader": "halfkay" } 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/keyboard.json b/keyboards/40percentclub/luddite/keyboard.json index 8a0b5d5913..a9f79d7369 100644 --- a/keyboards/40percentclub/luddite/keyboard.json +++ b/keyboards/40percentclub/luddite/keyboard.json @@ -18,6 +18,12 @@ "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/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 - -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 . -*/ - -#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/keyboard.json b/keyboards/40percentclub/mf68/keyboard.json index 47259ac23f..45585d5e47 100644 --- a/keyboards/40percentclub/mf68/keyboard.json +++ b/keyboards/40percentclub/mf68/keyboard.json @@ -17,6 +17,12 @@ "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/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 . - */ - -#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/keyboard.json b/keyboards/40percentclub/nein/keyboard.json index 53a3a7639b..9e1711f71e 100644 --- a/keyboards/40percentclub/nein/keyboard.json +++ b/keyboards/40percentclub/nein/keyboard.json @@ -18,6 +18,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "direct": [ ["F4", "F5", "F6"], 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 . - */ - -#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/info.json deleted file mode 100644 index 214d1da2a0..0000000000 --- a/keyboards/40percentclub/nori/info.json +++ /dev/null @@ -1,161 +0,0 @@ -{ - "keyboard_name": "The nori Keyboard", - "manufacturer": "di0ib", - "url": "", - "maintainer": "qmk", - "usb": { - "vid": "0x4025", - "pid": "0x0A0C", - "device_version": "4.4.4" - }, - "matrix_pins": { - "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D4", "C6", "D7", "E6"], - "rows": ["D3", "D2", "D1", "D0"] - }, - "diode_direction": "COL2ROW", - "backlight": { - "pin": "B5" - }, - "rgblight": { - "saturation_steps": 8, - "brightness_steps": 8, - "led_count": 10, - "animations": { - "breathing": true, - "rainbow_mood": true, - "rainbow_swirl": true, - "snake": true, - "knight": true, - "christmas": true, - "static_gradient": true, - "rgb_test": true, - "alternating": true, - "twinkle": true - } - }, - "ws2812": { - "pin": "B4" - }, - "processor": "atmega32u4", - "bootloader": "caterina", - "community_layouts": ["ortho_4x4", "ortho_4x12"], - "layouts": { - "LAYOUT_ortho_4x4": { - "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": [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": [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": [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} - ] - }, - "LAYOUT_ortho_4x8": { - "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": [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": [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": [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} - ] - }, - "LAYOUT_ortho_4x12": { - "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, "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/40percentclub/nori/keyboard.json b/keyboards/40percentclub/nori/keyboard.json new file mode 100644 index 0000000000..968e74e19e --- /dev/null +++ b/keyboards/40percentclub/nori/keyboard.json @@ -0,0 +1,176 @@ +{ + "keyboard_name": "The nori Keyboard", + "manufacturer": "di0ib", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0x4025", + "pid": "0x0A0C", + "device_version": "4.4.4" + }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D4", "C6", "D7", "E6"], + "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" + }, + "rgblight": { + "saturation_steps": 8, + "brightness_steps": 8, + "led_count": 10, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } + }, + "ws2812": { + "pin": "B4" + }, + "processor": "atmega32u4", + "bootloader": "caterina", + "community_layouts": ["ortho_4x4", "ortho_4x12"], + "layouts": { + "LAYOUT_ortho_4x4": { + "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": [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": [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": [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} + ] + }, + "LAYOUT_ortho_4x8": { + "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": [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": [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": [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} + ] + }, + "LAYOUT_ortho_4x12": { + "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, "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/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 . - */ - -#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 b04b050045..49b8bedbe3 100644 --- a/keyboards/40percentclub/polyandry/info.json +++ b/keyboards/40percentclub/polyandry/info.json @@ -11,9 +11,36 @@ "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/keyboard.json b/keyboards/40percentclub/polyandry/promicro/keyboard.json index 8a8cd98794..a8169c93dd 100644 --- a/keyboards/40percentclub/polyandry/promicro/keyboard.json +++ b/keyboards/40percentclub/polyandry/promicro/keyboard.json @@ -5,26 +5,5 @@ }, "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} - ] - } - } + "bootloader": "caterina" } diff --git a/keyboards/40percentclub/polyandry/teensy2/keyboard.json b/keyboards/40percentclub/polyandry/teensy2/keyboard.json index 33fd1d71df..0a870332b2 100644 --- a/keyboards/40percentclub/polyandry/teensy2/keyboard.json +++ b/keyboards/40percentclub/polyandry/teensy2/keyboard.json @@ -5,26 +5,5 @@ }, "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} - ] - } - } + "bootloader": "halfkay" } 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/keyboard.json b/keyboards/40percentclub/tomato/keyboard.json index a44946d372..c0b526cbc6 100644 --- a/keyboards/40percentclub/tomato/keyboard.json +++ b/keyboards/40percentclub/tomato/keyboard.json @@ -37,6 +37,15 @@ "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/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 . /* 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/info.json deleted file mode 100644 index 668f277f40..0000000000 --- a/keyboards/40percentclub/ut47/info.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "keyboard_name": "ut47", - "manufacturer": "40percent.club", - "url": "", - "maintainer": "qmk", - "usb": { - "vid": "0x4025", - "pid": "0x7574", - "device_version": "0.0.1" - }, - "processor": "atmega32u4", - "bootloader": "caterina", - "layouts": { - "LAYOUT": { - "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, "y": 0, "w": 1.5}, - - {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, - {"matrix": [1, 1], "x": 1.25, "y": 1}, - {"matrix": [1, 2], "x": 2.25, "y": 1}, - {"matrix": [1, 3], "x": 3.25, "y": 1}, - {"matrix": [1, 4], "x": 4.25, "y": 1}, - {"matrix": [1, 5], "x": 5.25, "y": 1}, - {"matrix": [1, 6], "x": 6.25, "y": 1}, - {"matrix": [1, 7], "x": 7.25, "y": 1}, - {"matrix": [1, 8], "x": 8.25, "y": 1}, - {"matrix": [1, 9], "x": 9.25, "y": 1}, - {"matrix": [1, 10], "x": 10.25, "y": 1}, - {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.25}, - - {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, - {"matrix": [2, 1], "x": 1.5, "y": 2}, - {"matrix": [2, 2], "x": 2.5, "y": 2}, - {"matrix": [2, 3], "x": 3.5, "y": 2}, - {"matrix": [2, 4], "x": 4.5, "y": 2}, - {"matrix": [2, 5], "x": 5.5, "y": 2}, - {"matrix": [2, 6], "x": 6.5, "y": 2}, - {"matrix": [2, 7], "x": 7.5, "y": 2}, - {"matrix": [2, 8], "x": 8.5, "y": 2}, - {"matrix": [2, 9], "x": 9.5, "y": 2}, - {"matrix": [2, 10], "x": 10.5, "y": 2}, - {"matrix": [2, 11], "x": 11.5, "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, "w": 1.25}, - {"matrix": [3, 5], "x": 5.25, "y": 3, "w": 2}, - {"matrix": [3, 7], "x": 7.25, "y": 3, "w": 1.25}, - {"matrix": [3, 8], "x": 8.5, "y": 3}, - {"matrix": [3, 9], "x": 9.5, "y": 3}, - {"matrix": [3, 10], "x": 10.5, "y": 3}, - {"matrix": [3, 11], "x": 11.5, "y": 3} - ] - } - } -} diff --git a/keyboards/40percentclub/ut47/keyboard.json b/keyboards/40percentclub/ut47/keyboard.json new file mode 100644 index 0000000000..62e4a940a1 --- /dev/null +++ b/keyboards/40percentclub/ut47/keyboard.json @@ -0,0 +1,82 @@ +{ + "keyboard_name": "ut47", + "manufacturer": "40percent.club", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0x4025", + "pid": "0x7574", + "device_version": "0.0.1" + }, + "processor": "atmega32u4", + "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, + "layouts": { + "LAYOUT": { + "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, "y": 0, "w": 1.5}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 10], "x": 10.25, "y": 1}, + {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [2, 6], "x": 6.5, "y": 2}, + {"matrix": [2, 7], "x": 7.5, "y": 2}, + {"matrix": [2, 8], "x": 8.5, "y": 2}, + {"matrix": [2, 9], "x": 9.5, "y": 2}, + {"matrix": [2, 10], "x": 10.5, "y": 2}, + {"matrix": [2, 11], "x": 11.5, "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, "w": 1.25}, + {"matrix": [3, 5], "x": 5.25, "y": 3, "w": 2}, + {"matrix": [3, 7], "x": 7.25, "y": 3, "w": 1.25}, + {"matrix": [3, 8], "x": 8.5, "y": 3}, + {"matrix": [3, 9], "x": 9.5, "y": 3}, + {"matrix": [3, 10], "x": 10.5, "y": 3}, + {"matrix": [3, 11], "x": 11.5, "y": 3} + ] + } + } +} 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 -- cgit v1.2.3