Oleksiy/GravityFW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added encoder acceleration. still needs fine-tuning

Browse Source
This commit is contained in:
Oleksiy
2025-04-06 22:51:57 +03:00
parent 395fa1ef1f
commit 8116b1182a
3 changed files with 160 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
Software/Gravity/Interactions.ino
View File

@ -88,33 +88,30 @@ void checkInputs() {
}
//encoder
// things to try:
// 1 - make checkInputs one if-else chain and move the encoder part to the first condition
// 2 - count "burst" changes and apply acceleration
// 3 - pinchange interrupts? https://github.com/mathertel/RotaryEncoder/blob/master/examples/InterruptRotator/InterruptRotator.ino
//encoder.tick();
//int encPosition = 0;//encoder.getPosition();
//int8_t encDirection = 0;//(int)(encoder.getDirection());
if (encoderChange != 0) {
int change = encoderChange;
if (!reverseEnc) {
change = change * -1;
encoderChange = encoderChange * -1;
}
/*unsigned long ms = 0;//encoder.getMillisBetweenRotations();
if (encDirectionOld == encDirection && ms < 18) { //encoder acceleration
change = change * 5;
} /* else if (encDirectionOld == encDirection && ms < 80) {
change = change * 2;
} else */
if (((encoderChange > 0) != encoderDirectionOld) && encoderTimeBetweenPulses < 200) { //filter out encoder "jumps"
change = 0;
if (((encoderChange > 0) != encoderDirectionOld) && encoderTimeBetweenPulses < 150) { //filter out encoder "jumps"
encoderChange = 0;
}
encoderDirectionOld = (encoderChange > 0);
//encoder acceleration
if (encoderTimeBetweenPulses < 60) {
encoderBurstCount++;
} else {
encoderBurstCount = 0;
}
if (encoderBurstCount > 2) { //
encoderChange = encoderChange * 3; // These two params need to be finetuned to feel natural
}
if (displayScreen == 0) {
byte channelCV;
if (!insideTab && !shiftBtnPushed) { //Change tab
displayTab = displayTab + change;
displayTab = displayTab + encoderChange;
if (displayTab > 100) { //to address "negative" numbers
displayTab = 0;
} else if (displayTab > 6) {
@ -124,7 +121,7 @@ void checkInputs() {
|| (insideTab && menuItem == 0
&& (menuItemSelected || shiftBtnPushed)))
&& displayTab == 0 && masterClockMode == 0) { //Change BPM
bpm = bpm + change;
bpm = bpm + encoderChange;
if (bpm > MAXBPM) {
bpm = MAXBPM;
} else if (bpm < MINBPM) {
@ -137,7 +134,7 @@ void checkInputs() {
&& (menuItemSelected || shiftBtnPushed)))
&& displayTab != 0
&& channels[displayTab - 1].mode == 0) {
channels[displayTab - 1].subDiv = channels[displayTab - 1].subDiv - change;
channels[displayTab - 1].subDiv = channels[displayTab - 1].subDiv -encoderChange;
//channels[displayTab - 1].offset = 0;
if (channels[displayTab - 1].subDiv > 100) {
channels[displayTab - 1].subDiv = 0;
@ -162,7 +159,7 @@ void checkInputs() {
&& (menuItemSelected || shiftBtnPushed)))
&& displayTab != 0
&& channels[displayTab - 1].mode == 1) { //Change Random
channels[displayTab - 1].random = channels[displayTab - 1].random + change;
channels[displayTab - 1].random = channels[displayTab - 1].random + encoderChange;
if (channels[displayTab - 1].random > 100) {
channels[displayTab - 1].random = 0;
} else if (channels[displayTab - 1].random > 9) {
@ -174,7 +171,7 @@ void checkInputs() {
&& (menuItemSelected || shiftBtnPushed)))
&& displayTab != 0
&& channels[displayTab - 1].mode == 2) { //Change SEQ pattern
channels[displayTab - 1].seqPattern = channels[displayTab - 1].seqPattern + change;
channels[displayTab - 1].seqPattern = channels[displayTab - 1].seqPattern + encoderChange;
if (channels[displayTab - 1].seqPattern > 100) {
channels[displayTab - 1].seqPattern = 0;
} else if (channels[displayTab - 1].seqPattern > 15) {
@ -182,7 +179,7 @@ void checkInputs() {
}
saveState();
} else if (insideTab && !shiftBtnPushed && !menuItemSelected) {
menuItem = menuItem + change;
menuItem = menuItem + encoderChange;
if (menuItem > 100) { //for "negative" values
menuItem = 0;
} else if (menuItem > lastMenuItem) {
@ -196,7 +193,7 @@ void checkInputs() {
isPlaying = false;
}
masterClockMode = masterClockMode + change;
masterClockMode = masterClockMode + encoderChange;
if (masterClockMode > 100) {
masterClockMode = 0;
} else if (masterClockMode > 2) { //Set to 1 to hide MIDI mode
@ -208,7 +205,7 @@ void checkInputs() {
&& displayTab == 0
&& menuItem == 2
&& masterClockMode == 0) { //Modulation channel
bpmModulationChannel = bpmModulationChannel + change;
bpmModulationChannel = bpmModulationChannel + encoderChange;
if (bpmModulationChannel == 0 || bpmModulationChannel == 1) {
bpmModulationRange = 1;
} else if (bpmModulationChannel > 100) {
@ -223,7 +220,7 @@ void checkInputs() {
&& displayTab == 0
&& menuItem == 2
&& masterClockMode == 1) { //PPQN
extClockPPQN = extClockPPQN + change;
extClockPPQN = extClockPPQN + encoderChange;
if (extClockPPQN > 100) {
extClockPPQN = 0;
} else if (extClockPPQN > 1) {
@ -234,7 +231,7 @@ void checkInputs() {
&& (menuItemSelected || shiftBtnPushed)
&& displayTab == 0
&& menuItem == 3) { //Modulation range
bpmModulationRange = bpmModulationRange + change;
bpmModulationRange = bpmModulationRange + encoderChange;
if (bpmModulationRange == 0) {
bpmModulationRange = 1;
} else if (bpmModulationRange > 100) {
@ -247,7 +244,7 @@ void checkInputs() {
&& (menuItemSelected || shiftBtnPushed)
&& displayTab != 0
&& menuItem == 1) { //Channel Mode
channels[displayTab - 1].mode = channels[displayTab - 1].mode + change;
channels[displayTab - 1].mode = channels[displayTab - 1].mode + encoderChange;
if (channels[displayTab - 1].mode > 100) {
channels[displayTab - 1].mode = 0;
} else if (channels[displayTab - 1].mode > 2) {
@ -260,7 +257,7 @@ void checkInputs() {
&& (menuItemSelected || shiftBtnPushed)
&& displayTab != 0 && menuItem == 2
&& channels[displayTab - 1].mode == 0) { //Offset
channels[displayTab - 1].offset = channels[displayTab - 1].offset + change;
channels[displayTab - 1].offset = channels[displayTab - 1].offset + encoderChange;
if (channels[displayTab - 1].offset == 255) { // 0 - 1 for uint8 is 255
channels[displayTab - 1].offset = 0;
} else if (channels[displayTab - 1].offset > channelPulsesPerCycle[displayTab-1]) {
@ -272,7 +269,7 @@ void checkInputs() {
&& displayTab != 0
&& menuItem == 2
&& channels[displayTab - 1].mode == 1) { //SUBDIV for RANDOM
channels[displayTab - 1].subDiv = channels[displayTab - 1].subDiv - change;
channels[displayTab - 1].subDiv = channels[displayTab - 1].subDiv - encoderChange;
if (channels[displayTab - 1].subDiv > 200) {
channels[displayTab - 1].subDiv = 0;
} else if (channels[displayTab - 1].subDiv > (sizeof(subDivs) / sizeof(int)) - 1) {
@ -294,7 +291,7 @@ void checkInputs() {
} else {
channelCV = 0;
}
channelCV = channelCV + change;
channelCV = channelCV + encoderChange;
if (channelCV == 0 || channelCV > 100) {
channelCV = 0;
channels[displayTab - 1].CV1Target = 0;
@ -316,7 +313,7 @@ void checkInputs() {
} else {
channelCV = 0;
}
channelCV = channelCV + change;
channelCV = channelCV + encoderChange;
if (channelCV == 0 || channelCV > 100) {
channelCV = 0;
channels[displayTab - 1].CV1Target = 0;
@ -338,7 +335,7 @@ void checkInputs() {
} else {
channelCV = 0;
}
channelCV = channelCV + change;
channelCV = channelCV + encoderChange;
if (channelCV == 0 || channelCV > 100) {
channelCV = 0;
channels[displayTab - 1].CV1Target = 0;
@ -354,14 +351,14 @@ void checkInputs() {
saveState();
}
} else if (displayScreen == 1 && !isRecording) {
stepNumSelected = stepNumSelected + change;
stepNumSelected = stepNumSelected + encoderChange;
if (stepNumSelected > 100) {
stepNumSelected = 15;
} else if (stepNumSelected > 15) {
stepNumSelected = 0;
}
} else if (displayScreen == 2 && !shiftBtnPushed) {
menuItem = menuItem + change;
menuItem = menuItem + encoderChange;
if (menuItem > 100) { //for "negative" values
menuItem = 0;
} else if (menuItem > lastMenuItem) {