masq
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
QMK Bot 2022-01-22 05:57:32 +00:00
parent b91efb896d 61246deec5
commit e137e39911
5 changed files with 40 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
keyboards/crkbd/keymaps/default/config.h
View File

@ -28,19 +28,24 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// #define MASTER_RIGHT // #define MASTER_RIGHT
// #define EE_HANDS // #define EE_HANDS
#define USE_SERIAL_PD2 //#define TAPPING_FORCE_HOLD
//#define TAPPING_TERM 100
#define TAPPING_FORCE_HOLD
#define TAPPING_TERM 100
#ifdef RGBLIGHT_ENABLE #ifdef RGBLIGHT_ENABLE
#undef RGBLED_NUM #define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_ANIMATIONS #define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLED_NUM 27 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
#define RGBLIGHT_EFFECT_SNAKE
#define RGBLIGHT_EFFECT_KNIGHT
#define RGBLIGHT_EFFECT_CHRISTMAS
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLIGHT_LIMIT_VAL 120 #define RGBLIGHT_LIMIT_VAL 120
#define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17 #define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17 #define RGBLIGHT_VAL_STEP 17
#endif #endif
#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c" #define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"

7
keyboards/crkbd/keymaps/default/rules.mk
View File

@ -1,2 +1,5 @@
OLED_ENABLE = yes MOUSEKEY_ENABLE = yes # Mouse keys
OLED_DRIVER = SSD1306 RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
OLED_ENABLE = yes
OLED_DRIVER = SSD1306
LTO_ENABLE = yes

24
keyboards/crkbd/keymaps/via/config.h
View File

@ -25,16 +25,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// #define EE_HANDS // #define EE_HANDS
#ifdef RGBLIGHT_ENABLE #ifdef RGBLIGHT_ENABLE
# undef RGBLED_NUM #define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_ANIMATIONS #define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLED_NUM 54 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
# undef RGBLED_SPLIT #define RGBLIGHT_EFFECT_SNAKE
# define RGBLED_SPLIT \ #define RGBLIGHT_EFFECT_KNIGHT
{ 27, 27 } #define RGBLIGHT_EFFECT_CHRISTMAS
# define RGBLIGHT_LIMIT_VAL 120 #define RGBLIGHT_EFFECT_STATIC_GRADIENT
# define RGBLIGHT_HUE_STEP 10 // #define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_SAT_STEP 17 // #define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_VAL_STEP 17 // #define RGBLIGHT_EFFECT_TWINKLE
#define RGBLIGHT_LIMIT_VAL 120
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
#endif #endif
#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c" #define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"

12
keyboards/crkbd/keymaps/via/rules.mk
View File

@ -1,6 +1,6 @@
MOUSEKEY_ENABLE = no # Mouse keys MOUSEKEY_ENABLE = no # Mouse keys
RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
VIA_ENABLE = yes # Enable VIA VIA_ENABLE = yes # Enable VIA
OLED_ENABLE = yes OLED_ENABLE = yes
OLED_DRIVER = SSD1306 OLED_DRIVER = SSD1306
LTO_ENABLE = yes LTO_ENABLE = yes

4
keyboards/crkbd/rev1/config.h
View File

@ -25,9 +25,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGB_DI_PIN D3 #define RGB_DI_PIN D3
#ifdef RGBLIGHT_ENABLE #ifdef RGBLIGHT_ENABLE
# define RGBLED_NUM 12 // Number of LEDs # define RGBLED_NUM 54 // Number of LEDs
# define RGBLED_SPLIT \ # define RGBLED_SPLIT \
{ 6, 6 } { 27, 27 }
# define RGBLIGHT_SPLIT # define RGBLIGHT_SPLIT
#endif #endif