pull/4/head
Holger Wirtz 6 years ago
parent 9a8b56f71f
commit b846c2f84b
  1. 6
      MicroDexed.ino
  2. 1
      config.h
  3. 2
      dexed.h
  4. 8
      dexed_sysex.cpp
  5. 4
      dexed_sysex.h

@ -95,8 +95,8 @@ uint8_t voice = 0;
float vol = VOLUME; float vol = VOLUME;
float vol_right = 1.0; float vol_right = 1.0;
float vol_left = 1.0; float vol_left = 1.0;
char bank_name[10]; char bank_name[11];
char voice_name[10]; char voice_name[11];
#ifdef MASTER_KEY_MIDI #ifdef MASTER_KEY_MIDI
bool master_key_enabled = false; bool master_key_enabled = false;
#endif #endif
@ -227,6 +227,7 @@ void setup()
#endif #endif
#ifdef I2C_DISPLAY #ifdef I2C_DISPLAY
lcd.clear();
lcd.show(0, 0, 2, bank); lcd.show(0, 0, 2, bank);
lcd.show(0, 2, 1, " "); lcd.show(0, 2, 1, " ");
lcd.show(0, 3, 10, bank_name); lcd.show(0, 3, 10, bank_name);
@ -917,4 +918,3 @@ void note_off(void)
show_patch(); show_patch();
} }
#endif #endif

@ -99,4 +99,3 @@
#define EEPROM_MASTER_VOLUME_ADDR 2 #define EEPROM_MASTER_VOLUME_ADDR 2
#define EEPROM_VOLUME_RIGHT_ADDR 3 #define EEPROM_VOLUME_RIGHT_ADDR 3
#define EEPROM_VOLUME_LEFT_ADDR 4 #define EEPROM_VOLUME_LEFT_ADDR 4

@ -44,7 +44,7 @@ extern float vol;
extern float vol_right; extern float vol_right;
extern float vol_left; extern float vol_left;
extern void set_volume(float master_volume, float volume_right, float volume_left); extern void set_volume(float master_volume, float volume_right, float volume_left);
extern char voice_name[10]; extern char voice_name[11];
struct ProcessorVoice { struct ProcessorVoice {
uint8_t midi_note; uint8_t midi_note;

@ -63,7 +63,7 @@ bool get_bank_name(uint8_t b)
else else
{ {
if (!entry.isDirectory()) if (!entry.isDirectory())
strncpy(bank_name, entry.name(), strlen(bank_name) - 1); strcpy(bank_name, entry.name());
} }
} }
} }
@ -80,10 +80,10 @@ bool load_sysex(uint8_t b, uint8_t v)
if (sd_card_available) if (sd_card_available)
{ {
char bankdir[3]; char bankdir[4];
memset(bankdir, 0, sizeof(bankdir));
bankdir[0] = '/'; bankdir[0] = '/';
bankdir[2] = '\0';
itoa(b, &bankdir[1], 10); itoa(b, &bankdir[1], 10);
root = SD.open(bankdir); root = SD.open(bankdir);
@ -122,7 +122,7 @@ bool load_sysex(uint8_t b, uint8_t v)
Serial.println(F("]")); Serial.println(F("]"));
#endif #endif
strncpy(bank_name, entry.name(), strlen(bank_name) - 1); strcpy(bank_name, entry.name());
return (dexed->loadSysexVoice(data)); return (dexed->loadSysexVoice(data));
} }

@ -33,8 +33,8 @@ extern Dexed* dexed;
extern uint16_t render_time_max; extern uint16_t render_time_max;
extern uint8_t bank; extern uint8_t bank;
extern uint8_t voice; extern uint8_t voice;
extern char bank_name[10]; extern char bank_name[11];
extern char voice_name[10]; extern char voice_name[11];
extern LiquidCrystalPlus_I2C lcd; extern LiquidCrystalPlus_I2C lcd;
bool get_bank_name(uint8_t b); bool get_bank_name(uint8_t b);

Loading…
Cancel
Save