From 1a6f38a9b2db4d310fc3b1f0493e914c5ada5514 Mon Sep 17 00:00:00 2001
From: petebrew <p.brewer@ltrr.arizona.edu>
Date: Thu, 3 Mar 2016 10:26:01 -0700
Subject: [PATCH] Getting ready for v1.2.1 release

---
 .../LinBuild/ServerControl/control            |  2 +-
 pom.xml                                       |  2 +-
 .../desktop/hardware/device/MitutoyoDMX1.java | 19 ++++---------------
 .../tellervo/desktop/versioning/Build.java    |  2 +-
 4 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/Native/BuildResources/LinBuild/ServerControl/control b/Native/BuildResources/LinBuild/ServerControl/control
index 435da5b03..d8860e9c8 100644
--- a/Native/BuildResources/LinBuild/ServerControl/control
+++ b/Native/BuildResources/LinBuild/ServerControl/control
@@ -3,7 +3,7 @@ Version: ${serverversion}
 Section: misc
 Priority: optional
 Architecture: all
-Depends: apache2, postgresql-9.1 | postgresql-9.3, postgresql-9.1-pljava-gcj | postgresql-9.3-pljava-gcj, postgresql-9.1-postgis | postgresql-9.3-postgis-2.1, postgresql-contrib-9.1 | postgresql-contrib-9.3, php5, php5-pgsql, php5-curl, php5-mhash | php5-common, expect
+Depends: apache2, postgresql-9.1 | postgresql-9.3, postgresql-9.1-postgis | postgresql-9.3-postgis-2.1, postgresql-contrib-9.1 | postgresql-contrib-9.3, php5, php5-pgsql, php5-curl, php5-mhash | php5-common, expect
 Suggests: openssh-server, pgadmin3, tellervo
 Replaces: [[name]]-server (<<${serverversion})
 Maintainer: Peter Brewer <p.brewer@ltrr.arizona.edu>
diff --git a/pom.xml b/pom.xml
index 7700a6534..efa7c5e59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1335,5 +1335,5 @@
 		<url>https://sourceforge.net/p/tellervo/tickets/</url>
 		<system>Sourceforge.net</system>
 	</issueManagement>
-	<version>1.2.1</version>
+	<version>1.2.1-SNAPSHOT</version>
 </project>
diff --git a/src/main/java/org/tellervo/desktop/hardware/device/MitutoyoDMX1.java b/src/main/java/org/tellervo/desktop/hardware/device/MitutoyoDMX1.java
index 9418171b0..1854dcad6 100644
--- a/src/main/java/org/tellervo/desktop/hardware/device/MitutoyoDMX1.java
+++ b/src/main/java/org/tellervo/desktop/hardware/device/MitutoyoDMX1.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (C) 2010 Lucas Madar and Peter Brewer
+ * Copyright (C) 2016 Peter Brewer
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,17 +26,10 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.tellervo.desktop.hardware.AbstractMeasuringDevice;
 import org.tellervo.desktop.hardware.MeasuringSampleIOEvent;
-import org.tellervo.desktop.hardware.AbstractMeasuringDevice.DataDirection;
-
-
-
 
 public class MitutoyoDMX1 extends GenericASCIIDevice {
 	protected final static Logger log = LoggerFactory.getLogger(MitutoyoDMX1.class);
@@ -58,7 +51,7 @@ public void setDefaultPortParams(){
 		parity = PortParity.NONE;
 		flowControl = FlowControl.NONE;
 		lineFeed = LineFeed.CR;
-		unitMultiplier = UnitMultiplier.TIMES_1;
+		unitMultiplier = UnitMultiplier.TIMES_1000;
 		measureCumulatively = true;
 	}
 	
@@ -132,14 +125,13 @@ public Boolean isReverseMeasureCapable() {
 		return true;
 	}
 	
-	/**
-	 * Send zero command to Quadra-check QC10
-	 */
 	@Override
 	public void zeroMeasurement()
 	{
 		// Not supported
 		log.debug("Requesting device to zero is not supported");
+		//String cmd = "#3";
+		//sendRequest(cmd);
 	}
 	
 	@Override
@@ -251,9 +243,6 @@ public void serialEvent(SerialPortEvent e) {
 		    		// Fire bad event as value is a negative number
 		    		fireMeasuringSampleEvent(this, MeasuringSampleIOEvent.BAD_SAMPLE_EVENT, "Negative value = "+intValue);
 		    	}
-			    							
-
-
 		}
 	}
 }
diff --git a/src/main/java/org/tellervo/desktop/versioning/Build.java b/src/main/java/org/tellervo/desktop/versioning/Build.java
index 693502910..ae8ad7f4a 100644
--- a/src/main/java/org/tellervo/desktop/versioning/Build.java
+++ b/src/main/java/org/tellervo/desktop/versioning/Build.java
@@ -40,7 +40,7 @@ public class Build {
     public final static String AUTHOR = "Peter Brewer, Chris Dunham, Dan Girshovich, Aaron Hamid, Ken Harris, Drew Kalina, Pavithra Lakshminarayanan, Rocky Li, Lucas Madar, Daniel Murphy, Robert 'Mecki' Pohl, Paul Sheppard and Kit Sturgeon";
 
 	/** Most primitive server version supported by this client should be a three part string e.g 1.1.1 */
-	public static final String earliestServerVersionSupported = "1.2.0";
+	public static final String earliestServerVersionSupported = "1.2.1";
 	
 	// don't instantiate me
     private Build() {