Fixing Transpose and Panorama.

pull/32/head
Holger Wirtz 5 years ago
parent 6c6dfd3484
commit 078a751463
  1. 7
      UI.hpp
  2. 4
      config.h
  3. 3
      dexed.cpp

@ -1624,12 +1624,12 @@ void UI_func_transpose(uint8_t param)
} }
} }
MicroDexed[instance_id]->notesOff();
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();
} }
lcd.setCursor(0, 1); lcd.setCursor(0, 1);
lcd_display_int(configuration.dexed[instance_id].transpose, 2, true, true, false); 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 *********
@ -1810,6 +1810,7 @@ void UI_func_panorama(uint8_t param)
{ {
lcd.setCursor(0, 1); lcd.setCursor(0, 1);
lcd.print(F("MONO-disabled")); lcd.print(F("MONO-disabled"));
return;
} }
} }
@ -1837,7 +1838,7 @@ void UI_func_panorama(uint8_t param)
if (configuration.mono == 0) if (configuration.mono == 0)
{ {
lcd.setCursor(0, 1); lcd.setCursor(0, 1);
lcd_display_int(configuration.dexed[instance_id].pan - 20, 2, false, true, true); lcd_display_int(configuration.dexed[instance_id].pan - 20, 1, false, true, true);
mono2stereo[instance_id]->panorama(mapfloat(configuration.dexed[instance_id].pan, PANORAMA_MIN, PANORAMA_MAX, -1.0, 1.0)); mono2stereo[instance_id]->panorama(mapfloat(configuration.dexed[instance_id].pan, PANORAMA_MIN, PANORAMA_MAX, -1.0, 1.0));
} }
} }

@ -177,7 +177,7 @@
#endif #endif
// Encoder with button // Encoder with button
#define ENCODER_USE_INTERRUPTS //#define ENCODER_USE_INTERRUPTS
#define NUM_ENCODER 2 #define NUM_ENCODER 2
#define ENC_L_PIN_A 3 #define ENC_L_PIN_A 3
#define ENC_L_PIN_B 2 #define ENC_L_PIN_B 2
@ -373,7 +373,7 @@ enum { DEXED, CHORUS, DELAY, REVERB};
#define MONOPOLY_MIN 0 #define MONOPOLY_MIN 0
#define MONOPOLY_MAX 1 #define MONOPOLY_MAX 1
#define MONOPOLY_DEFAULT 1 #define MONOPOLY_DEFAULT 0
#define PB_RANGE_MIN 0 #define PB_RANGE_MIN 0
#define PB_RANGE_MAX 12 #define PB_RANGE_MAX 12

@ -394,8 +394,9 @@ void Dexed::resetControllers(void)
void Dexed::notesOff(void) { void Dexed::notesOff(void) {
for (uint8_t i = 0; i < MAX_ACTIVE_NOTES; i++) { for (uint8_t i = 0; i < MAX_ACTIVE_NOTES; i++) {
if (voices[i].live == true && voices[i].keydown == true) { if (voices[i].live == true) {
voices[i].keydown = false; voices[i].keydown = false;
voices[i].live = false;
} }
} }
} }

Loading…
Cancel
Save