Updated application to verion 1.3 (beta). Incorporated changes by Benjamin Renz. Updated about dialog. Added null check on version detection. Sped up time set function by moving wait-for-reply outside the write loop. Removed some useless debug messages and outputs.

erikjber · erikjber · commit 8db72f7e1917 · 2019-02-27T10:07:20.000+01:00
diff --git a/OpenGammaTool/src/com/gammascout/AboutDialog.java b/OpenGammaTool/src/com/gammascout/AboutDialog.java
@@ -70,7 +70,9 @@ public AboutDialog()
 		dtrpnOpenGammaTool.setBackground(UIManager
 				.getColor("Button.background"));
 		dtrpnOpenGammaTool
-				.setText("<html><body>\nOpen Gamma Tool<br/>\nVersion 1.3 (beta)<br/>\n&#169; 2014-2019 Erik Berglund<br/>\n<br/>\nSpecial thanks to <a href=\"http://johannes-bauer.com/linux/gammascout/\">Johannes Bauer</a><br/>\nfor reverse engineering and documenting <br/>\nthe GammaScout&#8482; protocol<br/>\n</body></html>");
+				.setText("<html><body>\nOpen Gamma Tool<br/>\nVersion 1.3 (beta)<br/>\n&#169; 2014-2019 Erik Berglund<br/>\n<br/>"
+						+ "\nSpecial thanks to <a href=\"http://johannes-bauer.com/linux/gammascout/\">Johannes Bauer</a><br/>\nfor reverse engineering and documenting <br/>\nthe GammaScout&#8482; protocol.<br/><br/>"
+						+ "\nThanks to <a href=\"https://github.com/BenjaminRenz\">Benjamin Renz</a> for his work on the GammaScout&#8482; version 1 protocol.<br/>\n</body></html>");
 		GroupLayout gl_contentPanel = new GroupLayout(contentPanel);
 		gl_contentPanel.setHorizontalGroup(gl_contentPanel.createParallelGroup(
 				Alignment.TRAILING).addGroup(
diff --git a/OpenGammaTool/src/com/gammascout/MainWindow.java b/OpenGammaTool/src/com/gammascout/MainWindow.java
@@ -626,17 +626,24 @@ else if (portNames.length == 1)
 			if (portName != null)
 			{
 				ProtocolVersion version = new ProtocolVersionDetector(portName).getVersion();
-				switch (version)
+				if(version != null)
 				{
-					case VERSION1:
-						gsc = new GammaScoutConnectorV1(portName);
-						break;
-					case VERSION2:
-						gsc = new GammaScoutConnectorV2(portName);
-						break;
-					default:
-						System.out.println("Couldn't determine protocol version.");
-						break;
+					switch (version)
+					{
+						case VERSION1:
+							gsc = new GammaScoutConnectorV1(portName);
+							break;
+						case VERSION2:
+							gsc = new GammaScoutConnectorV2(portName);
+							break;
+						default:
+							System.out.println("Couldn't determine protocol version.");
+							break;
+					}
+				}
+				else
+				{
+					System.out.println("Protocol version detection failed.");
 				}
 				if(gsc!=null)
 				{
diff --git a/OpenGammaTool/src/com/gammascout/usb/GammaScoutConnectorV2.java b/OpenGammaTool/src/com/gammascout/usb/GammaScoutConnectorV2.java
@@ -103,9 +103,9 @@ public void setClock(Date time) throws SerialPortException
 			{
 				Tools.sleep(500);
 			}
-			waitForString("\r\n");
-			waitForString("Datum und Zeit gestellt\r\n");
 		}
+		waitForString("\r\n");
+		waitForString("Datum und Zeit gestellt\r\n");
 		updateInfo();
 		setPcMode(false);
 	}
diff --git a/OpenGammaTool/src/com/gammascout/usb/ProtocolVersionDetector.java b/OpenGammaTool/src/com/gammascout/usb/ProtocolVersionDetector.java
@@ -81,7 +81,6 @@ private ProtocolVersion innerTest(SerialPort serial) throws SerialPortException
 		try
 		{
 			String prelude = serial.readString(10, 1000);
-			System.out.println("Read \""+prelude+"\"");
 			if(prelude.startsWith("\r\n Vers"))
 			{
 				result = ProtocolVersion.VERSION1;
@@ -94,13 +93,11 @@ else if(prelude.startsWith("\r\nVers") || prelude.startsWith("\r\nStand"))
 		}
 		catch (SerialPortTimeoutException e)
 		{
-			System.out.println("Timed out waiting for response.");
-			e.printStackTrace();
+			// Do nothing, this is expected if we're using the wrong protocol version.
 		}
 		finally
 		{
 			String remainder = serial.readString();
-			System.out.println("Read \""+remainder+"\"");
 			serial.closePort();
 		}
 		return result;

Original file line number	Diff line number	Diff line change
`@@ -103,9 +103,9 @@ public void setClock(Date time) throws SerialPortException`
`103`	`103`	`{`
`104`	`104`	`Tools.sleep(500);`
`105`	`105`	`}`
`106`		`- waitForString("\r\n");`
`107`		`- waitForString("Datum und Zeit gestellt\r\n");`
`108`	`106`	`}`
	`107`	`+ waitForString("\r\n");`
	`108`	`+ waitForString("Datum und Zeit gestellt\r\n");`
`109`	`109`	`updateInfo();`
`110`	`110`	`setPcMode(false);`
`111`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,6 @@ private ProtocolVersion innerTest(SerialPort serial) throws SerialPortException`
`81`	`81`	`try`
`82`	`82`	`{`
`83`	`83`	`String prelude = serial.readString(10, 1000);`
`84`		`- System.out.println("Read \""+prelude+"\"");`
`85`	`84`	`if(prelude.startsWith("\r\n Vers"))`
`86`	`85`	`{`
`87`	`86`	`result = ProtocolVersion.VERSION1;`
`@@ -94,13 +93,11 @@ else if(prelude.startsWith("\r\nVers") \|\| prelude.startsWith("\r\nStand"))`
`94`	`93`	`}`
`95`	`94`	`catch (SerialPortTimeoutException e)`
`96`	`95`	`{`
`97`		`- System.out.println("Timed out waiting for response.");`
`98`		`- e.printStackTrace();`
	`96`	`+ // Do nothing, this is expected if we're using the wrong protocol version.`
`99`	`97`	`}`
`100`	`98`	`finally`
`101`	`99`	`{`
`102`	`100`	`String remainder = serial.readString();`
`103`		`- System.out.println("Read \""+remainder+"\"");`
`104`	`101`	`serial.closePort();`
`105`	`102`	`}`
`106`	`103`	`return result;`