diff --git a/NuEVI/NuEVI.ino b/NuEVI/NuEVI.ino index 854856c..4c0b475 100644 --- a/NuEVI/NuEVI.ino +++ b/NuEVI/NuEVI.ino @@ -92,7 +92,7 @@ uint16_t specialKeyEnable = 0; int touch_Thr = 1300; -byte ccList[13] = {0,1,2,7,11,19,1,2,7,11,19,74,20}; // OFF, Modulation, Breath, Volume, Expression, Sirin Cutoff (then same sent in hires), CC74 (cutoff/brightness), CC20 (UNO Cutoff) +byte ccList[11] = {0,1,2,7,11,1,2,7,11,74,20}; // OFF, Modulation, Breath, Volume, Expression (then same sent in hires), CC74 (cutoff/brightness), CC20 (UNO Cutoff) int pbDepthList[13] = {8192,8192,4096,2731,2048,1638,1365,1170,1024,910,819,744,683}; @@ -943,7 +943,7 @@ void breath() { } if (breathCCvalHires != oldbreathhires) { - if ((breathCC > 5) && (breathCC < 11)) { // send high resolution midi + if ((breathCC > 4) && (breathCC < 9)) { // send high resolution midi midiSendControlChange(ccList[breathCC] + 32, breathCCvalFine); } oldbreathhires = breathCCvalHires; diff --git a/NuEVI/globals.h b/NuEVI/globals.h index a9b0f0d..2659559 100644 --- a/NuEVI/globals.h +++ b/NuEVI/globals.h @@ -40,7 +40,7 @@ extern unsigned short extracMaxVal; extern unsigned short ctouchThrVal; extern unsigned short transpose; extern unsigned short MIDIchannel; -extern unsigned short breathCC; // OFF:MW:BR:VL:EX:SR:MW+:BR+:VL+:EX+:SR+:CF:UNO +extern unsigned short breathCC; // OFF:MW:BR:VL:EX:MW+:BR+:VL+:EX+:CF:UNO extern unsigned short breathCC2; // OFF:1-127 extern unsigned short breathCC2Rise; // 1X:2X:3X:4X:5X extern unsigned short breathAT; diff --git a/NuEVI/menu.cpp b/NuEVI/menu.cpp index d2793ac..79cf41c 100644 --- a/NuEVI/menu.cpp +++ b/NuEVI/menu.cpp @@ -642,10 +642,10 @@ const MenuPage rotatorMenuPage = { //*********************************************************** // Breath menu const MenuEntrySub breathCCMenu = { - MenuType::ESub, "BRTH CC1", "BRTH CC1", &breathCC, 0, 12, MenuEntryFlags::EMenuEntryWrap, + MenuType::ESub, "BRTH CC1", "BRTH CC1", &breathCC, 0, 10, MenuEntryFlags::EMenuEntryWrap, [](SubMenuRef __unused, char* out, const char** __unused unit) { - const char* breathCCMenuLabels[] = { "OFF", "MW", "BR", "VL", "EX","SR", "MW+", - "BR+", "VL+", "EX+", "SR+", "CF", "UNO" }; + const char* breathCCMenuLabels[] = { "OFF", "MW", "BR", "VL", "EX", "MW+", + "BR+", "VL+", "EX+", "CF", "UNO" }; strncpy(out, breathCCMenuLabels[breathCC], 4); }, [](const MenuEntrySub & __unused sub){