Removed old-style methods for motor speed/dir from Driver.

Fortunately, most code was already using the new-style methods.

src/replicatorg/app/ui/controlpanel/ExtruderPanel.java

@@ -801,14 +801,14 @@ private void handleChangedItem(ItemEvent e, ToolModel tool) {
 				machine.runCommand(new replicatorg.drivers.commands.SetMotorDirection(AxialDirection.CLOCKWISE,toolhead));
 				// TODO: Hack to support RepRap/Ultimaker- always re-send RPM
 				if (tool.motorHasEncoder() || tool.motorIsStepper()) {
-					machine.runCommand(new replicatorg.drivers.commands.SetMotorSpeedRPM(machine.getDriver().getMotorRPM(),toolhead));
+					machine.runCommand(new replicatorg.drivers.commands.SetMotorSpeedRPM(machine.getDriverQueryInterface().getMotorRPM(toolhead), toolhead));
 				}
 				machine.runCommand(new replicatorg.drivers.commands.EnableExtruderMotor(toolhead));
 			} else if (name.equals("motor-reverse")) {
 				machine.runCommand(new replicatorg.drivers.commands.SetMotorDirection(AxialDirection.COUNTERCLOCKWISE,toolhead));
 				// TODO: Hack to support RepRap/Ultimaker- always re-send RPM
 				if (tool.motorHasEncoder() || tool.motorIsStepper()) {
-					machine.runCommand(new replicatorg.drivers.commands.SetMotorSpeedRPM(machine.getDriver().getMotorRPM(),toolhead));
+					machine.runCommand(new replicatorg.drivers.commands.SetMotorSpeedRPM(machine.getDriverQueryInterface().getMotorRPM(toolhead), toolhead));
 				}
 				machine.runCommand(new replicatorg.drivers.commands.EnableExtruderMotor(toolhead));
 			} else if (name.equals("motor-stop")) {

src/replicatorg/drivers/Driver.java

@@ -271,18 +271,14 @@ public interface Driver {
 	/***************************************************************************
 	 * Motor interface functions
 	 **************************************************************************/
-	@Deprecated public void setMotorDirection(int dir);
 	public void setMotorDirection(int dir, int toolhead);
 
 	public void setMotorRPM(double rpm, int toolhead) throws RetryException;
 
-	@Deprecated public void setMotorSpeedPWM(int pwm) throws RetryException;
 	public void setMotorSpeedPWM(int pwm, int toolhead) throws RetryException;
 
-	@Deprecated public double getMotorRPM();
 	public double getMotorRPM(int toolhead);
 
-	@Deprecated public int getMotorSpeedPWM();
 	public int getMotorSpeedPWM(int toolhead);
 
 	/**

src/replicatorg/drivers/DriverBaseImplementation.java

@@ -457,10 +457,6 @@ protected Point5d getDelta(Point5d p) {
 	/***************************************************************************
 	 * Motor interface functions
 	 **************************************************************************/
-	@Deprecated @Override public void setMotorDirection(int dir) {
-		this.setMotorDirection(dir, machine.currentTool().getIndex());
-	}
-
 	@Override
 	public void setMotorDirection(int dir, int toolhead) {
 		/// toolhead -1 indicate auto-detect. Fast hack to get software out..
@@ -479,11 +475,6 @@ public void setMotorRPM(double rpm, int toolhead) throws RetryException {
 
 	}
 
-	@Deprecated @Override
-	public void setMotorSpeedPWM(int pwm) throws RetryException {
-		this.setMotorSpeedPWM(pwm, machine.currentTool().getIndex());
-	}
-
 	@Override public void setMotorSpeedPWM(int pwm, int toolhead) throws RetryException {
 		/// toolhead -1 indicate auto-detect.Fast hack to get software out..
 		if(toolhead == -1 ) toolhead = machine.currentTool().getIndex();
@@ -536,19 +527,11 @@ public void disableMotor() throws RetryException {
 
 	}
 
-	@Deprecated @Override public double getMotorRPM() {
-		return getMotorRPM(-1);
-	}
-
 	@Override public double getMotorRPM(int toolhead) {
 		if (toolhead == -1) toolhead = machine.currentTool().getIndex();
 		return machine.getTool(toolhead).getMotorSpeedRPM();
 	}
 
-	@Deprecated @Override public int getMotorSpeedPWM() {
-		return getMotorSpeedPWM(-1);
-	}
-
 	@Override public int getMotorSpeedPWM(int toolhead) {
 		if (toolhead == -1) toolhead = machine.currentTool().getIndex();
 		return machine.getTool(toolhead).getMotorSpeedPWM();

src/replicatorg/drivers/gen3/Makerbot4GAlternateDriver.java

@@ -236,9 +236,10 @@ protected void queueNewPoint(Point5d steps, long us, int relative) throws RetryE
 	 * Overridden to not ask the board for the RPM as it would report the RPM from the extruder 
 	 * controller, which doesn't know about it in this case.
 	 */
-	@Override public double getMotorRPM() {
-		double rpm = machine.currentTool().getMotorSpeedRPM();
-		machine.currentTool().setMotorSpeedReadingRPM(rpm);
+	@Override public double getMotorRPM(int toolhead) {
+		ToolModel tool = machine.getTool(toolhead);
+		double rpm = tool.getMotorSpeedRPM();
+		tool.setMotorSpeedReadingRPM(rpm);
 		return rpm;
 	}
 

src/replicatorg/drivers/gen3/MightyBoard.java

@@ -297,11 +297,11 @@ public boolean initializeBot()
 		for (ToolModel t : getMachine().getTools()) {
 			if (t != null) {
 				initSlave(t.getIndex());
+				getMotorRPM(t.getIndex());		//load our motor RPM from firmware if we can.
 			}
 		}
 
 		getStepperValues(); //read our current steppers into a local cache
-		getMotorRPM();		//load our motor RPM from firmware if we can.
 		if (verifyMachineId() == false ) //read and verify our PID/VID if we can
 		{
 			Base.logger.severe("Machine ID Mismatch. Please re-select your machine.");