From 4bd73a6fb56308a5bb71defcb0c340fab4ec9467 Mon Sep 17 00:00:00 2001 From: Holger Wirtz Date: Wed, 8 Apr 2020 16:24:31 +0200 Subject: [PATCH] Fixes for writing config. Fixes for ignoring config*.syx files in band directory. --- UI.hpp | 1 - UI_1_FX.h | 2 +- dexed_sysex.cpp | 8 +++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/UI.hpp b/UI.hpp index 85a75fa..9b28633 100644 --- a/UI.hpp +++ b/UI.hpp @@ -3295,7 +3295,6 @@ void UI_func_save_config(uint8_t param) lcd.setCursor(0, 1); lcd.print(F("Instance [1]")); #else - int8_t instance_id = 0; lcd.setCursor(0, 1); lcd.print(F("[NO ]")); #endif diff --git a/UI_1_FX.h b/UI_1_FX.h index bb6887c..14b1e36 100644 --- a/UI_1_FX.h +++ b/UI_1_FX.h @@ -98,7 +98,7 @@ LCDML_add(69, LCDML_0_2_3, 1, "Roomsize", UI_func_reverb_roomsize); LCDML_add(70, LCDML_0_2_3, 2, "Damping", UI_func_reverb_damping); LCDML_add(71, LCDML_0_2_3, 3, "Level", UI_func_reverb_level); LCDML_add(72, LCDML_0, 3, "Load/Save", NULL); -//LCDML_add(74, LCDML_0_3, 2, "Load Perf. SD", UI_func_load_performance); +//LCDML_add(73, LCDML_0_3, 2, "Load Perf. SD", UI_func_load_performance); //LCDML_add(74, LCDML_0_3, 2, "Save Perf. SD", UI_func_save_performance); LCDML_add(73, LCDML_0_3, 1, "Save Config SD", UI_func_save_config); LCDML_add(74, LCDML_0_3, 3, "Save Voice SD", UI_func_save_voice); diff --git a/dexed_sysex.cpp b/dexed_sysex.cpp index 9c49c73..aca4a81 100644 --- a/dexed_sysex.cpp +++ b/dexed_sysex.cpp @@ -220,6 +220,11 @@ uint8_t get_bank_names(uint8_t instance_id) File entry = root.openNextFile(); if (!entry.isDirectory()) { + while (strncmp(entry.name(), "CONFIG", 6) == 0) + { + entry = root.openNextFile(); + } + strcpy(bank_names[instance_id][bank_counter], entry.name()); #ifdef DEBUG Serial.print(F("Found bank [")); @@ -233,7 +238,7 @@ uint8_t get_bank_names(uint8_t instance_id) return (bank_counter); } else - return (bank_counter); + return (0); } bool load_sysex(uint8_t b, uint8_t v, uint8_t instance_id) @@ -530,6 +535,7 @@ bool save_sysex_config(uint8_t b, uint8_t v, uint8_t instance_id) if (write_sysex_config(sysex, configuration)) { + sysex.close(); return (true); } #ifdef DEBUG