wirtz
/
MicroDexed
mirror of https://codeberg.org/dcoredump/MicroDexed.git
1
1
Fork 0
Code Issues Releases Wiki Activity

Small fixes.

Browse Source
pull/32/head
Holger Wirtz 5 years ago
parent e5ee6b68e3
commit cc1380701a
3 changed files with 9 additions and 9 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      MicroDexed.ino
  2. 10
      UI.hpp
  3. 6
      UI_2_FX.h

2
MicroDexed.ino
Unescape View File

@ -1122,7 +1122,7 @@ void set_volume(uint8_t v, uint8_t m)
void initial_values_from_eeprom(bool init) void initial_values_from_eeprom(bool init)
{ {
uint32_t _m_ = 0x0000; uint32_t _m_;
EEPROM.get(EEPROM_START_ADDRESS + offsetof(configuration_s, _marker_), _m_); EEPROM.get(EEPROM_START_ADDRESS + offsetof(configuration_s, _marker_), _m_);
if (_m_ != EEPROM_MARKER) if (_m_ != EEPROM_MARKER)

10
UI.hpp
Unescape View File

@ -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_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); 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" #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" #include "UI_1_FX.h"
#elif defined(NUM_DEXED)==2 && !defined(USE_FX) #elif NUM_DEXED==2 && !defined(USE_FX)
#include "UI_2.h" #include "UI_2.h"
#else #else
#include "UI_1.h" #include "UI_1.h"
@ -3146,9 +3146,9 @@ void UI_func_eeprom_reset(uint8_t param)
if (yesno == true) if (yesno == true)
{ {
LCDML.DISP_clear(); 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.setCursor(0, 1);
lcd.print("Done."); lcd.print("Done.");

6
UI_2_FX.h
Unescape View File

@ -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(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(146, LCDML_0_4, 6, "EEPROM Reset", UI_func_eeprom_reset);
LCDML_add(147, LCDML_0, 5, "System", NULL); LCDML_add(147, LCDML_0, 5, "System", NULL);
LCDML_add(148, LCDML_0_4, 3, "Volume", UI_func_volume); LCDML_add(148, LCDML_0_5, 3, "Volume", UI_func_volume);
LCDML_add(149, LCDML_0_4, 1, "Stereo/Mono", UI_func_stereo_mono); LCDML_add(149, LCDML_0_5, 1, "Stereo/Mono", UI_func_stereo_mono);
LCDML_add(150, LCDML_0_4, 2, "MIDI Soft THRU", UI_func_midi_soft_thru); 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); LCDML_add(151, LCDML_0, 6, "Info", UI_func_information);
#define _LCDML_DISP_cnt 151 #define _LCDML_DISP_cnt 151
#define MENU_ID_OF_INSTANCE_2 59 #define MENU_ID_OF_INSTANCE_2 59

Write Preview
Loading…
Cancel
Save