1
0
Fork 0

Updated RGB Matrix suspend define part 3 (#13954)

* Updated RGB Matrix suspend define part 3

* Revert "Update config.h for kbdfans/kbd67/mkiirgb/v3 (#13978)"

This reverts commit 80015f7fb0.

* Add additional boards/keymaps
This commit is contained in:
Drashna Jaelre 2021-08-21 16:46:35 -07:00 committed by GitHub
parent 58a5030661
commit c5f41d42d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 37 additions and 44 deletions

View file

@ -1,4 +1,4 @@
/* /*
* Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com> * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
@ -50,8 +50,6 @@
# define RGB_MATRIX_SPLIT { 18, 18 } # define RGB_MATRIX_SPLIT { 18, 18 }
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50 # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
# define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS # define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
# ifndef RGB_DISABLE_WHEN_USB_SUSPENDED # define RGB_DISABLE_WHEN_USB_SUSPENDED
# define RGB_DISABLE_WHEN_USB_SUSPENDED true
# endif
# define RGB_MATRIX_KEYPRESSES # define RGB_MATRIX_KEYPRESSES
#endif #endif

View file

@ -53,7 +53,7 @@
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
# define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects # 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_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
# define RGB_MATRIX_KEYPRESSES # define RGB_MATRIX_KEYPRESSES
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS # define RGB_MATRIX_FRAMEBUFFER_EFFECTS
# define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN # define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN
@ -71,9 +71,9 @@
# define DISABLE_RGB_MATRIX_SOLID_SPLASH # define DISABLE_RGB_MATRIX_SOLID_SPLASH
# define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH # define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
# define DISABLE_RGB_MATRIX_DIGITAL_RAIN # define DISABLE_RGB_MATRIX_DIGITAL_RAIN
# define DRIVER_ADDR_1 0b1010000 # define DRIVER_ADDR_1 0b1010000
# define DRIVER_ADDR_2 0b1010000 // this is here for compliancy reasons. # define DRIVER_ADDR_2 0b1010000 // this is here for compliancy reasons.
# define DRIVER_COUNT 2 # define DRIVER_COUNT 2
# define DRIVER_1_LED_TOTAL 62 # define DRIVER_1_LED_TOTAL 62
# define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL # define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
#endif #endif

View file

@ -18,7 +18,7 @@
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
#define RGB_DISABLE_WHEN_USB_SUSPENDED true # define RGB_DISABLE_WHEN_USB_SUSPENDED
#endif #endif
#define FORCE_NKRO #define FORCE_NKRO

View file

@ -18,7 +18,7 @@
#define COMBO_TERM 100 #define COMBO_TERM 100
#define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_KEYPRESSES
#define RGB_DISABLE_WHEN_USB_SUSPENDED true #define RGB_DISABLE_WHEN_USB_SUSPENDED
#define RGB_DISABLE_TIMEOUT 90000 #define RGB_DISABLE_TIMEOUT 90000
#define MACRO_TIMER 5 #define MACRO_TIMER 5

View file

@ -23,15 +23,10 @@
#define QMK_KEYS_PER_SCAN 4 #define QMK_KEYS_PER_SCAN 4
/* Force NKRO on boot up */ /* Force NKRO on boot up */
#define FORCE_NKRO #define FORCE_NKRO
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
# define RGB_DISABLE_WHEN_USB_SUSPENDED
#undef RGB_DISABLE_WHEN_USB_SUSPENDED # undef RGB_DISABLE_TIMEOUT
#define RGB_DISABLE_WHEN_USB_SUSPENDED true # define RGB_DISABLE_TIMEOUT 900000
#undef RGB_DISABLE_TIMEOUT
#define RGB_DISABLE_TIMEOUT 900000
#endif #endif

View file

@ -42,7 +42,7 @@
#define NO_ACTION_FUNCTION #define NO_ACTION_FUNCTION
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects #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_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
#define USB_SUSPEND_WAKEUP_DELAY 5000 #define USB_SUSPEND_WAKEUP_DELAY 5000
#define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_KEYPRESSES
#define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN #define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN

View file

@ -23,8 +23,8 @@
#define QMK_KEYS_PER_SCAN 4 #define QMK_KEYS_PER_SCAN 4
/* Force NKRO on boot up */ /* Force NKRO on boot up */
#define FORCE_NKRO #define FORCE_NKRO
#define RGB_DISABLE_WHEN_USB_SUSPENDED true #define RGB_DISABLE_WHEN_USB_SUSPENDED
#define RGB_DISABLE_TIMEOUT 900000 #define RGB_DISABLE_TIMEOUT 900000

View file

@ -70,17 +70,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define USE_I2CV2 # define USE_I2CV2
# define RGB_MATRIX_DISABLE_KEYCODES # define RGB_MATRIX_DISABLE_KEYCODES
# define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects # 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_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
# define RGB_MATRIX_KEYPRESSES # define RGB_MATRIX_KEYPRESSES
# define RGB_MATRIX_LED_PROCESS_LIMIT 4 # define RGB_MATRIX_LED_PROCESS_LIMIT 4
# define RGB_MATRIX_LED_FLUSH_LIMIT 26 # define RGB_MATRIX_LED_FLUSH_LIMIT 26
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
# define RGB_MATRIX_STARTUP_VAL 128 # define RGB_MATRIX_STARTUP_VAL 128
# define DRIVER_ADDR_1 0b0110000 # define DRIVER_ADDR_1 0b0110000
# define DRIVER_ADDR_2 0b0110000 # define DRIVER_ADDR_2 0b0110000
# define DRIVER_COUNT 2 # define DRIVER_COUNT 2
# define DRIVER_1_LED_TOTAL 67 # define DRIVER_1_LED_TOTAL 67
# define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL # define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
#endif #endif
/* Encoder */ /* Encoder */

View file

@ -69,17 +69,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define USE_I2CV2 # define USE_I2CV2
# define RGB_MATRIX_DISABLE_KEYCODES # define RGB_MATRIX_DISABLE_KEYCODES
# define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects # 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_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
# define RGB_MATRIX_KEYPRESSES # define RGB_MATRIX_KEYPRESSES
# define RGB_MATRIX_LED_PROCESS_LIMIT 4 # define RGB_MATRIX_LED_PROCESS_LIMIT 4
# define RGB_MATRIX_LED_FLUSH_LIMIT 26 # define RGB_MATRIX_LED_FLUSH_LIMIT 26
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
# define RGB_MATRIX_STARTUP_VAL 128 # define RGB_MATRIX_STARTUP_VAL 128
# define DRIVER_ADDR_1 0b0110000 # define DRIVER_ADDR_1 0b0110000
# define DRIVER_ADDR_2 0b0110000 # define DRIVER_ADDR_2 0b0110000
# define DRIVER_COUNT 2 # define DRIVER_COUNT 2
# define DRIVER_1_LED_TOTAL 71 # define DRIVER_1_LED_TOTAL 71
# define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL # define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
#endif #endif
/* Encoder */ /* Encoder */

View file

@ -26,5 +26,5 @@
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
#define RGB_DISABLE_WHEN_USB_SUSPENDED true # define RGB_DISABLE_WHEN_USB_SUSPENDED
#endif #endif