brian/xevi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed SR and SR+ from CC list

Browse source
This commit is contained in:
Johan Berglund 2019-07-18 14:07:52 +02:00
parent 597991c968
commit ed7db007eb
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
NuEVI/NuEVI.ino
View file

@ -92,7 +92,7 @@ uint16_t specialKeyEnable = 0;
int touch_Thr = 1300; 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}; 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 (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); midiSendControlChange(ccList[breathCC] + 32, breathCCvalFine);
} }
oldbreathhires = breathCCvalHires; oldbreathhires = breathCCvalHires;

2
NuEVI/globals.h
View file

@ -40,7 +40,7 @@ extern unsigned short extracMaxVal;
extern unsigned short ctouchThrVal; extern unsigned short ctouchThrVal;
extern unsigned short transpose; extern unsigned short transpose;
extern unsigned short MIDIchannel; 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 breathCC2; // OFF:1-127
extern unsigned short breathCC2Rise; // 1X:2X:3X:4X:5X extern unsigned short breathCC2Rise; // 1X:2X:3X:4X:5X
extern unsigned short breathAT; extern unsigned short breathAT;

6
NuEVI/menu.cpp
View file

@ -642,10 +642,10 @@ const MenuPage rotatorMenuPage = {
//*********************************************************** //***********************************************************
// Breath menu // Breath menu
const MenuEntrySub breathCCMenu = { 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) { [](SubMenuRef __unused, char* out, const char** __unused unit) {
const char* breathCCMenuLabels[] = { "OFF", "MW", "BR", "VL", "EX","SR", "MW+", const char* breathCCMenuLabels[] = { "OFF", "MW", "BR", "VL", "EX", "MW+",
"BR+", "VL+", "EX+", "SR+", "CF", "UNO" }; "BR+", "VL+", "EX+", "CF", "UNO" };
strncpy(out, breathCCMenuLabels[breathCC], 4); strncpy(out, breathCCMenuLabels[breathCC], 4);
}, },
[](const MenuEntrySub & __unused sub){ [](const MenuEntrySub & __unused sub){