1.1.3 beta 2
This commit is contained in:
@ -250,9 +250,9 @@ ISR (PCINT2_vect) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
uint8_t encoderStatus;
|
uint8_t encoderStatus;
|
||||||
//uint32_t encoderCheckTime = 0;
|
uint32_t encoderCheckTime = 0;
|
||||||
//uint32_t encoderTimeBetweenPulses = 0;
|
uint32_t encoderTimeBetweenPulses = 0;
|
||||||
//bool encoderDirectionOld; //0 = -, 1 = +, Old because current direction can be determined by encoderChange
|
bool encoderDirectionOld; //0 = -, 1 = +, Old because current direction can be determined by encoderChange
|
||||||
int8_t encoderChange = 0;
|
int8_t encoderChange = 0;
|
||||||
//uint8_t encoderBurstCount = 0;
|
//uint8_t encoderBurstCount = 0;
|
||||||
|
|
||||||
@ -290,9 +290,9 @@ void checkEncoderStatus() {
|
|||||||
}
|
}
|
||||||
encoderStatus = newStatus;
|
encoderStatus = newStatus;
|
||||||
|
|
||||||
//uint32_t currentTime = millis();
|
uint32_t currentTime = millis();
|
||||||
//encoderTimeBetweenPulses = currentTime - encoderCheckTime;
|
encoderTimeBetweenPulses = currentTime - encoderCheckTime;
|
||||||
//encoderCheckTime = currentTime;
|
encoderCheckTime = currentTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
void sendMIDIClock() {
|
void sendMIDIClock() {
|
||||||
@ -403,6 +403,7 @@ void externalClock() {
|
|||||||
}
|
}
|
||||||
if ((newExtPulseTime - lastExtPulseTime) > 750) {
|
if ((newExtPulseTime - lastExtPulseTime) > 750) {
|
||||||
resetClocks();
|
resetClocks();
|
||||||
|
sendMIDIStart();
|
||||||
extResetCountdown = 0;
|
extResetCountdown = 0;
|
||||||
extTriggerCount = 0;
|
extTriggerCount = 0;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -93,8 +93,8 @@ void checkInputs() {
|
|||||||
encoderChange = encoderChange * -1;
|
encoderChange = encoderChange * -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*if (((encoderChange > 0) != encoderDirectionOld) && encoderTimeBetweenPulses < 150) { //filter out encoder "jumps". Comented out
|
/*if (((encoderChange > 0) != encoderDirectionOld) && encoderTimeBetweenPulses < 60) { //filter out encoder "jumps".
|
||||||
encoderChange = 0; //because it seems like sometimes it was preventing normal scroll
|
encoderChange = 0; //Comented out because it seems like sometimes it was preventing normal scroll
|
||||||
} //if it works ok without it delete encoderDirectionOld var altogether
|
} //if it works ok without it delete encoderDirectionOld var altogether
|
||||||
encoderDirectionOld = (encoderChange > 0);*/
|
encoderDirectionOld = (encoderChange > 0);*/
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user