Fixing transpose menu.

pull/32/head
Holger Wirtz 5 years ago
parent 115ac834c6
commit 8a94868daa
  1. 4
      MicroDexed.ino
  2. 11
      UI.hpp

@ -258,10 +258,10 @@ void setup()
setup_debug_message(); setup_debug_message();
#endif #endif
Serial.begin(SERIAL_SPEED); Serial.begin(SERIAL_SPEED);
while (!Serial) /* while (!Serial)
{ {
yield(); yield();
} }*/
#endif #endif
#ifndef ENABLE_LCD_UI #ifndef ENABLE_LCD_UI
#ifdef DEBUG #ifdef DEBUG

@ -1412,10 +1412,8 @@ void UI_func_transpose(uint8_t param)
if (LCDML.FUNC_setup()) // ****** SETUP ********* if (LCDML.FUNC_setup()) // ****** SETUP *********
{ {
// setup function // setup function
lcd.setCursor(0, 0); lcd_special_chars(METERBAR);
lcd.print(F("Transpose")); lcd_display_meter_int("Transpose", configuration.dexed[instance_id].transpose, 1.0, -24.0, TRANSPOSE_MIN, TRANSPOSE_MAX, 3, false, false, true, true);
lcd.setCursor(0, 1);
lcd_display_int(configuration.dexed[instance_id].transpose - 24, 2, true, true, true);
} }
if (LCDML.FUNC_loop()) // ****** LOOP ********* if (LCDML.FUNC_loop()) // ****** LOOP *********
@ -1431,8 +1429,7 @@ void UI_func_transpose(uint8_t param)
else if (LCDML.BT_checkUp()) else if (LCDML.BT_checkUp())
configuration.dexed[instance_id].transpose = constrain(configuration.dexed[instance_id].transpose - ENCODER[ENC_R].speed(), TRANSPOSE_MIN, TRANSPOSE_MAX); configuration.dexed[instance_id].transpose = constrain(configuration.dexed[instance_id].transpose - ENCODER[ENC_R].speed(), TRANSPOSE_MIN, TRANSPOSE_MAX);
lcd.setCursor(0, 1); lcd_display_meter_int("Transpose", configuration.dexed[instance_id].transpose, 1.0, -24.0, TRANSPOSE_MIN, TRANSPOSE_MAX, 3, false, false, true, true);
lcd_display_int(configuration.dexed[instance_id].transpose - 24, 2, true, true, true);
MicroDexed[instance_id]->data[DEXED_VOICE_OFFSET + DEXED_TRANSPOSE] = configuration.dexed[instance_id].transpose; MicroDexed[instance_id]->data[DEXED_VOICE_OFFSET + DEXED_TRANSPOSE] = configuration.dexed[instance_id].transpose;
MicroDexed[instance_id]->notesOff(); MicroDexed[instance_id]->notesOff();
@ -1441,7 +1438,7 @@ void UI_func_transpose(uint8_t param)
if (LCDML.FUNC_close()) // ****** STABLE END ********* if (LCDML.FUNC_close()) // ****** STABLE END *********
{ {
// you can here reset some global vars or do nothing lcd_special_chars(SCROLLBAR);
eeprom_write(); eeprom_write();
} }
} }

Loading…
Cancel
Save