diff options
Diffstat (limited to 'keyboards/xelus/dawn60')
-rw-r--r-- | keyboards/xelus/dawn60/info.json | 6 | ||||
-rw-r--r-- | keyboards/xelus/dawn60/rev1/config.h | 5 | ||||
-rw-r--r-- | keyboards/xelus/dawn60/rev1/keyboard.json (renamed from keyboards/xelus/dawn60/rev1/info.json) | 6 | ||||
-rw-r--r-- | keyboards/xelus/dawn60/rev1/rules.mk | 19 | ||||
-rw-r--r-- | keyboards/xelus/dawn60/rev1_qmk/config.h | 5 | ||||
-rw-r--r-- | keyboards/xelus/dawn60/rev1_qmk/keyboard.json (renamed from keyboards/xelus/dawn60/rev1_qmk/info.json) | 11 | ||||
-rw-r--r-- | keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c | 2 | ||||
-rw-r--r-- | keyboards/xelus/dawn60/rev1_qmk/rules.mk | 25 |
8 files changed, 29 insertions, 50 deletions
diff --git a/keyboards/xelus/dawn60/info.json b/keyboards/xelus/dawn60/info.json index 4bdc6df8a9..aafac25e05 100644 --- a/keyboards/xelus/dawn60/info.json +++ b/keyboards/xelus/dawn60/info.json @@ -8,6 +8,12 @@ "pid": "0x0060", "device_version": "0.0.1" }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/xelus/dawn60/rev1/config.h b/keyboards/xelus/dawn60/rev1/config.h index 2552942635..e64b0895fa 100644 --- a/keyboards/xelus/dawn60/rev1/config.h +++ b/keyboards/xelus/dawn60/rev1/config.h @@ -20,11 +20,6 @@ #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA #define IS31FL3731_LED_COUNT 64 -// 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/xelus/dawn60/rev1/info.json b/keyboards/xelus/dawn60/rev1/keyboard.json index 872bf0d33a..bfdaf26e76 100644 --- a/keyboards/xelus/dawn60/rev1/info.json +++ b/keyboards/xelus/dawn60/rev1/keyboard.json @@ -1,4 +1,10 @@ { + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "ws2812": { "pin": "F0" }, diff --git a/keyboards/xelus/dawn60/rev1/rules.mk b/keyboards/xelus/dawn60/rev1/rules.mk index 0a72a60eca..69c283a207 100644 --- a/keyboards/xelus/dawn60/rev1/rules.mk +++ b/keyboards/xelus/dawn60/rev1/rules.mk @@ -1,29 +1,14 @@ # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. -OPT_DEFS += -DNO_SUSPEND_POWER_DOWN - -# 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - We have custom RGB underglow +NO_SUSPEND_POWER_DOWN = yes CIE1931_CURVE = yes +I2C_DRIVER_REQUIRED = yes WS2812_DRIVER_REQUIRED = yes - # project specific files SRC += keyboards/wilba_tech/wt_main.c \ keyboards/wilba_tech/wt_rgb_backlight.c \ quantum/color.c \ drivers/led/issi/is31fl3731.c - -I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/xelus/dawn60/rev1_qmk/config.h b/keyboards/xelus/dawn60/rev1_qmk/config.h index 81d5dc1e83..b54fcaee2a 100644 --- a/keyboards/xelus/dawn60/rev1_qmk/config.h +++ b/keyboards/xelus/dawn60/rev1_qmk/config.h @@ -15,11 +15,6 @@ */ #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 - //RGB Underglow defines #define WS2812_LED_TOTAL 20 diff --git a/keyboards/xelus/dawn60/rev1_qmk/info.json b/keyboards/xelus/dawn60/rev1_qmk/keyboard.json index 12d6a5d529..7c3aa607df 100644 --- a/keyboards/xelus/dawn60/rev1_qmk/info.json +++ b/keyboards/xelus/dawn60/rev1_qmk/keyboard.json @@ -1,4 +1,15 @@ { + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgb_matrix": true + }, "ws2812": { "pin": "F0" }, diff --git a/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c b/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c index 6b8f91bc2f..a153a7cf83 100644 --- a/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c +++ b/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c @@ -155,7 +155,7 @@ static void init(void) { is31fl3731_update_led_control_registers(1); //RGB Underglow ws2812 - + ws2812_init(); } static void flush(void) { diff --git a/keyboards/xelus/dawn60/rev1_qmk/rules.mk b/keyboards/xelus/dawn60/rev1_qmk/rules.mk index edb15fa760..16816a5bdf 100644 --- a/keyboards/xelus/dawn60/rev1_qmk/rules.mk +++ b/keyboards/xelus/dawn60/rev1_qmk/rules.mk @@ -1,30 +1,11 @@ # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. -OPT_DEFS += -DNO_SUSPEND_POWER_DOWN +NO_SUSPEND_POWER_DOWN = yes -# 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 = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - We have custom RGB underglow - -RGB_MATRIX_ENABLE = yes # Enable RGB matrix effects. +I2C_DRIVER_REQUIRED = yes WS2812_DRIVER_REQUIRED = yes -COMMON_VPATH += $(DRIVER_PATH)/issi - # project specific files +COMMON_VPATH += $(DRIVER_PATH)/issi SRC += drivers/led/issi/is31fl3731.c - -I2C_DRIVER_REQUIRED = yes - -LTO_ENABLE = yes |