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

This commit is contained in:
James Young
2021-07-29 23:04:06 -07:00
78 changed files with 2856 additions and 731 deletions

View File

@@ -26,3 +26,8 @@
//Always send Escape if Control is pressed
#define TAPPING_TERM 180
#ifdef RGB_MATRIX_ENABLE
#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
#define RGB_DISABLE_WHEN_USB_SUSPENDED true
#endif