Changeset 660 for trunk/software

Timestamp:

02/07/10 19:48:05 (2 years ago)

Author:

mosttw

Message:

Added support for some messages in Wiimote daemon

Files:

• trunk/software/wiimoted.py (modified) (6 diffs)

trunk/software/wiimoted.py

@@ -38 +38 @@
 logger = logging.getLogger('wiimoted')
 
+
 class ClientChannel(asynchat.async_chat):
         def __init__(self, server, sock, addr):
@@ -65 +66 @@
                 self.producer_fifo.append(frame)
 
+
 class Server(asyncore.dispatcher):
         '''
@@ -113 +115 @@
                 cmd = frame[0]
                 arg = frame[1:]
-                if cmd == 'c':
-                        return '1' if self.wiimote else '0'
+                if cmd == 'c': # Get if connected
+                        return 'c 1' if self.wiimote else 'c 0'
+                elif cmd == 'r': # Disable rumble
+                        if self.wiimote:
+                                self.wiimote.rumble = Fale
+                                return 'r 1'
+                        else:
+                                return 'r 0'
+                elif cmd == 'R': # Enable rumble
+                        if self.wiimote:
+                                self.wiimote.rumble = True
+                                return 'R 1'
+                        else:
+                                return 'R 0'
+                elif cmd == 'L': # Set LEDs
+                        try:
+                                self.wiimote.led = int(arg)
+                                return 'L 1'
+                        except (AttributeError, ValueError):
+                                return 'L 0'
                 else:
                         logger.error('Unknown command %r', frame)
@@ -125 +145 @@
                 while True:
                         if self.connect():
+                                for client in self.clients:
+                                        client.send_message('c 1')
                                 while self.wiimote: # Just idle until a disconnection
                                         time.sleep(.5)
+                                for client in self.cients:
+                                        client.send_message('c 0')
         
         def translate_loop(self):
@@ -140 +164 @@
                                 time.sleep(0.001)
                         else:
-                                string = wiimote_update_to_string(type, data)
-                                for client in self.clients:
-                                        client.send_message(string)
+                                try:
+                                        string = wiimote_update_to_string(type, data)
+                                        assert string.startswith('m '), "Is a message"
+                                        for client in self.clients:
+                                                client.send_message(string)
+                                except ValueError:
+                                        logger.exception('Unknown message type %r', type)
 
         def connect(self):
@@ -184 +212 @@
 
 def wiimote_update_to_string(type, data):
+        '''
+        Convert a cwiid message into a string message (starting with the
+        message type indicator 'm').
+        '''
         if type == cwiid.MESG_BTN:
-                return '{0} {1}\r\n'.format(type, data)
+                return 'm {0} {1}\r\n'.format(type, data)
         elif type == cwiid.MESG_NUNCHUK:
-                return ('{type} {acc[0]} {acc[1]} {acc[2]} '
-                                '{buttons} {stick[0]} {stick[1]}').format(type=type, **data)
+                return ('m {type} {stick[0]} {stick[1]} {acc[0]} {acc[1]} {acc[2]} '
+                                '{buttons}').format(type=type, **data)
         else:
-                logger.error('Unknown message type %r', type)
+                raise ValueError('Can\'t convert message of type %r %r', type, data)