Changeset 3d477f9e40ceaedf2ee58027d5e0a5c098150f62

Timestamp:

05/19/10 14:57:48 (2 years ago)

Author:

Luper Rouch <luper.rouch@…>

Children:

eb367573c9a8c777f3776814ffd2d795e688b2ef

Parents:

0280387b4a7b139df25cf2a418e85037ea3d7b1b, 0fb7200268603a3392982b000d3f692d60c73e8e

git-committer:

Luper Rouch <luper.rouch@…> (05/19/10 14:57:48)

Message:

Merge branch 'master' of luper.fr:/var/git/projects

Files:

• pyflu/pyflu/jsonalize.py (modified) (1 diff)
• pompilop/pompilop/bin/pompicontrol.py (modified) (1 diff)
• pompilop/pompilop/serial/__init__.py (modified) (3 diffs)
• pompilop/pompilop/tests/test_serial.py (modified) (3 diffs)

pyflu/pyflu/jsonalize.py

@@ -220 +220 @@
             # Looks to be a serialized class
             cls = get_class(state["__class__"])
-            ret = cls(*state["__args__"], **state["__kwargs__"])
+            # Force kwargs keys to be of str type
+            kwargs = {}
+            for key, value in state["__kwargs__"].items():
+                kwargs[str(key)] = value
+            ret = cls(*state["__args__"], **kwargs)
         else:
             # A normal dict

pompilop/pompilop/bin/pompicontrol.py

@@ -28 +28 @@
 
 command, data = args
-command_obj = Command.from_strings(command, options.input, options.channel, 
-        data, aux=options.aux)
+command_obj = Command.from_strings(command, options.channel, data,
+        aux=options.aux, input=options.input)
 if options.debug:
     print "Sending command to %s:" % options.dev

pompilop/pompilop/serial/__init__.py

@@ -89 +89 @@
     AUX_MAX = 32
 
-    def __init__(self, command, input, channel, data, aux=None, device=0):
+    def __init__(self, command, channel, data, aux=None, device=0, input=True):
         self.command = command
         if device < 0 or device >= self.DEVICES_MAX:
@@ -121 +121 @@
         ret.append(CHANNEL_HEADER)
         ret.append(chr(CHANNEL_VALUE_BASE + self.channel))
+        # Aux bytes
+        if self.aux is not None:
+            ret.append(AUX_HEADER)
+            ret.append(chr(AUX_VALUE_BASE + self.aux))
         # Data bytes
         dumped_data = base96(self.data)
@@ -141 +145 @@
         return "\x20"
     bytes = []
-    while value:
-        byte = value & 0x5f
-        bytes.append(chr(byte + 0x20))
-        value >>= 5
-    print bytes
+    while value > 0:
+        if value >= 0x60:
+            bytes.append("\x7f")
+        else:
+            bytes.append(chr(value + 0x20))
+        value -= 0x60
     return "".join(reversed(bytes))
 

pompilop/pompilop/tests/test_serial.py

@@ -1 +1 @@
 from nose.tools import assert_equal
-from pompilop.serial import checksum, format_commands, Command
+from pompilop.serial import checksum, format_commands, Command, base96
 
 
@@ -17 +17 @@
 def test_format():
     data = [
-            (Command(Command.MUTE, False, 2, 1), 
+            (Command(Command.MUTE, 2, 1, input=False), 
                 "\x01\x57\x7F\x03\x4D\x55\x54\x30\x08\x20\x09\x21\x0A"
                 "\x22\x10\x21\x1F\x2E\x02"),
-            (Command(Command.EQ_FREQUENCY, True, 3, aux=5),
+            (Command(Command.EQ_FREQUENCY, 3, 1, aux=5, input=True),
                 "\x01\x57\x7F\x03\x45\x51\x46\x30\x08\x20\x09\x20\x0A"
                 "\x23\x0B\x25\x10\x21\x1F\x44\x02"),
@@ -26 +26 @@
     for cmd, expected in data:
         assert_equal(format_commands([cmd]), expected)
+
+
+def test_base96():
+    assert_equal(base96(0), "\x20")
+    assert_equal(base96(1), "\x21")
+    assert_equal(base96(0x60), "\x7f")
+    assert_equal(base96(0x61), "\x21\x7f")
+