diff options
author | moyi4681 <moyi4681@users.noreply.github.com> | 2019-11-15 03:55:46 +0800 |
---|---|---|
committer | Drashna Jaelre <drashna@live.com> | 2019-11-14 11:55:46 -0800 |
commit | 426c03eda0deb62d916498fbdd671c7d3532b9e4 (patch) | |
tree | a83ddac8182c0e9b3039e5605c56e476358348b7 /keyboards/kbdfans/kbd67 | |
parent | 5edd4b99fe4db7371a04fc554bb8f4672ccae707 (diff) |
[Keyboard] add kbdmini; dztech, kbdfans keyboards cleanup (#7223)
* add kbdmini, dztech and kbdfans keyboards small fix
* Caps lock indicator moved from keymap
* Update dz65rgb.c
* fix error
* fix matthewrobo keymap error
* Update keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c
Co-Authored-By: fauxpark <fauxpark@gmail.com>
* Update keyboards/dztech/dz60rgb/dz60rgb.c
Co-Authored-By: fauxpark <fauxpark@gmail.com>
* Update keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c
Co-Authored-By: fauxpark <fauxpark@gmail.com>
* Update keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c
Co-Authored-By: fauxpark <fauxpark@gmail.com>
* Update keyboards/dztech/dz65rgb/dz65rgb.c
Co-Authored-By: fauxpark <fauxpark@gmail.com>
* wrap all of the g_led_config stuff and rgb matrix functions in ifdefs
wrap all of the g_led_config stuff and rgb matrix functions in ifdefs
Diffstat (limited to 'keyboards/kbdfans/kbd67')
-rw-r--r-- | keyboards/kbdfans/kbd67/hotswap/config.h | 4 | ||||
-rw-r--r-- | keyboards/kbdfans/kbd67/mkii_soldered/config.h | 3 | ||||
-rw-r--r-- | keyboards/kbdfans/kbd67/mkiirgb/config.h | 22 | ||||
-rw-r--r-- | keyboards/kbdfans/kbd67/mkiirgb/keymaps/default/keymap.c | 9 | ||||
-rw-r--r-- | keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c | 12 | ||||
-rw-r--r-- | keyboards/kbdfans/kbd67/rev1/config.h | 4 | ||||
-rw-r--r-- | keyboards/kbdfans/kbd67/rev2/config.h | 1 |
7 files changed, 40 insertions, 15 deletions
diff --git a/keyboards/kbdfans/kbd67/hotswap/config.h b/keyboards/kbdfans/kbd67/hotswap/config.h index fca9916ed9..589d76da36 100644 --- a/keyboards/kbdfans/kbd67/hotswap/config.h +++ b/keyboards/kbdfans/kbd67/hotswap/config.h @@ -54,9 +54,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 #define BACKLIGHT_PIN B7 +#ifdef BACKLIGHT_PIN #define BACKLIGHT_BREATHING #define BACKLIGHT_LEVELS 3 - +#endif #define RGB_DI_PIN B4 #ifdef RGB_DI_PIN #define RGBLED_NUM 8 @@ -67,6 +68,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ // /*== all animations enable ==*/ #define RGBLIGHT_ANIMATIONS + #define RGBLIGHT_SLEEP // /*== or choose animations ==*/ // #define RGBLIGHT_EFFECT_BREATHING // #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/config.h b/keyboards/kbdfans/kbd67/mkii_soldered/config.h index 6a726af061..df0607b249 100644 --- a/keyboards/kbdfans/kbd67/mkii_soldered/config.h +++ b/keyboards/kbdfans/kbd67/mkii_soldered/config.h @@ -54,9 +54,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 #define BACKLIGHT_PIN B7 +#ifdef BACKLIGHT_PIN #define BACKLIGHT_BREATHING #define BACKLIGHT_LEVELS 3 - +#endif //#define RGB_DI_PIN B3 //#ifdef RGB_DI_PIN // #define RGBLED_NUM 20 diff --git a/keyboards/kbdfans/kbd67/mkiirgb/config.h b/keyboards/kbdfans/kbd67/mkiirgb/config.h index 5ef18fcc79..b60685e2b0 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/config.h +++ b/keyboards/kbdfans/kbd67/mkiirgb/config.h @@ -19,11 +19,27 @@ #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_MAXIMUM_BRIGHTNESS 180 -#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_SIMPLE +#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 RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 +#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL #define DRIVER_ADDR_1 0b1110100 #define DRIVER_ADDR_2 0b1110111 #define DRIVER_COUNT 2 #define DRIVER_1_LED_TOTAL 35 #define DRIVER_2_LED_TOTAL 32 -#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) +#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
\ No newline at end of file diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/default/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/default/keymap.c index 17bf4ec991..99556b7ef0 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/default/keymap.c +++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/default/keymap.c @@ -15,15 +15,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE,\ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT), }; - -void rgb_matrix_indicators_user(void) -{ - if (IS_LED_ON(host_keyboard_leds(), USB_LED_CAPS_LOCK)) - { - rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF); - } -} - void matrix_init_user(void) { //user initialization diff --git a/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c b/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c index 430dca9524..526949e6fe 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c +++ b/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c @@ -117,3 +117,15 @@ void suspend_wakeup_init_kb(void) rgb_matrix_set_suspend_state(false); suspend_wakeup_init_user(); } + +__attribute__ ((weak)) +void rgb_matrix_indicators_user(void) +{ + if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) + { + rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF); + } +} + + + diff --git a/keyboards/kbdfans/kbd67/rev1/config.h b/keyboards/kbdfans/kbd67/rev1/config.h index 7a26192f4a..d20dcb1c57 100644 --- a/keyboards/kbdfans/kbd67/rev1/config.h +++ b/keyboards/kbdfans/kbd67/rev1/config.h @@ -49,9 +49,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define DIODE_DIRECTION COL2ROW #define BACKLIGHT_PIN B6 +#ifdef BACKLIGHT_PIN #define BACKLIGHT_BREATHING #define BACKLIGHT_LEVELS 3 - +#endif #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 20 @@ -62,6 +63,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ /*== all animations enable ==*/ #define RGBLIGHT_ANIMATIONS + #define RGBLIGHT_SLEEP /*== or choose animations ==*/ // #define RGBLIGHT_EFFECT_BREATHING // #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/kbdfans/kbd67/rev2/config.h b/keyboards/kbdfans/kbd67/rev2/config.h index d4e200fa8e..931f5714b8 100644 --- a/keyboards/kbdfans/kbd67/rev2/config.h +++ b/keyboards/kbdfans/kbd67/rev2/config.h @@ -61,4 +61,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 240 +#define RGBLIGHT_SLEEP #endif |