1.1.3 beta 1
This commit is contained in:
@ -93,19 +93,19 @@ void checkInputs() {
|
|||||||
encoderChange = encoderChange * -1;
|
encoderChange = encoderChange * -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (((encoderChange > 0) != encoderDirectionOld) && encoderTimeBetweenPulses < 150) { //filter out encoder "jumps"
|
/*if (((encoderChange > 0) != encoderDirectionOld) && encoderTimeBetweenPulses < 150) { //filter out encoder "jumps". Comented out
|
||||||
encoderChange = 0;
|
encoderChange = 0; //because it seems like sometimes it was preventing normal scroll
|
||||||
}
|
} //if it works ok without it delete encoderDirectionOld var altogether
|
||||||
encoderDirectionOld = (encoderChange > 0);
|
encoderDirectionOld = (encoderChange > 0);*/
|
||||||
|
|
||||||
//encoder acceleration
|
//encoder acceleration
|
||||||
if (encoderTimeBetweenPulses < 60) {
|
if (encoderTimeBetweenPulses < 15) { // <--
|
||||||
encoderBurstCount++;
|
encoderBurstCount++;
|
||||||
} else {
|
} else {
|
||||||
encoderBurstCount = 0;
|
encoderBurstCount = 0;
|
||||||
}
|
}
|
||||||
if (encoderBurstCount > 2) { //
|
if (encoderBurstCount > 3) { // <--
|
||||||
encoderChange = encoderChange * 3; // These two params need to be finetuned to feel natural
|
encoderChange = encoderChange * 3; // <-- The three params need to be finetuned to feel natural
|
||||||
}
|
}
|
||||||
|
|
||||||
if (displayScreen == 0) {
|
if (displayScreen == 0) {
|
||||||
@ -169,7 +169,9 @@ void checkInputs() {
|
|||||||
} else if (((!insideTab && shiftBtnPushed)
|
} else if (((!insideTab && shiftBtnPushed)
|
||||||
|| (insideTab && menuItem == 0
|
|| (insideTab && menuItem == 0
|
||||||
&& (menuItemSelected || shiftBtnPushed)))
|
&& (menuItemSelected || shiftBtnPushed)))
|
||||||
&& displayTab != 0
|
&& displayTab != 0 // things to try:
|
||||||
|
// count "burst" changes and apply acceleration (test the period between ticks in a new sketch)
|
||||||
|
|
||||||
&& channels[displayTab - 1].mode == 2) { //Change SEQ pattern
|
&& 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 + encoderChange;
|
||||||
if (channels[displayTab - 1].seqPattern > 100) {
|
if (channels[displayTab - 1].seqPattern > 100) {
|
||||||
|
|||||||
Reference in New Issue
Block a user