Merge branch 'master' of https://spotzel.dyndns.org/gitblit/r/robocup…

…-2015/pi-server.git
Baschdl · Mar 6, 2015 · b5c1c27 · b5c1c27
2 parents ec8fb70 + ebfe08b
commit b5c1c27
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/pi-server/src/de/null_pointer/communication_pi/BrickControlPi.java b/pi-server/src/de/null_pointer/communication_pi/BrickControlPi.java
@@ -203,18 +203,22 @@ public void sendSensorData(String[] Sensor) {
 		}
 		readyToProcessData = true;
 
-		int linearAccelaration = Integer
-				.parseInt(propPiServer
-						.getProperty("CommunicationPi.BrickControlPi.forwardBackwardAccelaration"));
-		int rotationAccelaration = Integer
-				.parseInt(propPiServer
-						.getProperty("CommunicationPi.BrickControlPi.rotationAccelaration"));
-		int speed = Integer.parseInt(propPiServer
-				.getProperty("CommunicationPi.BrickControlPi.rotationSpeed"));
-
-		setLinearAccelaration(linearAccelaration);
-		setRotationAccelaration(rotationAccelaration);
-		setRotationSpeed(speed);
+		try {
+			int linearAccelaration = Integer
+					.parseInt(propPiServer
+							.getProperty("CommunicationPi.BrickControlPi.forwardBackwardAccelaration"));
+			int rotationAccelaration = Integer
+					.parseInt(propPiServer
+							.getProperty("CommunicationPi.BrickControlPi.rotationAccelaration"));
+			int speed = Integer
+					.parseInt(propPiServer
+							.getProperty("CommunicationPi.BrickControlPi.rotationSpeed"));
+			setLinearAccelaration(linearAccelaration);
+			setRotationAccelaration(rotationAccelaration);
+			setRotationSpeed(speed);
+		} catch (Exception e) {
+			logger.error("sendSensorData: error while parsing properties");
+		}
 		// notifyAll();
 		logger.debug("sendSensorData flag set to: " + readyToProcessData);
 	}