Tried fixing serial library for windows...

CubeControl/Frame.java

@@ -270,32 +270,28 @@ public class Frame extends JFrame implements ListSelectionListener {
 
 		// ----- 3D Stuff -----
 		// --------------------
-		gConfig = SimpleUniverse.getPreferredConfiguration();
-		try {
-			cubeCanvas = new Canvas3D(gConfig);
-			ledView = new Led3D(cubeCanvas);
-			cubeCanvas.setBounds(18, 31, 275, 275); // 3d view
-			cubeCanvas.addMouseListener(new MouseListener() { // React to clicks in 3d view
-				public void mouseClicked(MouseEvent e) {
-					Point2d mousePos = convertMousePositionToWorld(e.getX(), e.getY()); 
-				}
-				public void mouseExited(MouseEvent e) {
-	
-				}
-				public void mouseEntered(MouseEvent e) {
-	
-				}
-				public void mouseReleased(MouseEvent e) {
-	
-				}
-				public void mousePressed(MouseEvent e) {
-	
-				}
-			});
-			cp.add(cubeCanvas);
-		} catch (Exception e) {
-			System.out.println("ERROR: No 3D available!");
-		}
+		/* gConfig = SimpleUniverse.getPreferredConfiguration();
+		cubeCanvas = new Canvas3D(gConfig);
+		ledView = new Led3D(cubeCanvas);
+		cubeCanvas.setBounds(18, 31, 275, 275); // 3d view
+		cubeCanvas.addMouseListener(new MouseListener() { // React to clicks in 3d view
+			public void mouseClicked(MouseEvent e) {
+				Point2d mousePos = convertMousePositionToWorld(e.getX(), e.getY()); 
+			}
+			public void mouseExited(MouseEvent e) {
+
+			}
+			public void mouseEntered(MouseEvent e) {
+
+			}
+			public void mouseReleased(MouseEvent e) {
+
+			}
+			public void mousePressed(MouseEvent e) {
+
+			}
+		});
+		cp.add(cubeCanvas); */
 		// --------------------
 
 		// Add Layer edit buttons
@@ -779,7 +775,7 @@ public class Frame extends JFrame implements ListSelectionListener {
 		cp.add(serialPanel);
 	
 		settingsPanel.setBounds(409, 100, 243, 65);
-		settingsPanel.setBorder(BorderFactory.createTitledBorder("Serial communication"));
+		settingsPanel.setBorder(BorderFactory.createTitledBorder("Frame duration"));
 		cp.add(settingsPanel);
 	
 		// Ende Komponenten

CubeControl/HelperUtility.java

@@ -88,31 +88,16 @@ public class HelperUtility {
 			} catch (NullPointerException e) {
 				System.out.println("ERROR: Library name is null!");
 				return;
+			} catch (Exception e) {
+				System.out.println("ERROR: " + e.toString());
+				return;
 			}
 			System.out.println("Loaded Serial Library at \"" + path + "\"");
+			return;
 		} catch (Exception e) {
 			System.out.println("ERROR: Failed to load Serial Library:");
 			e.printStackTrace();
-		}
-	}
-
-	// http://thomaswabner.wordpress.com/2007/10/09/fast-stream-copy-using-javanio-channels/
-	private static void fastChannelCopy(ReadableByteChannel src, WritableByteChannel dest) throws IOException {
-		ByteBuffer buffer = ByteBuffer.allocateDirect(16 * 1024);
-		while (src.read(buffer) != -1) {
-			// prepare the buffer to be drained
-			buffer.flip();
-			// write to the channel, may block
-			dest.write(buffer);
-			// If partial transfer, shift remainder down
-			// If buffer is empty, same as doing clear()
-			buffer.compact();
-		}
-		// EOF will leave buffer in fill state
-		buffer.flip();
-		// make sure the buffer is fully drained.
-		while (buffer.hasRemaining()) {
-			dest.write(buffer);
+			return;
 		}
 	}
 
@@ -122,10 +107,11 @@ public class HelperUtility {
 	 * @return Array of port names. First entry is "No serial ports!" if no
 	 *         others
 	 */
+	// Get ports as single String from getPortsOS() and put them in an array
 	public static String[] getPorts() {
 		String portLines = getPortsOS();
 		if (portLines == null) {
-			String[] ports = { "Select serial port..." };
+			String[] ports = { "No serial ports!" };
 			return ports;
 		} else {
 			StringTokenizer sT = new StringTokenizer(portLines, "\n");
@@ -153,15 +139,9 @@ public class HelperUtility {
 			} else {
 				return getThePorts("tty");
 			} 
-		} catch (Exception e) {
-			System.out.println("Exception: " + e.toString());
-			return null;
 		} catch (UnsatisfiedLinkError e) {
 			System.out.println("ERROR: Library not loaded! (getPorts)");
-			// System.out.println(e.toString());
-			// Show error message because this is called in the initializer.
-			Frame.errorMessageStat("Could not load Serial Library!\nNo Serial functionality available!");
-			return null;
+			return "Serial Library Error!\n";
 		}
 	}
 
@@ -179,7 +159,6 @@ public class HelperUtility {
 			return openPortNative(name);
 		} catch (UnsatisfiedLinkError e) {
 			System.out.println("ERROR: Library not loaded! (openPort)");
-			// System.out.println(e.toString());
 			return false;
 		}
 	}
@@ -194,7 +173,6 @@ public class HelperUtility {
 			closePortNative();
 		} catch (UnsatisfiedLinkError e) {
 			System.out.println("ERROR: Library not loaded! (closePort)");
-			// System.out.println(e.toString());
 		}
 	}
 
@@ -212,7 +190,6 @@ public class HelperUtility {
 			return readDataNative(length);
 		} catch (UnsatisfiedLinkError e) {
 			System.out.println("ERROR: Library not loaded! (readData)");
-			// System.out.println(e.toString());
 			return null;
 		}
 	}
@@ -232,9 +209,28 @@ public class HelperUtility {
 			writeDataNative(data, length);
 		} catch (UnsatisfiedLinkError e) {
 			System.out.println("ERROR: Library not loaded! (writeData)");
-			// System.out.println(e.toString());
 		}
 	}
 
 	private static native void writeDataNative(short[] data, int length);
+
+	// http://thomaswabner.wordpress.com/2007/10/09/fast-stream-copy-using-javanio-channels/
+	private static void fastChannelCopy(ReadableByteChannel src, WritableByteChannel dest) throws IOException {
+		ByteBuffer buffer = ByteBuffer.allocateDirect(16 * 1024);
+		while (src.read(buffer) != -1) {
+			// prepare the buffer to be drained
+			buffer.flip();
+			// write to the channel, may block
+			dest.write(buffer);
+			// If partial transfer, shift remainder down
+			// If buffer is empty, same as doing clear()
+			buffer.compact();
+		}
+		// EOF will leave buffer in fill state
+		buffer.flip();
+		// make sure the buffer is fully drained.
+		while (buffer.hasRemaining()) {
+			dest.write(buffer);
+		}
+	}
 }

CubeControl/libSerial/makefile

@@ -2,13 +2,13 @@ CC = gcc
 STANDARD = gnu99
 # Path to jni.h
 ifdef SystemRoot
-HEADERPATH = C:/Program\ Files/Java/jdk1.6.0_29/include
+HEADERPATH = C:/Program\ Files/Java/jdk1.6.0_31/include
 RM = del
 else
 ifdef SYSTEMROOT
 # Looks like Cygwin or Mingw shell
-HEADERPATH = C:\Programme\Java\jdk1.6.0_07\include
-HEADERPATH += -IC:\Programme\Java\jdk1.6.0_07\include\win32
+HEADERPATH = C:\Programme\Java\jdk1.6.0_31\include
+HEADERPATH += -IC:\Programme\Java\jdk1.6.0_31\include\win32
 RM = rm -rf
 else
 RM = rm -f
@@ -25,15 +25,6 @@ endif
 
 all: libSerial
 
-doc: doc/index.html
-
-serialInterface.h: HelperUtility.class
-	javah -o serialInterface.h HelperUtility
-
-HelperUtility.class: ../HelperUtility.java
-	javac -sourcepath ../ ../HelperUtility.java
-	cp ../HelperUtility.class HelperUtility.class
-
 # SystemRoot is only defined in Windows
 ifdef SystemRoot
 libSerial: Serial.dll
@@ -58,13 +49,11 @@ libSerial.so: serialHelper.c unixSerial.c serialInterface.h
 	$(CC) -dynamiclib -o libSerial.so serialHelper.o
 
 Serial.dll: serialHelper.c winSerial.c serialInterface.h
-	$(CC) -x c -std=$(STANDARD) -I$(HEADERPATH) -c serialHelper.c -o serialHelper.o -D winHelper
+	$(CC) -x c -std=$(STANDARD) -DBUILDINGDLL -I$(HEADERPATH) -c serialHelper.c -o serialHelper.o -D winHelper
 	$(CC) -shared -o Serial.dll serialHelper.o
 
 # Delete intermediate files
 clean:
-	$(RM) *.class
-	$(RM) *.h
 	$(RM) *.o
 ifdef SystemRoot
 	$(RM) *.dll

CubeControl/libSerial/serialInterface.h

@@ -0,0 +1,62 @@
+#include <jni.h>
+/* Header for class HelperUtility */
+
+#ifdef winHelper
+#ifdef BUILDINGDLL
+#define DLL __declspec(dllexport)
+#else
+#define DLL __declspec(dllimport)
+#endif
+#else
+#define DLL
+#endif
+
+#ifndef _Included_HelperUtility
+#define _Included_HelperUtility
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     HelperUtility
+ * Method:    getThePorts
+ * Signature: (Ljava/lang/String;)Ljava/lang/String;
+ */
+JNIEXPORT jstring DLL JNICALL Java_HelperUtility_getThePorts
+  (JNIEnv *, jclass, jstring);
+
+/*
+ * Class:     HelperUtility
+ * Method:    openPortNative
+ * Signature: (Ljava/lang/String;)Z
+ */
+JNIEXPORT jboolean DLL JNICALL Java_HelperUtility_openPortNative
+  (JNIEnv *, jclass, jstring);
+
+/*
+ * Class:     HelperUtility
+ * Method:    closePortNative
+ * Signature: ()V
+ */
+JNIEXPORT void DLL JNICALL Java_HelperUtility_closePortNative
+  (JNIEnv *, jclass);
+
+/*
+ * Class:     HelperUtility
+ * Method:    readDataNative
+ * Signature: (I)[S
+ */
+JNIEXPORT jshortArray DLL JNICALL Java_HelperUtility_readDataNative
+  (JNIEnv *, jclass, jint);
+
+/*
+ * Class:     HelperUtility
+ * Method:    writeDataNative
+ * Signature: ([SI)V
+ */
+JNIEXPORT void DLL JNICALL Java_HelperUtility_writeDataNative
+  (JNIEnv *, jclass, jshortArray, jint);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

CubeControl/libSerial/winSerial.c

@@ -118,7 +118,7 @@ int availableSerialPorts(char *ports) {
 }
 
 // Last element has to be NULL
-char** getSerialPorts(char *search) {
+char** getSerialPorts(const char *search) {
 	int i, num, c = 0, s;
 	char ports[20];
 	char **portList;

CubeControl/makefile

@@ -1,15 +1,12 @@
 INJAR = *.class LEDoff.png LEDon.png splash.png bg.png
 # Path to jni.h
 ifdef SystemRoot
-HEADERPATH = C:/Program\ Files/Java/jdk1.6.0_29/include
 RM = del
 INJAR += Serial.dll
 PLATFORM = Win
 else
 ifdef SYSTEMROOT
 # Looks like cygwin or mingw shell
-HEADERPATH = C:\Programme\Java\jdk1.6.0_31\include
-HEADERPATH += -IC:\Programme\Java\jdk1.6.0_31\include\win32
 RM = rm -rf
 INJAR += Serial.dll
 PLATFORM = Win
@@ -19,11 +16,9 @@ UNAME := $(shell uname -s)
 ifeq ($(UNAME),Darwin)
 INJAR += libSerial.jnilib
 PLATFORM = Mac
-HEADERPATH = /System/Library/Frameworks/JavaVM.framework/Headers
 else
 INJAR += libSerial.so
 PLATFORM = Linux
-HEADERPATH = /usr/lib/jvm/java-6-openjdk/include
 endif
 endif
 endif
@@ -80,7 +75,6 @@ libSerial.so: libSerial/serialHelper.c libSerial/unixSerial.c
 clean:
 	make -C libSerial clean
 	$(RM) *.class
-	$(RM) *.
 	$(RM) *.o
 ifdef SystemRoot
 	$(RM) *.dll