Fix for keys

Author: yurii-litvinov

trikControl/config.xml

@@ -205,7 +205,7 @@ Use it if JCx ports are configured to work as PWM signal generators.
 	<i2c path="/dev/i2c-2" deviceId="0x48" />
 
 	<!-- Settings for virtual camera line sensor. -->
-	<lineSensor script="/etc/init.d/line-sensor-ov7670.sh" inputFile="/run/line-sensor.in.fifo" outputFile="/run/line-sensor.out.fifo" toleranceFactor="1.0" disabled="false" />
+	<lineSensor script="/etc/init.d/line-sensor-ov7670.sh" inputFile="/run/line-sensor-ov7670.in.fifo" outputFile="/run/line-sensor-ov7670.out.fifo" toleranceFactor="1.0" disabled="false" />
 
 	<!-- Settings for virtual camera object detector sensor. -->
 	<objectSensor script="/etc/init.d/object-sensor-ov7670.sh" inputFile="/run/object-sensor.in.fifo" outputFile="/run/object-sensor.out.fifo" toleranceFactor="1.0" disabled="false" />

trikControl/src/linux/keysWorker.cpp

@@ -37,7 +37,9 @@ KeysWorker::KeysWorker(QString const &keysPath)
 
 void KeysWorker::reset()
 {
+	mLock.lockForWrite();
 	mWasPressed.clear();
+	mLock.unlock();
 }
 
 bool KeysWorker::wasPressed(int code)

trikScriptRunner/src/scriptEngineWorker.cpp

@@ -106,6 +106,9 @@ void ScriptEngineWorker::run(QString const &script, bool inEventDrivenMode, QStr
 			"(.*%1\\s*=\\s*\\w*\\s*function\\(.*\\).*)|(.*function\\s+%1\\s*\\(.*\\).*)").arg(function));
 	bool const needCallFunction = !function.isEmpty() && functionRegexp.exactMatch(script)
 			&& !script.trimmed().endsWith(function + "();");
+
+	mBrick.keys()->reset();
+
 	mEngine->evaluate(needCallFunction ? QString("%1\n%2();").arg(script, function) : script);
 
 	if (!mBrick.isInEventDrivenMode()) {