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 1d2ed1fd48
commit 10f75c8a61
2 changed files with 31 additions and 28 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. 16
      MicroDexed.ino
  2. 21
      UI.hpp

16
MicroDexed.ino
Unescape View File

@ -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); MicroDexed[instance_id]->setPortamentoMode(configuration.dexed[instance_id].portamento_mode, configuration.dexed[instance_id].portamento_glissando, configuration.dexed[instance_id].portamento_time);
break; break;
case 70: 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); MicroDexed[instance_id]->controllers.wheel.setRange(configuration.dexed[instance_id].mw_range);
break; break;
case 71: 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); MicroDexed[instance_id]->controllers.wheel.setTarget(configuration.dexed[instance_id].mw_assign);
break; break;
case 72: 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); MicroDexed[instance_id]->controllers.foot.setRange(configuration.dexed[instance_id].fc_range);
break; break;
case 73: 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); MicroDexed[instance_id]->controllers.foot.setTarget(configuration.dexed[instance_id].fc_assign);
break; break;
case 74: 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); MicroDexed[instance_id]->controllers.breath.setRange(configuration.dexed[instance_id].bc_range);
break; break;
case 75: 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); MicroDexed[instance_id]->controllers.breath.setTarget(configuration.dexed[instance_id].bc_assign);
break; break;
case 76: 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); MicroDexed[instance_id]->controllers.at.setRange(configuration.dexed[instance_id].at_range);
break; break;
case 77: 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); MicroDexed[instance_id]->controllers.at.setTarget(configuration.dexed[instance_id].at_assign);
break; break;
default: default:

21
UI.hpp
Unescape View File

@ -1629,7 +1629,7 @@ void UI_func_transpose(uint8_t param)
} }
lcd.setCursor(0, 1); 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 ********* 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]); lcd.show(1, 4, 10, voice_names[selected_dexed_instance][configuration.dexed[selected_dexed_instance].voice]);
// display selected Dexed instance // 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"); lcd.show(0, 15, 1, "o");
#else #else
lcd.show(0, 15, 1, " "); lcd.show(0, 15, 1, " ");
#endif #endif
lcd.show(1, 15, 1, "*"); lcd.show(1, 15, 1, "*");
} }
else else
{ {
selected_dexed_instance = 0; selected_dexed_instance = 0;
lcd.show(0, 15, 1, "*"); lcd.show(0, 15, 1, "*");
#if NUM_DEXED > 1 #if NUM_DEXED > 1
lcd.show(1, 15, 1, "o"); lcd.show(1, 15, 1, "o");
#else #else
lcd.show(1, 15, 1, " ");
#endif
} */
lcd.show(0, 15, 1, " ");
lcd.show(1, 15, 1, " "); lcd.show(1, 15, 1, " ");
#endif
}
// display selections // display selections
switch (menu_voice) switch (menu_voice)

Write Preview
Loading…
Cancel
Save