Fixed MPR121 and TTP keypads issues (#514)

Author: user2684

sensors/SensorMPR121.h

@@ -68,7 +68,7 @@ class SensorMPR121: public Sensor {
 		// do not average the value
 		children.get()->setValueProcessing(NONE);
 		// report immediately
-		setReportTimerMode(IMMEDIATELY);		
+		setReportTimerMode(IMMEDIATELY);
 		if (!_cap->begin(_i2c_addr)) debug(PSTR(LOG_SENSOR "%s: KO\n"),_name);
 		// setup passcode array  
 		_passcode.allocateBlocks(_passcode_length);
@@ -82,9 +82,9 @@ class SensorMPR121: public Sensor {
 		while(true) {
 			// if a timer is set, leave the cycle if over
 			if (_wait_code_for_seconds > 0 && ((millis() - start_millis) > (unsigned long)_wait_code_for_seconds*1000)) break;
-
 			 // Get the currently touched pads
 			_currtouched = _cap->touched();
+			bool value_set = false;
 			for (uint8_t i=0; i<12; i++) {
 				if ((_currtouched & _BV(i)) && !(_lasttouched & _BV(i)) ) {
 					// pad i touched
@@ -103,10 +103,13 @@ class SensorMPR121: public Sensor {
 						child->setValue(passcode);
 						// clear the passcode array
 						_passcode.clear();
+						value_set = true;
 						break;
 					}
 				}
 			}
+			// value was captured, leave the while cycle
+			if (value_set) break;
 			// reset state
 			_lasttouched = _currtouched;
 			wait(100);

sensors/SensorTTP.h

@@ -30,7 +30,7 @@ class SensorTTP: public Sensor {
 	int8_t _dv_pin = 3;
 	int8_t _rst_pin = 4;
 	int key = 0;
-	int ziro = 0;
+	int count = 0;
 	List<int> _passcode;
 	int _passcode_length = 4;
 
@@ -109,19 +109,20 @@ class SensorTTP: public Sensor {
 protected:
 	// Send 8 clock pulses and check each data bit as it arrives
 	int _fetchData() {
+		count = 0;
 		for(int i = 1; i < 9; i++) {       
 			digitalWrite(_clock_pin,1);
 			delayMicroseconds(1000);
 			// If data bit, high, then that key was pressed.
 			if(digitalRead(_sdo_pin) == HIGH)  
 			key=i; 
 			else 
-			ziro++;
+			count++;
 			digitalWrite(_clock_pin,0);
 			// Don't use delay(1) as it will mess up interrupts
 			delayMicroseconds(1000);  
 		}
-		if(key > 0 && ziro == 7) return key;
+		if(key > 0 && count == 7) return key;
 		return 0;
 	};
 };