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

This commit is contained in:
QMK Bot 2021-11-17 20:46:24 +00:00
commit b47f3b1853
9 changed files with 51 additions and 13 deletions

View file

@ -197,16 +197,32 @@
// # define OLED_FONT_AZTECH
// # define OLED_FONT_BMPLAIN
// # define OLED_FONT_CRACKERS
// # define OLED_FONT_HISKYF21
# define OLED_FONT_DEAD_MEAL
// # define OLED_FONT_EIN
// # define OLED_FONT_HISKYF21
// # define OLED_FONT_SQUASH
// # define OLED_FONT_ZXPIX
// # define OLED_FONT_SUPER_DIGG
// # define OLED_LOGO_GMK_BAD
// # define OLED_LOGO_HUE_MANITEE
// # define OLED_LOGO_BEBOP
// # define OLED_LOGO_CORNE
// # define OLED_LOGO_GMK_BAD
// # define OLED_LOGO_GOTHAM
// # define OLED_LOGO_HUE_MANITEE
// # define OLED_LOGO_LOOSE
# define OLED_LOGO_SCIFI
// # define OLED_LOGO_SETS3N
// # define OLED_LOGO_SKEEB
#endif
// #define WPM_ESTIMATED_WORD_SIZE 5
#define WPM_ALLOW_COUNT_REGRESSION
// #define WPM_UNFILTERED
// #define WPM_SAMPLE_SECONDS 5
// #define WPM_SAMPLE_PERIODS 50
// #define WPM_LAUNCH_CONTROL
#ifndef ONESHOT_TAP_TOGGLE
# define ONESHOT_TAP_TOGGLE 2
#endif // !ONESHOT_TAP_TOGGLE