shagi
/
qmk_firmare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed all the rgb matrix code in userspace, until I fix, and technik code to use generic rgb matrix

This commit is contained in:
Sadek Baroudi 2021-08-17 01:40:44 -07:00
parent 95a630083e
commit 1f0795f4d0
5 changed files with 55 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
users/sadekbaroudi/config.h
View File

@ -37,11 +37,12 @@
# define RGB_MATRIX_FRAMEBUFFER_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_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_UP_DOWN
// # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
// # define EECONFIG_RGB_MATRIX (uint32_t *)16
# if defined(__AVR__) && !defined(__AVR_AT90USB1286__) && !defined(KEYBOARD_launchpad)
# define DISABLE_RGB_MATRIX_ALPHAS_MODS
// # define DISABLE_RGB_MATRIX_ALPHAS_MODS
# define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN
# define DISABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
# define DISABLE_RGB_MATRIX_BREATHING
@ -54,26 +55,23 @@
# define DISABLE_RGB_MATRIX_CYCLE_ALL
# define DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
# define DISABLE_RGB_MATRIX_CYCLE_UP_DOWN
// # define DISABLE_RGB_MATRIX_CYCLE_OUT_IN
// # define DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
# define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
# define DISABLE_RGB_MATRIX_DUAL_BEACON
# define DISABLE_RGB_MATRIX_CYCLE_PINWHEEL
# define DISABLE_RGB_MATRIX_CYCLE_SPIRAL
# define DISABLE_RGB_MATRIX_RAINBOW_BEACON
# define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS
# define DISABLE_RGB_MATRIX_RAINDROPS
// # define DISABLE_RGB_MATRIX_RAINDROPS
# define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
// # define DISABLE_RGB_MATRIX_TYPING_HEATMAP
# define DISABLE_RGB_MATRIX_DIGITAL_RAIN
# define DISABLE_RGB_MATRIX_SOLID_REACTIVE
# 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_SOLID_REACTIVE
// # 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

52
users/sadekbaroudi/process_records.c
View File

@ -27,9 +27,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#endif // KEYLOGGER_ENABLE
if (!(process_record_keymap(keycode, record) && process_record_secrets(keycode, record)
#ifdef RGB_MATRIX_ENABLE
&& process_record_user_rgb_matrix(keycode, record)
#endif
// #ifdef RGB_MATRIX_ENABLE
// && process_record_user_rgb_matrix(keycode, record)
// #endif
#ifdef RGBLIGHT_ENABLE
&& process_record_user_rgb_light(keycode, record)
#endif
@ -92,14 +92,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
xprintf("rgblight layer change [EEPROM]: %u\n", userspace_config.rgb_layer_change);
eeconfig_update_user(userspace_config.raw);
if (userspace_config.rgb_layer_change) {
# if defined(RGBLIGHT_ENABLE) && defined(RGB_MATRIX_ENABLE)
rgblight_enable_noeeprom();
# endif
// # if defined(RGBLIGHT_ENABLE) && defined(RGB_MATRIX_ENABLE)
// rgblight_enable_noeeprom();
// # endif
layer_state_set(layer_state); // This is needed to immediately set the layer color (looks better)
} else {
# if defined(RGBLIGHT_ENABLE) && defined(RGB_MATRIX_ENABLE)
rgblight_disable_noeeprom();
# endif
// # if defined(RGBLIGHT_ENABLE) && defined(RGB_MATRIX_ENABLE)
// rgblight_disable_noeeprom();
// # endif
# if defined(RGBLIGHT_ENABLE)
rgblight_set_hsv_and_mode(userspace_config.hue, userspace_config.sat, userspace_config.val, userspace_config.mode);
# endif
@ -115,14 +115,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
xprintf("rgblight base layer override change [EEPROM]: %u\n", userspace_config.rgb_base_layer_override);
eeconfig_update_user(userspace_config.raw);
if (userspace_config.rgb_base_layer_override) {
# if defined(RGBLIGHT_ENABLE) && defined(RGB_MATRIX_ENABLE)
rgblight_enable_noeeprom();
# endif
// # if defined(RGBLIGHT_ENABLE) && defined(RGB_MATRIX_ENABLE)
// rgblight_enable_noeeprom();
// # endif
layer_state_set(layer_state); // This is needed to immediately set the layer color (looks better)
# if defined(RGBLIGHT_ENABLE) && defined(RGB_MATRIX_ENABLE)
} else {
rgblight_disable_noeeprom();
# endif
// # if defined(RGBLIGHT_ENABLE) && defined(RGB_MATRIX_ENABLE)
// } else {
// rgblight_disable_noeeprom();
// # endif
}
}
#endif // RGBLIGHT_ENABLE
@ -139,9 +139,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
# if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES)
rgblight_toggle();
# endif
# if defined(RGB_MATRIX_ENABLE) && !defined(RGB_MATRIX_DISABLE_KEYCODES)
rgb_matrix_toggle();
# endif
// # if defined(RGB_MATRIX_ENABLE) && !defined(RGB_MATRIX_DISABLE_KEYCODES)
// rgb_matrix_toggle();
// # endif
}
return false;
break;
@ -157,13 +157,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
# endif
}
# if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS)
if (userspace_config.rgb_matrix_idle_anim) {
userspace_config.rgb_matrix_idle_anim = false;
xprintf("RGB Matrix Idle Animation [EEPROM]: %u\n", userspace_config.rgb_matrix_idle_anim);
is_eeprom_updated = true;
}
# endif
// # if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS)
// if (userspace_config.rgb_matrix_idle_anim) {
// userspace_config.rgb_matrix_idle_anim = false;
// xprintf("RGB Matrix Idle Animation [EEPROM]: %u\n", userspace_config.rgb_matrix_idle_anim);
// is_eeprom_updated = true;
// }
// # endif
if (is_eeprom_updated) {
eeconfig_update_user(userspace_config.raw);
}

8
users/sadekbaroudi/rules.mk
View File

@ -39,10 +39,10 @@ ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
endif
endif
RGB_MATRIX_ENABLE ?= no
ifneq ($(strip $(RGB_MATRIX_ENABLE)), no)
SRC += rgb_matrix_stuff.c
endif
# RGB_MATRIX_ENABLE ?= no
# ifneq ($(strip $(RGB_MATRIX_ENABLE)), no)
# SRC += rgb_matrix_stuff.c
# endif
ifdef CONSOLE_ENABLE
ifeq ($(strip $(KEYLOGGER_ENABLE)), yes)

23
users/sadekbaroudi/sadekbaroudi.c
View File

@ -143,9 +143,9 @@ void keyboard_post_init_user(void) {
#if defined(RGBLIGHT_ENABLE)
keyboard_post_init_rgb_light();
#endif
#if defined(RGB_MATRIX_ENABLE)
keyboard_post_init_rgb_matrix();
#endif
// #if defined(RGB_MATRIX_ENABLE)
// keyboard_post_init_rgb_matrix();
// #endif
keyboard_post_init_keymap();
}
@ -158,12 +158,11 @@ void shutdown_user(void) {
rgblight_enable_noeeprom();
rgblight_mode_noeeprom(1);
rgblight_setrgb_red();
#endif // RGBLIGHT_ENABLE
#ifdef RGB_MATRIX_ENABLE
rgb_matrix_set_color_all(0xFF, 0x00, 0x00);
rgb_matrix_update_pwm_buffers();
#endif // RGB_MATRIX_ENABLE
#endif
// #ifdef RGB_MATRIX_ENABLE
// rgb_matrix_set_color_all(0xFF, 0x00, 0x00);
// rgb_matrix_update_pwm_buffers();
// #endif
shutdown_keymap();
}
@ -198,9 +197,9 @@ void matrix_scan_user(void) {
handle_caps_lock_change();
}
#if defined(RGB_MATRIX_ENABLE)
matrix_scan_rgb_matrix();
#endif
// #if defined(RGB_MATRIX_ENABLE)
// matrix_scan_rgb_matrix();
// #endif
#if defined(LEADER_ENABLE)
matrix_scan_leader_key();

6
users/sadekbaroudi/sadekbaroudi.h
View File

@ -24,9 +24,9 @@
#if defined(RGBLIGHT_ENABLE)
# include "rgb_stuff.h"
#endif
#if defined(RGB_MATRIX_ENABLE)
# include "rgb_matrix_stuff.h"
#endif
// #if defined(RGB_MATRIX_ENABLE)
// # include "rgb_matrix_stuff.h"
// #endif
/* Define layer names */
enum userspace_layers {