Changeset 9d933f34d0845a0e2174fb91c2fc7809c83c0bdc

Timestamp:

05/08/10 00:41:28 (2 years ago)

Author:

Luper Rouch <flupke@…>

Children:

4549db4ca6fda39655fd1888e95e5f415c1bf047

Parents:

06c5c29de5c9c613c7ccb1995d2792ecaa925d68

git-committer:

Luper Rouch <flupke@…> (05/08/10 00:41:28)

Message:

pompilop: made a command line tool

Location:

pompilop

Files:

• pompilop/__init__.py (modified) (1 diff)
• pompilop/bin/pompicontrol.py (added)
• pompilop/serial/__init__.py (modified) (4 diffs)
• pompilop/tests/test_serial.py (modified) (1 diff)
• setup.py (modified) (1 diff, 1 prop)

pompilop/pompilop/__init__.py

@@ +1 @@
+__version__ = "0.1_pre"

pompilop/pompilop/serial/__init__.py

@@ -56 +56 @@
     CHANNEL_NAME = "CHN0"
 
+    COMMANDS_STRINGS = {
+            "METER": METER,
+            "MUTE": MUTE,
+            "MIX_GAIN": MIX_GAIN,
+            "SIGNAL_LEVEL": SIGNAL_LEVEL,
+            "SIGNAL_POLARITY": SIGNAL_POLARITY,
+            "SIGNAL_DELAY": SIGNAL_DELAY,
+            "EQ_TYPE": EQ_TYPE,
+            "EQ_FREQUENCY": EQ_FREQUENCY,
+            "EQ_LEVEL": EQ_LEVEL,
+            "EQ_BYPASS": EQ_BYPASS,
+            "GEQ_LEVEL": GEQ_LEVEL,
+            "GEQ_BYPASS": GEQ_BYPASS,
+            "CROSSOVER_TYPE": CROSSOVER_TYPE,
+            "CROSSOVER_FREQUENCY": CROSSOVER_FREQUENCY,
+            "CROSSOVER_SLOPE": CROSSOVER_SLOPE,
+            "FIR_TYPE": FIR_TYPE,
+            "FIR_FREQUENCY": FIR_FREQUENCY,
+            "COMPRESSOR_THRESHOLD": COMPRESSOR_THRESHOLD,
+            "COMPRESSOR_ATTACK": COMPRESSOR_ATTACK,
+            "COMPRESSOR_RELEASE": COMPRESSOR_RELEASE,
+            "COMPRESSOR_RATIO": COMPRESSOR_RATIO,
+            "LIMITER_THRESHOLD": LIMITER_THRESHOLD,
+            "LIMITER_ATTACK": LIMITER_ATTACK,
+            "LIMITER_RELEASE": LIMITER_RELEASE,
+            "MIXER": MIXER,
+            "CHANNEL_NAME": CHANNEL_NAME,
+        }
+
     DEVICES_MAX = 16
     CHANNELS_MAX = 8
     AUX_MAX = 32
 
-    def __init__(self, command, input, channel, data, device=0):
+    def __init__(self, command, input, channel, data, aux=None, device=0):
         self.command = command
         if device < 0 or device >= self.DEVICES_MAX:
@@ -72 +101 @@
         self.channel = channel
         self.data = data
+        self.aux = aux
     
     def tolist(self):
@@ -97 +127 @@
         return ret
 
+    @classmethod
+    def from_strings(cls, command, input, channel, data):
+        data = int(data)
+        return Command(cls.COMMANDS_STRINGS[command], input, channel, data)
+
 
 def base96(value):
+    """
+    Convert integer *value* to a string encoded in base 96, shifted by 0x20.
+    """
     bytes = []
     while value:
@@ -142 +180 @@
 
 
-if __name__ == "__main__":
-    # Init serial connection
-    ser = serial.Serial("/dev/tty.usbserial", 115200)
-
+def send_command(command, write=True, sender=DEFAULT_SENDER, 
+        dev="/dev/tty.usbserial"):
+    """
+    Send a single :class:`Command`.
+    """
+    cmd_data = format_commands([command], write=write, sender=sender)
+    print cmd_data
+    #ser = serial.Serial(dev, 115200)
+    #ser.write(cmd_data)
+    #ser.close()

pompilop/pompilop/tests/test_serial.py

@@ -20 +20 @@
                 "\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),
+                "\x01\x57\x7F\x03\x45\x51\x46\x30\x08\x20\x09\x20\x0A"
+                "\x23\x0B\x25\x10\x21\x1F\x44\x02"),
         ]
     for cmd, expected in data:
         assert_equal(format_commands([cmd]), expected)
-                
-

pompilop/setup.py

@@ +1 @@
+#!/usr/bin/env python
+
+from setuptools import setup, find_packages
+from pompilop import __version__
+
+
+setup(
+    name = "pompilop",
+    version = __version__,
+    author = "Luper Rouch",
+    author_email = "luper.rouch@gmail.com",
+    maintainer = "Luper Rouch",
+    maintainer_email = "luper.rouch@gmail.com",
+    description = "Utilities to control Xilica processors.",
+    long_description = 
+"""
+Xilica processors offer blablablabl
+""",
+    setup_requires = ["nose"],
+    install_requires = ["pyserial"],
+    scripts = ["pompilop/bin/pompicontrol.py"],
+    packages = find_packages("."),
+)
+