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

This commit is contained in:
QMK Bot 2023-03-26 22:56:50 +00:00
commit 9cea208bfa

View file

@ -3,7 +3,7 @@
#pragma once #pragma once
// Uncomment the following if your board uses 1.5A and 3.0A hold current fuses. // Uncomment the following if your board uses 1.5A and 3.0A hold current fuses.
//#define DJINN_SUPPORTS_3A_FUSE // #define DJINN_SUPPORTS_3A_FUSE
// Encoder settings // Encoder settings
#define ENCODER_RESOLUTION 2 #define ENCODER_RESOLUTION 2
@ -60,4 +60,4 @@
#define ENABLE_RGB_MATRIX_SPLASH #define ENABLE_RGB_MATRIX_SPLASH
#define ENABLE_RGB_MATRIX_MULTISPLASH #define ENABLE_RGB_MATRIX_MULTISPLASH
#define ENABLE_RGB_MATRIX_SOLID_SPLASH #define ENABLE_RGB_MATRIX_SOLID_SPLASH
#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH