Improved menu status display
Added ability to adjust key params from status and load preset
This commit is contained in:
parent
7219872a14
commit
a2f2fb260d
5 changed files with 165 additions and 84 deletions
|
|
@ -419,68 +419,47 @@ void portamento_() {
|
|||
//***********************************************************
|
||||
|
||||
void sendCC() {
|
||||
if (ExtraControl::CC == state.currentPreset->biteControl) {
|
||||
int biteVal = mapConstrain(instrument.biteSignal, calibration.biteThrVal, calibration.biteMaxVal, 127, 0);
|
||||
|
||||
if (biteVal != instrument.biteVal) {
|
||||
midiSendControlChange(state.currentPreset->biteCC, biteVal);
|
||||
}
|
||||
instrument.biteVal = biteVal;
|
||||
int biteVal = mapConstrain(instrument.biteSignal, calibration.biteThrVal, calibration.biteMaxVal, 127, 0);
|
||||
if (ExtraControl::CC == state.currentPreset->biteControl && biteVal != instrument.biteVal) {
|
||||
midiSendControlChange(state.currentPreset->biteCC, biteVal);
|
||||
}
|
||||
instrument.biteVal = biteVal;
|
||||
|
||||
if (ExtraControl::CC == state.currentPreset->extraControl) {
|
||||
int extraVal = mapConstrain(instrument.extraSignal, calibration.extraMinVal, calibration.extraMaxVal, 0, 127);
|
||||
|
||||
if (extraVal != instrument.extraVal) {
|
||||
midiSendControlChange(state.currentPreset->extraCC, extraVal);
|
||||
}
|
||||
instrument.extraVal = extraVal;
|
||||
int extraVal = mapConstrain(instrument.extraSignal, calibration.extraMinVal, calibration.extraMaxVal, 0, 127);
|
||||
if (ExtraControl::CC == state.currentPreset->extraControl && extraVal != instrument.extraVal) {
|
||||
midiSendControlChange(state.currentPreset->extraCC, extraVal);
|
||||
}
|
||||
instrument.extraVal = extraVal;
|
||||
|
||||
int leverVal = mapConstrain(instrument.leverSignal, calibration.leverMinVal, calibration.leverMaxVal, 0, 127);
|
||||
if (ExtraControl::CC == state.currentPreset->leverControl) {
|
||||
if (leverVal != instrument.leverVal) {
|
||||
midiSendControlChange(state.currentPreset->leverCC, leverVal);
|
||||
}
|
||||
if (ExtraControl::CC == state.currentPreset->leverControl && leverVal != instrument.leverVal) {
|
||||
midiSendControlChange(state.currentPreset->leverCC, leverVal);
|
||||
}
|
||||
instrument.leverVal = leverVal;
|
||||
|
||||
if (ExtraControl::CC == state.currentPreset->pbControl) {
|
||||
int pbVal = mapConstrain(instrument.pbSignal, calibration.pbMinVal, calibration.pbMaxVal, 0, 127);
|
||||
|
||||
if (pbVal != instrument.pbVal) {
|
||||
midiSendControlChange(state.currentPreset->pbCC, pbVal);
|
||||
}
|
||||
instrument.pbVal = pbVal;
|
||||
int pbVal = mapConstrain(instrument.pbSignal, calibration.pbMinVal, calibration.pbMaxVal, 0, 127);
|
||||
if (ExtraControl::CC == state.currentPreset->pbControl && pbVal != instrument.pbVal) {
|
||||
midiSendControlChange(state.currentPreset->pbCC, pbVal);
|
||||
}
|
||||
instrument.pbVal = pbVal;
|
||||
|
||||
if (state.currentPreset->pbYCC) {
|
||||
int pbYVal = mapConstrain(instrument.pbYSignal, calibration.pbYMinVal, calibration.pbYMaxVal, 0, 127);
|
||||
|
||||
if (pbYVal != instrument.pbYVal) {
|
||||
midiSendControlChange(state.currentPreset->pbYCC, pbYVal);
|
||||
}
|
||||
instrument.pbYVal = pbYVal;
|
||||
int pbYVal = mapConstrain(instrument.pbYSignal, calibration.pbYMinVal, calibration.pbYMaxVal, 0, 127);
|
||||
if (state.currentPreset->pbYCC && pbYVal != instrument.pbYVal) {
|
||||
midiSendControlChange(state.currentPreset->pbYCC, pbYVal);
|
||||
}
|
||||
instrument.pbYVal = pbYVal;
|
||||
|
||||
if (state.currentPreset->stickXCC) {
|
||||
int stickXVal = mapConstrain(instrument.stickXSignal, calibration.stickXMinVal, calibration.stickXMaxVal, 0, 127);
|
||||
|
||||
if (stickXVal != instrument.stickXVal) {
|
||||
midiSendControlChange(state.currentPreset->stickXCC, stickXVal);
|
||||
}
|
||||
instrument.stickXVal = stickXVal;
|
||||
int stickXVal = mapConstrain(instrument.stickXSignal, calibration.stickXMinVal, calibration.stickXMaxVal, 0, 127);
|
||||
if (state.currentPreset->stickXCC && stickXVal != instrument.stickXVal) {
|
||||
midiSendControlChange(state.currentPreset->stickXCC, stickXVal);
|
||||
}
|
||||
instrument.stickXVal = stickXVal;
|
||||
|
||||
if (state.currentPreset->stickYCC) {
|
||||
int stickYVal = mapConstrain(instrument.stickYSignal, calibration.stickYMinVal, calibration.stickYMaxVal, 0, 127);
|
||||
|
||||
if (stickYVal != instrument.stickYVal) {
|
||||
midiSendControlChange(state.currentPreset->stickYCC, stickYVal);
|
||||
}
|
||||
instrument.stickYVal = stickYVal;
|
||||
int stickYVal = mapConstrain(instrument.stickYSignal, calibration.stickYMinVal, calibration.stickYMaxVal, 0, 127);
|
||||
if (state.currentPreset->stickYCC && stickYVal != instrument.stickYVal) {
|
||||
midiSendControlChange(state.currentPreset->stickYCC, stickYVal);
|
||||
}
|
||||
|
||||
instrument.stickYVal = stickYVal;
|
||||
|
||||
if (!inMenu()) {
|
||||
for (int i = 0; i < 4; i++) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue