thomas
/
LED-Cube
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Start helper from debug menu

Thomas Buck 12 years ago
parent
1a30e1e164
commit
f58bf4fafb
23 changed files with 78 additions and 48 deletions
Split View Show Diff Stats
  1. 23
    9
      Cube Control/Frame.java
  2. 10
    17
      Cube Control/HelperUtility.java
  3. 1
    1
      Cube Control/doc/AFrame.html
  4. 1
    1
      Cube Control/doc/Animation.html
  5. 1
    1
      Cube Control/doc/AnimationUtility.html
  6. 1
    1
      Cube Control/doc/HelperUtility.html
  7. 1
    1
      Cube Control/doc/Led3D.html
  8. 1
    1
      Cube Control/doc/allclasses-frame.html
  9. 1
    1
      Cube Control/doc/allclasses-noframe.html
  10. 1
    1
      Cube Control/doc/constant-values.html
  11. 1
    1
      Cube Control/doc/cubeWorker.html
  12. 1
    1
      Cube Control/doc/deprecated-list.html
  13. 19
    1
      Cube Control/doc/frame.html
  14. 1
    1
      Cube Control/doc/help-doc.html
  15. 4
    1
      Cube Control/doc/index-all.html
  16. 1
    1
      Cube Control/doc/index.html
  17. 1
    1
      Cube Control/doc/layerEditFrame.html
  18. 1
    1
      Cube Control/doc/overview-tree.html
  19. 1
    1
      Cube Control/doc/package-frame.html
  20. 1
    1
      Cube Control/doc/package-summary.html
  21. 1
    1
      Cube Control/doc/package-tree.html
  22. 1
    1
      Cube Control/doc/serialized-form.html
  23. 4
    2
      Cube Control/serialHelper.c

+ 23
- 9
Cube Control/Frame.java View File 

@@ -77,7 +77,7 @@ public class Frame extends JFrame implements ListSelectionListener {
77 77 
   private JButton frameDuration = new JButton();
78 78 
   // Ende Attribute
79 79
80 
-  private cubeWorker worker = new cubeWorker();
80 
+  public cubeWorker worker = new cubeWorker();
81 81 
   private boolean fileSelected = false;
82 82 
   // Ende Variablen
83 83 
 

@@ -762,14 +762,13 @@ public class Frame extends JFrame implements ListSelectionListener {
762 762 
     Frame f = new Frame("Cube Control");
763 763 
   Led3D l = f.get3D();
764 764 
   java.util.Scanner sc = new java.util.Scanner(System.in);
765 
-
766 765 
   System.out.println("#### Cube Control Debug Console ####");
767 766 
   System.out.println("## Enter a Command ('h' for help) ##");
768 767 
   System.out.print("$> ");
769 768
770 769 
   do {
771 
-    if (sc.hasNext()) {
772 
-      String s = sc.next();
770 
+    if (sc.hasNextLine()) {
771 
+      String s = sc.nextLine();
773 772
774 773 
       if (s.equals("p") || (s.equals("print")))
775 774 
         l.printTranslationData();

@@ -795,13 +794,28 @@ public class Frame extends JFrame implements ListSelectionListener {
795 794 
         System.out.println("All LEDs off now...");
796 795 
       }
797 796
797 
+	  if (s.equals("e") || s.equals("exec")) {
798 
+  	  		System.out.println(HelperUtility.runHelper(new String[0]));
799 
+	  }
800 
+
801 
+	  if (s.startsWith("e ") || s.startsWith("exec ")) {
802 
+			int pos = 0;
803 
+			while (s.charAt(pos) != ' ') {
804 
+				pos++;
805 
+			}
806 
+			String[] arr = new String[1];
807 
+			arr[0] = s.substring(pos + 1);
808 
+			System.out.println(HelperUtility.runHelper(arr));
809 
+	  }
810 
+
798 811 
       if (s.equals("h") || (s.equals("help"))) {
799 812 
         System.out.println("Commands:");
800 
-        System.out.println("\t'on'    / '1'\t:\tToggle all LEDs on");
801 
-        System.out.println("\t'off'   / '0'\t:\tToggle all LEDs off");
802 
-        System.out.println("\t'print' / 'p'\t:\tPrint 3D Translation Matrix Data");
803 
-        System.out.println("\t'help'  / 'h'\t:\tShow this message");
804 
-        System.out.println("\t'quit'  / 'q'\t:\tExit Cube Control");
813 
+        System.out.println("\t'on'     / '1'\t:\tToggle all LEDs on");
814 
+        System.out.println("\t'off'    / '0'\t:\tToggle all LEDs off");
815 
+        System.out.println("\t'print'  / 'p'\t:\tPrint 3D Translation Matrix Data");
816 
+		System.out.println("\t'exec'   / 'e'\t:\tExecute helper with given args");
817 
+        System.out.println("\t'help'   / 'h'\t:\tShow this message");
818 
+        System.out.println("\t'quit'   / 'q'\t:\tExit Cube Control");
805 819 
       }
806 820
807 821 
       System.out.print("$> ");

+ 10
- 17
Cube Control/HelperUtility.java View File 

@@ -83,28 +83,21 @@ public class HelperUtility {
83 83 
 			BufferedReader br = new BufferedReader(new InputStreamReader(p.getInputStream()));
84 84 
 			String line;
85 85 
 			boolean fin = false;
86 
+
87 
+			while ((line = br.readLine()) != null) {
88 
+				ret = ret + line + "\n";
89 
+			}
86 90
87 
-			do { // Wait for process to finish... Doesn't work...?
88 
-				fin = false;
89 
-				try {
90 
-					p.waitFor();
91 
-				} catch (Exception e) {
92 
-					fin = true;
93 
-				}
91 
+			p.waitFor();
94 92
95 
-				// Read output in same loop... Should work...!
96 
-				line = br.readLine();
97 
-				if (line != null) {
98 
-					ret = ret + line + "\n";
99 
-					fin = true;
100 
-				}
101 
-			} while (fin);
93 
+			while ((line = br.readLine()) != null) {
94 
+				ret = ret + line + "\n";
95 
+			}
102 96
103 97 
 			br.close();
104 
-			if (ret.length() == 0) {
105 
-				ret = "g"; // We have added a last \n... We will remove it, so add garbage to be removed...
98 
+			if (ret.length() > 0) {
99 
+				ret = ret.substring(0, ret.length() - 1);
106 100 
 			}
107 
-			ret = ret.substring(0, ret.length() - 1);
108 101 
 			return ret;
109 102 
 		} catch(Exception e) {
110 103 
 			e.printStackTrace();

+ 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 Mon Dec 05 20:09:33 CET 2011 -->
5 
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:38 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 Mon Dec 05 20:09:33 CET 2011 -->
5 
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:38 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 Mon Dec 05 20:09:33 CET 2011 -->
5 
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:39 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 Mon Dec 05 20:09:34 CET 2011 -->
5 
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:40 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 Mon Dec 05 20:09:35 CET 2011 -->
5 
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:40 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 Mon Dec 05 20:09:35 CET 2011 -->
5 
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:40 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 Mon Dec 05 20:09:35 CET 2011 -->
5 
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:40 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 Mon Dec 05 20:09:35 CET 2011 -->
5 
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:40 CET 2011 -->
6 6 
 <TITLE>
7 7 
 Constant Field Values
8 8 
 </TITLE>

+ 1
- 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 Mon Dec 05 20:09:33 CET 2011 -->
5 
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:39 CET 2011 -->
6 6 
 <TITLE>
7 7 
 cubeWorker
8 8 
 </TITLE>

+ 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 Mon Dec 05 20:09:35 CET 2011 -->
5 
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:40 CET 2011 -->
6 6 
 <TITLE>
7 7 
 Deprecated List
8 8 
 </TITLE>

+ 19
- 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 Mon Dec 05 20:09:33 CET 2011 -->
5 
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:39 CET 2011 -->
6 6 
 <TITLE>
7 7 
 Frame
8 8 
 </TITLE>
 
@@ -184,6 +184,14 @@ java.lang.Object
184 184 
 <BR>
185 185 
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
186 186 
 </TR>
187 
+<TR BGCOLOR="white" CLASS="TableRowColor">
188 
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
189 
+<CODE>&nbsp;<A HREF="cubeWorker.html" title="class in &lt;Unnamed&gt;">cubeWorker</A></CODE></FONT></TD>
190 
+<TD><CODE><B><A HREF="Frame.html#worker">worker</A></B></CODE>
191 
+
192 
+<BR>
193 
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
194 
+</TR>
187 195 
 </TABLE>
188 196 
 &nbsp;<A NAME="fields_inherited_from_class_javax.swing.JFrame"><!-- --></A>
189 197 
 <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
 
@@ -532,6 +540,16 @@ public javax.swing.JList <B>frameList</B></PRE>
532 540 
 <DL>
533 541 
 </DL>
534 542 
 </DL>
543 
+<HR>
544 
+
545 
+<A NAME="worker"><!-- --></A><H3>
546 
+worker</H3>
547 
+<PRE>
548 
+public <A HREF="cubeWorker.html" title="class in &lt;Unnamed&gt;">cubeWorker</A> <B>worker</B></PRE>
549 
+<DL>
550 
+<DL>
551 
+</DL>
552 
+</DL>
535 553
536 554 
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
537 555

+ 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 Mon Dec 05 20:09:35 CET 2011 -->
5 
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:40 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 Mon Dec 05 20:09:35 CET 2011 -->
5 
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:40 CET 2011 -->
6 6 
 <TITLE>
7 7 
 Index
8 8 
 </TITLE>
 
@@ -398,6 +398,9 @@ Method in class <A HREF="./Frame.html" title="class in &lt;Unnamed&gt;">Frame</A
398 398 
 <A NAME="_W_"><!-- --></A><H2>
399 399 
 <B>W</B></H2>
400 400 
 <DL>
401 
+<DT><A HREF="./Frame.html#worker"><B>worker</B></A> -
402 
+Variable in class <A HREF="./Frame.html" title="class in &lt;Unnamed&gt;">Frame</A>
403 
+<DD>&nbsp;
401 404 
 <DT><A HREF="./AnimationUtility.html#writeFile(java.lang.String, java.util.ArrayList)"><B>writeFile(String, ArrayList&lt;Animation&gt;)</B></A> -
402 405 
 Static method in class <A HREF="./AnimationUtility.html" title="class in &lt;Unnamed&gt;">AnimationUtility</A>
403 406 
 <DD>Write a file with all Animations of an ArrayList

+ 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 Mon Dec 05 20:09:35 CET 2011-->
5 
+<!-- Generated by javadoc on Mon Dec 05 21:22:40 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 Mon Dec 05 20:09:34 CET 2011 -->
5 
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:40 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 Mon Dec 05 20:09:35 CET 2011 -->
5 
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:40 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 Mon Dec 05 20:09:35 CET 2011 -->
5 
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:40 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 Mon Dec 05 20:09:35 CET 2011 -->
5 
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:40 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 Mon Dec 05 20:09:35 CET 2011 -->
5 
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:40 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 Mon Dec 05 20:09:35 CET 2011 -->
5 
+<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:40 CET 2011 -->
6 6 
 <TITLE>
7 7 
 Serialized Form
8 8 
 </TITLE>

+ 4
- 2
Cube Control/serialHelper.c View File 

@@ -51,7 +51,7 @@ Return values:
51 51 
 int main(int argc, char *argv[]) {
52 52 
 	size_t length, written;
53 53
54 
-		printf("Debugging Worker... Ignore me!\n");
54 
+		// printf("Debugging Worker... Ignore me!\n");
55 55
56 56 
 		if (argc < 2) {
57 57 
 			usage(argv[0]);
 
@@ -93,7 +93,7 @@ int main(int argc, char *argv[]) {
93 93 
 				written = serialWrite(fileData, length);
94 94 
 			}
95 95
96 
-		} else {
96 
+		} else if (argv[1][0] == 'r') {
97 97
98 98 
 			if (argc != 4) {
99 99 
 				usage(argv[0]);
 
@@ -120,6 +120,8 @@ int main(int argc, char *argv[]) {
120 120
121 121 
 			printFileData(length);
122 122
123 
+		} else {
124 
+			printf("Unrecognized Option: %s\n", argv[1]);
123 125 
 		}
124 126
125 127 
 		free(fileData);

Write Preview
Loading…
Cancel
Save