Wiimote en Lirc extra getest en bijgewerkt. Geexporteerd naar jar: werkt, maar dll's en native dingen zijn nogal kieskeurig over hun locatie. Nog controleren of daar iets aan te doen is.

java/.classpath

@@ -7,7 +7,6 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="lib" path="native"/>
-	<classpathentry kind="lib" path="cfg"/>
 	<classpathentry kind="lib" path="resource"/>
 	<classpathentry kind="lib" path="lib/commons-logging-1.1.1.jar"/>
 	<classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>
@@ -15,5 +14,6 @@
 	<classpathentry kind="lib" path="lib/nativecall-0.4.1.jar"/>
 	<classpathentry kind="lib" path="lib/nativeloader-200505172341.jar"/>
 	<classpathentry kind="lib" path="lib/jxinput.jar"/>
+	<classpathentry kind="lib" path="cfg"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

java/main.bat

@@ -1,4 +1,4 @@
 @echo off
-set path=%path%;native
+set path="C:\Program Files (x86)\Java\jdk1.6.0_24\bin";%path%;native
 java -cp bin;cfg;resource;lib/commons-logging-1.1.1.jar;lib/jacob-1.15-M3.jar;lib/TableLayout.jar;lib/nativecall-0.4.1.jar;lib/nativeloader-200505172341.jar mimis.Main
 pause

java/src/mimis/Client.java

@@ -44,7 +44,6 @@ public class Client {
         } catch (ActivateException e) {
             log.fatal(e);
         }
-        mimis.stop();
     }
 
     public static void main(String[] args) {

java/src/mimis/device/lirc/LircDevice.java

@@ -74,9 +74,7 @@ public class LircDevice extends Device implements LircButtonListener, SignalList
     public void deactivate() throws DeactivateException {
         log.debug("Deactivate LircDevice");
         super.deactivate();
-        log.debug("nu lircserv");
         lircService.deactivate();
-        log.debug("nu erna");
     }
 
     public void add(LircButton lircButton) {

java/src/mimis/device/lirc/LircService.java

@@ -79,7 +79,6 @@ public class LircService extends Worker {
         if (active && !socket.isConnected()) {
             active = false;
         }
-        log.trace(active);
         return active;
     }
 

java/src/mimis/device/wiimote/WiimoteDevice.java

@@ -2,6 +2,7 @@ package mimis.device.wiimote;
 
 import mimis.Button;
 import mimis.Device;
+import mimis.Worker;
 import mimis.device.wiimote.gesture.GestureDevice;
 import mimis.event.Feedback;
 import mimis.exception.button.UnknownButtonException;
@@ -10,6 +11,7 @@ import mimis.exception.worker.ActivateException;
 import mimis.exception.worker.DeactivateException;
 import mimis.sequence.state.Press;
 import mimis.sequence.state.Release;
+import mimis.util.ArrayCycle;
 import mimis.value.Action;
 
 import org.wiigee.event.GestureEvent;
@@ -32,6 +34,7 @@ public class WiimoteDevice extends Device implements GestureListener {
     protected boolean connected;
     protected GestureDevice gestureDevice;
     protected int gestureId;
+    protected LedWorker ledWorker;
 
     static {
         WiimoteDevice.wiimoteService = new WiimoteService();
@@ -45,6 +48,7 @@ public class WiimoteDevice extends Device implements GestureListener {
         gestureDevice = new GestureDevice();
         gestureDevice.add(this);
         gestureId = 0;
+        ledWorker = new LedWorker();
     }
 
     /* Worker */
@@ -56,6 +60,13 @@ public class WiimoteDevice extends Device implements GestureListener {
 
     public boolean active() {
         if (wiimote != null) {
+            if (!ledWorker.active()) {
+                try {
+                    ledWorker.activate();
+                } catch (ActivateException e) {
+                    log.error(e);
+                }
+            }
             connected = false;
             wiimote.getStatus();
             synchronized (this) {
@@ -66,24 +77,25 @@ public class WiimoteDevice extends Device implements GestureListener {
                 }
             }
             if (!connected) {                
-                disconnect();
                 active = false;
+                try {
+                    ledWorker.deactivate();
+                } catch (DeactivateException e) {
+                    log.error(e);
+                }
             }
         }
         return active;
     }
 
-    public void deactivate() throws DeactivateException {
-        super.deactivate();
-        if (wiimote != null) {
-            wiimote.deactivateMotionSensing();
-        }
-        wiimoteDiscovery.disconnect();
-    }
-
     public void stop() {
         super.stop();
+        ledWorker.stop();
+        if (wiimote != null) {
+            disconnect();
+        }
         wiimoteService.exit();
+        wiimoteDiscovery.stop();
     }
 
     /* Events */
@@ -145,6 +157,7 @@ public class WiimoteDevice extends Device implements GestureListener {
         wiimote = null;
         try {
             wiimote = wiimoteService.getDevice(this);
+            ledWorker.activate();
         } catch (DeviceNotFoundException e) {
             wiimoteDiscovery.activate();
         }
@@ -166,7 +179,6 @@ public class WiimoteDevice extends Device implements GestureListener {
     public void disconnect() {
         wiimote.disconnect();
         wiimote = null;
-        wiimoteDiscovery.disconnect();
     }
 
     public void disconnected() {
@@ -203,4 +215,37 @@ public class WiimoteDevice extends Device implements GestureListener {
             System.out.printf("id #%d, prob %.0f%%, valid %b\n", event.getId(), 100 * event.getProbability(), event.isValid());
         }
     }
+    
+    class LedWorker extends Worker {
+        protected ArrayCycle<Integer> ledCycle;
+
+        public LedWorker() {
+            ledCycle = new ArrayCycle<Integer>();
+            ledCycle.add(3);
+            ledCycle.add(6);
+            ledCycle.add(12);
+            ledCycle.add(8);
+            ledCycle.add(12);
+            ledCycle.add(6);
+            ledCycle.add(3);
+        }
+
+        public void deactivate() throws DeactivateException {
+            super.deactivate();
+            setLeds(1);
+        }
+
+        protected void work() {
+            setLeds(ledCycle.next()); 
+        }
+
+        protected void setLeds(int leds) {
+            wiimote.setLeds(
+                (leds & 1) > 0,
+                (leds & 2) > 0,
+                (leds & 4) > 0,
+                (leds & 8) > 0);
+                sleep(leds == 8 ? 200 : 100);
+        }
+    }
 }

java/src/mimis/device/wiimote/WiimoteDiscovery.java

@@ -47,8 +47,8 @@ public class WiimoteDiscovery extends Worker {
             wiimoteDevice.connected();
         } else if (disconnect) {
             disconnect();
+            disconnect = false;
         }
-        disconnect = false;
     }
 
     public void activate() throws ActivateException {
@@ -62,9 +62,4 @@ public class WiimoteDiscovery extends Worker {
             process.destroy();
         }
     }
-
-    public void stop() {
-        super.stop();
-        disconnect();
-    }
 }