From ea2f8fbbd989a4be0dd57a9c8e5f398f56d8fa9d Mon Sep 17 00:00:00 2001 From: Holger Wirtz Date: Tue, 4 Jun 2019 14:22:33 +0200 Subject: [PATCH] Fixing DEBUG option (renaming to avoid conflict with LiquidMenu). Small fixes. --- MicroMDAEPiano.ino | 28 +-- UI.hpp | 259 +++++++++++++------------ config.h | 4 +- midi_devices.hpp | 456 ++++++++++++++++++++++----------------------- 4 files changed, 376 insertions(+), 371 deletions(-) diff --git a/MicroMDAEPiano.ino b/MicroMDAEPiano.ino index 96c46d3..4c94684 100644 --- a/MicroMDAEPiano.ino +++ b/MicroMDAEPiano.ino @@ -21,14 +21,12 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "config.h" #include #include #include #include #include #include "EEPROMAnything.h" -#include #include "mdaEPiano.h" #include "effect_modulated_chorus.h" #ifdef USE_XFADE_DATA @@ -38,6 +36,7 @@ #endif #include "UI.hpp" #include "midi_devices.hpp" +#include "config.h" //************************************************************************************************* //* GLOBAL VARIABLES @@ -213,7 +212,7 @@ void setup() Serial.println(F("PT8211 enabled.")); #endif -#if defined (DEBUG) && defined (SHOW_CPU_LOAD_MSEC) +#if defined (SHOW_DEBUG) && defined (SHOW_CPU_LOAD_MSEC) // Initialize processor and memory measurements AudioProcessorUsageMaxReset(); AudioMemoryUsageMaxReset(); @@ -242,10 +241,12 @@ void setup() modulator.frequency(1.0); modulator.phase(0); modulator.offset(0.0); - + // internal mixing of original signal(0), reverb(1) and chorus(2) mixer_r.gain(0, 1.0); mixer_l.gain(0, 1.0); + mixer_r.gain(1, 0.5); + mixer_l.gain(1, 0.5); mixer_r.gain(2, 0.5); mixer_l.gain(2, 0.5); @@ -254,7 +255,7 @@ void setup() Serial.println(F("")); -#if defined (DEBUG) && defined (SHOW_CPU_LOAD_MSEC) +#if defined (SHOW_DEBUG) && defined (SHOW_CPU_LOAD_MSEC) Serial.println(); show_cpu_and_mem_usage(); cpu_mem_millis = 0; @@ -275,7 +276,7 @@ void loop() { fill_audio_buffer = 0; -#if defined (DEBUG) && defined (SHOW_CPU_LOAD_MSEC) +#if defined (SHOW_DEBUG) && defined (SHOW_CPU_LOAD_MSEC) if (cpu_mem_millis > SHOW_CPU_LOAD_MSEC) { show_cpu_and_mem_usage(); @@ -474,7 +475,7 @@ bool checkMidiChannel(byte inChannel) } else if (inChannel != configuration.midi_channel) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Ignoring MIDI data on channel ")); Serial.print(inChannel); Serial.print(F("(listening on ")); @@ -492,7 +493,7 @@ void set_master_volume(uint8_t value) uint16_t tmp = map(value, ENC_MASTER_VOLUME_MIN, ENC_MASTER_VOLUME_MAX, 0, 0x3ff); float tmp2 = mapfloat(configuration.pan, ENC_MASTER_PAN_MIN, ENC_MASTER_PAN_MAX, 0.0, 1.0); float tmp3 = (float)(tmp * (tmp + 2)) / (float)(1 << 20); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Setting volume: VOL=")); Serial.print(value, DEC); Serial.print(F("[")); @@ -531,7 +532,7 @@ void config_from_eeprom(void) EEPROM_readAnything(EEPROM_CONFIGURATIONS + sizeof(config_t) * (sound - 1), tmp_conf); checksum = crc32((byte*)&tmp_conf + 4, sizeof(tmp_conf) - 4); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Reading sound ")); Serial.print(sound, DEC); Serial.print(F(" from 0x")); @@ -545,17 +546,22 @@ void config_from_eeprom(void) if (checksum == tmp_conf.checksum) { EEPROM_readAnything(EEPROM_CONFIGURATIONS + sizeof(config_t) * (sound - 1), configuration); +#ifdef SHOW_DEBUG Serial.print(F(" - OK")); +#endif } else { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F(" - mismatch -> loading initial configuration.")); #endif set_complete_configuration(); EEPROM.update(EEPROM_SOUND, sound); } + +#ifdef SHOW_DEBUG show_sound(); +#endif } void initial_values_from_eeprom(void) @@ -621,7 +627,7 @@ uint32_t crc32(byte * calc_start, uint16_t calc_bytes) // base code from https:/ //* DEBUG FUNCTIONS //************************************************************************************************* -#if defined (DEBUG) && defined (SHOW_CPU_LOAD_MSEC) +#if defined (SHOW_DEBUG) && defined (SHOW_CPU_LOAD_MSEC) void show_cpu_and_mem_usage(void) { Serial.print(F("CPU: ")); diff --git a/UI.hpp b/UI.hpp index ee328fc..31dfbd2 100644 --- a/UI.hpp +++ b/UI.hpp @@ -43,7 +43,6 @@ #ifndef UI_HPP_INCLUDED #define UI_HPP_INCLUDED - #include #include #include @@ -757,7 +756,7 @@ LiquidSystem menu_system; LOAD SOUND CALLBACKS ******************************************/ void callback_load_sound_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("callback_load_sound_function")); #endif menu_system.change_menu(load_sound_menu); @@ -772,7 +771,7 @@ void callback_load_sound_function(void) { ******************************************/ void callback_edit_sound_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("callback_edit_sound_function, focus position:")); Serial.println(menu_position[EDIT_SOUND], DEC); #endif @@ -796,7 +795,7 @@ void callback_edit_sound_function(void) void callback_decay_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("callback_decay_function")); #endif menu_system.change_menu(decay_menu); @@ -808,7 +807,7 @@ void callback_decay_function(void) void callback_release_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("callback_release_function")); #endif menu_system.change_menu(release_menu); @@ -820,7 +819,7 @@ void callback_release_function(void) void callback_hardness_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("callback_hardness_function")); #endif menu_system.change_menu(hardness_menu); @@ -832,7 +831,7 @@ void callback_hardness_function(void) void callback_treble_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("callback_treble_function")); #endif menu_system.change_menu(treble_menu); @@ -844,7 +843,7 @@ void callback_treble_function(void) void callback_stereo_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("callback_stereo_function")); #endif menu_system.change_menu(stereo_menu); @@ -856,7 +855,7 @@ void callback_stereo_function(void) void callback_transpose_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("callback_transpose_function")); #endif menu_system.change_menu(transpose_menu); @@ -868,7 +867,7 @@ void callback_transpose_function(void) void callback_tune_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("callback_tune_function")); #endif menu_system.change_menu(tune_menu); @@ -880,7 +879,7 @@ void callback_tune_function(void) void callback_detune_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("callback_detune_function")); #endif menu_system.change_menu(detune_menu); @@ -892,7 +891,7 @@ void callback_detune_function(void) void callback_velocity_sense_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("callback_velocity_sense_function")); #endif menu_system.change_menu(velocity_sense_menu); @@ -907,7 +906,7 @@ void callback_velocity_sense_function(void) ******************************************/ void callback_effect_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("callback_effect_function, focus position:")); Serial.println(menu_position[EFFECTS]); #endif @@ -931,7 +930,7 @@ void callback_effect_function(void) void callback_pan_trem_frequency_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("callback_pan_trem_frequency_function")); #endif menu_system.change_menu(pan_trem_frequency_menu); @@ -943,7 +942,7 @@ void callback_pan_trem_frequency_function(void) void callback_pan_trem_level_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("callback_pan_trem_level_function")); #endif menu_system.change_menu(pan_trem_level_menu); @@ -955,7 +954,7 @@ void callback_pan_trem_level_function(void) void callback_overdrive_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("callback_overdrive_function")); #endif menu_system.change_menu(overdrive_menu); @@ -967,7 +966,7 @@ void callback_overdrive_function(void) void callback_comp_gain_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("callback_comp_gain_function")); #endif menu_system.change_menu(comp_gain_menu); @@ -979,7 +978,7 @@ void callback_comp_gain_function(void) void callback_comp_response_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("callback_comp_response_function")); #endif menu_system.change_menu(comp_response_menu); @@ -991,7 +990,7 @@ void callback_comp_response_function(void) void callback_comp_limit_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("callback_comp_limit_function")); #endif menu_system.change_menu(comp_limit_menu); @@ -1003,7 +1002,7 @@ void callback_comp_limit_function(void) void callback_comp_threshold_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("callback_comp_threshold_function")); #endif menu_system.change_menu(comp_threshold_menu); @@ -1015,7 +1014,7 @@ void callback_comp_threshold_function(void) void callback_comp_attack_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("callback_comp_attack_function")); #endif menu_system.change_menu(comp_attack_menu); @@ -1027,7 +1026,7 @@ void callback_comp_attack_function(void) void callback_comp_decay_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("callback_comp_decay_function")); #endif menu_system.change_menu(comp_decay_menu); @@ -1039,7 +1038,7 @@ void callback_comp_decay_function(void) void callback_reverb_roomsize_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("callback_reverb_roomsize_function")); #endif menu_system.change_menu(reverb_roomsize_menu); @@ -1051,7 +1050,7 @@ void callback_reverb_roomsize_function(void) void callback_reverb_damping_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("callback_reverb_damping_function")); #endif menu_system.change_menu(reverb_damping_menu); @@ -1063,7 +1062,7 @@ void callback_reverb_damping_function(void) void callback_reverb_level_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("callback_reverb_level_function")); #endif menu_system.change_menu(reverb_level_menu); @@ -1075,7 +1074,7 @@ void callback_reverb_level_function(void) void callback_chorus_frequency_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("callback_chorus_frequency_function")); #endif menu_system.change_menu(chorus_frequency_menu); @@ -1087,7 +1086,7 @@ void callback_chorus_frequency_function(void) void callback_chorus_delay_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("callback_chorus_delay_function")); #endif menu_system.change_menu(chorus_delay_menu); @@ -1099,7 +1098,7 @@ void callback_chorus_delay_function(void) void callback_chorus_intensity_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("callback_chorus_intensity_function")); #endif menu_system.change_menu(chorus_intensity_menu); @@ -1111,7 +1110,7 @@ void callback_chorus_intensity_function(void) void callback_chorus_level_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("callback_chorus_level_function")); #endif menu_system.change_menu(chorus_level_menu); @@ -1123,7 +1122,7 @@ void callback_chorus_level_function(void) void callback_bass_lr_level_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("callback_bass_lr_level_function")); #endif menu_system.change_menu(bass_lr_level_menu); @@ -1135,7 +1134,7 @@ void callback_bass_lr_level_function(void) void callback_bass_mono_level_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("callback_bass_mono_level_function")); #endif menu_system.change_menu(bass_mono_level_menu); @@ -1147,7 +1146,7 @@ void callback_bass_mono_level_function(void) void callback_eq_bass_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("callback_eq_bass_function")); #endif menu_system.change_menu(eq_bass_menu); @@ -1159,7 +1158,7 @@ void callback_eq_bass_function(void) void callback_eq_treble_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("callback_eq_treble_function")); #endif menu_system.change_menu(eq_treble_menu); @@ -1174,7 +1173,7 @@ void callback_eq_treble_function(void) ******************************************/ void callback_save_sound_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("callback_save_sound_function")); #endif menu_system.change_menu(save_sound_menu); @@ -1186,7 +1185,7 @@ void callback_save_sound_function(void) void callback_store_question_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("callback_store_question_function")); #endif menu_system.change_menu(store_question_menu); @@ -1200,7 +1199,7 @@ void callback_store_question_function(void) ******************************************/ void callback_system_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("callback_system_function, focus position:")); Serial.println(menu_position[SYSTEM]); #endif @@ -1224,7 +1223,7 @@ void callback_system_function(void) void callback_loudness_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("callback_loudness_function")); #endif menu_system.change_menu(loudness_menu); @@ -1236,7 +1235,7 @@ void callback_loudness_function(void) void callback_midi_channel_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("callback_midi_channel_function")); #endif menu_system.change_menu(midi_channel_menu); @@ -1248,7 +1247,7 @@ void callback_midi_channel_function(void) void callback_midi_soft_thru_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("callback_midi_soft_thru_function")); #endif menu_system.change_menu(midi_soft_thru_menu); @@ -1260,7 +1259,7 @@ void callback_midi_soft_thru_function(void) void callback_max_poly_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("callback_max_poly_function")); #endif menu_system.change_menu(max_poly_menu); @@ -1275,7 +1274,7 @@ void callback_max_poly_function(void) ******************************************/ void callback_info_function(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("callback_info_function")); #endif menu_system.change_menu(info_menu); @@ -1765,7 +1764,7 @@ void init_menus(void) void load_sound(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Load sound ")); Serial.println(sound, DEC); #endif @@ -1775,7 +1774,7 @@ void load_sound(void) void save_sound(void) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Save sound ")); Serial.println(sound); #endif @@ -1785,7 +1784,7 @@ void save_sound(void) void set_decay(uint8_t value) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Set DECAY ")); Serial.println(value); #endif @@ -1796,7 +1795,7 @@ void set_decay(uint8_t value) void set_release(uint8_t value) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Set RELEASE ")); Serial.println(value); #endif @@ -1807,7 +1806,7 @@ void set_release(uint8_t value) void set_hardness(uint8_t value) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Set HARDNESS ")); Serial.println(value); #endif @@ -1818,7 +1817,7 @@ void set_hardness(uint8_t value) void set_treble(uint8_t value) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Set TREBLE ")); Serial.println(value); #endif @@ -1829,7 +1828,7 @@ void set_treble(uint8_t value) void set_stereo(int8_t value) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Set STEREO ")); Serial.println(value); #endif @@ -1840,7 +1839,7 @@ void set_stereo(int8_t value) void set_transpose(int8_t value) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Set TRANSPOSE ")); Serial.println(value); #endif @@ -1850,7 +1849,7 @@ void set_transpose(int8_t value) void set_tune(int8_t value) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Set TUNE ")); Serial.println(value); #endif @@ -1861,7 +1860,7 @@ void set_tune(int8_t value) void set_detune(uint8_t value) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Set DETUNE ")); Serial.println(value); #endif @@ -1872,7 +1871,7 @@ void set_detune(uint8_t value) void set_velocity_sense(uint8_t value) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Set VELOCITY_SENSE ")); Serial.println(value); #endif @@ -1883,7 +1882,7 @@ void set_velocity_sense(uint8_t value) void set_pan_trem_frequency(uint8_t value) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Set PAN_TREM_FREQENCY ")); Serial.println(value); #endif @@ -1894,7 +1893,7 @@ void set_pan_trem_frequency(uint8_t value) void set_pan_trem_level(uint8_t value) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Set PAN_TREM_LEVEL ")); Serial.println(value); #endif @@ -1905,7 +1904,7 @@ void set_pan_trem_level(uint8_t value) void set_overdrive(uint8_t value) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Set OVERDRIVE ")); Serial.println(value); #endif @@ -1916,7 +1915,7 @@ void set_overdrive(uint8_t value) void set_comp_gain(uint8_t value) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Set COMP_GAIN ")); Serial.println(value); #endif @@ -1927,7 +1926,7 @@ void set_comp_gain(uint8_t value) void set_comp_response(uint8_t value) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Set COMP_RESPONSE ")); Serial.println(value); #endif @@ -1938,7 +1937,7 @@ void set_comp_response(uint8_t value) void set_comp_limit(uint8_t value) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Set COMP_LIMIT ")); Serial.println(value); #endif @@ -1949,7 +1948,7 @@ void set_comp_limit(uint8_t value) void set_comp_threshold(uint8_t value) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Set COMP_THRESHOLD ")); Serial.println(value); #endif @@ -1960,7 +1959,7 @@ void set_comp_threshold(uint8_t value) void set_comp_attack(uint8_t value) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Set COMP_ATTACK ")); Serial.println(value); #endif @@ -1971,7 +1970,7 @@ void set_comp_attack(uint8_t value) void set_comp_decay(uint8_t value) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Set COMP_DECAY ")); Serial.println(value); #endif @@ -1982,7 +1981,7 @@ void set_comp_decay(uint8_t value) void set_reverb_roomsize(uint8_t value) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Set REVERB_ROOMSIZE ")); Serial.println(value); #endif @@ -1994,7 +1993,7 @@ void set_reverb_roomsize(uint8_t value) void set_reverb_damping(uint8_t value) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Set REVERB_DAMPING ")); Serial.println(value); #endif @@ -2006,7 +2005,7 @@ void set_reverb_damping(uint8_t value) void set_reverb_level(uint8_t value) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Set REVERB_LEVEL ")); Serial.println(value); #endif @@ -2022,7 +2021,7 @@ void set_reverb_level(uint8_t value) void set_chorus_frequency(uint8_t value) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Set CHORUS_FREQUENCY ")); Serial.println(value); #endif @@ -2031,7 +2030,7 @@ void set_chorus_frequency(uint8_t value) void set_chorus_delay(uint8_t value) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Set CHORUS_DELAY ")); Serial.println(value); #endif @@ -2040,7 +2039,7 @@ void set_chorus_delay(uint8_t value) void set_chorus_intensity(uint8_t value) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Set CHORUS_INTENSITY ")); Serial.println(value); #endif @@ -2049,7 +2048,7 @@ void set_chorus_intensity(uint8_t value) void set_chorus_level(uint8_t value) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Set CHORUS_LEVEL ")); Serial.println(value); #endif @@ -2060,7 +2059,7 @@ void set_chorus_level(uint8_t value) void set_bass_lr_level(uint8_t value) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Set BASS_LR_LEVEL ")); Serial.println(value); #endif @@ -2072,7 +2071,7 @@ void set_bass_lr_level(uint8_t value) void set_bass_mono_level(uint8_t value) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Set BASS_MONO_LEVEL ")); Serial.println(value); #endif @@ -2084,7 +2083,7 @@ void set_bass_mono_level(uint8_t value) void set_eq_bass(uint8_t value) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Set EQ_BASS ")); Serial.println(value); #endif @@ -2096,7 +2095,7 @@ void set_eq_bass(uint8_t value) void set_eq_treble(uint8_t value) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Set EQ_TREBLE ")); Serial.println(value); #endif @@ -2108,7 +2107,7 @@ void set_eq_treble(uint8_t value) void set_loudness(uint8_t value) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Set LOUDNESS ")); Serial.println(value); #endif @@ -2120,7 +2119,7 @@ void set_loudness(uint8_t value) void set_midi_channel(uint8_t value) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Set MIDI_CHANNEL ")); Serial.println(value); #endif @@ -2129,7 +2128,7 @@ void set_midi_channel(uint8_t value) void set_midi_soft_thru(uint8_t value) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Set MIDI_SOFT_THRU ")); Serial.println(value); #endif @@ -2138,7 +2137,7 @@ void set_midi_soft_thru(uint8_t value) void set_max_poly(uint8_t value) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Set MAX_POLY ")); Serial.println(value); #endif @@ -2192,7 +2191,7 @@ void handle_ui(void) if (back_to_main > BACK_TO_MAIN_MS && menu_system.get_currentScreen() == &master_volume_screen) { { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from master_volume to main")); #endif goto_main_menu(MASTER_VOLUME); @@ -2539,7 +2538,7 @@ void handle_ui(void) if (encoder_tmp > encoder_value[RIGHT_ENCODER]) { // move down -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("ENC-R-DOWN: ")); Serial.println(encoder_tmp); #endif @@ -2549,7 +2548,7 @@ void handle_ui(void) else if (encoder_tmp < encoder_value[RIGHT_ENCODER]) { // move up -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("ENC-R-UP: ")); Serial.println(encoder_tmp); #endif @@ -2562,14 +2561,14 @@ void handle_ui(void) // button handling if (but[i].fallingEdge()) // SELECT { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("SELECT-R")); #endif if (menu_system.get_currentScreen() == &load_sound_screen) { // load sound -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print("Load sound "); Serial.println(); #endif @@ -2579,7 +2578,7 @@ void handle_ui(void) else if (menu_system.get_currentScreen() == &save_sound_screen) { // ask for storing sound -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print("Storing sound?"); Serial.println(); #endif @@ -2590,13 +2589,13 @@ void handle_ui(void) // save sound if (encoder_tmp == 1) { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Save sound ")); Serial.println(sound, DEC); #endif save_sound(); } -#ifdef DEBUG +#ifdef SHOW_DEBUG else Serial.println(F("Not saving sound!")); #endif @@ -2613,7 +2612,7 @@ void handle_ui(void) else if (menu_system.get_currentScreen() == &system_screen) menu_callback_offset = NUM_MAIN_MENUS + NUM_EDIT_SOUND_MENUS + NUM_EFFECTS_MENUS; -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("Starting callback number ")); Serial.println(encoder_value[RIGHT_ENCODER] + menu_callback_offset, DEC); Serial.print(F("encoder_value[RIGHT_ENCODER]=")); @@ -2628,7 +2627,7 @@ void handle_ui(void) menu_system.call_function(encoder_value[RIGHT_ENCODER] + 1 + menu_callback_offset); //menu_system.update(); } -#ifdef DEBUG +#ifdef SHOW_DEBUG else { Serial.print(F("No callback for ")); @@ -2646,7 +2645,7 @@ void handle_ui(void) if (encoder_tmp > encoder_value[LEFT_ENCODER]) { // move down -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("ENC-L-DOWN: ")); Serial.println(encoder_tmp); #endif @@ -2654,7 +2653,7 @@ void handle_ui(void) else if (encoder_tmp < encoder_value[LEFT_ENCODER]) { // move up -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("ENC-L-UP: ")); Serial.println(encoder_tmp); #endif @@ -2663,7 +2662,7 @@ void handle_ui(void) { master_volume = encoder_tmp; set_master_volume(master_volume); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("master_volume: ")); Serial.println(master_volume); #endif @@ -2676,19 +2675,19 @@ void handle_ui(void) // button handling if (but[i].fallingEdge()) // BACK { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print("Back press detected: "); #endif if (menu_system.get_currentScreen() == &load_sound_screen) // load_sound menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from load_sound to main")); #endif goto_main_menu(LOAD_SOUND); } else if (menu_system.get_currentScreen() == &edit_sound_screen) // sound menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from edit_sound to main")); #endif goto_main_menu(EDIT_SOUND); @@ -2696,266 +2695,266 @@ void handle_ui(void) } else if (menu_system.get_currentScreen() == &decay_screen) // decay menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from decay to edit_sound")); #endif goto_edit_sound_menu(DECAY); } else if (menu_system.get_currentScreen() == &release_screen) // release menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from release to edit_sound")); #endif goto_edit_sound_menu(RELEASE); } else if (menu_system.get_currentScreen() == &hardness_screen) // hardness menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from hardness to edit_sound")); #endif goto_edit_sound_menu(HARDNESS); } else if (menu_system.get_currentScreen() == &treble_screen) // treble menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from treble to edit_sound")); #endif goto_edit_sound_menu(TREBLE); } else if (menu_system.get_currentScreen() == &stereo_screen) // stereo menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from stereo to edit_sound")); #endif goto_edit_sound_menu(STEREO_LEVEL); } else if (menu_system.get_currentScreen() == &transpose_screen) // transpose menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from transpose to edit_sound")); #endif goto_edit_sound_menu(TRANSPOSE); } else if (menu_system.get_currentScreen() == &tune_screen) // tune menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from tune to edit_sound")); #endif goto_edit_sound_menu(TUNE); } else if (menu_system.get_currentScreen() == &detune_screen) // detune menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from detune to edit_sound")); #endif goto_edit_sound_menu(DETUNE); } else if (menu_system.get_currentScreen() == &velocity_sense_screen) // velocity_sense menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from velocity_sense to edit_sound")); #endif goto_edit_sound_menu(VELOCITY_SENSE); } else if (menu_system.get_currentScreen() == &effects_screen) // effect menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from effect to main")); #endif goto_main_menu(EFFECTS); } else if (menu_system.get_currentScreen() == &pan_trem_frequency_screen) //pan_trem_frequency menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from pan_trem_frequency to effects")); #endif goto_effects_menu(PAN_TREM_FREQUENCY); } else if (menu_system.get_currentScreen() == &pan_trem_level_screen) // pan_trem_level menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from pan_trem_level to effects")); #endif goto_effects_menu(PAN_TREM_LEVEL); } else if (menu_system.get_currentScreen() == &overdrive_screen) // overdrive menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from overdrive to effects")); #endif goto_effects_menu(OVERDRIVE); } else if (menu_system.get_currentScreen() == &comp_gain_screen) // comp_gain menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from comp_gain to effects")); #endif goto_effects_menu(COMP_GAIN); } else if (menu_system.get_currentScreen() == &comp_response_screen) // comp_response menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from comp_response to effects")); #endif goto_effects_menu(COMP_RESPONSE); } else if (menu_system.get_currentScreen() == &comp_limit_screen) // comp_limit menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from comp_limit to effects")); #endif goto_effects_menu(COMP_LIMIT); } else if (menu_system.get_currentScreen() == &comp_threshold_screen) // comp_threshold menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from comp_threshold to effects")); #endif goto_effects_menu(COMP_THRESHOLD); } else if (menu_system.get_currentScreen() == &comp_attack_screen) // comp_attack menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from comp_attack to effects")); #endif goto_effects_menu(COMP_ATTACK); } else if (menu_system.get_currentScreen() == &comp_decay_screen) // comp_decay menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from comp_decay to effects")); #endif goto_effects_menu(COMP_DECAY); } else if (menu_system.get_currentScreen() == &reverb_roomsize_screen) // reverb_roomsize menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from reverb_roomsize to effects")); #endif goto_effects_menu(REV_ROOMSIZE); } else if (menu_system.get_currentScreen() == &reverb_damping_screen) // reverb_damping menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from reverb_damping to effects")); #endif goto_effects_menu(REV_DAMPING); } else if (menu_system.get_currentScreen() == &reverb_level_screen) // reverb_level menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from reverb_level to effects")); #endif goto_effects_menu(REV_LEVEL); } else if (menu_system.get_currentScreen() == &chorus_frequency_screen) // chorus_frequency menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from chorus_frequency to effects")); #endif goto_effects_menu(CHORUS_FREQ); } else if (menu_system.get_currentScreen() == &chorus_delay_screen) // chorus_delay menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from chorus_delay to effects")); #endif goto_effects_menu(CHORUS_DELAY); } else if (menu_system.get_currentScreen() == &chorus_intensity_screen) // chorus_intensity menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from chorus_intensity to effects")); #endif goto_effects_menu(CHORUS_INTENSITY); } else if (menu_system.get_currentScreen() == &chorus_level_screen) // chorus_level menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from chorus_level to effects")); #endif goto_effects_menu(CHORUS_LEVEL); } else if (menu_system.get_currentScreen() == &bass_lr_level_screen) // bass_lr_level menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from bass_lr_level to effects")); #endif goto_effects_menu(BASS_LR_LEVEL); } else if (menu_system.get_currentScreen() == &bass_mono_level_screen) // bass_mono_level menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from bass_mono_level to effects")); #endif goto_effects_menu(BASS_MONO_LEVEL); } else if (menu_system.get_currentScreen() == &eq_bass_screen) // eq_bass menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from eq_bass to effects")); #endif goto_effects_menu(EQ_BASS); } else if (menu_system.get_currentScreen() == &eq_treble_screen) // eq_treble menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from eq_treble to main")); #endif goto_effects_menu(EQ_TREBLE); } else if (menu_system.get_currentScreen() == &save_sound_screen) // save_sound menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from save_sound to main")); #endif goto_main_menu(SAVE_SOUND); } else if (menu_system.get_currentScreen() == &store_question_screen) // store_question menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from store_question to main")); #endif goto_main_menu(SAVE_SOUND); } else if (menu_system.get_currentScreen() == &system_screen) // system menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from system to main")); #endif goto_main_menu(SYSTEM); } else if (menu_system.get_currentScreen() == &loudness_screen) // loudness menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from loudness to system")); #endif goto_system_menu(LOUDNESS); } else if (menu_system.get_currentScreen() == &midi_channel_screen) // midi_channel menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from midi_channel to system")); #endif goto_system_menu(MIDI_CHANNEL); } else if (menu_system.get_currentScreen() == &midi_soft_thru_screen) // midi_soft_thru menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from midi_soft_thru to system")); #endif goto_system_menu(MIDI_SOFT_THRU); } else if (menu_system.get_currentScreen() == &max_poly_screen) // max_poly menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from max_poly to system")); #endif goto_system_menu(MAX_POLY); } else if (menu_system.get_currentScreen() == &info_screen) // info menu { -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(F("from info to main")); #endif goto_main_menu(INFO); diff --git a/config.h b/config.h index a6718a9..f347948 100644 --- a/config.h +++ b/config.h @@ -70,7 +70,7 @@ //* DEBUG OUTPUT SETTINGS //************************************************************************************************* -//#define DEBUG 1 +#define SHOW_DEBUG 1 #define SERIAL_SPEED 38400 #define SHOW_XRUN 1 #define SHOW_CPU_LOAD_MSEC 5000 @@ -139,7 +139,7 @@ //* DO NO CHANGE ANYTHING BEYOND IF YOU DON'T KNOW WHAT YOU ARE DOING !!! //************************************************************************************************* -#define MICRO_MDAEPIANO_VERSION "0.9.3" +#define MICRO_MDAEPIANO_VERSION "0.9.4" #define MAX_SOUNDS min(99,int((4096-EEPROM_CONFIGURATIONS)/sizeof(config_t))) diff --git a/midi_devices.hpp b/midi_devices.hpp index 7eb92a1..753eb20 100644 --- a/midi_devices.hpp +++ b/midi_devices.hpp @@ -74,7 +74,7 @@ void handleSystemReset(void); void handleNoteOn_MIDI_DEVICE_DIN(byte inChannel, byte inNumber, byte inVelocity) { handleNoteOn(inChannel, inNumber, inVelocity); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_DIN] NoteOn")); #endif #ifdef MIDI_MERGE_THRU @@ -82,18 +82,18 @@ void handleNoteOn_MIDI_DEVICE_DIN(byte inChannel, byte inNumber, byte inVelocity { #ifdef MIDI_DEVICE_USB_HOST midi_usb.sendNoteOn(inNumber, inVelocity, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif #ifdef MIDI_DEVICE_USB usbMIDI.sendNoteOn(inNumber, inVelocity, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -102,7 +102,7 @@ void handleNoteOn_MIDI_DEVICE_DIN(byte inChannel, byte inNumber, byte inVelocity void handleNoteOff_MIDI_DEVICE_DIN(byte inChannel, byte inNumber, byte inVelocity) { handleNoteOff(inChannel, inNumber, inVelocity); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_DIN] NoteOff")); #endif #ifdef MIDI_MERGE_THRU @@ -110,18 +110,18 @@ void handleNoteOff_MIDI_DEVICE_DIN(byte inChannel, byte inNumber, byte inVelocit { #ifdef MIDI_DEVICE_USB_HOST midi_usb.sendNoteOff(inNumber, inVelocity, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif #ifdef MIDI_DEVICE_USB usbMIDI.sendNoteOff(inNumber, inVelocity, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -130,7 +130,7 @@ void handleNoteOff_MIDI_DEVICE_DIN(byte inChannel, byte inNumber, byte inVelocit void handleControlChange_MIDI_DEVICE_DIN(byte inChannel, byte inData1, byte inData2) { handleControlChange(inChannel, inData1, inData2); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_DIN] CC")); #endif #ifdef MIDI_MERGE_THRU @@ -138,18 +138,18 @@ void handleControlChange_MIDI_DEVICE_DIN(byte inChannel, byte inData1, byte inDa { #ifdef MIDI_DEVICE_USB_HOST midi_usb.sendControlChange(inData1, inData2, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif #ifdef MIDI_DEVICE_USB usbMIDI.sendControlChange(inData1, inData2, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -158,7 +158,7 @@ void handleControlChange_MIDI_DEVICE_DIN(byte inChannel, byte inData1, byte inDa void handleAfterTouch_MIDI_DEVICE_DIN(byte inChannel, byte inPressure) { handleAfterTouch(inChannel, inPressure); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_DIN] AT")); #endif #ifdef MIDI_MERGE_THRU @@ -166,18 +166,18 @@ void handleAfterTouch_MIDI_DEVICE_DIN(byte inChannel, byte inPressure) { #ifdef MIDI_DEVICE_USB_HOST midi_usb.sendAfterTouch(inPressure, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif #ifdef MIDI_DEVICE_USB usbMIDI.sendAfterTouch(inPressure, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -186,7 +186,7 @@ void handleAfterTouch_MIDI_DEVICE_DIN(byte inChannel, byte inPressure) void handlePitchBend_MIDI_DEVICE_DIN(byte inChannel, int inPitch) { handlePitchBend(inChannel, inPitch); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_DIN] PB")); #endif #ifdef MIDI_MERGE_THRU @@ -194,18 +194,18 @@ void handlePitchBend_MIDI_DEVICE_DIN(byte inChannel, int inPitch) { #ifdef MIDI_DEVICE_USB_HOST midi_usb.sendPitchBend(inPitch, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif #ifdef MIDI_DEVICE_USB usbMIDI.sendPitchBend(inPitch, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -214,7 +214,7 @@ void handlePitchBend_MIDI_DEVICE_DIN(byte inChannel, int inPitch) void handleProgramChange_MIDI_DEVICE_DIN(byte inChannel, byte inProgram) { handleProgramChange(inChannel, inProgram); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_DIN] PC")); #endif #ifdef MIDI_MERGE_THRU @@ -222,18 +222,18 @@ void handleProgramChange_MIDI_DEVICE_DIN(byte inChannel, byte inProgram) { #ifdef MIDI_DEVICE_USB_HOST midi_usb.sendProgramChange(inProgram, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif #ifdef MIDI_DEVICE_USB usbMIDI.sendProgramChange(inProgram, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -242,7 +242,7 @@ void handleProgramChange_MIDI_DEVICE_DIN(byte inChannel, byte inProgram) void handleSystemExclusive_MIDI_DEVICE_DIN(byte *data, uint len) { handleSystemExclusive(data, len); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_DIN] SysEx")); #endif #ifdef MIDI_MERGE_THRU @@ -250,18 +250,18 @@ void handleSystemExclusive_MIDI_DEVICE_DIN(byte *data, uint len) { #ifdef MIDI_DEVICE_USB_HOST midi_usb.sendSysEx(len, data); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif #ifdef MIDI_DEVICE_USB usbMIDI.sendSysEx(len, data); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -270,7 +270,7 @@ void handleSystemExclusive_MIDI_DEVICE_DIN(byte *data, uint len) /* void handleSystemExclusiveChunk_MIDI_DEVICE_DIN(byte *data, uint len, bool last) { handleSystemExclusiveChunk(data, len, last); - #ifdef DEBUG + #ifdef SHOW_DEBUG Serial.print(F("[MIDI_DIN] SysExChunk")); #endif #ifdef MIDI_MERGE_THRU @@ -278,18 +278,18 @@ void handleSystemExclusive_MIDI_DEVICE_DIN(byte *data, uint len) { #ifdef MIDI_DEVICE_USB_HOST midi_usb.sendSysEx(len, data, last); - #ifdef DEBUG + #ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif #ifdef MIDI_DEVICE_USB usbMIDI.sendSysEx(len, data, last); - #ifdef DEBUG + #ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB")); #endif #endif } - #ifdef DEBUG + #ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -298,7 +298,7 @@ void handleSystemExclusive_MIDI_DEVICE_DIN(byte *data, uint len) void handleTimeCodeQuarterFrame_MIDI_DEVICE_DIN(byte data) { handleTimeCodeQuarterFrame(data); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_DIN] TimeCodeQuarterFrame")); #endif #ifdef MIDI_MERGE_THRU @@ -306,18 +306,18 @@ void handleTimeCodeQuarterFrame_MIDI_DEVICE_DIN(byte data) { #ifdef MIDI_DEVICE_USB_HOST midi_usb.sendTimeCodeQuarterFrame(0xF1, data); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif #ifdef MIDI_DEVICE_USB usbMIDI.sendTimeCodeQuarterFrame(0xF1, data); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -326,7 +326,7 @@ void handleTimeCodeQuarterFrame_MIDI_DEVICE_DIN(byte data) void handleAfterTouchPoly_MIDI_DEVICE_DIN(byte inChannel, byte inNumber, byte inVelocity) { handleAfterTouchPoly(inChannel, inNumber, inVelocity); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_DIN] AT-Poly")); #endif #ifdef MIDI_MERGE_THRU @@ -334,18 +334,18 @@ void handleAfterTouchPoly_MIDI_DEVICE_DIN(byte inChannel, byte inNumber, byte in if (configuration.midi_soft_thru == true) { midi_usb.sendAfterTouch(inNumber, inVelocity, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif #ifdef MIDI_DEVICE_USB usbMIDI.sendAfterTouch(inNumber, inVelocity, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -354,7 +354,7 @@ void handleAfterTouchPoly_MIDI_DEVICE_DIN(byte inChannel, byte inNumber, byte in void handleSongSelect_MIDI_DEVICE_DIN(byte inSong) { handleSongSelect(inSong); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_DIN] SongSelect")); #endif #ifdef MIDI_MERGE_THRU @@ -362,18 +362,18 @@ void handleSongSelect_MIDI_DEVICE_DIN(byte inSong) { #ifdef MIDI_DEVICE_USB_HOST midi_usb.sendSongSelect(inSong); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif #ifdef MIDI_DEVICE_USB usbMIDI.sendSongSelect(inSong); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -382,7 +382,7 @@ void handleSongSelect_MIDI_DEVICE_DIN(byte inSong) void handleTuneRequest_MIDI_DEVICE_DIN(void) { handleTuneRequest(); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_DIN] TuneRequest")); #endif #ifdef MIDI_MERGE_THRU @@ -390,18 +390,18 @@ void handleTuneRequest_MIDI_DEVICE_DIN(void) { #ifdef MIDI_DEVICE_USB_HOST midi_usb.sendTuneRequest(); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif #ifdef MIDI_DEVICE_USB usbMIDI.sendTuneRequest(); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -410,7 +410,7 @@ void handleTuneRequest_MIDI_DEVICE_DIN(void) void handleClock_MIDI_DEVICE_DIN(void) { handleClock(); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_DIN] Clock")); #endif #ifdef MIDI_MERGE_THRU @@ -418,18 +418,18 @@ void handleClock_MIDI_DEVICE_DIN(void) { #ifdef MIDI_DEVICE_USB_HOST midi_usb.sendRealTime(midi::Clock); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif #ifdef MIDI_DEVICE_USB usbMIDI.sendRealTime(midi::Clock); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -438,7 +438,7 @@ void handleClock_MIDI_DEVICE_DIN(void) void handleStart_MIDI_DEVICE_DIN(void) { handleStart(); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_DIN] Start")); #endif #ifdef MIDI_MERGE_THRU @@ -446,18 +446,18 @@ void handleStart_MIDI_DEVICE_DIN(void) { #ifdef MIDI_DEVICE_USB_HOST midi_usb.sendRealTime(midi::Start); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif #ifdef MIDI_DEVICE_USB usbMIDI.sendRealTime(midi::Start); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -466,7 +466,7 @@ void handleStart_MIDI_DEVICE_DIN(void) void handleContinue_MIDI_DEVICE_DIN(void) { handleContinue(); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_DIN] Continue")); #endif #ifdef MIDI_MERGE_THRU @@ -474,18 +474,18 @@ void handleContinue_MIDI_DEVICE_DIN(void) { #ifdef MIDI_DEVICE_USB_HOST midi_usb.sendRealTime(midi::Continue); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif #ifdef MIDI_DEVICE_USB usbMIDI.sendRealTime(midi::Continue); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -494,7 +494,7 @@ void handleContinue_MIDI_DEVICE_DIN(void) void handleStop_MIDI_DEVICE_DIN(void) { handleStop(); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_DIN] Stop")); #endif #ifdef MIDI_MERGE_THRU @@ -502,18 +502,18 @@ void handleStop_MIDI_DEVICE_DIN(void) { #ifdef MIDI_DEVICE_USB_HOST midi_usb.sendRealTime(midi::Stop); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif #ifdef MIDI_DEVICE_USB usbMIDI.sendRealTime(midi::Stop); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -522,7 +522,7 @@ void handleStop_MIDI_DEVICE_DIN(void) void handleActiveSensing_MIDI_DEVICE_DIN(void) { handleActiveSensing(); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_DIN] ActiveSensing")); #endif #ifdef MIDI_MERGE_THRU @@ -530,18 +530,18 @@ void handleActiveSensing_MIDI_DEVICE_DIN(void) { #ifdef MIDI_DEVICE_USB_HOST midi_usb.sendRealTime(midi::ActiveSensing); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif #ifdef MIDI_DEVICE_USB usbMIDI.sendRealTime(midi::ActiveSensing); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -550,7 +550,7 @@ void handleActiveSensing_MIDI_DEVICE_DIN(void) void handleSystemReset_MIDI_DEVICE_DIN(void) { handleSystemReset(); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_DIN] SystemReset")); #endif #ifdef MIDI_MERGE_THRU @@ -558,18 +558,18 @@ void handleSystemReset_MIDI_DEVICE_DIN(void) { #ifdef MIDI_DEVICE_USB_HOST midi_usb.sendRealTime(midi::SystemReset); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif #ifdef MIDI_DEVICE_USB usbMIDI.sendRealTime(midi::SystemReset); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -578,7 +578,7 @@ void handleSystemReset_MIDI_DEVICE_DIN(void) /* void handlRealTimeSysteme_MIDI_DEVICE_DIN(byte inRealTime) { handleRealTimeSystem(); - #ifdef DEBUG + #ifdef SHOW_DEBUG Serial.print(F("[MIDI_DIN] RealTimeSystem")); #endif #ifdef MIDI_MERGE_THRU @@ -586,18 +586,18 @@ void handleSystemReset_MIDI_DEVICE_DIN(void) { #ifdef MIDI_DEVICE_USB_HOST midi_usb.sendRealTime(inRealTime); - #ifdef DEBUG + #ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif #ifdef MIDI_DEVICE_USB //usbMIDI.sendRealTime(inRealTIme); - #ifdef DEBUG + #ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB[NOTSUPPORTED]")); #endif #endif } - #ifdef DEBUG + #ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -611,7 +611,7 @@ void handleSystemReset_MIDI_DEVICE_DIN(void) void handleNoteOn_MIDI_DEVICE_USB_HOST(byte inChannel, byte inNumber, byte inVelocity) { handleNoteOn(inChannel, inNumber, inVelocity); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB_HOST] NoteOn")); #endif #ifdef MIDI_MERGE_THRU @@ -619,18 +619,18 @@ void handleNoteOn_MIDI_DEVICE_USB_HOST(byte inChannel, byte inNumber, byte inVel { #ifdef MIDI_DEVICE_DIN midi_serial.sendNoteOn(inNumber, inVelocity, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_DIN")); #endif #endif #ifdef MIDI_DEVICE_USB usbMIDI.sendNoteOn(inNumber, inVelocity, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -639,7 +639,7 @@ void handleNoteOn_MIDI_DEVICE_USB_HOST(byte inChannel, byte inNumber, byte inVel void handleNoteOff_MIDI_DEVICE_USB_HOST(byte inChannel, byte inNumber, byte inVelocity) { handleNoteOff(inChannel, inNumber, inVelocity); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB_HOST] NoteOff")); #endif #ifdef MIDI_MERGE_THRU @@ -647,18 +647,18 @@ void handleNoteOff_MIDI_DEVICE_USB_HOST(byte inChannel, byte inNumber, byte inVe { #ifdef MIDI_DEVICE_DIN midi_serial.sendNoteOff(inNumber, inVelocity, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_DIN")); #endif #endif #ifdef MIDI_DEVICE_USB usbMIDI.sendNoteOff(inNumber, inVelocity, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -667,7 +667,7 @@ void handleNoteOff_MIDI_DEVICE_USB_HOST(byte inChannel, byte inNumber, byte inVe void handleControlChange_MIDI_DEVICE_USB_HOST(byte inChannel, byte inData1, byte inData2) { handleControlChange(inChannel, inData1, inData2); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB_HOST] CC")); #endif #ifdef MIDI_MERGE_THRU @@ -675,18 +675,18 @@ void handleControlChange_MIDI_DEVICE_USB_HOST(byte inChannel, byte inData1, byte { #ifdef MIDI_DEVICE_DIN midi_serial.sendControlChange(inData1, inData2, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_DIN")); #endif #endif #ifdef MIDI_DEVICE_USB usbMIDI.sendControlChange(inData1, inData2, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -695,7 +695,7 @@ void handleControlChange_MIDI_DEVICE_USB_HOST(byte inChannel, byte inData1, byte void handleAfterTouch_MIDI_DEVICE_USB_HOST(byte inChannel, byte inPressure) { handleAfterTouch(inChannel, inPressure); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB_HOST] AT")); #endif #ifdef MIDI_MERGE_THRU @@ -703,18 +703,18 @@ void handleAfterTouch_MIDI_DEVICE_USB_HOST(byte inChannel, byte inPressure) { #ifdef MIDI_DEVICE_DIN midi_serial.sendAfterTouch(inPressure, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_DIN")); #endif #endif #ifdef MIDI_DEVICE_USB usbMIDI.sendAfterTouch(inPressure, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -723,7 +723,7 @@ void handleAfterTouch_MIDI_DEVICE_USB_HOST(byte inChannel, byte inPressure) void handlePitchBend_MIDI_DEVICE_USB_HOST(byte inChannel, int inPitch) { handlePitchBend(inChannel, inPitch); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB_HOST] PB")); #endif #ifdef MIDI_MERGE_THRU @@ -731,18 +731,18 @@ void handlePitchBend_MIDI_DEVICE_USB_HOST(byte inChannel, int inPitch) { #ifdef MIDI_DEVICE_DIN midi_serial.sendPitchBend(inPitch, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_DIN")); #endif #endif #ifdef MIDI_DEVICE_USB usbMIDI.sendPitchBend(inPitch, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -751,7 +751,7 @@ void handlePitchBend_MIDI_DEVICE_USB_HOST(byte inChannel, int inPitch) void handleProgramChange_MIDI_DEVICE_USB_HOST(byte inChannel, byte inProgram) { handleProgramChange(inChannel, inProgram); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB_HOST] PC")); #endif #ifdef MIDI_MERGE_THRU @@ -759,18 +759,18 @@ void handleProgramChange_MIDI_DEVICE_USB_HOST(byte inChannel, byte inProgram) { #ifdef MIDI_DEVICE_DIN midi_serial.sendProgramChange(inProgram, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_DIN")); #endif #endif #ifdef MIDI_DEVICE_USB usbMIDI.sendProgramChange(inProgram, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -779,7 +779,7 @@ void handleProgramChange_MIDI_DEVICE_USB_HOST(byte inChannel, byte inProgram) void handleSystemExclusive_MIDI_DEVICE_USB_HOST(byte *data, uint len) { handleSystemExclusive(data, len); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB_HOST] SysEx")); #endif #ifdef MIDI_MERGE_THRU @@ -787,18 +787,18 @@ void handleSystemExclusive_MIDI_DEVICE_USB_HOST(byte *data, uint len) { #ifdef MIDI_DEVICE_DIN midi_serial.sendSysEx(len, data); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_DIN")); #endif #endif #ifdef MIDI_DEVICE_USB usbMIDI.sendSysEx(len, data); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -807,7 +807,7 @@ void handleSystemExclusive_MIDI_DEVICE_USB_HOST(byte *data, uint len) /* void handleSystemExclusiveChunk_MIDI_DEVICE_USB_HOST(byte *data, uint len, bool last) { handleSystemExclusiveChunk(data, len, last); - #ifdef DEBUG + #ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB_HOST] SysExChunk")); #endif #ifdef MIDI_MERGE_THRU @@ -815,18 +815,18 @@ void handleSystemExclusive_MIDI_DEVICE_USB_HOST(byte *data, uint len) { #ifdef MIDI_DEVICE_DIN midi_serial.sendSysEx(len, data, last); - #ifdef DEBUG + #ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_DIN")); #endif #endif #ifdef MIDI_DEVICE_USB usbMIDI.sendSysEx(len, data, last); - #ifdef DEBUG + #ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB")); #endif #endif } - #ifdef DEBUG + #ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -835,7 +835,7 @@ void handleSystemExclusive_MIDI_DEVICE_USB_HOST(byte *data, uint len) void handleTimeCodeQuarterFrame_MIDI_DEVICE_USB_HOST(midi::DataByte data) { handleTimeCodeQuarterFrame(data); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB_HOST] TimeCodeQuarterFrame")); #endif #ifdef MIDI_MERGE_THRU @@ -843,18 +843,18 @@ void handleTimeCodeQuarterFrame_MIDI_DEVICE_USB_HOST(midi::DataByte data) { #ifdef MIDI_DEVICE_DIN midi_serial.sendTimeCodeQuarterFrame(data); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_DIN")); #endif #endif #ifdef MIDI_DEVICE_USB usbMIDI.sendTimeCodeQuarterFrame(0xF1, data); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -863,7 +863,7 @@ void handleTimeCodeQuarterFrame_MIDI_DEVICE_USB_HOST(midi::DataByte data) void handleAfterTouchPoly_MIDI_DEVICE_USB_HOST(byte inChannel, byte inNumber, byte inVelocity) { handleAfterTouchPoly(inChannel, inNumber, inVelocity); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB_HOST] AT-Poly")); #endif #ifdef MIDI_MERGE_THRU @@ -871,18 +871,18 @@ void handleAfterTouchPoly_MIDI_DEVICE_USB_HOST(byte inChannel, byte inNumber, by { #ifdef MIDI_DEVICE_DIN midi_serial.sendAfterTouch(inNumber, inVelocity, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->DIN")); #endif #endif #ifdef MIDI_DEVICE_USB usbMIDI.sendAfterTouch(inNumber, inVelocity, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -891,7 +891,7 @@ void handleAfterTouchPoly_MIDI_DEVICE_USB_HOST(byte inChannel, byte inNumber, by void handleSongSelect_MIDI_DEVICE_USB_HOST(byte inSong) { handleSongSelect(inSong); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB_HOST] SongSelect")); #endif #ifdef MIDI_MERGE_THRU @@ -899,18 +899,18 @@ void handleSongSelect_MIDI_DEVICE_USB_HOST(byte inSong) { #ifdef MIDI_DEVICE_DIN midi_serial.sendSongSelect(inSong); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_DIN")); #endif #endif #ifdef MIDI_DEVICE_USB usbMIDI.sendSongSelect(inSong); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -919,7 +919,7 @@ void handleSongSelect_MIDI_DEVICE_USB_HOST(byte inSong) void handleTuneRequest_MIDI_DEVICE_USB_HOST(void) { handleTuneRequest(); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB_HOST] TuneRequest")); #endif #ifdef MIDI_MERGE_THRU @@ -927,18 +927,18 @@ void handleTuneRequest_MIDI_DEVICE_USB_HOST(void) { #ifdef MIDI_DEVICE_DIN midi_serial.sendTuneRequest(); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_DIN")); #endif #endif #ifdef MIDI_DEVICE_USB usbMIDI.sendTuneRequest(); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -947,7 +947,7 @@ void handleTuneRequest_MIDI_DEVICE_USB_HOST(void) void handleClock_MIDI_DEVICE_USB_HOST(void) { handleClock(); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB_HOST] Clock")); #endif #ifdef MIDI_MERGE_THRU @@ -955,18 +955,18 @@ void handleClock_MIDI_DEVICE_USB_HOST(void) { #ifdef MIDI_DEVICE_DIN midi_serial.sendRealTime(midi::Clock); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_DIN")); #endif #endif #ifdef MIDI_DEVICE_USB usbMIDI.sendRealTime(midi::Clock); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -975,7 +975,7 @@ void handleClock_MIDI_DEVICE_USB_HOST(void) void handleStart_MIDI_DEVICE_USB_HOST(void) { handleStart(); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB_HOST] Start")); #endif #ifdef MIDI_MERGE_THRU @@ -983,18 +983,18 @@ void handleStart_MIDI_DEVICE_USB_HOST(void) { #ifdef MIDI_DEVICE_DIN midi_serial.sendRealTime(midi::Start); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_DIN")); #endif #endif #ifdef MIDI_DEVICE_USB usbMIDI.sendRealTime(midi::Start); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -1003,7 +1003,7 @@ void handleStart_MIDI_DEVICE_USB_HOST(void) void handleContinue_MIDI_DEVICE_USB_HOST(void) { handleContinue(); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB_HOST] Continue")); #endif #ifdef MIDI_MERGE_THRU @@ -1011,18 +1011,18 @@ void handleContinue_MIDI_DEVICE_USB_HOST(void) { #ifdef MIDI_DEVICE_DIN midi_serial.sendRealTime(midi::Continue); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_DIN")); #endif #endif #ifdef MIDI_DEVICE_USB usbMIDI.sendRealTime(midi::Continue); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -1031,7 +1031,7 @@ void handleContinue_MIDI_DEVICE_USB_HOST(void) void handleStop_MIDI_DEVICE_USB_HOST(void) { handleStop(); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB_HOST] Stop")); #endif #ifdef MIDI_MERGE_THRU @@ -1039,18 +1039,18 @@ void handleStop_MIDI_DEVICE_USB_HOST(void) { #ifdef MIDI_DEVICE_DIN midi_serial.sendRealTime(midi::Stop); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_DIN")); #endif #endif #ifdef MIDI_DEVICE_USB usbMIDI.sendRealTime(midi::Stop); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -1059,7 +1059,7 @@ void handleStop_MIDI_DEVICE_USB_HOST(void) void handleActiveSensing_MIDI_DEVICE_USB_HOST(void) { handleActiveSensing(); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB_HOST] ActiveSensing")); #endif #ifdef MIDI_MERGE_THRU @@ -1067,18 +1067,18 @@ void handleActiveSensing_MIDI_DEVICE_USB_HOST(void) { #ifdef MIDI_DEVICE_DIN midi_serial.sendRealTime(midi::ActiveSensing); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_DIN")); #endif #endif #ifdef MIDI_DEVICE_USB usbMIDI.sendRealTime(midi::ActiveSensing); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -1087,7 +1087,7 @@ void handleActiveSensing_MIDI_DEVICE_USB_HOST(void) void handleSystemReset_MIDI_DEVICE_USB_HOST(void) { handleSystemReset(); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB_HOST] SystemReset")); #endif #ifdef MIDI_MERGE_THRU @@ -1095,18 +1095,18 @@ void handleSystemReset_MIDI_DEVICE_USB_HOST(void) { #ifdef MIDI_DEVICE_DIN midi_serial.sendRealTime(midi::SystemReset); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_DIN")); #endif #endif #ifdef MIDI_DEVICE_USB usbMIDI.sendRealTime(midi::SystemReset); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -1115,7 +1115,7 @@ void handleSystemReset_MIDI_DEVICE_USB_HOST(void) /* void handlRealTimeSysteme_MIDI_DEVICE_USB_HOST(midi::MidiType inRealTime) { handleRealTimeSystem(); - #ifdef DEBUG + #ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB_HOST] RealTimeSystem")); #endif #ifdef MIDI_MERGE_THRU @@ -1123,18 +1123,18 @@ void handleSystemReset_MIDI_DEVICE_USB_HOST(void) { #ifdef MIDI_DEVICE_DIN midi_serial.sendRealTime(inRealTime); - #ifdef DEBUG + #ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_DIN")); #endif #endif #ifdef MIDI_DEVICE_USB usbMIDI.sendRealTime(inRealTime); - #ifdef DEBUG + #ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB")); #endif #endif } - #ifdef DEBUG + #ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -1148,7 +1148,7 @@ void handleSystemReset_MIDI_DEVICE_USB_HOST(void) void handleNoteOn_MIDI_DEVICE_USB(byte inChannel, byte inNumber, byte inVelocity) { handleNoteOn(inChannel, inNumber, inVelocity); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB] NoteOn")); #endif #ifdef MIDI_MERGE_THRU @@ -1156,18 +1156,18 @@ void handleNoteOn_MIDI_DEVICE_USB(byte inChannel, byte inNumber, byte inVelocity { #ifdef MIDI_DEVICE_DIN midi_serial.sendNoteOn(inNumber, inVelocity, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_DIN")); #endif #endif #ifdef MIDI_DEVICE_USB_HOST midi_usb.sendNoteOn(inNumber, inVelocity, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -1176,7 +1176,7 @@ void handleNoteOn_MIDI_DEVICE_USB(byte inChannel, byte inNumber, byte inVelocity void handleNoteOff_MIDI_DEVICE_USB(byte inChannel, byte inNumber, byte inVelocity) { handleNoteOff(inChannel, inNumber, inVelocity); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB] NoteOff")); #endif #ifdef MIDI_MERGE_THRU @@ -1184,18 +1184,18 @@ void handleNoteOff_MIDI_DEVICE_USB(byte inChannel, byte inNumber, byte inVelocit { #ifdef MIDI_DEVICE_DIN midi_serial.sendNoteOff(inNumber, inVelocity, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_DIN")); #endif #endif #ifdef MIDI_DEVICE_USB_HOST midi_usb.sendNoteOff(inNumber, inVelocity, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -1204,7 +1204,7 @@ void handleNoteOff_MIDI_DEVICE_USB(byte inChannel, byte inNumber, byte inVelocit void handleControlChange_MIDI_DEVICE_USB(byte inChannel, byte inData1, byte inData2) { handleControlChange(inChannel, inData1, inData2); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB] CC")); #endif #ifdef MIDI_MERGE_THRU @@ -1212,18 +1212,18 @@ void handleControlChange_MIDI_DEVICE_USB(byte inChannel, byte inData1, byte inDa { #ifdef MIDI_DEVICE_DIN midi_serial.sendControlChange(inData1, inData2, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_DIN")); #endif #endif #ifdef MIDI_DEVICE_USB_HOST midi_usb.sendControlChange(inData1, inData2, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -1232,7 +1232,7 @@ void handleControlChange_MIDI_DEVICE_USB(byte inChannel, byte inData1, byte inDa void handleAfterTouch_MIDI_DEVICE_USB(byte inChannel, byte inPressure) { handleAfterTouch(inChannel, inPressure); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB] AT")); #endif #ifdef MIDI_MERGE_THRU @@ -1240,18 +1240,18 @@ void handleAfterTouch_MIDI_DEVICE_USB(byte inChannel, byte inPressure) { #ifdef MIDI_DEVICE_DIN midi_serial.sendAfterTouch(inPressure, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_DIN")); #endif #endif #ifdef MIDI_DEVICE_USB_HOST midi_usb.sendAfterTouch(inPressure, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -1260,7 +1260,7 @@ void handleAfterTouch_MIDI_DEVICE_USB(byte inChannel, byte inPressure) void handlePitchBend_MIDI_DEVICE_USB(byte inChannel, int inPitch) { handlePitchBend(inChannel, inPitch); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB] PB")); #endif #ifdef MIDI_MERGE_THRU @@ -1268,18 +1268,18 @@ void handlePitchBend_MIDI_DEVICE_USB(byte inChannel, int inPitch) { #ifdef MIDI_DEVICE_DIN midi_serial.sendPitchBend(inPitch, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_DIN")); #endif #endif #ifdef MIDI_DEVICE_USB_HOST midi_usb.sendPitchBend(inPitch, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -1288,7 +1288,7 @@ void handlePitchBend_MIDI_DEVICE_USB(byte inChannel, int inPitch) void handleProgramChange_MIDI_DEVICE_USB(byte inChannel, byte inProgram) { handleProgramChange(inChannel, inProgram); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB] PC")); #endif #ifdef MIDI_MERGE_THRU @@ -1296,18 +1296,18 @@ void handleProgramChange_MIDI_DEVICE_USB(byte inChannel, byte inProgram) { #ifdef MIDI_DEVICE_DIN midi_serial.sendProgramChange(inProgram, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_DIN")); #endif #endif #ifdef MIDI_DEVICE_USB_HOST midi_usb.sendProgramChange(inProgram, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -1316,7 +1316,7 @@ void handleProgramChange_MIDI_DEVICE_USB(byte inChannel, byte inProgram) void handleSystemExclusive_MIDI_DEVICE_USB(byte *data, uint len) { handleSystemExclusive(data, len); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB] SysEx")); #endif #ifdef MIDI_MERGE_THRU @@ -1324,18 +1324,18 @@ void handleSystemExclusive_MIDI_DEVICE_USB(byte *data, uint len) { #ifdef MIDI_DEVICE_DIN midi_serial.sendSysEx(len, data); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_DIN")); #endif #endif #ifdef MIDI_DEVICE_USB_HOST midi_usb.sendSysEx(len, data); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -1344,7 +1344,7 @@ void handleSystemExclusive_MIDI_DEVICE_USB(byte *data, uint len) /* void handleSystemExclusiveChunk_MIDI_DEVICE_USB(byte *data, uint len, bool last) { handleSystemExclusiveChunk(data, len, last); - #ifdef DEBUG + #ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB] SysExChunk")); #endif #ifdef MIDI_MERGE_THRU @@ -1352,18 +1352,18 @@ void handleSystemExclusive_MIDI_DEVICE_USB(byte *data, uint len) { #ifdef MIDI_DEVICE_DIN midi_serial.sendSysEx(len, data, last); - #ifdef DEBUG + #ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_DIN")); #endif #endif #ifdef MIDI_DEVICE_USB_HOST midi_usb.sendSysEx(len, data, last); - #ifdef DEBUG + #ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif } - #ifdef DEBUG + #ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -1372,7 +1372,7 @@ void handleSystemExclusive_MIDI_DEVICE_USB(byte *data, uint len) void handleTimeCodeQuarterFrame_MIDI_DEVICE_USB(midi::DataByte data) { handleTimeCodeQuarterFrame(data); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB] TimeCodeQuarterFrame")); #endif #ifdef MIDI_MERGE_THRU @@ -1380,18 +1380,18 @@ void handleTimeCodeQuarterFrame_MIDI_DEVICE_USB(midi::DataByte data) { #ifdef MIDI_DEVICE_DIN midi_serial.sendTimeCodeQuarterFrame(data); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_DIN")); #endif #endif #ifdef MIDI_DEVICE_USB_HOST midi_usb.sendTimeCodeQuarterFrame(0xF1, data); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -1400,7 +1400,7 @@ void handleTimeCodeQuarterFrame_MIDI_DEVICE_USB(midi::DataByte data) void handleAfterTouchPoly_MIDI_DEVICE_USB(byte inChannel, byte inNumber, byte inVelocity) { handleAfterTouchPoly(inChannel, inNumber, inVelocity); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB] AT-Poly")); #endif #ifdef MIDI_MERGE_THRU @@ -1408,18 +1408,18 @@ void handleAfterTouchPoly_MIDI_DEVICE_USB(byte inChannel, byte inNumber, byte in { #ifdef MIDI_DEVICE_DIN midi_serial.sendAfterTouch(inNumber, inVelocity, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->DIN")); #endif #endif #ifdef MIDI_DEVICE_USB_HOST midi_usb.sendAfterTouch(inNumber, inVelocity, inChannel); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -1428,7 +1428,7 @@ void handleAfterTouchPoly_MIDI_DEVICE_USB(byte inChannel, byte inNumber, byte in void handleSongSelect_MIDI_DEVICE_USB(byte inSong) { handleSongSelect(inSong); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB] SongSelect")); #endif #ifdef MIDI_MERGE_THRU @@ -1436,18 +1436,18 @@ void handleSongSelect_MIDI_DEVICE_USB(byte inSong) { #ifdef MIDI_DEVICE_DIN midi_serial.sendSongSelect(inSong); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_DIN")); #endif #endif #ifdef MIDI_DEVICE_USB_HOST midi_usb.sendSongSelect(inSong); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -1456,7 +1456,7 @@ void handleSongSelect_MIDI_DEVICE_USB(byte inSong) void handleTuneRequest_MIDI_DEVICE_USB(void) { handleTuneRequest(); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB] TuneRequest")); #endif #ifdef MIDI_MERGE_THRU @@ -1464,18 +1464,18 @@ void handleTuneRequest_MIDI_DEVICE_USB(void) { #ifdef MIDI_DEVICE_DIN midi_serial.sendTuneRequest(); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_DIN")); #endif #endif #ifdef MIDI_DEVICE_USB_HOST midi_usb.sendTuneRequest(); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -1484,7 +1484,7 @@ void handleTuneRequest_MIDI_DEVICE_USB(void) void handleClock_MIDI_DEVICE_USB(void) { handleClock(); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB] Clock")); #endif #ifdef MIDI_MERGE_THRU @@ -1492,18 +1492,18 @@ void handleClock_MIDI_DEVICE_USB(void) { #ifdef MIDI_DEVICE_DIN midi_serial.sendRealTime(midi::Clock); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_DIN")); #endif #endif #ifdef MIDI_DEVICE_USB_HOST midi_usb.sendRealTime(midi::Clock); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -1512,7 +1512,7 @@ void handleClock_MIDI_DEVICE_USB(void) void handleStart_MIDI_DEVICE_USB(void) { handleStart(); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB] Start")); #endif #ifdef MIDI_MERGE_THRU @@ -1520,18 +1520,18 @@ void handleStart_MIDI_DEVICE_USB(void) { #ifdef MIDI_DEVICE_DIN midi_serial.sendRealTime(midi::Start); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_DIN")); #endif #endif #ifdef MIDI_DEVICE_USB_HOST midi_usb.sendRealTime(midi::Start); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -1540,7 +1540,7 @@ void handleStart_MIDI_DEVICE_USB(void) void handleContinue_MIDI_DEVICE_USB(void) { handleContinue(); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB] Continue")); #endif #ifdef MIDI_MERGE_THRU @@ -1548,18 +1548,18 @@ void handleContinue_MIDI_DEVICE_USB(void) { #ifdef MIDI_DEVICE_DIN midi_serial.sendRealTime(midi::Continue); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_DIN")); #endif #endif #ifdef MIDI_DEVICE_USB_HOST midi_usb.sendRealTime(midi::Continue); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -1568,7 +1568,7 @@ void handleContinue_MIDI_DEVICE_USB(void) void handleStop_MIDI_DEVICE_USB(void) { handleStop(); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB] Stop")); #endif #ifdef MIDI_MERGE_THRU @@ -1576,18 +1576,18 @@ void handleStop_MIDI_DEVICE_USB(void) { #ifdef MIDI_DEVICE_DIN midi_serial.sendRealTime(midi::Stop); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_DIN")); #endif #endif #ifdef MIDI_DEVICE_USB_HOST midi_usb.sendRealTime(midi::Stop); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -1596,7 +1596,7 @@ void handleStop_MIDI_DEVICE_USB(void) void handleActiveSensing_MIDI_DEVICE_USB(void) { handleActiveSensing(); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB] ActiveSensing")); #endif #ifdef MIDI_MERGE_THRU @@ -1604,18 +1604,18 @@ void handleActiveSensing_MIDI_DEVICE_USB(void) { #ifdef MIDI_DEVICE_DIN midi_serial.sendRealTime(midi::ActiveSensing); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_DIN")); #endif #endif #ifdef MIDI_DEVICE_USB_HOST midi_usb.sendRealTime(midi::ActiveSensing); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -1624,7 +1624,7 @@ void handleActiveSensing_MIDI_DEVICE_USB(void) void handleSystemReset_MIDI_DEVICE_USB(void) { handleSystemReset(); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB] SystemReset")); #endif #ifdef MIDI_MERGE_THRU @@ -1632,18 +1632,18 @@ void handleSystemReset_MIDI_DEVICE_USB(void) { #ifdef MIDI_DEVICE_DIN midi_serial.sendRealTime(midi::SystemReset); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_DIN")); #endif #endif #ifdef MIDI_DEVICE_USB_HOST midi_usb.sendRealTime(midi::SystemReset); -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif } -#ifdef DEBUG +#ifdef SHOW_DEBUG Serial.println(); #endif #endif @@ -1652,7 +1652,7 @@ void handleSystemReset_MIDI_DEVICE_USB(void) /* void handleRealTimeSystem_MIDI_DEVICE_USB(byte inRealTime) { handleRealTimeSystem(); - #ifdef DEBUG + #ifdef SHOW_DEBUG Serial.print(F("[MIDI_USB] RealTimeSystem")); #endif #ifdef MIDI_MERGE_THRU @@ -1660,18 +1660,18 @@ void handleSystemReset_MIDI_DEVICE_USB(void) { #ifdef MIDI_DEVICE_DIN midi_serial.sendRealTime((midi::MidiType)inRealTime); - #ifdef DEBUG + #ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_DIN")); #endif #endif #ifdef MIDI_DEVICE_USB_HOST midi_usb.sendRealTime(inRealTime); - #ifdef DEBUG + #ifdef SHOW_DEBUG Serial.print(F(" THRU->MIDI_USB_HOST")); #endif #endif } - #ifdef DEBUG + #ifdef SHOW_DEBUG Serial.println(); #endif #endif