Browse Source

Added method to worker API

Thomas Buck 12 years ago
parent
commit
c260197188

+ 7
- 1
Cube Control/Frame.java View File

@@ -742,7 +742,13 @@ public class Frame extends JFrame implements ListSelectionListener {
742 742
          if (jComboBox1.getSelectedItem().equals("Select serial port...")) {
743 743
             errorMessage("No serial port selected...");
744 744
          } else {
745
-           worker.uploadState((String)jComboBox1.getSelectedItem());
745
+			 if (worker.probeCubeConnected((String)jComboBox1.getSelectedItem())) {
746
+				 if (worker.uploadState((String)jComboBox1.getSelectedItem()) != 0) {
747
+					 errorMessage("Could not upload data!");
748
+				 }
749
+			 } else {
750
+				 errorMessage("Cube does not respond...");
751
+			 }
746 752
          }
747 753
   }
748 754
 

+ 9
- 0
Cube Control/cubeWorker.java View File

@@ -367,6 +367,15 @@ public class cubeWorker {
367 367
     }
368 368
 
369 369
 	/**
370
+	 * Try to speak with the cube.
371
+	 * @return TRUE if cube responds
372
+	 * @param port Name of serial port
373
+	 */
374
+	public boolean probeCubeConnected(String port) {
375
+		return false;
376
+	}
377
+
378
+	/**
370 379
 	 * Get the names of all available serial ports.
371 380
 	 * @return Array of port names. First entry is always "Select serial port..."
372 381
 	 */

+ 1
- 1
Cube Control/doc/AFrame.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:18 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:22 CET 2011 -->
6 6
 <TITLE>
7 7
 AFrame
8 8
 </TITLE>

+ 1
- 1
Cube Control/doc/Animation.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:18 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:23 CET 2011 -->
6 6
 <TITLE>
7 7
 Animation
8 8
 </TITLE>

+ 1
- 1
Cube Control/doc/AnimationUtility.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:18 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:23 CET 2011 -->
6 6
 <TITLE>
7 7
 AnimationUtility
8 8
 </TITLE>

+ 1
- 1
Cube Control/doc/HelperUtility.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:19 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:24 CET 2011 -->
6 6
 <TITLE>
7 7
 HelperUtility
8 8
 </TITLE>

+ 1
- 1
Cube Control/doc/Led3D.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:20 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:24 CET 2011 -->
6 6
 <TITLE>
7 7
 Led3D
8 8
 </TITLE>

+ 1
- 1
Cube Control/doc/allclasses-frame.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:20 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:24 CET 2011 -->
6 6
 <TITLE>
7 7
 All Classes
8 8
 </TITLE>

+ 1
- 1
Cube Control/doc/allclasses-noframe.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:20 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:24 CET 2011 -->
6 6
 <TITLE>
7 7
 All Classes
8 8
 </TITLE>

+ 1
- 1
Cube Control/doc/constant-values.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:20 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:24 CET 2011 -->
6 6
 <TITLE>
7 7
 Constant Field Values
8 8
 </TITLE>

+ 23
- 1
Cube Control/doc/cubeWorker.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:18 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:23 CET 2011 -->
6 6
 <TITLE>
7 7
 cubeWorker
8 8
 </TITLE>
@@ -240,6 +240,14 @@ This class holds all Data of the Application. Additionally it performs the trans
240 240
 </TR>
241 241
 <TR BGCOLOR="white" CLASS="TableRowColor">
242 242
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
243
+<CODE>&nbsp;boolean</CODE></FONT></TD>
244
+<TD><CODE><B><A HREF="cubeWorker.html#probeCubeConnected(java.lang.String)">probeCubeConnected</A></B>(java.lang.String&nbsp;port)</CODE>
245
+
246
+<BR>
247
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Try to speak with the cube.</TD>
248
+</TR>
249
+<TR BGCOLOR="white" CLASS="TableRowColor">
250
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
243 251
 <CODE>&nbsp;void</CODE></FONT></TD>
244 252
 <TD><CODE><B><A HREF="cubeWorker.html#removeAnimation(int)">removeAnimation</A></B>(int&nbsp;selectedAnimation)</CODE>
245 253
 
@@ -649,6 +657,20 @@ public int <B>downloadState</B>(java.lang.String&nbsp;port)</PRE>
649 657
 </DL>
650 658
 <HR>
651 659
 
660
+<A NAME="probeCubeConnected(java.lang.String)"><!-- --></A><H3>
661
+probeCubeConnected</H3>
662
+<PRE>
663
+public boolean <B>probeCubeConnected</B>(java.lang.String&nbsp;port)</PRE>
664
+<DL>
665
+<DD>Try to speak with the cube.
666
+<P>
667
+<DD><DL>
668
+<DT><B>Parameters:</B><DD><CODE>port</CODE> - Name of serial port
669
+<DT><B>Returns:</B><DD>TRUE if cube responds</DL>
670
+</DD>
671
+</DL>
672
+<HR>
673
+
652 674
 <A NAME="getSerialPorts()"><!-- --></A><H3>
653 675
 getSerialPorts</H3>
654 676
 <PRE>

+ 1
- 1
Cube Control/doc/deprecated-list.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:20 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:24 CET 2011 -->
6 6
 <TITLE>
7 7
 Deprecated List
8 8
 </TITLE>

+ 1
- 1
Cube Control/doc/frame.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:18 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:23 CET 2011 -->
6 6
 <TITLE>
7 7
 Frame
8 8
 </TITLE>

+ 1
- 1
Cube Control/doc/help-doc.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:20 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:24 CET 2011 -->
6 6
 <TITLE>
7 7
 API Help
8 8
 </TITLE>

+ 4
- 1
Cube Control/doc/index-all.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:20 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:24 CET 2011 -->
6 6
 <TITLE>
7 7
 Index
8 8
 </TITLE>
@@ -303,6 +303,9 @@ Method in class <A HREF="./cubeWorker.html" title="class in &lt;Unnamed&gt;">cub
303 303
 <DT><A HREF="./Led3D.html#printTranslationData()"><B>printTranslationData()</B></A> - 
304 304
 Method in class <A HREF="./Led3D.html" title="class in &lt;Unnamed&gt;">Led3D</A>
305 305
 <DD>Prints the translation matrix that is changed by moving/rotating the 3D Cube with your mouse.
306
+<DT><A HREF="./cubeWorker.html#probeCubeConnected(java.lang.String)"><B>probeCubeConnected(String)</B></A> - 
307
+Method in class <A HREF="./cubeWorker.html" title="class in &lt;Unnamed&gt;">cubeWorker</A>
308
+<DD>Try to speak with the cube.
306 309
 </DL>
307 310
 <HR>
308 311
 <A NAME="_R_"><!-- --></A><H2>

+ 1
- 1
Cube Control/doc/index.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc on Tue Dec 06 16:46:20 CET 2011-->
5
+<!-- Generated by javadoc on Tue Dec 06 20:47:24 CET 2011-->
6 6
 <TITLE>
7 7
 Generated Documentation (Untitled)
8 8
 </TITLE>

+ 1
- 1
Cube Control/doc/layerEditFrame.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:20 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:24 CET 2011 -->
6 6
 <TITLE>
7 7
 layerEditFrame
8 8
 </TITLE>

+ 1
- 1
Cube Control/doc/overview-tree.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:20 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:24 CET 2011 -->
6 6
 <TITLE>
7 7
 Class Hierarchy
8 8
 </TITLE>

+ 1
- 1
Cube Control/doc/package-frame.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:20 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:24 CET 2011 -->
6 6
 <TITLE>
7 7
 &lt;Unnamed&gt;
8 8
 </TITLE>

+ 1
- 1
Cube Control/doc/package-summary.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:20 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:24 CET 2011 -->
6 6
 <TITLE>
7 7
 
8 8
 </TITLE>

+ 1
- 1
Cube Control/doc/package-tree.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:20 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:24 CET 2011 -->
6 6
 <TITLE>
7 7
  Class Hierarchy
8 8
 </TITLE>

+ 1
- 1
Cube Control/doc/serialized-form.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:20 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:24 CET 2011 -->
6 6
 <TITLE>
7 7
 Serialized Form
8 8
 </TITLE>

Loading…
Cancel
Save