Merge tag '0.13.13' into firmware_21

This commit is contained in:
Drashna Jael're
2021-07-08 21:16:31 -07:00
177 changed files with 5485 additions and 1649 deletions
+2 -1
View File
@@ -322,7 +322,7 @@ uint16_t muse_counter = 0;
uint8_t muse_offset = 70;
uint16_t muse_tempo = 50;
void encoder_update(bool clockwise) {
bool encoder_update(bool clockwise) {
if (muse_mode) {
if (IS_LAYER_ON(_RAISE)) {
if (clockwise) {
@@ -356,6 +356,7 @@ void encoder_update(bool clockwise) {
#endif
}
}
return true;
}
void matrix_scan_user(void) {