diff --git a/MicroDexed.ino b/MicroDexed.ino index 48352ac..dffc6b8 100644 --- a/MicroDexed.ino +++ b/MicroDexed.ino @@ -528,7 +528,7 @@ void loop() if (midi_decay_timer > 100 && midi_decay[instance_id] > 0) { midi_decay[instance_id]--; - lcd.createChar(6 + instance_id, (uint8_t*)inverse_num[15 - (7 - midi_decay[instance_id])]); + lcd.createChar(6 + instance_id, (uint8_t*)special_chars[15 - (7 - midi_decay[instance_id])]); lcd.setCursor(14 + instance_id, 1); lcd.write(6 + instance_id); } diff --git a/UI.hpp b/UI.hpp index 3181606..9b4de6a 100644 --- a/UI.hpp +++ b/UI.hpp @@ -123,41 +123,41 @@ const uint8_t scroll_bar[5][8] = { {B10001, B10001, B10001, B10001, B10001, B10001, B11111, B11111} // scrollbar bottom }; -/* - const uint8_t block_bar[5][8] = { +const uint8_t block_bar[5][8] = { {B10000, B10000, B10000, B10000, B10000, B10000, B10000, B10000}, {B11000, B11000, B11000, B11000, B11000, B11000, B11000, B11000}, {B11100, B11100, B11100, B11100, B11100, B11100, B11100, B11100}, {B11110, B11110, B11110, B11110, B11110, B11110, B11110, B11110}, {B11111, B11111, B11111, B11111, B11111, B11111, B11111, B11111} - }; +}; - const uint8_t meter_bar[5][8] = { +const uint8_t meter_bar[5][8] = { {B10000, B10000, B10000, B10000, B10000, B10000, B10000, B10000}, {B01000, B01000, B01000, B01000, B01000, B01000, B01000, B01000}, {B00100, B00100, B00100, B00100, B00100, B00100, B00100, B00100}, {B00010, B00010, B00010, B00010, B00010, B00010, B00010, B00010}, {B00001, B00001, B00001, B00001, B00001, B00001, B00001, B00001} - }; -*/ +}; -const uint8_t block_bar[5][8] = { +/* + const uint8_t block_bar[5][8] = { {B00000, B10000, B10000, B10000, B10000, B10000, B10000, B00000}, {B00000, B11000, B11000, B11000, B11000, B11000, B11000, B00000}, {B00000, B11100, B11100, B11100, B11100, B11100, B11100, B00000}, {B00000, B11110, B11110, B11110, B11110, B11110, B11110, B00000}, {B00000, B11111, B11111, B11111, B11111, B11111, B11111, B00000} -}; + }; -const uint8_t meter_bar[5][8] = { + const uint8_t meter_bar[5][8] = { {B00000, B10000, B10000, B10000, B10000, B10000, B10000, B00000}, {B00000, B01000, B01000, B01000, B01000, B01000, B01000, B00000}, {B00000, B00100, B00100, B00100, B00100, B00100, B00100, B00000}, {B00000, B00010, B00010, B00010, B00010, B00010, B00010, B00000}, {B00000, B00001, B00001, B00001, B00001, B00001, B00001, B00000} -}; + }; +*/ -const uint8_t inverse_num[16][8] = { +const uint8_t special_chars[16][8] = { {B11111, B11011, B10011, B11011, B11011, B11011, B11011, B11111}, // [0] 1 small invers {B11111, B11011, B10101, B11101, B11011, B10111, B10001, B11111}, // [1] 2 small invers {B11111, B11011, B10011, B11011, B11011, B11011, B11011, B11111}, // [2] 1 OP invers @@ -250,12 +250,10 @@ void UI_function_not_enabled(void); void UI_function_not_implemented(uint8_t param); void lcd_display_int(int16_t var, uint8_t size, bool zeros, bool brackets, bool sign); void lcd_display_float(float var, uint8_t size_number, uint8_t size_fraction, bool zeros, bool brackets, bool sign); -void lcd_display_bar_int(const char* title, uint32_t value, float factor, int32_t min_value, int32_t max_value, uint8_t size, bool zeros, bool brackets, bool sign, bool init); -void lcd_display_bar_int_new(const char* title, uint32_t value, float factor, int32_t min_value, int32_t max_value, uint8_t size, bool zeros, bool sign, bool init); -void lcd_display_bar_float(const char* title, float value, float factor, int32_t min_value, int32_t max_value, uint8_t size_number, uint8_t size_fraction, bool zeros, bool brackets, bool sign, bool init); -void lcd_display_bar_float_new(const char* title, float value, float factor, int32_t min_value, int32_t max_value, uint8_t size_number, uint8_t size_fraction, bool zeros, bool sign, bool init); -void lcd_display_meter_int(const char* title, uint32_t value, float factor, float offset, int32_t min_value, int32_t max_value, uint8_t size, bool zeros, bool brackets, bool sign, bool init); -void lcd_display_meter_float(const char* title, float value, float factor, float offset, int32_t min_value, int32_t max_value, uint8_t size_number, uint8_t size_fraction, bool zeros, bool brackets, bool sign, bool init); +void lcd_display_bar_int(const char* title, uint32_t value, float factor, int32_t min_value, int32_t max_value, uint8_t size, bool zeros, bool sign, bool init); +void lcd_display_bar_float(const char* title, float value, float factor, int32_t min_value, int32_t max_value, uint8_t size_number, uint8_t size_fraction, bool zeros, bool sign, bool init); +void lcd_display_meter_int(const char* title, uint32_t value, float factor, float offset, int32_t min_value, int32_t max_value, uint8_t size, bool zeros, bool sign, bool init); +void lcd_display_meter_float(const char* title, float value, float factor, float offset, int32_t min_value, int32_t max_value, uint8_t size_number, uint8_t size_fraction, bool zeros, bool sign, bool init); void lcd_active_instance_number(uint8_t instance_id); void lcd_OP_active_instance_number(uint8_t instance_id, uint8_t op); void lcd_special_chars(uint8_t mode); @@ -908,7 +906,7 @@ void UI_func_reverb_roomsize(uint8_t param) encoderDir[ENC_R].reset(); lcd_special_chars(BLOCKBAR); - lcd_display_bar_int("Reverb Room", configuration.fx.reverb_roomsize, 1.0, REVERB_ROOMSIZE_MIN, REVERB_ROOMSIZE_MAX, 3, false, false, false, true); + lcd_display_bar_int("Reverb Room", configuration.fx.reverb_roomsize, 1.0, REVERB_ROOMSIZE_MIN, REVERB_ROOMSIZE_MAX, 3, false, false, true); } if (LCDML.FUNC_loop()) // ****** LOOP ********* @@ -920,7 +918,7 @@ void UI_func_reverb_roomsize(uint8_t param) else if (LCDML.BT_checkUp()) configuration.fx.reverb_roomsize = constrain(configuration.fx.reverb_roomsize - ENCODER[ENC_R].speed(), REVERB_ROOMSIZE_MIN, REVERB_ROOMSIZE_MAX); } - lcd_display_bar_int("Reverb Room", configuration.fx.reverb_roomsize, 1.0, REVERB_ROOMSIZE_MIN, REVERB_ROOMSIZE_MAX, 3, false, false, false, false); + lcd_display_bar_int("Reverb Room", configuration.fx.reverb_roomsize, 1.0, REVERB_ROOMSIZE_MIN, REVERB_ROOMSIZE_MAX, 3, false, false, false); freeverb_r.roomsize(mapfloat(configuration.fx.reverb_roomsize, REVERB_ROOMSIZE_MIN, REVERB_ROOMSIZE_MAX, 0.0, 1.0)); freeverb_l.roomsize(mapfloat(configuration.fx.reverb_roomsize, REVERB_ROOMSIZE_MIN, REVERB_ROOMSIZE_MAX, 0.0, 1.0)); @@ -941,7 +939,7 @@ void UI_func_reverb_damping(uint8_t param) encoderDir[ENC_R].reset(); lcd_special_chars(BLOCKBAR); - lcd_display_bar_int("Reverb Damp.", configuration.fx.reverb_damping, 1.0, REVERB_DAMPING_MIN, REVERB_DAMPING_MAX, 3, false, false, false, true); + lcd_display_bar_int("Reverb Damp.", configuration.fx.reverb_damping, 1.0, REVERB_DAMPING_MIN, REVERB_DAMPING_MAX, 3, false, false, true); } if (LCDML.FUNC_loop()) // ****** LOOP ********* @@ -954,7 +952,7 @@ void UI_func_reverb_damping(uint8_t param) configuration.fx.reverb_damping = constrain(configuration.fx.reverb_damping - ENCODER[ENC_R].speed(), REVERB_DAMPING_MIN, REVERB_DAMPING_MAX); } - lcd_display_bar_int("Reverb Damp.", configuration.fx.reverb_damping, 1.0, REVERB_DAMPING_MIN, REVERB_DAMPING_MAX, 3, false, false, false, false); + lcd_display_bar_int("Reverb Damp.", configuration.fx.reverb_damping, 1.0, REVERB_DAMPING_MIN, REVERB_DAMPING_MAX, 3, false, false, false); freeverb_l.damping(mapfloat(configuration.fx.reverb_damping, REVERB_DAMPING_MIN, REVERB_DAMPING_MAX, 0.0, 1.0)); freeverb_r.damping(mapfloat(configuration.fx.reverb_damping, REVERB_DAMPING_MIN, REVERB_DAMPING_MAX, 0.0, 1.0)); @@ -975,7 +973,7 @@ void UI_func_reverb_level(uint8_t param) encoderDir[ENC_R].reset(); lcd_special_chars(BLOCKBAR); - lcd_display_bar_int("Reverb Level", configuration.fx.reverb_level, 1.0, REVERB_LEVEL_MIN, REVERB_LEVEL_MAX, 3, false, false, false, true); + lcd_display_bar_int("Reverb Level", configuration.fx.reverb_level, 1.0, REVERB_LEVEL_MIN, REVERB_LEVEL_MAX, 3, false, false, true); } if (LCDML.FUNC_loop()) // ****** LOOP ********* @@ -988,7 +986,7 @@ void UI_func_reverb_level(uint8_t param) configuration.fx.reverb_level = constrain(configuration.fx.reverb_level - ENCODER[ENC_R].speed(), REVERB_LEVEL_MIN, REVERB_LEVEL_MAX); } - lcd_display_bar_int("Reverb Level", configuration.fx.reverb_level, 1.0, REVERB_LEVEL_MIN, REVERB_LEVEL_MAX, 3, false, false, false, true); + lcd_display_bar_int("Reverb Level", configuration.fx.reverb_level, 1.0, REVERB_LEVEL_MIN, REVERB_LEVEL_MAX, 3, false, false, true); master_mixer_r.gain(3, configuration.fx.reverb_level / 100.0); master_mixer_l.gain(3, configuration.fx.reverb_level / 100.0); @@ -1009,7 +1007,7 @@ void UI_func_chorus_frequency(uint8_t param) encoderDir[ENC_R].reset(); lcd_special_chars(BLOCKBAR); - lcd_display_bar_float_new("Chorus Frq.", configuration.fx.chorus_frequency[selected_instance_id], 0.1, CHORUS_FREQUENCY_MIN, CHORUS_FREQUENCY_MAX, 2, 1, false, false, true); + lcd_display_bar_float("Chorus Frq.", configuration.fx.chorus_frequency[selected_instance_id], 0.1, CHORUS_FREQUENCY_MIN, CHORUS_FREQUENCY_MAX, 2, 1, false, false, true); #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); @@ -1041,7 +1039,7 @@ void UI_func_chorus_frequency(uint8_t param) } #endif } - lcd_display_bar_float_new("Chorus Frq.", configuration.fx.chorus_frequency[selected_instance_id], 0.1, CHORUS_FREQUENCY_MIN, CHORUS_FREQUENCY_MAX, 2, 1, false, false, false); + lcd_display_bar_float("Chorus Frq.", configuration.fx.chorus_frequency[selected_instance_id], 0.1, CHORUS_FREQUENCY_MIN, CHORUS_FREQUENCY_MAX, 2, 1, false, false, false); chorus_modulator[selected_instance_id]->frequency(configuration.fx.chorus_frequency[selected_instance_id] / 10.0); } @@ -1068,9 +1066,9 @@ void UI_func_chorus_waveform(uint8_t param) #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); #endif } @@ -1086,9 +1084,9 @@ void UI_func_chorus_waveform(uint8_t param) { selected_instance_id = !selected_instance_id; lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); } #endif @@ -1127,8 +1125,8 @@ void UI_func_chorus_depth(uint8_t param) { encoderDir[ENC_R].reset(); - lcd_special_chars(BLOCKBAR); - lcd_display_bar_int_new("Chorus Dpt.", configuration.fx.chorus_depth[selected_instance_id], 1.0, CHORUS_DEPTH_MIN, CHORUS_DEPTH_MAX, 3, false, false, true); + lcd_special_chars(BLOCKBAR); + lcd_display_bar_int("Chorus Dpt.", configuration.fx.chorus_depth[selected_instance_id], 1.0, CHORUS_DEPTH_MIN, CHORUS_DEPTH_MAX, 3, false, false, true); #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); @@ -1160,7 +1158,7 @@ void UI_func_chorus_depth(uint8_t param) #endif } - lcd_display_bar_int_new("Chorus Dpt.", configuration.fx.chorus_depth[selected_instance_id], 1.0, CHORUS_DEPTH_MIN, CHORUS_DEPTH_MAX, 3, false, false, false); + lcd_display_bar_int("Chorus Dpt.", configuration.fx.chorus_depth[selected_instance_id], 1.0, CHORUS_DEPTH_MIN, CHORUS_DEPTH_MAX, 3, false, false, false); chorus_modulator[selected_instance_id]->amplitude(configuration.fx.chorus_depth[selected_instance_id] / 100.0); } @@ -1183,13 +1181,13 @@ void UI_func_chorus_level(uint8_t param) encoderDir[ENC_R].reset(); lcd_special_chars(BLOCKBAR); - lcd_display_bar_int("Chorus Lvl.", configuration.fx.chorus_level[selected_instance_id], 1.0, CHORUS_LEVEL_MIN, CHORUS_LEVEL_MAX, 3, false, false, false, true); + lcd_display_bar_int("Chorus Lvl.", configuration.fx.chorus_level[selected_instance_id], 1.0, CHORUS_LEVEL_MIN, CHORUS_LEVEL_MAX, 3, false, false, true); #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); #endif } @@ -1207,15 +1205,15 @@ void UI_func_chorus_level(uint8_t param) { selected_instance_id = !selected_instance_id; lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); } #endif } - lcd_display_bar_int("Chorus Lvl.", configuration.fx.chorus_level[selected_instance_id], 1.0, CHORUS_LEVEL_MIN, CHORUS_LEVEL_MAX, 3, false, false, false, false); + lcd_display_bar_int("Chorus Lvl.", configuration.fx.chorus_level[selected_instance_id], 1.0, CHORUS_LEVEL_MIN, CHORUS_LEVEL_MAX, 3, false, false, false); //chorus_mixer[selected_instance_id]->gain(0, 1.0 - pseudo_log_curve(mapfloat(configuration.fx.chorus_level[selected_instance_id], CHORUS_LEVEL_MIN, CHORUS_LEVEL_MAX, 0.0, 1.0), true)); //chorus_mixer[selected_instance_id]->gain(1, pseudo_log_curve(mapfloat(configuration.fx.chorus_level[selected_instance_id], CHORUS_LEVEL_MIN, CHORUS_LEVEL_MAX, 0.0, 1.0), true)); @@ -1241,13 +1239,13 @@ void UI_func_delay_time(uint8_t param) encoderDir[ENC_R].reset(); lcd_special_chars(BLOCKBAR); - lcd_display_bar_int("Delay Time", configuration.fx.delay_time[selected_instance_id], 10.0, DELAY_TIME_MIN, DELAY_TIME_MAX, 3, false, false, false, true); + lcd_display_bar_int("Delay Time", configuration.fx.delay_time[selected_instance_id], 10.0, DELAY_TIME_MIN, DELAY_TIME_MAX, 3, false, false, true); #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); #endif } @@ -1265,15 +1263,15 @@ void UI_func_delay_time(uint8_t param) { selected_instance_id = !selected_instance_id; lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); } #endif } - lcd_display_bar_int("Delay Time", configuration.fx.delay_time[selected_instance_id], 10.0, DELAY_TIME_MIN, DELAY_TIME_MAX, 3, false, false, false, true); + lcd_display_bar_int("Delay Time", configuration.fx.delay_time[selected_instance_id], 10.0, DELAY_TIME_MIN, DELAY_TIME_MAX, 3, false, false, true); delay_fx[selected_instance_id]->delay(0, configuration.fx.delay_time[selected_instance_id] * 10); } @@ -1296,13 +1294,13 @@ void UI_func_delay_feedback(uint8_t param) encoderDir[ENC_R].reset(); lcd_special_chars(BLOCKBAR); - lcd_display_bar_int("Delay Feedb.", configuration.fx.delay_feedback[selected_instance_id], 1.0, DELAY_FEEDBACK_MIN, DELAY_FEEDBACK_MAX, 3, false, false, false, true); + lcd_display_bar_int("Delay Feedb.", configuration.fx.delay_feedback[selected_instance_id], 1.0, DELAY_FEEDBACK_MIN, DELAY_FEEDBACK_MAX, 3, false, false, true); #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); #endif } @@ -1320,15 +1318,15 @@ void UI_func_delay_feedback(uint8_t param) { selected_instance_id = !selected_instance_id; lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); } #endif } - lcd_display_bar_int("Delay Feedb.", configuration.fx.delay_feedback[selected_instance_id], 1.0, DELAY_FEEDBACK_MIN, DELAY_FEEDBACK_MAX, 3, false, false, false, false); + lcd_display_bar_int("Delay Feedb.", configuration.fx.delay_feedback[selected_instance_id], 1.0, DELAY_FEEDBACK_MIN, DELAY_FEEDBACK_MAX, 3, false, false, false); delay_fb_mixer[selected_instance_id]->gain(1, configuration.fx.delay_feedback[selected_instance_id] / 100.0); // amount of feedback } @@ -1351,13 +1349,13 @@ void UI_func_delay_level(uint8_t param) encoderDir[ENC_R].reset(); lcd_special_chars(BLOCKBAR); - lcd_display_bar_int("Delay Lvl.", configuration.fx.delay_level[selected_instance_id], 1.0, DELAY_LEVEL_MIN, DELAY_LEVEL_MAX, 3, false, false, false, true); + lcd_display_bar_int("Delay Lvl.", configuration.fx.delay_level[selected_instance_id], 1.0, DELAY_LEVEL_MIN, DELAY_LEVEL_MAX, 3, false, false, true); #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); #endif } @@ -1375,15 +1373,15 @@ void UI_func_delay_level(uint8_t param) { selected_instance_id = !selected_instance_id; lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); } #endif } - lcd_display_bar_int("Delay Lvl.", configuration.fx.delay_level[selected_instance_id], 1.0, DELAY_LEVEL_MIN, DELAY_LEVEL_MAX, 3, false, false, false, false); + lcd_display_bar_int("Delay Lvl.", configuration.fx.delay_level[selected_instance_id], 1.0, DELAY_LEVEL_MIN, DELAY_LEVEL_MAX, 3, false, false, false); delay_mixer[selected_instance_id]->gain(1, mapfloat(configuration.fx.delay_level[selected_instance_id], DELAY_LEVEL_MIN, DELAY_LEVEL_MAX, 0.0, 1.0)); } @@ -1406,13 +1404,13 @@ void UI_func_reverb_send(uint8_t param) encoderDir[ENC_R].reset(); lcd_special_chars(BLOCKBAR); - lcd_display_bar_int("Reverb Send", configuration.fx.reverb_send[selected_instance_id], 1.0, REVERB_SEND_MIN, REVERB_SEND_MAX, 3, false, false, false, true); + lcd_display_bar_int("Reverb Send", configuration.fx.reverb_send[selected_instance_id], 1.0, REVERB_SEND_MIN, REVERB_SEND_MAX, 3, false, false, true); #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); #endif } @@ -1430,15 +1428,15 @@ void UI_func_reverb_send(uint8_t param) { selected_instance_id = !selected_instance_id; lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); } #endif } - lcd_display_bar_int("Reverb Send", configuration.fx.reverb_send[selected_instance_id], 1.0, REVERB_SEND_MIN, REVERB_SEND_MAX, 3, false, false, false, false); + lcd_display_bar_int("Reverb Send", configuration.fx.reverb_send[selected_instance_id], 1.0, REVERB_SEND_MIN, REVERB_SEND_MAX, 3, false, false, false); reverb_mixer_r.gain(selected_instance_id, configuration.fx.reverb_send[selected_instance_id] / 100.0); reverb_mixer_l.gain(selected_instance_id, configuration.fx.reverb_send[selected_instance_id] / 100.0); @@ -1462,13 +1460,13 @@ void UI_func_filter_cutoff(uint8_t param) encoderDir[ENC_R].reset(); lcd_special_chars(BLOCKBAR); - lcd_display_bar_int("Filter Cut", configuration.dexed[selected_instance_id].filter_cutoff, 1.0, FILTER_CUTOFF_MIN, FILTER_CUTOFF_MAX, 3, false, false, false, true); + lcd_display_bar_int("Filter Cut", configuration.dexed[selected_instance_id].filter_cutoff, 1.0, FILTER_CUTOFF_MIN, FILTER_CUTOFF_MAX, 3, false, false, true); #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); #endif } @@ -1486,15 +1484,15 @@ void UI_func_filter_cutoff(uint8_t param) { selected_instance_id = !selected_instance_id; lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); } #endif } - lcd_display_bar_int("Filter Cut", configuration.dexed[selected_instance_id].filter_cutoff, 1.0, FILTER_CUTOFF_MIN, FILTER_CUTOFF_MAX, 3, false, false, false, false); + lcd_display_bar_int("Filter Cut", configuration.dexed[selected_instance_id].filter_cutoff, 1.0, FILTER_CUTOFF_MIN, FILTER_CUTOFF_MAX, 3, false, false, false); MicroDexed[selected_instance_id]->fx.Cutoff = mapfloat(configuration.dexed[selected_instance_id].filter_cutoff, FILTER_CUTOFF_MIN, FILTER_CUTOFF_MAX, 1.0, 0.0); } @@ -1517,13 +1515,13 @@ void UI_func_filter_resonance(uint8_t param) encoderDir[ENC_R].reset(); lcd_special_chars(BLOCKBAR); - lcd_display_bar_int("Filter Res", configuration.dexed[selected_instance_id].filter_resonance, 1.0, FILTER_RESONANCE_MIN, FILTER_RESONANCE_MAX, 3, false, false, false, true); + lcd_display_bar_int("Filter Res", configuration.dexed[selected_instance_id].filter_resonance, 1.0, FILTER_RESONANCE_MIN, FILTER_RESONANCE_MAX, 3, false, false, true); #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); #endif } @@ -1541,15 +1539,15 @@ void UI_func_filter_resonance(uint8_t param) { selected_instance_id = !selected_instance_id; lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); } #endif } - lcd_display_bar_int("Filter Res", configuration.dexed[selected_instance_id].filter_resonance, 1.0, FILTER_RESONANCE_MIN, FILTER_RESONANCE_MAX, 3, false, false, false, false); + lcd_display_bar_int("Filter Res", configuration.dexed[selected_instance_id].filter_resonance, 1.0, FILTER_RESONANCE_MIN, FILTER_RESONANCE_MAX, 3, false, false, false); MicroDexed[selected_instance_id]->fx.Reso = mapfloat(configuration.dexed[selected_instance_id].filter_resonance, FILTER_RESONANCE_MIN, FILTER_RESONANCE_MAX, 1.0, 0.0); } @@ -1573,13 +1571,13 @@ void UI_func_transpose(uint8_t param) encoderDir[ENC_R].reset(); lcd_special_chars(METERBAR); - lcd_display_meter_int("Transpose", configuration.dexed[selected_instance_id].transpose, 1.0, -24.0, TRANSPOSE_MIN, TRANSPOSE_MAX, 3, false, false, true, true); + lcd_display_meter_int("Transpose", configuration.dexed[selected_instance_id].transpose, 1.0, -24.0, TRANSPOSE_MIN, TRANSPOSE_MAX, 2, false, true, true); #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); #endif } @@ -1597,15 +1595,15 @@ void UI_func_transpose(uint8_t param) { selected_instance_id = !selected_instance_id; lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); } #endif } - lcd_display_meter_int("Transpose", configuration.dexed[selected_instance_id].transpose, 1.0, -24.0, TRANSPOSE_MIN, TRANSPOSE_MAX, 3, false, false, true, true); + lcd_display_meter_int("Transpose", configuration.dexed[selected_instance_id].transpose, 1.0, -24.0, TRANSPOSE_MIN, TRANSPOSE_MAX, 2, false, true, true); MicroDexed[selected_instance_id]->data[DEXED_VOICE_OFFSET + DEXED_TRANSPOSE] = configuration.dexed[selected_instance_id].transpose; MicroDexed[selected_instance_id]->notesOff(); @@ -1629,13 +1627,13 @@ void UI_func_tune(uint8_t param) encoderDir[ENC_R].reset(); lcd_special_chars(METERBAR); - lcd_display_meter_int("Fine Tune", configuration.dexed[selected_instance_id].tune, 1.0, -100.0, TUNE_MIN, TUNE_MAX, 3, false, false, true, true); + lcd_display_meter_int("Fine Tune", configuration.dexed[selected_instance_id].tune, 1.0, -100.0, TUNE_MIN, TUNE_MAX, 2, false, true, true); #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); #endif } @@ -1653,15 +1651,15 @@ void UI_func_tune(uint8_t param) { selected_instance_id = !selected_instance_id; lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); } #endif } - lcd_display_meter_int("Fine Tune", configuration.dexed[selected_instance_id].tune, 1.0, -100.0, TUNE_MIN, TUNE_MAX, 3, false, false, true, false); + lcd_display_meter_int("Fine Tune", configuration.dexed[selected_instance_id].tune, 1.0, -100.0, TUNE_MIN, TUNE_MAX, 2, false, true, false); MicroDexed[selected_instance_id]->controllers.masterTune = (int((configuration.dexed[selected_instance_id].tune - 100) / 100.0 * 0x4000) << 11) * (1.0 / 12); MicroDexed[selected_instance_id]->doRefreshVoice(); @@ -1689,9 +1687,9 @@ void UI_func_midi_channel(uint8_t param) #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); #endif } @@ -1707,9 +1705,9 @@ void UI_func_midi_channel(uint8_t param) { selected_instance_id = !selected_instance_id; lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); } #endif @@ -1763,9 +1761,9 @@ void UI_func_lowest_note(uint8_t param) #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); #endif } @@ -1783,9 +1781,9 @@ void UI_func_lowest_note(uint8_t param) { selected_instance_id = !selected_instance_id; lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); } #endif @@ -1824,9 +1822,9 @@ void UI_func_highest_note(uint8_t param) #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); #endif } @@ -1844,9 +1842,9 @@ void UI_func_highest_note(uint8_t param) { selected_instance_id = !selected_instance_id; lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); } #endif @@ -1874,13 +1872,13 @@ void UI_func_sound_intensity(uint8_t param) encoderDir[ENC_R].reset(); lcd_special_chars(BLOCKBAR); - lcd_display_bar_int("Voice Level", configuration.dexed[selected_instance_id].sound_intensity, 1.0, SOUND_INTENSITY_MIN, SOUND_INTENSITY_MAX, 3, false, false, false, true); + lcd_display_bar_int("Voice Level", configuration.dexed[selected_instance_id].sound_intensity, 1.0, SOUND_INTENSITY_MIN, SOUND_INTENSITY_MAX, 3, false, false, true); #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); #endif } @@ -1900,15 +1898,15 @@ void UI_func_sound_intensity(uint8_t param) { selected_instance_id = !selected_instance_id; lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); } #endif } - lcd_display_bar_int("Voice Level", configuration.dexed[selected_instance_id].sound_intensity, 1.0, SOUND_INTENSITY_MIN, SOUND_INTENSITY_MAX, 3, false, false, false, false); + lcd_display_bar_int("Voice Level", configuration.dexed[selected_instance_id].sound_intensity, 1.0, SOUND_INTENSITY_MIN, SOUND_INTENSITY_MAX, 3, false, false, false); dexed_level[selected_instance_id]->gain(mapfloat(configuration.dexed[selected_instance_id].sound_intensity, SOUND_INTENSITY_MIN, SOUND_INTENSITY_MAX, 0.0, SOUND_INTENSITY_AMP_MAX)); } @@ -1938,13 +1936,13 @@ void UI_func_panorama(uint8_t param) return; } lcd_special_chars(METERBAR); - lcd_display_meter_float("Panorama", configuration.dexed[selected_instance_id].pan, 0.05, -20.0, PANORAMA_MIN, PANORAMA_MAX, 3, 1, false, false, true, true); + lcd_display_meter_float("Panorama", configuration.dexed[selected_instance_id].pan, 0.05, -20.0, PANORAMA_MIN, PANORAMA_MAX, 1, 1, false, true, true); #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); #endif } @@ -1960,16 +1958,16 @@ void UI_func_panorama(uint8_t param) { selected_instance_id = !selected_instance_id; lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); } #endif if (configuration.sys.mono == 0) { - lcd_display_meter_float("Panorama", configuration.dexed[selected_instance_id].pan, 0.05, -20.0, PANORAMA_MIN, PANORAMA_MAX, 3, 1, false, false, true, false); + lcd_display_meter_float("Panorama", configuration.dexed[selected_instance_id].pan, 0.05, -20.0, PANORAMA_MIN, PANORAMA_MAX, 1, 1, false, true, false); mono2stereo[selected_instance_id]->panorama(mapfloat(configuration.dexed[selected_instance_id].pan, PANORAMA_MIN, PANORAMA_MAX, -1.0, 1.0)); } } @@ -2059,13 +2057,13 @@ void UI_func_polyphony(uint8_t param) encoderDir[ENC_R].reset(); lcd_special_chars(BLOCKBAR); - lcd_display_bar_int("Polyphony", configuration.dexed[selected_instance_id].polyphony, 1.0, POLYPHONY_MIN, POLYPHONY_MAX, 3, false, false, false, true); + lcd_display_bar_int("Polyphony", configuration.dexed[selected_instance_id].polyphony, 1.0, POLYPHONY_MIN, POLYPHONY_MAX, 3, false, false, true); #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); #endif } @@ -2083,16 +2081,16 @@ void UI_func_polyphony(uint8_t param) { selected_instance_id = !selected_instance_id; lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); } #endif lcd_active_instance_number(selected_instance_id); } - lcd_display_bar_int("Polyphony", configuration.dexed[selected_instance_id].polyphony, 1.0, POLYPHONY_MIN, POLYPHONY_MAX, 3, false, false, false, false); + lcd_display_bar_int("Polyphony", configuration.dexed[selected_instance_id].polyphony, 1.0, POLYPHONY_MIN, POLYPHONY_MAX, 3, false, false, false); MicroDexed[selected_instance_id]->setMaxNotes(configuration.dexed[selected_instance_id].polyphony); } @@ -2119,9 +2117,9 @@ void UI_func_engine(uint8_t param) #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); #endif } @@ -2139,9 +2137,9 @@ void UI_func_engine(uint8_t param) { selected_instance_id = !selected_instance_id; lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); } #endif @@ -2185,9 +2183,9 @@ void UI_func_mono_poly(uint8_t param) #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); #endif } @@ -2205,9 +2203,9 @@ void UI_func_mono_poly(uint8_t param) { selected_instance_id = !selected_instance_id; lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); } #endif @@ -2249,9 +2247,9 @@ void UI_func_note_refresh(uint8_t param) #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); #endif } @@ -2269,9 +2267,9 @@ void UI_func_note_refresh(uint8_t param) { selected_instance_id = !selected_instance_id; lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); } #endif @@ -2308,13 +2306,13 @@ void UI_func_pb_range(uint8_t param) encoderDir[ENC_R].reset(); lcd_special_chars(BLOCKBAR); - lcd_display_bar_int("PB Range", configuration.dexed[selected_instance_id].pb_range, 1.0, PB_RANGE_MIN, PB_RANGE_MAX, 2, false, false, false, true); + lcd_display_bar_int("PB Range", configuration.dexed[selected_instance_id].pb_range, 1.0, PB_RANGE_MIN, PB_RANGE_MAX, 2, false, false, true); #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); #endif } @@ -2332,15 +2330,15 @@ void UI_func_pb_range(uint8_t param) { selected_instance_id = !selected_instance_id; lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); } #endif } - lcd_display_bar_int("PB Range", configuration.dexed[selected_instance_id].pb_range, 1.0, PB_RANGE_MIN, PB_RANGE_MAX, 2, false, false, false, false); + lcd_display_bar_int("PB Range", configuration.dexed[selected_instance_id].pb_range, 1.0, PB_RANGE_MIN, PB_RANGE_MAX, 2, false, false, false); MicroDexed[selected_instance_id]->setPBController(configuration.dexed[selected_instance_id].pb_range, configuration.dexed[selected_instance_id].pb_step); } @@ -2363,13 +2361,13 @@ void UI_func_pb_step(uint8_t param) encoderDir[ENC_R].reset(); lcd_special_chars(BLOCKBAR); - lcd_display_bar_int("PB Step", configuration.dexed[selected_instance_id].pb_step, 1.0, PB_STEP_MIN, PB_STEP_MAX, 2, false, false, false, true); + lcd_display_bar_int("PB Step", configuration.dexed[selected_instance_id].pb_step, 1.0, PB_STEP_MIN, PB_STEP_MAX, 2, false, false, true); #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); #endif } @@ -2387,15 +2385,15 @@ void UI_func_pb_step(uint8_t param) { selected_instance_id = !selected_instance_id; lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); } #endif } - lcd_display_bar_int("PB Step", configuration.dexed[selected_instance_id].pb_step, 1.0, PB_STEP_MIN, PB_STEP_MAX, 2, false, false, false, false); + lcd_display_bar_int("PB Step", configuration.dexed[selected_instance_id].pb_step, 1.0, PB_STEP_MIN, PB_STEP_MAX, 2, false, false, false); MicroDexed[selected_instance_id]->setPBController(configuration.dexed[selected_instance_id].pb_range, configuration.dexed[selected_instance_id].pb_step); } @@ -2418,13 +2416,13 @@ void UI_func_mw_range(uint8_t param) encoderDir[ENC_R].reset(); lcd_special_chars(BLOCKBAR); - lcd_display_bar_int("MW Range", configuration.dexed[selected_instance_id].mw_range, 1.0, MW_RANGE_MIN, MW_RANGE_MAX, 2, false, false, false, true); + lcd_display_bar_int("MW Range", configuration.dexed[selected_instance_id].mw_range, 1.0, MW_RANGE_MIN, MW_RANGE_MAX, 2, false, false, true); #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); #endif } @@ -2442,15 +2440,15 @@ void UI_func_mw_range(uint8_t param) { selected_instance_id = !selected_instance_id; lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); } #endif } - lcd_display_bar_int("MW Range", configuration.dexed[selected_instance_id].mw_range, 1.0, MW_RANGE_MIN, MW_RANGE_MAX, 2, false, false, false, false); + lcd_display_bar_int("MW Range", configuration.dexed[selected_instance_id].mw_range, 1.0, MW_RANGE_MIN, MW_RANGE_MAX, 2, false, false, false); MicroDexed[selected_instance_id]->setMWController(configuration.dexed[selected_instance_id].mw_range, configuration.dexed[selected_instance_id].mw_assign, configuration.dexed[selected_instance_id].mw_mode); } @@ -2477,9 +2475,9 @@ void UI_func_mw_assign(uint8_t param) #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); #endif } @@ -2497,9 +2495,9 @@ void UI_func_mw_assign(uint8_t param) { selected_instance_id = !selected_instance_id; lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); } #endif @@ -2558,9 +2556,9 @@ void UI_func_mw_mode(uint8_t param) #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); #endif } @@ -2578,9 +2576,9 @@ void UI_func_mw_mode(uint8_t param) { selected_instance_id = !selected_instance_id; lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); } #endif @@ -2621,13 +2619,13 @@ void UI_func_fc_range(uint8_t param) encoderDir[ENC_R].reset(); lcd_special_chars(BLOCKBAR); - lcd_display_bar_int("FC Range", configuration.dexed[selected_instance_id].fc_range, 1.0, FC_RANGE_MIN, FC_RANGE_MAX, 2, false, false, false, true); + lcd_display_bar_int("FC Range", configuration.dexed[selected_instance_id].fc_range, 1.0, FC_RANGE_MIN, FC_RANGE_MAX, 2, false, false, true); #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); #endif @@ -2646,15 +2644,15 @@ void UI_func_fc_range(uint8_t param) { selected_instance_id = !selected_instance_id; lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); } #endif } - lcd_display_bar_int("FC Range", configuration.dexed[selected_instance_id].fc_range, 1.0, FC_RANGE_MIN, FC_RANGE_MAX, 2, false, false, false, false); + lcd_display_bar_int("FC Range", configuration.dexed[selected_instance_id].fc_range, 1.0, FC_RANGE_MIN, FC_RANGE_MAX, 2, false, false, false); MicroDexed[selected_instance_id]->setFCController(configuration.dexed[selected_instance_id].fc_range, configuration.dexed[selected_instance_id].fc_assign, configuration.dexed[selected_instance_id].fc_mode); } @@ -2681,9 +2679,9 @@ void UI_func_fc_assign(uint8_t param) #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); #endif } @@ -2701,9 +2699,9 @@ void UI_func_fc_assign(uint8_t param) { selected_instance_id = !selected_instance_id; lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); } #endif @@ -2762,9 +2760,9 @@ void UI_func_fc_mode(uint8_t param) #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); #endif } @@ -2782,9 +2780,9 @@ void UI_func_fc_mode(uint8_t param) { selected_instance_id = !selected_instance_id; lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); } #endif @@ -2825,13 +2823,13 @@ void UI_func_bc_range(uint8_t param) encoderDir[ENC_R].reset(); lcd_special_chars(BLOCKBAR); - lcd_display_bar_int("BC Range", configuration.dexed[selected_instance_id].bc_range, 1.0, BC_RANGE_MIN, BC_RANGE_MAX, 2, false, false, false, true); + lcd_display_bar_int("BC Range", configuration.dexed[selected_instance_id].bc_range, 1.0, BC_RANGE_MIN, BC_RANGE_MAX, 2, false, false, true); #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); #endif } @@ -2849,15 +2847,15 @@ void UI_func_bc_range(uint8_t param) { selected_instance_id = !selected_instance_id; lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); } #endif } - lcd_display_bar_int("BC Range", configuration.dexed[selected_instance_id].bc_range, 1.0, BC_RANGE_MIN, BC_RANGE_MAX, 2, false, false, false, false); + lcd_display_bar_int("BC Range", configuration.dexed[selected_instance_id].bc_range, 1.0, BC_RANGE_MIN, BC_RANGE_MAX, 2, false, false, false); MicroDexed[selected_instance_id]->setBCController(configuration.dexed[selected_instance_id].bc_range, configuration.dexed[selected_instance_id].bc_assign, configuration.dexed[selected_instance_id].bc_mode); } @@ -2884,9 +2882,9 @@ void UI_func_bc_assign(uint8_t param) #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); #endif } @@ -2904,9 +2902,9 @@ void UI_func_bc_assign(uint8_t param) { selected_instance_id = !selected_instance_id; lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); } #endif @@ -2965,9 +2963,9 @@ void UI_func_bc_mode(uint8_t param) #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); #endif } @@ -2985,9 +2983,9 @@ void UI_func_bc_mode(uint8_t param) { selected_instance_id = !selected_instance_id; lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); } #endif @@ -3028,13 +3026,13 @@ void UI_func_at_range(uint8_t param) encoderDir[ENC_R].reset(); lcd_special_chars(BLOCKBAR); - lcd_display_bar_int("AT Range", configuration.dexed[selected_instance_id].at_range, 1.0, AT_RANGE_MIN, AT_RANGE_MAX, 2, false, false, false, true); + lcd_display_bar_int("AT Range", configuration.dexed[selected_instance_id].at_range, 1.0, AT_RANGE_MIN, AT_RANGE_MAX, 2, false, false, true); #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); #endif } @@ -3052,15 +3050,15 @@ void UI_func_at_range(uint8_t param) { selected_instance_id = !selected_instance_id; lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); } #endif } - lcd_display_bar_int("AT Range", configuration.dexed[selected_instance_id].at_range, 1.0, AT_RANGE_MIN, AT_RANGE_MAX, 2, false, false, false, false); + lcd_display_bar_int("AT Range", configuration.dexed[selected_instance_id].at_range, 1.0, AT_RANGE_MIN, AT_RANGE_MAX, 2, false, false, false); MicroDexed[selected_instance_id]->setATController(configuration.dexed[selected_instance_id].at_range, configuration.dexed[selected_instance_id].at_assign, configuration.dexed[selected_instance_id].at_mode); } @@ -3087,9 +3085,9 @@ void UI_func_at_assign(uint8_t param) #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); #endif } @@ -3107,9 +3105,9 @@ void UI_func_at_assign(uint8_t param) { selected_instance_id = !selected_instance_id; lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); } #endif @@ -3168,9 +3166,9 @@ void UI_func_at_mode(uint8_t param) #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); #endif } @@ -3188,9 +3186,9 @@ void UI_func_at_mode(uint8_t param) { selected_instance_id = !selected_instance_id; lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); } #endif @@ -3235,9 +3233,9 @@ void UI_func_portamento_mode(uint8_t param) #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); #endif } @@ -3255,9 +3253,9 @@ void UI_func_portamento_mode(uint8_t param) { selected_instance_id = !selected_instance_id; lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); } #endif @@ -3304,9 +3302,9 @@ void UI_func_portamento_glissando(uint8_t param) #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); #endif } @@ -3324,9 +3322,9 @@ void UI_func_portamento_glissando(uint8_t param) { selected_instance_id = !selected_instance_id; lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); } #endif @@ -3363,13 +3361,13 @@ void UI_func_portamento_time(uint8_t param) encoderDir[ENC_R].reset(); lcd_special_chars(BLOCKBAR); - lcd_display_bar_int("Portam. Time", configuration.dexed[selected_instance_id].portamento_time, 1.0, PORTAMENTO_TIME_MIN, PORTAMENTO_TIME_MAX, 2, false, false, false, true); + lcd_display_bar_int("Portam. Time", configuration.dexed[selected_instance_id].portamento_time, 1.0, PORTAMENTO_TIME_MIN, PORTAMENTO_TIME_MAX, 2, false, false, true); #if NUM_DEXED > 1 lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); #endif } @@ -3387,15 +3385,15 @@ void UI_func_portamento_time(uint8_t param) { selected_instance_id = !selected_instance_id; lcd_active_instance_number(selected_instance_id); - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); } #endif } - lcd_display_bar_int("Portam. Time", configuration.dexed[selected_instance_id].portamento_time, 1.0, PORTAMENTO_TIME_MIN, PORTAMENTO_TIME_MAX, 2, false, false, false, false); + lcd_display_bar_int("Portam. Time", configuration.dexed[selected_instance_id].portamento_time, 1.0, PORTAMENTO_TIME_MIN, PORTAMENTO_TIME_MAX, 2, false, false, false); MicroDexed[selected_instance_id]->setPortamentoMode(configuration.dexed[selected_instance_id].portamento_mode, configuration.dexed[selected_instance_id].portamento_glissando, configuration.dexed[selected_instance_id].portamento_time); } @@ -3428,9 +3426,9 @@ void UI_handle_OP(uint8_t param) lcd.write(i); #if NUM_DEXED > 1 - lcd.setCursor(15, 0); + lcd.setCursor(14, 0); lcd.write(0); - lcd.setCursor(15, 1); + lcd.setCursor(15, 0); lcd.write(1); #endif @@ -3570,7 +3568,7 @@ void UI_func_velocity_level(uint8_t param) encoderDir[ENC_R].reset(); lcd_special_chars(BLOCKBAR); - lcd_display_bar_int("Velocity Lvl", configuration.dexed[selected_instance_id].velocity_level, 1.0, VELOCITY_LEVEL_MIN, VELOCITY_LEVEL_MAX, 3, false, false, false, true); + lcd_display_bar_int("Velocity Lvl", configuration.dexed[selected_instance_id].velocity_level, 1.0, VELOCITY_LEVEL_MIN, VELOCITY_LEVEL_MAX, 3, false, false, true); } if (LCDML.FUNC_loop()) // ****** LOOP ********* @@ -3583,7 +3581,7 @@ void UI_func_velocity_level(uint8_t param) configuration.dexed[selected_instance_id].velocity_level = constrain(configuration.dexed[selected_instance_id].velocity_level - ENCODER[ENC_R].speed(), VELOCITY_LEVEL_MIN, VELOCITY_LEVEL_MAX); } - lcd_display_bar_int("Velocity Lvl", configuration.dexed[selected_instance_id].velocity_level, 1.0, VELOCITY_LEVEL_MIN, VELOCITY_LEVEL_MAX, 3, false, false, false, false); + lcd_display_bar_int("Velocity Lvl", configuration.dexed[selected_instance_id].velocity_level, 1.0, VELOCITY_LEVEL_MIN, VELOCITY_LEVEL_MAX, 3, false, false, false); } if (LCDML.FUNC_close()) // ****** STABLE END ********* @@ -3916,7 +3914,7 @@ void UI_func_volume(uint8_t param) encoderDir[ENC_L].reset(); lcd_special_chars(BLOCKBAR); - lcd_display_bar_int("Master Vol.", configuration.sys.vol, 1.0, VOLUME_MIN, VOLUME_MAX, 3, false, false, false, true); + lcd_display_bar_int("Master Vol.", configuration.sys.vol, 1.0, VOLUME_MIN, VOLUME_MAX, 3, false, false, true); back_from_volume = 0; } @@ -3937,7 +3935,7 @@ void UI_func_volume(uint8_t param) } } - lcd_display_bar_int("Master Vol.", configuration.sys.vol, 1.0, VOLUME_MIN, VOLUME_MAX, 3, false, false, false, false); + lcd_display_bar_int("Master Vol.", configuration.sys.vol, 1.0, VOLUME_MIN, VOLUME_MAX, 3, false, false, false); set_volume(configuration.sys.vol, configuration.sys.mono); } @@ -4999,81 +4997,12 @@ void lcd_display_float(float var, uint8_t size_number, uint8_t size_fraction, bo lcd.print(s); } - -inline void lcd_display_bar_int(const char* title, uint32_t value, float factor, int32_t min_value, int32_t max_value, uint8_t size, bool zeros, bool brackets, bool sign, bool init) +inline void lcd_display_bar_int(const char* title, uint32_t value, float factor, int32_t min_value, int32_t max_value, uint8_t size, bool zeros, bool sign, bool init) { - lcd_display_bar_float(title, float(value), factor, min_value, max_value, size, 0, zeros, brackets, sign, init); -} - -inline void lcd_display_bar_int_new(const char* title, uint32_t value, float factor, int32_t min_value, int32_t max_value, uint8_t size, bool zeros, bool sign, bool init) -{ - lcd_display_bar_float_new(title, float(value), factor, min_value, max_value, size, 0, zeros, sign, init); -} - -void lcd_display_bar_float(const char* title, float value, float factor, int32_t min_value, int32_t max_value, uint8_t size_number, uint8_t size_fraction, bool zeros, bool brackets, bool sign, bool init) -{ - uint8_t size = 0; -#if NUM_DEXED == 1 - uint8_t cols = LCD_cols; -#else - uint8_t cols = LCD_cols - 1; -#endif - float v = float((value - min_value) * cols) / (max_value - min_value); - float _vi = 0.0; - uint8_t vf = uint8_t(modff(v, &_vi) * 10.0 + 0.5); - uint8_t vi = uint8_t(_vi); - - if (size_fraction == 0) - size = size_number; - else - size = size_number + size_fraction + 1; - - if (brackets == true) - size += 2; - if (sign == true) - size += 1; - - if (init == true) - { - // Title - lcd.setCursor(0, 0); - lcd.print(title); - - // Value-Brackets - if (brackets == true) - { - lcd.setCursor(cols - size, 0); - lcd.print(F("[")); - lcd.setCursor(cols - 1, 0); - lcd.print(F("]")); - } - } - - // Value - lcd.setCursor(cols - size, 0); - lcd_display_float(value * factor, size_number, size_fraction, zeros, brackets, sign); - - // Bar - lcd.setCursor(0, 1); - - if (vi == 0) - { - lcd.write((uint8_t)(vf / 2.0 - 0.5) + 2); - for (uint8_t i = vi + 1; i < cols; i++) - lcd.print(F(" ")); // empty block - } - else - { - for (uint8_t i = 0; i < vi; i++) - lcd.write((uint8_t)4 + 2); // full block - if (vi < cols) - lcd.write((uint8_t)(vf / 2.0 - 0.5) + 2); - for (uint8_t i = vi + 1; i < cols; i++) - lcd.print(F(" ")); // empty block - } + lcd_display_bar_float(title, float(value), factor, min_value, max_value, size, 0, zeros, sign, init); } -void lcd_display_bar_float_new(const char* title, float value, float factor, int32_t min_value, int32_t max_value, uint8_t size_number, uint8_t size_fraction, bool zeros, bool sign, bool init) +void lcd_display_bar_float(const char* title, float value, float factor, int32_t min_value, int32_t max_value, uint8_t size_number, uint8_t size_fraction, bool zeros, bool sign, bool init) { uint8_t size; float v; @@ -5085,6 +5014,8 @@ void lcd_display_bar_float_new(const char* title, float value, float factor, int size = size_number; else size = size_number + size_fraction + 1; + if (sign == true) + size++; v = float((value - min_value) * (LCD_cols - size)) / (max_value - min_value); vf = uint8_t(modff(v, &_vi) * 10.0 + 0.5); @@ -5121,53 +5052,40 @@ void lcd_display_bar_float_new(const char* title, float value, float factor, int } } -inline void lcd_display_meter_int(const char* title, uint32_t value, float factor, float offset, int32_t min_value, int32_t max_value, uint8_t size, bool zeros, bool brackets, bool sign, bool init) +inline void lcd_display_meter_int(const char* title, uint32_t value, float factor, float offset, int32_t min_value, int32_t max_value, uint8_t size, bool zeros, bool sign, bool init) { - lcd_display_meter_float(title, float(value), factor, offset, min_value, max_value, size, 0, zeros, brackets, sign, init); + lcd_display_meter_float(title, float(value), factor, offset, min_value, max_value, size, 0, zeros, sign, init); } -void lcd_display_meter_float(const char* title, float value, float factor, float offset, int32_t min_value, int32_t max_value, uint8_t size_number, uint8_t size_fraction, bool zeros, bool brackets, bool sign, bool init) +void lcd_display_meter_float(const char* title, float value, float factor, float offset, int32_t min_value, int32_t max_value, uint8_t size_number, uint8_t size_fraction, bool zeros, bool sign, bool init) { uint8_t size = 0; -#if NUM_DEXED == 1 - uint8_t cols = LCD_cols; -#else - uint8_t cols = LCD_cols - 1; -#endif - float v = float((value - min_value) * cols) / (max_value - min_value); + float v; float _vi = 0.0; - uint8_t vf = uint8_t(modff(v, &_vi) * 10.0 + 0.5); - uint8_t vi = uint8_t(_vi); + uint8_t vf; + uint8_t vi; if (size_fraction == 0) size = size_number; else size = size_number + size_fraction + 1; - - if (brackets == true) - size += 2; if (sign == true) - size += 1; + size++; + + v = float((value - min_value) * (LCD_cols - size)) / (max_value - min_value); + vf = uint8_t(modff(v, &_vi) * 10.0 + 0.5); + vi = uint8_t(_vi); if (init == true) { // Title lcd.setCursor(0, 0); lcd.print(title); - - // Value-Brackets - if (brackets == true) - { - lcd.setCursor(cols - size, 0); - lcd.print(F("[")); - lcd.setCursor(cols - 1, 0); - lcd.print(F("]")); - } } // Value - lcd.setCursor(cols - size, 0); - lcd_display_float((value + offset) * factor, size_number, size_fraction, zeros, brackets, sign); + lcd.setCursor(LCD_cols - size, 1); + lcd_display_float((value + offset) * factor, size_number, size_fraction, zeros, false, sign); // Bar lcd.setCursor(0, 1); @@ -5175,22 +5093,22 @@ void lcd_display_meter_float(const char* title, float value, float factor, float if (vi == 0) { lcd.write((uint8_t)(vf / 2.0) + 2); - for (uint8_t i = 1; i < cols; i++) + for (uint8_t i = 1; i < LCD_cols - size; i++) lcd.print(F(" ")); // empty block } - else if (vi == cols) + else if (vi == LCD_cols - size) { - for (uint8_t i = 0; i < cols - 1; i++) + for (uint8_t i = 0; i < LCD_cols - size - 1; i++) lcd.print(F(" ")); // empty block lcd.write(4 + 2); } else { - for (uint8_t i = 0; i < cols; i++) + for (uint8_t i = 0; i < LCD_cols - size; i++) lcd.print(F(" ")); // empty block lcd.setCursor(vi, 1); lcd.write((uint8_t)(vf / 2.0) + 2); - for (uint8_t i = vi + 1; i < cols; i++) + for (uint8_t i = vi + 1; i < LCD_cols - size; i++) lcd.print(F(" ")); // empty block } } @@ -5210,32 +5128,32 @@ void lcd_active_instance_number(uint8_t instance_id) if (instance_id == 0) { if (configuration.dexed[instance_id].polyphony == 0) - instance_num[0][i] = bit_reverse8(inverse_num[0][i]); + instance_num[0][i] = bit_reverse8(special_chars[0][i]); else - instance_num[0][i] = inverse_num[0][i]; + instance_num[0][i] = special_chars[0][i]; if (configuration.dexed[!instance_id].polyphony == 0) { - instance_num[1][i] = bit_reverse8(inverse_num[1][i]); + instance_num[1][i] = bit_reverse8(special_chars[1][i]); instance_num[1][i] = ~instance_num[1][i]; } else - instance_num[1][i] = ~inverse_num[1][i]; + instance_num[1][i] = ~special_chars[1][i]; } else { if (configuration.dexed[!instance_id].polyphony == 0) { - instance_num[0][i] = bit_reverse8(inverse_num[0][i]); + instance_num[0][i] = bit_reverse8(special_chars[0][i]); instance_num[0][i] = ~instance_num[0][i]; } else - instance_num[0][i] = ~inverse_num[0][i]; + instance_num[0][i] = ~special_chars[0][i]; if (configuration.dexed[instance_id].polyphony == 0) - instance_num[1][i] = bit_reverse8(inverse_num[1][i]); + instance_num[1][i] = bit_reverse8(special_chars[1][i]); else - instance_num[1][i] = inverse_num[1][i]; + instance_num[1][i] = special_chars[1][i]; } } @@ -5252,9 +5170,9 @@ void lcd_OP_active_instance_number(uint8_t instance_id, uint8_t op) for (i = 0; i < 8; i++) { if (bitRead(op, n - 2)) - instance_num[n][i] = inverse_num[n][i]; + instance_num[n][i] = special_chars[n][i]; else - instance_num[n][i] = ~inverse_num[n][i]; + instance_num[n][i] = ~special_chars[n][i]; } lcd.createChar(n, instance_num[n]); } @@ -5264,32 +5182,32 @@ void lcd_OP_active_instance_number(uint8_t instance_id, uint8_t op) if (instance_id == 0) { if (configuration.dexed[instance_id].polyphony == 0) - instance_num[0][i] = bit_reverse8(inverse_num[0][i]); + instance_num[0][i] = bit_reverse8(special_chars[0][i]); else - instance_num[0][i] = inverse_num[0][i]; + instance_num[0][i] = special_chars[0][i]; if (configuration.dexed[!instance_id].polyphony == 0) { - instance_num[1][i] = bit_reverse8(inverse_num[1][i]); + instance_num[1][i] = bit_reverse8(special_chars[1][i]); instance_num[1][i] = ~instance_num[1][i]; } else - instance_num[1][i] = ~inverse_num[1][i]; + instance_num[1][i] = ~special_chars[1][i]; } else { if (configuration.dexed[!instance_id].polyphony == 0) { - instance_num[0][i] = bit_reverse8(inverse_num[0][i]); + instance_num[0][i] = bit_reverse8(special_chars[0][i]); instance_num[0][i] = ~instance_num[0][i]; } else - instance_num[0][i] = ~inverse_num[0][i]; + instance_num[0][i] = ~special_chars[0][i]; if (configuration.dexed[instance_id].polyphony == 0) - instance_num[1][i] = bit_reverse8(inverse_num[1][i]); + instance_num[1][i] = bit_reverse8(special_chars[1][i]); else - instance_num[1][i] = inverse_num[1][i]; + instance_num[1][i] = special_chars[1][i]; } } diff --git a/config.h b/config.h index 4f4b22b..a2e148a 100644 --- a/config.h +++ b/config.h @@ -84,7 +84,7 @@ //************************************************************************************************* //* DEBUG OUTPUT SETTINGS //************************************************************************************************* -//#define DEBUG 1 +#define DEBUG 1 #define SERIAL_SPEED 230400 #define SHOW_XRUN 1 #define SHOW_CPU_LOAD_MSEC 5000