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

RotaryEncoder.h with interrupts seems to work fine (hopefully this version is not messed up with merge conflicts)

Browse Source
This commit is contained in:
Oleksiy
2025-05-09 00:42:03 +03:00
parent 663b723ddb
commit d8bcbabad5
2 changed files with 43 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
Software/Gravity/Interactions.ino
View File

@ -87,31 +87,28 @@ void checkInputs() {
updateScreen();
}
//encoder
if (encoderChange != 0) {
if (!reverseEnc) {
encoderChange = encoderChange * -1;
//encoder
//encoder.tick();
int encPosition = encoder.getPosition();
int encDirection = (int)(encoder.getDirection());
if (encPositionOld != encPosition) {
int change = encPositionOld - encPosition;
if (reverseEnc) {
change = change * -1;
}
/*if (((encoderChange > 0) != encoderDirectionOld) && encoderTimeBetweenPulses < 60) { //filter out encoder "jumps".
encoderChange = 0; //Comented out because it seems like sometimes it was preventing normal scroll
} //if it works ok without it delete encoderDirectionOld var altogether
encoderDirectionOld = (encoderChange > 0);*/
//encoder acceleration
/*if (encoderTimeBetweenPulses < 15) { // <--
encoderBurstCount++;
} else {
encoderBurstCount = 0;
unsigned long ms = encoder.getMillisBetweenRotations();
/*if (encDirectionOld == encDirection && ms < 20) { //encoder acceleration
change = change * 5;
} else if (encDirectionOld == encDirection && ms < 80) {
change = change * 2;
} else */ if (encDirectionOld != encDirection && ms < 200) { //filter out encoder "jumps"
change = 0;
}
if (encoderBurstCount > 3) { // <--
encoderChange = encoderChange * 3; // <-- The three params need to be finetuned to feel natural
}*/
encDirectionOld = encDirection;
if (displayScreen == 0) {
byte channelCV;
if (!insideTab && !shiftBtnPushed) { //Change tab
displayTab = displayTab + encoderChange;
displayTab = displayTab + change;
if (displayTab > 100) { //to address "negative" numbers
displayTab = 0;
} else if (displayTab > 6) {
@ -121,7 +118,7 @@ void checkInputs() {
|| (insideTab && menuItem == 0
&& (menuItemSelected || shiftBtnPushed)))
&& displayTab == 0 && masterClockMode == 0) { //Change BPM
bpm = bpm + encoderChange;
bpm = bpm + change;
if (bpm > MAXBPM) {
bpm = MAXBPM;
} else if (bpm < MINBPM) {
@ -134,7 +131,7 @@ void checkInputs() {
&& (menuItemSelected || shiftBtnPushed)))
&& displayTab != 0
&& channels[displayTab - 1].mode == 0) {
channels[displayTab - 1].subDiv = channels[displayTab - 1].subDiv -encoderChange;
channels[displayTab - 1].subDiv = channels[displayTab - 1].subDiv - change;
//channels[displayTab - 1].offset = 0;
if (channels[displayTab - 1].subDiv > 100) {
channels[displayTab - 1].subDiv = 0;
@ -159,7 +156,7 @@ void checkInputs() {
&& (menuItemSelected || shiftBtnPushed)))
&& displayTab != 0
&& channels[displayTab - 1].mode == 1) { //Change Random
channels[displayTab - 1].random = channels[displayTab - 1].random + encoderChange;
channels[displayTab - 1].random = channels[displayTab - 1].random + change;
if (channels[displayTab - 1].random > 100) {
channels[displayTab - 1].random = 0;
} else if (channels[displayTab - 1].random > 9) {
@ -171,7 +168,7 @@ void checkInputs() {
&& (menuItemSelected || shiftBtnPushed)))
&& displayTab != 0
&& channels[displayTab - 1].mode == 2) { //Change SEQ pattern
channels[displayTab - 1].seqPattern = channels[displayTab - 1].seqPattern + encoderChange;
channels[displayTab - 1].seqPattern = channels[displayTab - 1].seqPattern + change;
if (channels[displayTab - 1].seqPattern > 100) {
channels[displayTab - 1].seqPattern = 0;
} else if (channels[displayTab - 1].seqPattern > 15) {
@ -179,7 +176,7 @@ void checkInputs() {
}
saveState();
} else if (insideTab && !shiftBtnPushed && !menuItemSelected) {
menuItem = menuItem + encoderChange;
menuItem = menuItem + change;
if (menuItem > 100) { //for "negative" values
menuItem = 0;
} else if (menuItem > lastMenuItem) {
@ -193,7 +190,7 @@ void checkInputs() {
isPlaying = false;
}
masterClockMode = masterClockMode + encoderChange;
masterClockMode = masterClockMode + change;
if (masterClockMode > 100) {
masterClockMode = 0;
} else if (masterClockMode > 2) { //Set to 1 to hide MIDI mode
@ -205,7 +202,7 @@ void checkInputs() {
&& displayTab == 0
&& menuItem == 2
&& masterClockMode == 0) { //Modulation channel
bpmModulationChannel = bpmModulationChannel + encoderChange;
bpmModulationChannel = bpmModulationChannel + change;
if (bpmModulationChannel == 0 || bpmModulationChannel == 1) {
bpmModulationRange = 1;
} else if (bpmModulationChannel > 100) {
@ -220,7 +217,7 @@ void checkInputs() {
&& displayTab == 0
&& menuItem == 2
&& masterClockMode == 1) { //PPQN
extClockPPQN = extClockPPQN + encoderChange;
extClockPPQN = extClockPPQN + change;
if (extClockPPQN > 100) {
extClockPPQN = 0;
} else if (extClockPPQN > 1) {
@ -231,7 +228,7 @@ void checkInputs() {
&& (menuItemSelected || shiftBtnPushed)
&& displayTab == 0
&& menuItem == 3) { //Modulation range
bpmModulationRange = bpmModulationRange + encoderChange;
bpmModulationRange = bpmModulationRange + change;
if (bpmModulationRange == 0) {
bpmModulationRange = 1;
} else if (bpmModulationRange > 100) {
@ -244,7 +241,7 @@ void checkInputs() {
&& (menuItemSelected || shiftBtnPushed)
&& displayTab != 0
&& menuItem == 1) { //Channel Mode
channels[displayTab - 1].mode = channels[displayTab - 1].mode + encoderChange;
channels[displayTab - 1].mode = channels[displayTab - 1].mode + change;
if (channels[displayTab - 1].mode > 100) {
channels[displayTab - 1].mode = 0;
} else if (channels[displayTab - 1].mode > 2) {
@ -257,7 +254,7 @@ void checkInputs() {
&& (menuItemSelected || shiftBtnPushed)
&& displayTab != 0 && menuItem == 2
&& channels[displayTab - 1].mode == 0) { //Offset
channels[displayTab - 1].offset = channels[displayTab - 1].offset + encoderChange;
channels[displayTab - 1].offset = channels[displayTab - 1].offset + change;
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]) {
@ -269,7 +266,7 @@ void checkInputs() {
&& displayTab != 0
&& menuItem == 2
&& channels[displayTab - 1].mode == 1) { //SUBDIV for RANDOM
channels[displayTab - 1].subDiv = channels[displayTab - 1].subDiv - encoderChange;
channels[displayTab - 1].subDiv = channels[displayTab - 1].subDiv - change;
if (channels[displayTab - 1].subDiv > 200) {
channels[displayTab - 1].subDiv = 0;
} else if (channels[displayTab - 1].subDiv > (sizeof(subDivs) / sizeof(int)) - 1) {
@ -291,7 +288,7 @@ void checkInputs() {
} else {
channelCV = 0;
}
channelCV = channelCV + encoderChange;
channelCV = channelCV + change;
if (channelCV == 0 || channelCV > 100) {
channelCV = 0;
channels[displayTab - 1].CV1Target = 0;
@ -313,7 +310,7 @@ void checkInputs() {
} else {
channelCV = 0;
}
channelCV = channelCV + encoderChange;
channelCV = channelCV + change;
if (channelCV == 0 || channelCV > 100) {
channelCV = 0;
channels[displayTab - 1].CV1Target = 0;
@ -335,7 +332,7 @@ void checkInputs() {
} else {
channelCV = 0;
}
channelCV = channelCV + encoderChange;
channelCV = channelCV + change;
if (channelCV == 0 || channelCV > 100) {
channelCV = 0;
channels[displayTab - 1].CV1Target = 0;
@ -351,14 +348,14 @@ void checkInputs() {
saveState();
}
} else if (displayScreen == 1 && !isRecording) {
stepNumSelected = stepNumSelected + encoderChange;
stepNumSelected = stepNumSelected + change;
if (stepNumSelected > 100) {
stepNumSelected = 15;
} else if (stepNumSelected > 15) {
stepNumSelected = 0;
}
} else if (displayScreen == 2 && !shiftBtnPushed) {
menuItem = menuItem + encoderChange;
menuItem = menuItem + change;
if (menuItem > 100) { //for "negative" values
menuItem = 0;
} else if (menuItem > lastMenuItem) {
@ -367,8 +364,7 @@ void checkInputs() {
}
updateScreen();
//encPositionOld = encPosition;
encoderChange = 0;
encPositionOld = encPosition;
}
//play button