Incrémentation de version : 2.0.0 -> 2.0.1.

[minwii.git] / src / pywiiuse / pygame_wiimouse.py

diff --git a/src/pywiiuse/pygame_wiimouse.py b/src/pywiiuse/pygame_wiimouse.py
index e5d506c..d26ce12 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
 


@@ -97,9 +110,10 @@ class wiimote_thread(Thread):
 
     def quit(self):
         '''Go away.'''
 
     def quit(self):
         '''Go away.'''

-        for i in range(self.nmotes):
-            wiiuse.set_leds(self.wiimotes[i], 0)
-            wiiuse.disconnect(self.wiimotes[i])
+        # TODO will crash if self.nmotes > 4
+        # for i in range(self.nmotes):
+        #     wiiuse.set_leds(self.wiimotes[i], 0)
+        #     wiiuse.disconnect(self.wiimotes[i])

         self.go = False
 
     def get_count(self):
         self.go = False
 
     def get_count(self):


@@ -169,7 +183,7 @@ def _full_mouse_event_cb(self, id, wmp):
         if button :
             event = pygame.event.Event(pygame.MOUSEBUTTONUP,
                                        pos = pos,
         if button :
             event = pygame.event.Event(pygame.MOUSEBUTTONUP,
                                        pos = pos,

-                                       button = 1)
+                                       button = button)

             pygame.event.post(event)
 
 
             pygame.event.post(event)
 
 


@@ -180,15 +194,8 @@ 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) :
     
     nmotes = get_count()
     for i in range(nmotes) :