From b4b34cd2cd4a1c6bbb6c9990fdd48f239d931af7 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 Jun 2022 08:24:29 +1000 Subject: [PATCH] Wasdat: move some stuff to info.json (#17327) --- keyboards/evyd13/wasdat/config.h | 86 ------------------------------- keyboards/evyd13/wasdat/info.json | 29 +++++++++++ keyboards/evyd13/wasdat/rules.mk | 22 +------- 3 files changed, 30 insertions(+), 107 deletions(-) diff --git a/keyboards/evyd13/wasdat/config.h b/keyboards/evyd13/wasdat/config.h index e151496aed3..821cc26b652 100644 --- a/keyboards/evyd13/wasdat/config.h +++ b/keyboards/evyd13/wasdat/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4705 -#define PRODUCT_ID 0xC474 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Evyd13 -#define PRODUCT Wasdat - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 16 @@ -46,87 +39,8 @@ along with this program. If not, see . #define SN74X138_ADDRESS_PINS { D2, D1, D0 } -// For QMK DFU -#define QMK_ESC_OUTPUT D6 -#define QMK_ESC_INPUT D7 -#define QMK_LED B0 - -#define LED_NUM_LOCK_PIN B2 -#define LED_CAPS_LOCK_PIN B0 -#define LED_SCROLL_LOCK_PIN B1 #define LED_PIN_ON_STATE 0 -// #define BACKLIGHT_PIN B7 -// #define BACKLIGHT_BREATHING -// #define BACKLIGHT_LEVELS 3 - -// #define RGB_DI_PIN E2 -// #ifdef RGB_DI_PIN -// #define RGBLED_NUM 16 -// #define RGBLIGHT_HUE_STEP 8 -// #define RGBLIGHT_SAT_STEP 8 -// #define RGBLIGHT_VAL_STEP 8 -// #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ -// #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -// /*== all animations enable ==*/ -// #define RGBLIGHT_ANIMATIONS -// /*== or choose animations ==*/ -// #define RGBLIGHT_EFFECT_BREATHING -// #define RGBLIGHT_EFFECT_RAINBOW_MOOD -// #define RGBLIGHT_EFFECT_RAINBOW_SWIRL -// #define RGBLIGHT_EFFECT_SNAKE -// #define RGBLIGHT_EFFECT_KNIGHT -// #define RGBLIGHT_EFFECT_CHRISTMAS -// #define RGBLIGHT_EFFECT_STATIC_GRADIENT -// #define RGBLIGHT_EFFECT_RGB_TEST -// #define RGBLIGHT_EFFECT_ALTERNATING -// /*== customize breathing effect ==*/ -// /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ -// #define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 -// /*==== use exp() and sin() ====*/ -// #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 -// #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 -// #endif - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - -/* number of backlight levels */ - -/* 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 - -/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. - * This is userful for the Windows task manager shortcut (ctrl+shift+esc). - */ -// #define GRAVE_ESC_CTRL_OVERRIDE - -/* - * Force NKRO - * - * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved - * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the - * makefile for this to work.) - * - * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) - * until the next keyboard reset. - * - * NKRO may prevent your keystrokes from being detected in the BIOS, but it is - * fully operational during normal computer usage. - * - * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) - * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by - * bootmagic, NKRO mode will always be enabled until it is toggled again during a - * power-up. - * - */ -//#define FORCE_NKRO - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/evyd13/wasdat/info.json b/keyboards/evyd13/wasdat/info.json index 23e59c6b33e..32a25d96d2e 100644 --- a/keyboards/evyd13/wasdat/info.json +++ b/keyboards/evyd13/wasdat/info.json @@ -1,7 +1,36 @@ { "keyboard_name": "Wasdat", + "manufacturer": "Evyd13", "url": "https://maartenwut.com/product/wasdat/", "maintainer": "evyd13", + "processor": "atmega32u4", + "bootloader": "qmk-dfu", + "usb": { + "vid": "0x4705", + "pid": "0xC474", + "device_version": "0.0.1", + }, + "qmk_lufa_bootloader": { + "esc_output": "D6", + "esc_input": "D7", + "led": "B0" + }, + "features": { + "bootmagic": true, + "extrakey": true, + "nkro": true, + }, + "indicators": { + "num_lock": "B2", + "caps_lock": "B0", + "scroll_lock": "B1" + }, + "community_layouts": [ + "fullsize_ansi", + "fullsize_iso", + "tkl_ansi", + "tkl_iso" + ], "layouts": { "LAYOUT_fullsize_ansi": { "layout": [ diff --git a/keyboards/evyd13/wasdat/rules.mk b/keyboards/evyd13/wasdat/rules.mk index bb4261a4fea..64eebdfac4b 100644 --- a/keyboards/evyd13/wasdat/rules.mk +++ b/keyboards/evyd13/wasdat/rules.mk @@ -1,24 +1,4 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - CUSTOM_MATRIX = lite + VPATH += drivers/gpio SRC += matrix.c sn74x138.c - -LAYOUTS = fullsize_ansi fullsize_iso tkl_ansi tkl_iso