Your ROOT_URL in app.ini is https://source.parasitstudio.de:63000/ but you are visiting https://source.parasitstudio.de/wirtz/MicroDexed/commit/f8b140409e7b8a4feb34671c8d4d2e83425dac6f?style=split&whitespace=ignore-all You should set ROOT_URL correctly, otherwise the web may not work correctly.
wirtz
/
MicroDexed
mirror of https://codeberg.org/dcoredump/MicroDexed.git
1
1
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into dev

Browse Source
pull/11/head
Dirk Niggemann 6 years ago
parent 9ce32c0207 ca563505ea
commit f8b140409e
2 changed files with 53 additions and 48 deletions
  1. 25
      UI.hpp
  2. 76
      doc/sysex-format_dexed-setup.txt

25
UI.hpp
Unescape View File

@ -565,7 +565,7 @@ void encoder_left_up(void)
soften_volume.update(soften_volume.value() + (VOLUME_MAX - VOLUME_MIN) / VOLUME_ENC_STEPS, SOFTEN_VALUE_CHANGE_STEPS); soften_volume.update(soften_volume.value() + (VOLUME_MAX - VOLUME_MIN) / VOLUME_ENC_STEPS, SOFTEN_VALUE_CHANGE_STEPS);
else else
configuration.vol = VOLUME_MAX; configuration.vol = VOLUME_MAX;
eeprom_write();
UI_func_volume(0); UI_func_volume(0);
} }
@ -579,7 +579,7 @@ void encoder_left_down(void)
soften_volume.update(tmp, SOFTEN_VALUE_CHANGE_STEPS); soften_volume.update(tmp, SOFTEN_VALUE_CHANGE_STEPS);
else else
configuration.vol = VOLUME_MIN; configuration.vol = VOLUME_MIN;
eeprom_write();
UI_func_volume(0); UI_func_volume(0);
} }
@ -1730,24 +1730,27 @@ void UI_func_volume(uint8_t param)
Serial.println(F("UI_func_volume()")); Serial.println(F("UI_func_volume()"));
#endif #endif
menu_state = MENU_VOLUME;
back_from_volume = 0; back_from_volume = 0;
// update LCD content if (menu_state != MENU_VOLUME)
LCDML.DISP_clear(); {
lcd.show(0, 0, 8, "Volume: "); lcd.show(0, 0, LCD_cols, "Volume:");
lcd.show(0, 9, 3, configuration.vol); lcd.show(1, 0, LCD_cols, "[ ]");
menu_state = MENU_VOLUME;
}
lcd.setCursor(8, 0);
lcd_display_int(configuration.vol, 3, true, false, false);
lcd.setCursor(1, 1); lcd.setCursor(1, 1);
for (uint8_t i = 0; i < LCD_cols; i++) for (uint8_t i = 0; i < LCD_cols - 2; i++)
{ {
if (i < int((LCD_cols - 2) * configuration.vol / 100.0)) if (i < int(((LCD_cols - 2) * configuration.vol / 100.0) + 0.5))
lcd.print(F("*")); lcd.print(F("*"));
else else
lcd.print(F(" ")); lcd.print(F(" "));
} }
set_volume(configuration.vol, configuration.pan[0], configuration.mono); set_volume(configuration.vol, configuration.pan[0], configuration.mono);
lcd.show(1, 0, 1, "["); eeprom_write();
lcd.show(1, 15, 1, "]");
} }
void UI_function_not_enabled(void) void UI_function_not_enabled(void)

76
doc/sysex-format_controller-setup.txt → doc/sysex-format_dexed-setup.txt
Unescape View File

@ -5,21 +5,22 @@ SYSEX Message Controller-Set
---------------------------- ----------------------------
11110000 F0 Status byte - start sysex 11110000 F0 Status byte - start sysex
0iiiiiii 43 ID # (i=67; Yamaha) 0iiiiiii 67 ID # (i=103; unofficial SYSEX-ID for MicroDexed)
0sssnnnn 00 Sub-status (s=0) & channel number (n=0; ch 1) 0sssnnnn 00 Sub-status (s=0) & channel number (n=0; ch 1)
0fffffff 00 format number (f=75; 1 controller-set) 0fffffff 00 format number (f=75; 1 MicroDexed setup)
0bbbbbbb 01 byte count MS byte 0bbbbbbb 01 byte count MS byte
0bbbbbbb 1B byte count LS byte (b=155; 1 voice) 0bbbbbbb 1B byte count LS byte (b=38; 1 setup using 1 instance
b=69; 1 setup using 2 instances)
0ddddddd ** data byte 1 controller-set 0ddddddd ** data byte 1 controller-set
| | | | | |
0ddddddd ** data byte 4096 (there are 128 bytes / voice) 0ddddddd ** data byte 38 or 69
0eeeeeee ** checksum (masked 2's comp. of sum of 4096 bytes) 0eeeeeee ** checksum (masked 2's comp. of sum of 38 or 69 bytes)
11110111 F7 Status - end sysex 11110111 F7 Status - end sysex
Data Structure: Single Controller-Set Dump Data Structure: MicroDexed Setup Dump
------------------------------------------ -------------------------------------
Parameter Parameter
Number Parameter Value Range Number Parameter Value Range
@ -62,35 +63,36 @@ Parameter
35 DEXED 1 FILTER-RESONANCE 0-100 35 DEXED 1 FILTER-RESONANCE 0-100
26 DEXED 1 MIDI-CHANNEL 0-16 (0=OMNI) 26 DEXED 1 MIDI-CHANNEL 0-16 (0=OMNI)
37 DEXED 1 POLYPHONY 0-32 (depends on CPU and FX) 37 DEXED 1 POLYPHONY 0-32 (depends on CPU and FX)
38 DEXED 1 ENGINE 0-2 (1=modern, 2=Mark1, 2=OPL) 38 DEXED 1 ENGINE 0-2 (1=Modern, 2=Mark1, 2=OPL)
--- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
39 DEXED 2 MONO/POLY MODE CHANGE 0-1 O=POLY 39 DEXED 2 MONO/POLY MODE CHANGE 0-1 O=POLY
40 DEXED 2 PITCH BEND RANGE 0-12 40 DEXED 2 PITCH BEND RANGE 0-12
2 DEXED 2 " " STEP 0-12 41 DEXED 2 " " STEP 0-12
3 DEXED 2 PORTAMENTO MODE 0-1 0=RETAIN 1=FOLLOW 42 DEXED 2 PORTAMENTO MODE 0-1 0=RETAIN 1=FOLLOW
4 DEXED 2 " GLISS 0-1 43 DEXED 2 " GLISS 0-1
5 DEXED 2 " TIME 0-99 44 DEXED 2 " TIME 0-99
6 DEXED 2 MOD WHEEL RANGE 0-99 45 DEXED 2 MOD WHEEL RANGE 0-99
7 DEXED 2 " " ASSIGN 0-7 b0: pitch, b1:amp, b2: EG bias 46 DEXED 2 " " ASSIGN 0-7 b0: pitch, b1:amp, b2: EG bias
8 DEXED 2 FOOT CONTROL RANGE 0-99 47 DEXED 2 FOOT CONTROL RANGE 0-99
9 DEXED 2 " " ASSIGN 0-7 " 48 DEXED 2 " " ASSIGN 0-7 "
10 DEXED 2 BREATH CONT RANGE 0-99 49 DEXED 2 BREATH CONT RANGE 0-99
11 DEXED 2 " " ASSIGN 0-7 " 40 DEXED 2 " " ASSIGN 0-7 "
12 DEXED 2 AFTERTOUCH RANGE 0-99 51 DEXED 2 AFTERTOUCH RANGE 0-99
13 DEXED 2 " ASSIGN 0-7 " 52 DEXED 2 " ASSIGN 0-7 "
14 DEXED 2 OP1_ENABLE 0-1 53 DEXED 2 OP1_ENABLE 0-1
15 DEXED 2 OP2_ENABLE 0-1 54 DEXED 2 OP2_ENABLE 0-1
16 DEXED 2 OP3_ENABLE 0-1 55 DEXED 2 OP3_ENABLE 0-1
17 DEXED 2 OP4_ENABLE 0-1 56 DEXED 2 OP4_ENABLE 0-1
18 DEXED 2 OP5_ENABLE 0-1 57 DEXED 2 OP5_ENABLE 0-1
19 DEXED 2 OP6_ENABLE 0-1 58 DEXED 2 OP6_ENABLE 0-1
20 DEXED 2 MAX_NOTES 0-32 59 DEXED 2 MAX_NOTES 0-32
21 DEXED 2 LOUDNESS 0-100 60 DEXED 2 LOUDNESS 0-100
22 DEXED 2 PANORAMA 0-40 (20 is middle) 61 DEXED 2 PANORAMA 0-40 (20 is middle)
26 DEXED 2 REVERB-LEVEL 0-100 62 DEXED 2 REVERB-LEVEL 0-100
30 DEXED 2 CHORUS-LEVEL 0-100 63 DEXED 2 CHORUS-LEVEL 0-100
33 DEXED 2 DELAY-LEVEL 0-100 64 DEXED 2 DELAY-LEVEL 0-100
34 DEXED 2 FILTER-CUTOFF 0-100 65 DEXED 2 FILTER-CUTOFF 0-100
35 DEXED 2 FILTER-RESONANCE 0-100 66 DEXED 2 FILTER-RESONANCE 0-100
26 DEXED 2 MIDI-CHANNEL 0-16 (0=OMNI) 67 DEXED 2 MIDI-CHANNEL 0-16 (0=OMNI)
37 DEXED 2 POLYPHONY 0-32 (depends on CPU and FX) 68 DEXED 2 POLYPHONY 0-32 (depends on CPU and FX)
38 DEXED 2 ENGINE 0-2 (1=modern, 2=Mark1, 2=OPL) 69 DEXED 2 ENGINE 0-2 (1=Modern, 2=Mark1, 2=OPL)
Write Preview
Loading…
Cancel
Save