wirtz
/
MicroDexed
mirror of https://codeberg.org/dcoredump/MicroDexed.git
1
1
Fork 0
Code Issues Releases Wiki Activity

Renamed "Sound Intensity" to "Volume".

Browse Source 
Fixing controller handling for "Special".
Small fixes.
pull/32/head
Holger Wirtz 5 years ago
parent 708221d59c
commit c1dacebe24
7 changed files with 25 additions and 25 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. 29
      UI.hpp
  2. 2
      UI_1.h
  3. 2
      UI_1_FX.h
  4. 4
      UI_2.h
  5. 4
      UI_2_FX.h
  6. 6
      config.h
  7. 3
      controllers.h

29
UI.hpp
Unescape View File

@ -1530,7 +1530,7 @@ void UI_func_sound_intensity(uint8_t param)
{ {
// setup function // setup function
lcd_special_chars(BLOCKBAR); lcd_special_chars(BLOCKBAR);
lcd_display_bar_float("Sound Intens.", float(configuration.dexed[instance_id].sound_intensity), 1.0, SOUND_INTENSITY_MIN, SOUND_INTENSITY_MAX, 3, 0, false, false, false, true); lcd_display_bar_float("Volume", float(configuration.dexed[instance_id].sound_intensity), 1.0, SOUND_INTENSITY_MIN, SOUND_INTENSITY_MAX, 3, 0, false, false, false, true);
} }
if (LCDML.FUNC_loop()) // ****** LOOP ********* if (LCDML.FUNC_loop()) // ****** LOOP *********
@ -1546,7 +1546,7 @@ void UI_func_sound_intensity(uint8_t param)
else if (LCDML.BT_checkUp()) else if (LCDML.BT_checkUp())
configuration.dexed[instance_id].sound_intensity = constrain(configuration.dexed[instance_id].sound_intensity - ENCODER[ENC_R].speed(), SOUND_INTENSITY_MIN, SOUND_INTENSITY_MAX); configuration.dexed[instance_id].sound_intensity = constrain(configuration.dexed[instance_id].sound_intensity - ENCODER[ENC_R].speed(), SOUND_INTENSITY_MIN, SOUND_INTENSITY_MAX);
lcd_display_bar_float("Sound Intens.", float(configuration.dexed[instance_id].sound_intensity), 1.0, SOUND_INTENSITY_MIN, SOUND_INTENSITY_MAX, 3, 0, false, false, false, false); lcd_display_bar_float("Volume", float(configuration.dexed[instance_id].sound_intensity), 1.0, SOUND_INTENSITY_MIN, SOUND_INTENSITY_MAX, 3, 0, false, false, false, false);
dexed_level[instance_id]->gain(mapfloat(configuration.dexed[instance_id].sound_intensity, SOUND_INTENSITY_MIN, SOUND_INTENSITY_MAX, 0.0, SOUND_INTENSITY_AMP_MAX)); dexed_level[instance_id]->gain(mapfloat(configuration.dexed[instance_id].sound_intensity, SOUND_INTENSITY_MIN, SOUND_INTENSITY_MAX, 0.0, SOUND_INTENSITY_AMP_MAX));
} }
@ -2904,17 +2904,16 @@ void UI_func_midi_soft_thru(uint8_t param)
configuration.soft_midi_thru = constrain(configuration.soft_midi_thru + 1, SOFT_MIDI_THRU_MIN, SOFT_MIDI_THRU_MAX); configuration.soft_midi_thru = constrain(configuration.soft_midi_thru + 1, SOFT_MIDI_THRU_MIN, SOFT_MIDI_THRU_MAX);
else if (LCDML.BT_checkUp()) else if (LCDML.BT_checkUp())
configuration.soft_midi_thru = constrain(configuration.soft_midi_thru - 1, SOFT_MIDI_THRU_MIN, SOFT_MIDI_THRU_MAX); configuration.soft_midi_thru = constrain(configuration.soft_midi_thru - 1, SOFT_MIDI_THRU_MIN, SOFT_MIDI_THRU_MAX);
}
lcd.setCursor(0, 1); lcd.setCursor(0, 1);
switch (configuration.soft_midi_thru) switch (configuration.soft_midi_thru)
{ {
case 0: case 0:
lcd.print(F("[OFF]")); lcd.print(F("[OFF]"));
break; break;
case 1: case 1:
lcd.print(F("[ON ]")); lcd.print(F("[ON ]"));
break; break;
}
} }
} }
@ -3041,11 +3040,11 @@ void UI_func_volume(uint8_t param)
{ {
LCDML.DISP_clear(); LCDML.DISP_clear();
lcd_special_chars(BLOCKBAR); lcd_special_chars(BLOCKBAR);
lcd_display_bar_int("Volume", configuration.vol, 1.0, VOLUME_MIN, VOLUME_MAX, 3, false, false, false, true); lcd_display_bar_int("Master Vol.", configuration.vol, 1.0, VOLUME_MIN, VOLUME_MAX, 3, false, false, false, true);
menu_state = MENU_VOLUME; menu_state = MENU_VOLUME;
} }
else else
lcd_display_bar_int("Volume", configuration.vol, 1.0, VOLUME_MIN, VOLUME_MAX, 3, false, false, false, false); lcd_display_bar_int("Master Vol.", configuration.vol, 1.0, VOLUME_MIN, VOLUME_MAX, 3, false, false, false, false);
set_volume(configuration.vol, configuration.mono); set_volume(configuration.vol, configuration.mono);
eeprom_write(); eeprom_write();

2
UI_1.h
Unescape View File

@ -27,7 +27,7 @@
LCDML_add(0, LCDML_0, 1, "Setup", NULL); LCDML_add(0, LCDML_0, 1, "Setup", NULL);
LCDML_add(1, LCDML_0_1, 1, "MIDI Channel", UI_func_midi_channel); LCDML_add(1, LCDML_0_1, 1, "MIDI Channel", UI_func_midi_channel);
LCDML_add(2, LCDML_0_1, 2, "Sound Intens.", UI_func_sound_intensity); LCDML_add(2, LCDML_0_1, 2, "Volume", UI_func_sound_intensity);
LCDML_add(3, LCDML_0_1, 3, "Transpose", UI_func_transpose); LCDML_add(3, LCDML_0_1, 3, "Transpose", UI_func_transpose);
LCDML_add(4, LCDML_0_1, 4, "Tune", UI_func_tune); LCDML_add(4, LCDML_0_1, 4, "Tune", UI_func_tune);
LCDML_add(5, LCDML_0_1, 5, "Panorama", UI_func_panorama); LCDML_add(5, LCDML_0_1, 5, "Panorama", UI_func_panorama);

2
UI_1_FX.h
Unescape View File

@ -27,7 +27,7 @@
LCDML_add(0, LCDML_0, 1, "Setup", NULL); LCDML_add(0, LCDML_0, 1, "Setup", NULL);
LCDML_add(1, LCDML_0_1, 1, "MIDI Channel", UI_func_midi_channel); LCDML_add(1, LCDML_0_1, 1, "MIDI Channel", UI_func_midi_channel);
LCDML_add(2, LCDML_0_1, 2, "Sound Intens.", UI_func_sound_intensity); LCDML_add(2, LCDML_0_1, 2, "Volume", UI_func_sound_intensity);
LCDML_add(3, LCDML_0_1, 3, "Transpose", UI_func_transpose); LCDML_add(3, LCDML_0_1, 3, "Transpose", UI_func_transpose);
LCDML_add(4, LCDML_0_1, 4, "Tune", UI_func_tune); LCDML_add(4, LCDML_0_1, 4, "Tune", UI_func_tune);
LCDML_add(5, LCDML_0_1, 5, "Reverb Send", UI_func_reverb_send); LCDML_add(5, LCDML_0_1, 5, "Reverb Send", UI_func_reverb_send);

4
UI_2.h
Unescape View File

@ -30,7 +30,7 @@ LCDML_add(1, LCDML_0_1, 1, "Instance 1", NULL);
LCDML_add(2, LCDML_0_1_1, 1, "MIDI Channel 1", UI_func_midi_channel); LCDML_add(2, LCDML_0_1_1, 1, "MIDI Channel 1", UI_func_midi_channel);
LCDML_add(3, LCDML_0_1_1, 2, "Transpose 1", UI_func_transpose); LCDML_add(3, LCDML_0_1_1, 2, "Transpose 1", UI_func_transpose);
LCDML_add(4, LCDML_0_1_1, 3, "Tune 1", UI_func_tune); LCDML_add(4, LCDML_0_1_1, 3, "Tune 1", UI_func_tune);
LCDML_add(5, LCDML_0_1_1, 4, "Sound Intens. 1", UI_func_sound_intensity); LCDML_add(5, LCDML_0_1_1, 4, "Volume 1", UI_func_sound_intensity);
LCDML_add(6, LCDML_0_1_1, 9, "Panorama 1", UI_func_panorama); LCDML_add(6, LCDML_0_1_1, 9, "Panorama 1", UI_func_panorama);
LCDML_add(7, LCDML_0_1_1, 10, "Polyphony 1", UI_func_polyphony); LCDML_add(7, LCDML_0_1_1, 10, "Polyphony 1", UI_func_polyphony);
LCDML_add(8, LCDML_0_1_1, 11, "Velocity Lvl 1", UI_func_velocity_level); LCDML_add(8, LCDML_0_1_1, 11, "Velocity Lvl 1", UI_func_velocity_level);
@ -69,7 +69,7 @@ LCDML_add(40, LCDML_0_1_1_21, 5, "OP5 1", UI_func_OP5);
LCDML_add(41, LCDML_0_1_1_21, 6, "OP6 1", UI_func_OP6); LCDML_add(41, LCDML_0_1_1_21, 6, "OP6 1", UI_func_OP6);
LCDML_add(42, LCDML_0_1, 2, "Instance 2", NULL); LCDML_add(42, LCDML_0_1, 2, "Instance 2", NULL);
LCDML_add(43, LCDML_0_1_2, 1, "MIDI Channel 2", UI_func_midi_channel); LCDML_add(43, LCDML_0_1_2, 1, "MIDI Channel 2", UI_func_midi_channel);
LCDML_add(44, LCDML_0_1_2, 2, "Sound Intens. 2", UI_func_sound_intensity); LCDML_add(44, LCDML_0_1_2, 2, "Volume 2", UI_func_sound_intensity);
LCDML_add(45, LCDML_0_1_2, 3, "Transpose 2", UI_func_transpose); LCDML_add(45, LCDML_0_1_2, 3, "Transpose 2", UI_func_transpose);
LCDML_add(46, LCDML_0_1_2, 4, "Tune 2", UI_func_tune); LCDML_add(46, LCDML_0_1_2, 4, "Tune 2", UI_func_tune);
LCDML_add(47, LCDML_0_1_2, 9, "Panorama 2", UI_func_panorama); LCDML_add(47, LCDML_0_1_2, 9, "Panorama 2", UI_func_panorama);

4
UI_2_FX.h
Unescape View File

@ -30,7 +30,7 @@ LCDML_add(1, LCDML_0_1, 1, "Instance 1", NULL);
LCDML_add(2, LCDML_0_1_1, 1, "MIDI Channel 1", UI_func_midi_channel); LCDML_add(2, LCDML_0_1_1, 1, "MIDI Channel 1", UI_func_midi_channel);
LCDML_add(3, LCDML_0_1_1, 2, "Transpose 1", UI_func_transpose); LCDML_add(3, LCDML_0_1_1, 2, "Transpose 1", UI_func_transpose);
LCDML_add(4, LCDML_0_1_1, 3, "Tune 1", UI_func_tune); LCDML_add(4, LCDML_0_1_1, 3, "Tune 1", UI_func_tune);
LCDML_add(5, LCDML_0_1_1, 4, "Sound Intens. 1", UI_func_sound_intensity); LCDML_add(5, LCDML_0_1_1, 4, "Volume 1", UI_func_sound_intensity);
LCDML_add(6, LCDML_0_1_1, 5, "Reverb Send 1", UI_func_reverb_send); LCDML_add(6, LCDML_0_1_1, 5, "Reverb Send 1", UI_func_reverb_send);
LCDML_add(7, LCDML_0_1_1, 6, "Chorus Send 1", UI_func_chorus_send); LCDML_add(7, LCDML_0_1_1, 6, "Chorus Send 1", UI_func_chorus_send);
LCDML_add(8, LCDML_0_1_1, 7, "Delay Send 1", UI_func_delay_send); LCDML_add(8, LCDML_0_1_1, 7, "Delay Send 1", UI_func_delay_send);
@ -75,7 +75,7 @@ LCDML_add(46, LCDML_0_1_1_21, 5, "OP5 1", UI_func_OP5);
LCDML_add(47, LCDML_0_1_1_21, 6, "OP6 1", UI_func_OP6); LCDML_add(47, LCDML_0_1_1_21, 6, "OP6 1", UI_func_OP6);
LCDML_add(48, LCDML_0_1, 2, "Instance 2", NULL); LCDML_add(48, LCDML_0_1, 2, "Instance 2", NULL);
LCDML_add(49, LCDML_0_1_2, 1, "MIDI Channel 2", UI_func_midi_channel); LCDML_add(49, LCDML_0_1_2, 1, "MIDI Channel 2", UI_func_midi_channel);
LCDML_add(50, LCDML_0_1_2, 2, "Sound Intens. 2", UI_func_sound_intensity); LCDML_add(50, LCDML_0_1_2, 2, "Volume 2", UI_func_sound_intensity);
LCDML_add(51, LCDML_0_1_2, 3, "Transpose 2", UI_func_transpose); LCDML_add(51, LCDML_0_1_2, 3, "Transpose 2", UI_func_transpose);
LCDML_add(52, LCDML_0_1_2, 4, "Tune 2", UI_func_tune); LCDML_add(52, LCDML_0_1_2, 4, "Tune 2", UI_func_tune);
LCDML_add(53, LCDML_0_1_2, 5, "Reverb Send 2", UI_func_reverb_send); LCDML_add(53, LCDML_0_1_2, 5, "Reverb Send 2", UI_func_reverb_send);

6
config.h
Unescape View File

@ -78,7 +78,7 @@
//************************************************************************************************* //*************************************************************************************************
//* DEBUG OUTPUT SETTINGS //* DEBUG OUTPUT SETTINGS
//************************************************************************************************* //*************************************************************************************************
//#define DEBUG 1 #define DEBUG 1
#define SERIAL_SPEED 230400 #define SERIAL_SPEED 230400
#define SHOW_XRUN 1 #define SHOW_XRUN 1
#define SHOW_CPU_LOAD_MSEC 5000 #define SHOW_CPU_LOAD_MSEC 5000
@ -385,8 +385,8 @@ enum { DEXED, CHORUS, DELAY, REVERB};
#define SOUND_INTENSITY_MIN 0 #define SOUND_INTENSITY_MIN 0
#define SOUND_INTENSITY_MAX 100 #define SOUND_INTENSITY_MAX 100
#define SOUND_INTENSITY_DEFAULT 50 #define SOUND_INTENSITY_DEFAULT 100
#define SOUND_INTENSITY_AMP_MAX 2.0 #define SOUND_INTENSITY_AMP_MAX 1.5
#define POLYPHONY_MIN 1 #define POLYPHONY_MIN 1
#define POLYPHONY_MAX MAX_NOTES #define POLYPHONY_MAX MAX_NOTES

3
controllers.h
Unescape View File

@ -83,7 +83,8 @@ class Controllers {
total = (float)(127 - cc) * range; // REVERSE mode total = (float)(127 - cc) * range; // REVERSE mode
break; break;
case 2: case 2:
total = 100.0 - range + (float)cc * range / 100.0; // Special BC mode by Thierry (opus.quatre) //total = 100.0 - range + (float)cc * range / 100.0; // Special BC mode by Thierry (opus.quatre)
total = 127.0 * ( 1 - range ) + ((float)cc * range ); // Special BC mode by Thierry (opus.quatre)
break; break;
} }

Write Preview
Loading…
Cancel
Save