From cc1380701a3f7bd0c068dff2038a1c639bdd452c Mon Sep 17 00:00:00 2001 From: Holger Wirtz Date: Fri, 24 Apr 2020 14:48:03 +0200 Subject: [PATCH] Small fixes. --- MicroDexed.ino | 2 +- UI.hpp | 10 +++++----- UI_2_FX.h | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/MicroDexed.ino b/MicroDexed.ino index 59b4782..355275a 100644 --- a/MicroDexed.ino +++ b/MicroDexed.ino @@ -1122,7 +1122,7 @@ void set_volume(uint8_t v, uint8_t m) void initial_values_from_eeprom(bool init) { - uint32_t _m_ = 0x0000; + uint32_t _m_; EEPROM.get(EEPROM_START_ADDRESS + offsetof(configuration_s, _marker_), _m_); if (_m_ != EEPROM_MARKER) diff --git a/UI.hpp b/UI.hpp index f1754e2..7a37563 100644 --- a/UI.hpp +++ b/UI.hpp @@ -230,11 +230,11 @@ void eeprom_update_var(uint16_t pos, uint8_t val, const char* val_string); LCDMenuLib2_menu LCDML_0(255, 0, 0, NULL, NULL); // normal root menu element (do not change) LCDMenuLib2 LCDML(LCDML_0, _LCDML_DISP_rows, _LCDML_DISP_cols, lcdml_menu_display, lcdml_menu_clear, lcdml_menu_control); -#if defined(NUM_DEXED)>1 && defined(USE_FX) +#if NUM_DEXED>1 && defined(USE_FX) #include "UI_2_FX.h" -#elif defined(NUM_DEXED)==1 && defined(USE_FX) +#elif NUM_DEXED==1 && defined(USE_FX) #include "UI_1_FX.h" -#elif defined(NUM_DEXED)==2 && !defined(USE_FX) +#elif NUM_DEXED==2 && !defined(USE_FX) #include "UI_2.h" #else #include "UI_1.h" @@ -3146,9 +3146,9 @@ void UI_func_eeprom_reset(uint8_t param) if (yesno == true) { LCDML.DISP_clear(); - lcd.print("EEPROM reset:"); + lcd.print("EEPROM Reset:"); - initial_values_from_eeprom(yesno); + initial_values_from_eeprom(true); lcd.setCursor(0, 1); lcd.print("Done."); diff --git a/UI_2_FX.h b/UI_2_FX.h index 3f0262b..31ced02 100644 --- a/UI_2_FX.h +++ b/UI_2_FX.h @@ -173,9 +173,9 @@ LCDML_add(144, LCDML_0_4_5, 1, "MIDI Recv Bank", UI_func_sysex_receive_bank); LCDML_add(145, LCDML_0_4_5, 2, "MIDI Send Bank", UI_func_sysex_send_bank); LCDML_add(146, LCDML_0_4, 6, "EEPROM Reset", UI_func_eeprom_reset); LCDML_add(147, LCDML_0, 5, "System", NULL); -LCDML_add(148, LCDML_0_4, 3, "Volume", UI_func_volume); -LCDML_add(149, LCDML_0_4, 1, "Stereo/Mono", UI_func_stereo_mono); -LCDML_add(150, LCDML_0_4, 2, "MIDI Soft THRU", UI_func_midi_soft_thru); +LCDML_add(148, LCDML_0_5, 3, "Volume", UI_func_volume); +LCDML_add(149, LCDML_0_5, 1, "Stereo/Mono", UI_func_stereo_mono); +LCDML_add(150, LCDML_0_5, 2, "MIDI Soft THRU", UI_func_midi_soft_thru); LCDML_add(151, LCDML_0, 6, "Info", UI_func_information); #define _LCDML_DISP_cnt 151 #define MENU_ID_OF_INSTANCE_2 59