Merge branch 'master' of https://github.com/trikset/trikRuntime

yurii-litvinov · yurii-litvinov · commit 2ede716b4138 · 2016-03-11T19:53:44.000+03:00
diff --git a/trikControl/src/powerMotor.cpp b/trikControl/src/powerMotor.cpp
@@ -85,10 +85,10 @@ void PowerMotor::powerOff()
 void PowerMotor::setPeriod(int period)
 {
 	mCurrentPeriod = period;
-	QByteArray command(3, '\0');
+	QByteArray command(4, '\0');
 	command[0] = static_cast<char>((mMspCommandNumber - 4) & 0xFF);
-	command[1] = static_cast<char>(period && 0xFF);
-	command[2] = static_cast<char>(period >> 8);
+	command[2] = static_cast<char>(period & 0xFF);
+	command[3] = static_cast<char>(period >> 8);
 	mCommunicator.send(command);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -85,10 +85,10 @@ void PowerMotor::powerOff()`
`85`	`85`	`void PowerMotor::setPeriod(int period)`
`86`	`86`	`{`
`87`	`87`	`mCurrentPeriod = period;`
`88`		`- QByteArray command(3, '\0');`
	`88`	`+ QByteArray command(4, '\0');`
`89`	`89`	`command[0] = static_cast<char>((mMspCommandNumber - 4) & 0xFF);`
`90`		`- command[1] = static_cast<char>(period && 0xFF);`
`91`		`- command[2] = static_cast<char>(period >> 8);`
	`90`	`+ command[2] = static_cast<char>(period & 0xFF);`
	`91`	`+ command[3] = static_cast<char>(period >> 8);`
`92`	`92`	`mCommunicator.send(command);`
`93`	`93`	`}`
`94`	`94`