Merge pull request #4 from blind/calibrationloop

Use loop for calibration
This commit is contained in:
John Stäck 2019-03-13 20:06:23 +01:00 committed by GitHub
commit b6fc9c74d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -493,25 +493,21 @@ void setup() {
initDisplay(); //Start up display and show logo initDisplay(); //Start up display and show logo
//auto-calibrate the vibrato threshold while showing splash screen //auto-calibrate the vibrato threshold while showing splash screen
int cv1=touchRead(vibratoPin); vibZero = breathCalZero = 0;
int bc1=analogRead(breathSensorPin); const int sampleCount = 4;
digitalWrite(statusLedPin,HIGH); for(int i = 1 ; i <= sampleCount; ++i) {
delay(250); vibZero += touchRead(vibratoPin);
int cv2=touchRead(vibratoPin); breathCalZero += analogRead(breathSensorPin);
int bc2=analogRead(breathSensorPin); digitalWrite( statusLedPin, i&1 );
digitalWrite(statusLedPin,LOW); delay(250);
delay(250); }
int cv3=touchRead(vibratoPin); vibZero /= sampleCount;
int bc3=analogRead(breathSensorPin); breathCalZero /= sampleCount;
digitalWrite(statusLedPin,HIGH);
delay(250); vibThr = vibZero - vibSquelch;
digitalWrite(statusLedPin,LOW); vibThrLo = vibZero + vibSquelch;
int cv4=touchRead(vibratoPin);
int bc4=analogRead(breathSensorPin); digitalWrite(statusLedPin, LOW);
vibZero=(cv1+cv2+cv3+cv4)/4;
vibThr=vibZero-vibSquelch;
vibThrLo=vibZero+vibSquelch;
breathCalZero=(bc1+bc2+bc3+bc4)/4;
delay(250); delay(250);
digitalWrite(statusLedPin,HIGH); digitalWrite(statusLedPin,HIGH);
delay(250); delay(250);