From 5d76b5f6551ade03285e27a5d3ea6fcf09ae0810 Mon Sep 17 00:00:00 2001 From: moyi4681 Date: Thu, 21 Nov 2019 03:19:10 -0800 Subject: [Keyboard] dztech rgb pcb v2 support (#7423) * dztech rgb pcb v2 support dztech rgb pcb v2 support * Update config.h * Update rules.mk * Update rules.mk * Update rules.mk * Update keyboards/dztech/dz60rgb/v2/rules.mk Co-Authored-By: fauxpark * Update keyboards/dztech/dz60rgb/v2/rules.mk Co-Authored-By: fauxpark * Update keyboards/dztech/dz60rgb_ansi/v2/rules.mk Co-Authored-By: fauxpark * Update keyboards/dztech/dz60rgb_ansi/v2/rules.mk Co-Authored-By: fauxpark * Update keyboards/dztech/dz60rgb_wkl/v2/rules.mk Co-Authored-By: fauxpark * Update keyboards/dztech/dz60rgb_wkl/v2/rules.mk Co-Authored-By: fauxpark --- keyboards/dztech/dz60rgb_ansi/config.h | 37 -------------------------- keyboards/dztech/dz60rgb_ansi/rules.mk | 16 ----------- keyboards/dztech/dz60rgb_ansi/v1/config.h | 36 +++++++++++++++++++++++++ keyboards/dztech/dz60rgb_ansi/v1/rules.mk | 14 ++++++++++ keyboards/dztech/dz60rgb_ansi/v2/config.h | 44 +++++++++++++++++++++++++++++++ keyboards/dztech/dz60rgb_ansi/v2/rules.mk | 23 ++++++++++++++++ 6 files changed, 117 insertions(+), 53 deletions(-) delete mode 100644 keyboards/dztech/dz60rgb_ansi/rules.mk create mode 100644 keyboards/dztech/dz60rgb_ansi/v1/config.h create mode 100644 keyboards/dztech/dz60rgb_ansi/v1/rules.mk create mode 100644 keyboards/dztech/dz60rgb_ansi/v2/config.h create mode 100644 keyboards/dztech/dz60rgb_ansi/v2/rules.mk (limited to 'keyboards/dztech/dz60rgb_ansi') diff --git a/keyboards/dztech/dz60rgb_ansi/config.h b/keyboards/dztech/dz60rgb_ansi/config.h index 2bd40a44d0..e38246b228 100644 --- a/keyboards/dztech/dz60rgb_ansi/config.h +++ b/keyboards/dztech/dz60rgb_ansi/config.h @@ -1,39 +1,2 @@ #pragma once - #include "config_common.h" - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x1219 -#define DEVICE_VER 0x0001 -#define MANUFACTURER DZTECH - -#define PRODUCT DZ60RGB -#define DESCRIPTION DZ60 ARM RGB keyboard -#define MATRIX_ROWS 5 -#define MATRIX_COLS 14 - -#define MATRIX_ROW_PINS { B1, B10, B11, B14, B12 } -#define MATRIX_COL_PINS {A6, A7, B0, B13, B15, A8, A15, B3, B4, B5, B8, B9, C13, C14 } - -/* #define UNUSED_PINS {A0,A1,A2, A3,A4,A9,A10,C15,A13,A14,B2}*/ - -#define DIODE_DIRECTION COL2ROW - -#define DEBOUNCE 3 -#ifdef RGB_MATRIX_ENABLE -#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects -#define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended -#define RGB_MATRIX_KEYPRESSES -#define RGB_MATRIX_LED_PROCESS_LIMIT 4 -#define RGB_MATRIX_LED_FLUSH_LIMIT 26 -#define DISABLE_RGB_MATRIX_SPLASH -#define DISABLE_RGB_MATRIX_MULTISPLASH -#define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH -#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL -#define DRIVER_ADDR_1 0b1010000 -#define DRIVER_ADDR_2 0b1010000 // this is here for compliancy reasons. -#define DRIVER_COUNT 2 -#define DRIVER_1_LED_TOTAL 61 -#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL -#endif \ No newline at end of file diff --git a/keyboards/dztech/dz60rgb_ansi/rules.mk b/keyboards/dztech/dz60rgb_ansi/rules.mk deleted file mode 100644 index 0636150529..0000000000 --- a/keyboards/dztech/dz60rgb_ansi/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# MCU name -MCU = STM32F303 - -BACKLIGHT_ENABLE = no -BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend -NKRO_ENABLE = no # USB Nkey Rollover -AUDIO_ENABLE = no -RGB_MATRIX_ENABLE = IS31FL3733 # Use RGB matrix -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in - -LAYOUTS = 60_ansi diff --git a/keyboards/dztech/dz60rgb_ansi/v1/config.h b/keyboards/dztech/dz60rgb_ansi/v1/config.h new file mode 100644 index 0000000000..bd9d6e848c --- /dev/null +++ b/keyboards/dztech/dz60rgb_ansi/v1/config.h @@ -0,0 +1,36 @@ +#pragma once +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0x1220 +#define DEVICE_VER 0x0001 +#define MANUFACTURER DZTECH + +#define PRODUCT DZ60RGB_ANSI +#define DESCRIPTION DZ60 ARM RGB keyboard +#define MATRIX_ROWS 5 +#define MATRIX_COLS 14 + +#define MATRIX_ROW_PINS { B1, B10, B11, B14, B12 } +#define MATRIX_COL_PINS {A6, A7, B0, B13, B15, A8, A15, B3, B4, B5, B8, B9, C13, C14 } + +/* #define UNUSED_PINS {A0,A1,A2, A3,A4,A9,A10,C15,A13,A14,B2}*/ + +#define DIODE_DIRECTION COL2ROW + +#define DEBOUNCE 3 +#ifdef RGB_MATRIX_ENABLE +#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects +#define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended +#define RGB_MATRIX_KEYPRESSES +#define RGB_MATRIX_LED_PROCESS_LIMIT 4 +#define RGB_MATRIX_LED_FLUSH_LIMIT 26 +#define DISABLE_RGB_MATRIX_SPLASH +#define DISABLE_RGB_MATRIX_MULTISPLASH +#define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH +#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL +#define DRIVER_ADDR_1 0b1010000 +#define DRIVER_ADDR_2 0b1010000 // this is here for compliancy reasons. +#define DRIVER_COUNT 2 +#define DRIVER_1_LED_TOTAL 61 +#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL +#endif \ No newline at end of file diff --git a/keyboards/dztech/dz60rgb_ansi/v1/rules.mk b/keyboards/dztech/dz60rgb_ansi/v1/rules.mk new file mode 100644 index 0000000000..4f2073e6fa --- /dev/null +++ b/keyboards/dztech/dz60rgb_ansi/v1/rules.mk @@ -0,0 +1,14 @@ +# MCU name +MCU = STM32F303 + +BACKLIGHT_ENABLE = no +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend +NKRO_ENABLE = yes # USB Nkey Rollover +AUDIO_ENABLE = no +RGB_MATRIX_ENABLE = IS31FL3733 # Use RGB matrix +NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in diff --git a/keyboards/dztech/dz60rgb_ansi/v2/config.h b/keyboards/dztech/dz60rgb_ansi/v2/config.h new file mode 100644 index 0000000000..b963fa2beb --- /dev/null +++ b/keyboards/dztech/dz60rgb_ansi/v2/config.h @@ -0,0 +1,44 @@ +#pragma once +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0x1220 +#define DEVICE_VER 0x0002 +#define MANUFACTURER DZTECH + +#define PRODUCT DZ60RGB_ANSI +#define DESCRIPTION DZ60 AVR RGB keyboard +#define MATRIX_ROWS 5 +#define MATRIX_COLS 14 + +#define MATRIX_ROW_PINS {F5, F4, F1, B3, B2 } +#define MATRIX_COL_PINS {C7, F7, F6, F0, B0, B1, B4, D7, D6, D4, D5, D3, D2, B7 } +#define UNUSED_PINS +#define DIODE_DIRECTION COL2ROW + +#define DEBOUNCE 3 +#ifdef RGB_MATRIX_ENABLE +#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects +#define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended +#define RGB_MATRIX_KEYPRESSES +#define RGB_MATRIX_FRAMEBUFFER_EFFECTS +#define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN +#define DISABLE_RGB_MATRIX_BAND_SAT +#define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT +#define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT +#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +#define DISABLE_RGB_MATRIX_SPLASH +#define DISABLE_RGB_MATRIX_MULTISPLASH +#define DISABLE_RGB_MATRIX_SOLID_SPLASH +#define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH +#define DISABLE_RGB_MATRIX_DIGITAL_RAIN +#define DRIVER_ADDR_1 0b1010000 +#define DRIVER_ADDR_2 0b1010000 // this is here for compliancy reasons. +#define DRIVER_COUNT 2 +#define DRIVER_1_LED_TOTAL 61 +#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL +#endif diff --git a/keyboards/dztech/dz60rgb_ansi/v2/rules.mk b/keyboards/dztech/dz60rgb_ansi/v2/rules.mk new file mode 100644 index 0000000000..9dda31a1bd --- /dev/null +++ b/keyboards/dztech/dz60rgb_ansi/v2/rules.mk @@ -0,0 +1,23 @@ +MCU = atmega32u4 + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = atmel-dfu + +BACKLIGHT_ENABLE = no +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend +NKRO_ENABLE = yes # USB Nkey Rollover +AUDIO_ENABLE = no +RGB_MATRIX_ENABLE = IS31FL3733 # Use RGB matrix +NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in -- cgit v1.2.1