Probing for cube working...

CubeControl/Frame.java

@@ -896,26 +896,32 @@ public class Frame extends JFrame implements ListSelectionListener {
 		}
 	}
 
+	// We get detailed error messages from the SerialHelper...
 	public void upload_ActionPerformed(ActionEvent evt) {
 		if (jComboBox1.getSelectedItem().equals("Select serial port...")) {
-			errorMessage("No serial port selected...");
+			// errorMessage("No serial port selected...");
 		} else {
-			if (worker
-					.probeCubeConnected((String) jComboBox1.getSelectedItem())) {
+			if (worker.probeCubeConnected((String) jComboBox1.getSelectedItem())) {
 				if (worker.uploadState((String) jComboBox1.getSelectedItem()) != 0) {
-					errorMessage("Could not upload data!");
+					// errorMessage("Could not upload data!");
 				}
 			} else {
-				errorMessage("Cube does not respond...");
+				// errorMessage("Cube does not respond...");
 			}
 		}
 	}
 
 	public void download_ActionPerformed(ActionEvent evt) {
 		if (jComboBox1.getSelectedItem().equals("Select serial port...")) {
-			errorMessage("No serial port selected...");
+			// errorMessage("No serial port selected...");
 		} else {
-			worker.downloadState((String) jComboBox1.getSelectedItem());
+			if (worker.probeCubeConnected((String) jComboBox1.getSelectedItem())) {
+				if (worker.downloadState((String) jComboBox1.getSelectedItem()) != 0) {
+					// errorMessage("Could not download data!");
+				}
+			} else {
+				// errorMessage("Cube does not respond...");
+			}
 		}
 	}
 

CubeControl/SerialHelper.java

@@ -48,12 +48,32 @@ public class SerialHelper {
 	 */
 	public SerialHelper(String serialPort, Frame frame) throws Exception {
 		if (HelperUtility.openPort(serialPort) == false) {
+			printErrorMessage("Could not open serial port \"" + serialPort + "\"");
 			throw new Exception("Could not open serial port \"" + serialPort + "\"");
 		}
 		this.frame = frame;
 	}
 
 	/**
+	 * Poll to check if the cube is there...
+	 * @return TRUE if cube is connected.
+	 */
+	public boolean probeForCube() {
+		short[] data = new short[1];
+		data[0] = OK;
+		if (!writeData(data)) {
+			printErrorMessage("Timeout Probing for Cube");
+			return false;
+		}
+		data = readData(1);
+		if ((data == null) || (data[0] != OK)) {
+			printErrorMessage("No response from cube!");
+			return false;
+		}
+		return true;
+	}
+
+	/**
 	 * Recieve all animations saved in cube.
 	 * @return A cubeWorker populated with the new data or null.
 	 */

CubeControl/cubeWorker.java

@@ -426,7 +426,6 @@ public class cubeWorker {
 			sh.closeSerialPort();
 			return ret;
 		} catch (Exception e) {
-			System.out.println("Serial Exception: " + e.getMessage());
 			return -1;
 		}
 	}
@@ -450,7 +449,6 @@ public class cubeWorker {
 				return 0;
 			}
 		} catch (Exception e) {
-			System.out.println("Serial Exception: " + e.getMessage());
 			return -1;
 		}
 	}
@@ -470,7 +468,14 @@ public class cubeWorker {
 	 * @param port Name of serial port
 	 */
 	public boolean probeCubeConnected(String port) {
-		return false;
+		try {
+			SerialHelper sh = new SerialHelper(port, parentFrame);
+			boolean response = sh.probeForCube();
+			sh.closeSerialPort();
+			return response;
+		} catch (Exception e) {
+			return false;
+		}
 	}
 
 	/**