Extinction du tracking infrarouge sur les wiimotes inactives. (est-ce vraiment mieux ?)

git-svn-id: https://svn.cri.ensmp.fr/svn/minwii/trunk@355 fe552daf-6dbe-4428-90eb-1537e0879342

diff --git a/src/minwii/app.py b/src/minwii/app.py
index 2ac1d72effd92a92b6ee966941bf5300960df015..95bfaab00b84a3d408afe8f277d204be56abb577 100755 (executable)
--- a/src/minwii/app.py
+++ b/src/minwii/app.py
@@ -58,7 +58,7 @@ class MinWii(object):
             global pygame_wiimouse
             from pywiiuse import pygame_wiimouse
             from minwii.config import IR_POSITION
             global pygame_wiimouse
             from pywiiuse import pygame_wiimouse
             from minwii.config import IR_POSITION

-            pygame_wiimouse.init(2, 5, self.screenResolution, IR_POSITION) # look for 4, wait 5 seconds
+            pygame_wiimouse.init(5, 5, self.screenResolution, IR_POSITION) # look for 5, wait 5 seconds

             self.nwiimotes = nwiimotes = pygame_wiimouse.get_count()
             console.debug('wiimotes found : %d', nwiimotes)
             self.WT = WT = pygame_wiimouse.WT
             self.nwiimotes = nwiimotes = pygame_wiimouse.get_count()
             console.debug('wiimotes found : %d', nwiimotes)
             self.WT = WT = pygame_wiimouse.WT

diff --git a/src/pywiiuse/pygame_wiimouse.py b/src/pywiiuse/pygame_wiimouse.py
index 3328eff1e644199eda6e5eeb0fd7a6c78276746f..013d91b6059b3e55b5c2b852c17bacf8b111c49e 100755 (executable)
--- a/src/pywiiuse/pygame_wiimouse.py
+++ b/src/pywiiuse/pygame_wiimouse.py
@@ -17,13 +17,16 @@ wiiuse = None # import within the thread, why do I have to do this?
 
 class wiimote_thread(Thread):
     '''Manage the wiiuse interface'''
 
 class wiimote_thread(Thread):
     '''Manage the wiiuse interface'''

-    def __init__(self, nmotes=1, timeout=5):
+    
+    def __init__(self, nmotes=1, timeout=5, screenResolution=(660, 370), position='ABOVE'):

         Thread.__init__(self, name='wiimote')
         self.queue = Queue()
         self.startup = Queue()
         self.nmotes = nmotes
         Thread.__init__(self, name='wiimote')
         self.queue = Queue()
         self.startup = Queue()
         self.nmotes = nmotes

-        self.selectedWiimoteIndex = 0

         self.timeout = timeout
         self.timeout = timeout

+        self.screenResolution = screenResolution
+        self.position = position
+        self.selectedWiimoteIndex = 0

         self.setDaemon(1)
         self._paused = False
         self.start()
         self.setDaemon(1)
         self._paused = False
         self.start()


@@ -41,9 +44,19 @@ class wiimote_thread(Thread):
         found = wiiuse.find(self.wiimotes, self.nmotes, self.timeout)
         self.actual_nmotes = wiiuse.connect(self.wiimotes, self.nmotes)
         
         found = wiiuse.find(self.wiimotes, self.nmotes, self.timeout)
         self.actual_nmotes = wiiuse.connect(self.wiimotes, self.nmotes)
         

-
-        for i in range(self.nmotes):
-            wiiuse.set_leds(self.wiimotes[i], wiiuse.LED[i])
+        
+        if self.nmotes <= 4 :
+            for i in range(self.nmotes):
+                wiiuse.set_leds(self.wiimotes[i], wiiuse.LED[i])
+        else :
+            for i in range(4):
+                wiiuse.set_leds(self.wiimotes[i], wiiuse.LED[i])
+
+            if self.nmotes == 5 :
+                wiiuse.set_leds(self.wiimotes[4], wiiuse.LED_1 | wiiuse.LED_4)
+            if self.nmotes == 6 :
+                wiiuse.set_leds(self.wiimotes[4], wiiuse.LED_1 | wiiuse.LED_4)
+                wiiuse.set_leds(self.wiimotes[5], wiiuse.LED_1 | wiiuse.LED_2 | wiiuse.LED_3 | wiiuse.LED_4)

 
         self.go = self.actual_nmotes != 0
 
 
         self.go = self.actual_nmotes != 0
 


@@ -75,6 +88,23 @@ class wiimote_thread(Thread):
     
     def selectWiimote(self, wiimoteIndex) :
         self.selectedWiimoteIndex = wiimoteIndex
     
     def selectWiimote(self, wiimoteIndex) :
         self.selectedWiimoteIndex = wiimoteIndex

+        for i in range(self.actual_nmotes) :
+            wm = self.wiimotes[i]
+            if i == wiimoteIndex :
+                self.do(wiiuse.set_ir, wm, 1)
+                self.do(wiiuse.set_ir_vres, wm, *self.screenResolution)
+                if self.position == 'ABOVE' :
+                    position = wiiuse.IR_ABOVE
+                elif self.position == 'BELOW' :
+                    position = wiiuse.IR_BELOW
+                else :
+                    position = wiiuse.IR_ABOVE
+                self.do(wiiuse.set_ir_position, wm, position)
+                # TODO aspect ratio
+                #self.do(wiiuse.set_aspect_ratio, wm, aspect)
+                
+            else :
+                self.do(wiiuse.set_ir, wm, 0)

 
     def do(self, func, *args):
         '''Run the function in the thread handling the wiimote'''
 
     def do(self, func, *args):
         '''Run the function in the thread handling the wiimote'''


@@ -180,21 +210,14 @@ def init(nmotes, timeout, screenResolution=(660, 370), position='ABOVE'):
     global WT
     if WT:
         return
     global WT
     if WT:
         return

-    WT = wiimote_thread(nmotes, timeout)
-    
-    if position == 'ABOVE' :
-        position = wiiuse.IR_ABOVE
-    elif position == 'BELOW' :
-        position = wiiuse.IR_BELOW
-    else :
-        position = wiiuse.IR_ABOVE

     
     

+    WT = wiimote_thread(nmotes, timeout, screenResolution, position)

     
     nmotes = get_count()
     for i in range(nmotes) :
         wm = Wiimote(i) # access the wiimote object
         wm.enable_accels(0) # turn off acceleration reporting
     
     nmotes = get_count()
     for i in range(nmotes) :
         wm = Wiimote(i) # access the wiimote object
         wm.enable_accels(0) # turn off acceleration reporting

-        wm.enable_ir(1, vres = screenResolution, position=position)
+        #wm.enable_ir(1, vres = screenResolution, position=position)

 
 
 def get_count():
 
 
 def get_count():