Small fixes.

pull/32/head
Holger Wirtz 5 years ago
parent 1d2ed1fd48
commit 10f75c8a61
  1. 16
      MicroDexed.ino
  2. 21
      UI.hpp

@ -968,35 +968,35 @@ void handleSystemExclusive(byte * sysex, uint len)
MicroDexed[instance_id]->setPortamentoMode(configuration.dexed[instance_id].portamento_mode, configuration.dexed[instance_id].portamento_glissando, configuration.dexed[instance_id].portamento_time);
break;
case 70:
configuration.dexed[instance_id].mw_range = constrain(sysex[4], MW_RANGE_MIN, MW_RANGE_MIN);
configuration.dexed[instance_id].mw_range = constrain(sysex[4], MW_RANGE_MIN, MW_RANGE_MAX);
MicroDexed[instance_id]->controllers.wheel.setRange(configuration.dexed[instance_id].mw_range);
break;
case 71:
configuration.dexed[instance_id].mw_assign = constrain(sysex[4], MW_ASSIGN_MIN, MW_ASSIGN_MIN);
configuration.dexed[instance_id].mw_assign = constrain(sysex[4], MW_ASSIGN_MIN, MW_ASSIGN_MAX);
MicroDexed[instance_id]->controllers.wheel.setTarget(configuration.dexed[instance_id].mw_assign);
break;
case 72:
configuration.dexed[instance_id].fc_range = constrain(sysex[4], FC_RANGE_MIN, FC_RANGE_MIN);
configuration.dexed[instance_id].fc_range = constrain(sysex[4], FC_RANGE_MIN, FC_RANGE_MAX);
MicroDexed[instance_id]->controllers.foot.setRange(configuration.dexed[instance_id].fc_range);
break;
case 73:
configuration.dexed[instance_id].fc_assign = constrain(sysex[4], FC_ASSIGN_MIN, FC_ASSIGN_MIN);
configuration.dexed[instance_id].fc_assign = constrain(sysex[4], FC_ASSIGN_MIN, FC_ASSIGN_MAX);
MicroDexed[instance_id]->controllers.foot.setTarget(configuration.dexed[instance_id].fc_assign);
break;
case 74:
configuration.dexed[instance_id].bc_range = constrain(sysex[4], BC_RANGE_MIN, BC_RANGE_MIN);
configuration.dexed[instance_id].bc_range = constrain(sysex[4], BC_RANGE_MIN, BC_RANGE_MAX);
MicroDexed[instance_id]->controllers.breath.setRange(configuration.dexed[instance_id].bc_range);
break;
case 75:
configuration.dexed[instance_id].bc_assign = constrain(sysex[4], BC_ASSIGN_MIN, BC_ASSIGN_MIN);
configuration.dexed[instance_id].bc_assign = constrain(sysex[4], BC_ASSIGN_MIN, BC_ASSIGN_MAX);
MicroDexed[instance_id]->controllers.breath.setTarget(configuration.dexed[instance_id].bc_assign);
break;
case 76:
configuration.dexed[instance_id].at_range = constrain(sysex[4], AT_RANGE_MIN, AT_RANGE_MIN);
configuration.dexed[instance_id].at_range = constrain(sysex[4], AT_RANGE_MIN, AT_RANGE_MAX);
MicroDexed[instance_id]->controllers.at.setRange(configuration.dexed[instance_id].at_range);
break;
case 77:
configuration.dexed[instance_id].at_assign = constrain(sysex[4], AT_ASSIGN_MIN, AT_ASSIGN_MIN);
configuration.dexed[instance_id].at_assign = constrain(sysex[4], AT_ASSIGN_MIN, AT_ASSIGN_MAX);
MicroDexed[instance_id]->controllers.at.setTarget(configuration.dexed[instance_id].at_assign);
break;
default:

@ -1629,7 +1629,7 @@ void UI_func_transpose(uint8_t param)
}
lcd.setCursor(0, 1);
lcd_display_int(configuration.dexed[instance_id].transpose-24, 1, false, true, true);
lcd_display_int(configuration.dexed[instance_id].transpose - 24, 1, false, true, true);
}
if (LCDML.FUNC_close()) // ****** STABLE END *********
@ -3087,25 +3087,28 @@ void UI_func_voice_selection(uint8_t param)
lcd.show(1, 4, 10, voice_names[selected_dexed_instance][configuration.dexed[selected_dexed_instance].voice]);
// display selected Dexed instance
if (selected_dexed_instance == 1)
/* if (selected_dexed_instance == 1)
{
#if NUM_DEXED > 1
#if NUM_DEXED > 1
lcd.show(0, 15, 1, "o");
#else
#else
lcd.show(0, 15, 1, " ");
#endif
#endif
lcd.show(1, 15, 1, "*");
}
else
{
selected_dexed_instance = 0;
lcd.show(0, 15, 1, "*");
#if NUM_DEXED > 1
#if NUM_DEXED > 1
lcd.show(1, 15, 1, "o");
#else
#else
lcd.show(1, 15, 1, " ");
#endif
} */
lcd.show(0, 15, 1, " ");
lcd.show(1, 15, 1, " ");
#endif
}
// display selections
switch (menu_voice)

Loading…
Cancel
Save