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

2022-03-10 03:47:09 +00:00
commit 62696e82cd
@@ -42,9 +42,7 @@
 #define USB_SUSPEND_WAKEUP_DELAY 5000

 #define RGB_DI_PIN C7
-#define RGBLED_NUM 68
-#define DRIVER_LED_TOTAL RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define DRIVER_LED_TOTAL 68

 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_KEYPRESSES           // reacts to keypresses
@@ -85,9 +83,6 @@
 #    define ENABLE_RGB_MATRIX_HUE_BREATHING
 #    define ENABLE_RGB_MATRIX_HUE_PENDULUM
 #    define ENABLE_RGB_MATRIX_HUE_WAVE
-#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
-#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
-#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
 // enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
 #    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
 // #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
@@ -3,6 +3,7 @@ MCU = atmega32u4

 # Bootloader selection
 BOOTLOADER = lufa-ms
+BOOTLOADER_SIZE = 6144

 # Build Options
 #   change yes to no to disable