Merge remote-tracking branch 'upstream/master' into develop

This commit is contained in:
Nick Brassel 2021-08-02 13:55:36 +10:00
commit ee3c138385
40 changed files with 2099 additions and 328 deletions

View file

@ -373,7 +373,7 @@ void set_layer_color(int layer) {
}
void rgb_matrix_indicators_user(void) {
if (g_suspend_state || disable_layer_color ||
if (disable_layer_color ||
rgb_matrix_get_flags() == LED_FLAG_NONE ||
rgb_matrix_get_flags() == LED_FLAG_UNDERGLOW) {
return;

View file

@ -33,7 +33,6 @@
#define RGB_TIME_OUT_MIN 10
#define RGB_TIME_OUT_STEP 10
extern bool g_suspend_state;
extern rgb_config_t rgb_matrix_config;
bool disable_layer_color;