summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-03-10 03:47:09 +0000
committerQMK Bot <hello@qmk.fm>2022-03-10 03:47:09 +0000
commit62696e82cd691ed00fcc681f234fbf5a52b5c360 (patch)
treecc325e3c0983bf463a8859530f4dfb1a54662ba2
parent0f22bccb3fa358b00324c3a8cfe9c20193c78bb6 (diff)
parent708b3f91928d578a1f9babaf27490c80f1b7a918 (diff)
downloadqmk_firmware-62696e82cd691ed00fcc681f234fbf5a52b5c360.tar.gz
qmk_firmware-62696e82cd691ed00fcc681f234fbf5a52b5c360.zip
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/kbdfans/kbd67/mkiirgb_iso/config.h7
-rw-r--r--keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk1
2 files changed, 2 insertions, 6 deletions
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h b/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h
index 8806624e24..42f5af8c25 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h
@@ -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
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk
index 7e5b22ef73..14509a1872 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk
@@ -3,6 +3,7 @@ MCU = atmega32u4
# Bootloader selection
BOOTLOADER = lufa-ms
+BOOTLOADER_SIZE = 6144
# Build Options
# change yes to no to disable