diff --git a/UI.hpp b/UI.hpp index d1b2df7..7360a4b 100644 --- a/UI.hpp +++ b/UI.hpp @@ -2098,7 +2098,7 @@ void UI_func_favorites(uint8_t param) break; case 3: lcd.print(F("[random non-FAV]")); - break; + break; } } @@ -3941,12 +3941,12 @@ void locate_next_non_favorite() void locate_random_non_favorite() { - //find random non-fav - + //find random non-fav + do { - configuration.performance.voice[selected_instance_id]=random(32); - configuration.performance.bank[selected_instance_id]=random(MAX_BANKS - 1); + configuration.performance.voice[selected_instance_id] = random(32); + configuration.performance.bank[selected_instance_id] = random(MAX_BANKS - 1); favsearcher++; @@ -4055,7 +4055,7 @@ void UI_func_voice_select(uint8_t param) #ifdef DISPLAY_LCD_SPI change_disp_sd(true); #endif - } else //only non-Favs + } else //only non-Favs if (configuration.sys.favorites == 2) { locate_previous_non_favorite(); @@ -4069,18 +4069,18 @@ void UI_func_voice_select(uint8_t param) //break; } else //random non-Favs - if (configuration.sys.favorites == 3) - { - locate_random_non_favorite(); + if (configuration.sys.favorites == 3) + { + locate_random_non_favorite(); #ifdef DISPLAY_LCD_SPI - change_disp_sd(false); + change_disp_sd(false); #endif - load_sd_voice(configuration.performance.bank[selected_instance_id], configuration.performance.voice[selected_instance_id], selected_instance_id); + load_sd_voice(configuration.performance.bank[selected_instance_id], configuration.performance.voice[selected_instance_id], selected_instance_id); #ifdef DISPLAY_LCD_SPI - change_disp_sd(true); + change_disp_sd(true); #endif - } + } } //end UP else if (LCDML.BT_checkDown()) { @@ -4094,13 +4094,13 @@ void UI_func_voice_select(uint8_t param) bank_tmp = constrain(configuration.performance.bank[selected_instance_id] + ENCODER[ENC_R].speed(), 0, MAX_BANKS - 1); configuration.performance.bank[selected_instance_id] = bank_tmp; #ifdef DISPLAY_LCD_SPI - change_disp_sd(false); + change_disp_sd(false); #endif - load_sd_voice(configuration.performance.bank[selected_instance_id], configuration.performance.voice[selected_instance_id], selected_instance_id); + load_sd_voice(configuration.performance.bank[selected_instance_id], configuration.performance.voice[selected_instance_id], selected_instance_id); #ifdef DISPLAY_LCD_SPI - change_disp_sd(true); + change_disp_sd(true); #endif - break; + break; case MENU_VOICE_SOUND: memset(g_voice_name[selected_instance_id], 0, VOICE_NAME_LEN); voice_tmp = configuration.performance.voice[selected_instance_id] + ENCODER[ENC_R].speed(); @@ -4117,13 +4117,14 @@ void UI_func_voice_select(uint8_t param) configuration.performance.voice[selected_instance_id] = constrain(voice_tmp, 0, MAX_VOICES - 1); #ifdef DISPLAY_LCD_SPI - change_disp_sd(false); + change_disp_sd(false); #endif - load_sd_voice(configuration.performance.bank[selected_instance_id], configuration.performance.voice[selected_instance_id], selected_instance_id); + load_sd_voice(configuration.performance.bank[selected_instance_id], configuration.performance.voice[selected_instance_id], selected_instance_id); #ifdef DISPLAY_LCD_SPI - change_disp_sd(true); + change_disp_sd(true); #endif - break; + break; + } } else //only Favs if (configuration.sys.favorites == 1) @@ -4153,18 +4154,18 @@ void UI_func_voice_select(uint8_t param) #endif //break; } else //random non-Favs - if (configuration.sys.favorites == 3) - { - locate_random_non_favorite(); + if (configuration.sys.favorites == 3) + { + locate_random_non_favorite(); #ifdef DISPLAY_LCD_SPI - change_disp_sd(false); + change_disp_sd(false); #endif - load_sd_voice(configuration.performance.bank[selected_instance_id], configuration.performance.voice[selected_instance_id], selected_instance_id); + load_sd_voice(configuration.performance.bank[selected_instance_id], configuration.performance.voice[selected_instance_id], selected_instance_id); #ifdef DISPLAY_LCD_SPI - change_disp_sd(true); -#endif - } - + change_disp_sd(true); +#endif + } + } else if (LCDML.BT_checkEnter() && encoderDir[ENC_R].ButtonPressed()) {