pyetherpix

@@ -12,8 +12,8 @@ are sent for one frame - a single MCUF frame to every distributor.

 The coordinates of the pixels in the MCUF packets do not correspond to pixel

 locations, but to pixel addresses. The y coordinate is the number of the

 output of the distributor and the x coordinate is the number of the pixel

-in the chain. The number of channels is always 3 (RGB) and the maximum value

-is always 255 (8 bit per channel).

+in the chain. The number of channels is always 1 (monochrome)  or 3 (RGB) and

+the maximum value is always 255 (8 bit per channel).

 This library can be used to send the required UDP packets to the EtherPix

 display to make it show images and/or videos.

@@ -29,7 +29,8 @@ distributor 15 = 6,64

 # those lines introduce a mapping between the channel values in the video and the values transmitted to the display

 #  - mapping is done per distributor and applies to all pixels connected to it

-#  - the general format is: mapping <distributor number> (red|green|blue) = <base> <factor> <gamma>

+#  - RGB distributors use red, green and blue, monochrone distributors use white

+#  - the general format is: mapping <distributor number> (red|green|blue|white) = <base> <factor> <gamma>

 #  - the mapping formula is: <display value> := <base> + <factor> * <original value> ^ (1 / <gamma>)

 mapping 0 red = 0.005 0.99 1.0

 mapping 0 green = 0.005 0.99 1.0

@@ -0,0 +1,26 @@

+# EtherPix configuration file

+

+# the address to bind the local socket to

+#  - the EtherPix network 10.70.80.0/16 must be reachable from this address

+bindAddr = 0.0.0.0:0

+

+# the size of the display

+#  - <width>,<height> in pixels

+size = 8,8

+

+# this line adds a new distributor

+#  - the general format is: distributor <distributor number> = <number of outputs>,<number of pixel per output>

+distributor 0 = 6,64

+

+# those lines introduce a mapping between the channel values in the video and the values transmitted to the display

+#  - mapping is done per distributor and applies to all pixels connected to it

+#  - RGB distributors use red, green and blue, monochrone distributors use white

+#  - the general format is: mapping <distributor number> (red|green|blue|white) = <base> <factor> <gamma>

+#  - the mapping formula is: <display value> := <base> + <factor> * <original value> ^ (1 / <gamma>)

+mapping 0 white = 0.0 1.0 1.0

+

+# these lines specify the logical positions of the pixels at an output in movie coordinates

+#  - the general format is: output <distributor number>,<output number> = <pixel x>,<pixel y> ...

+#  - the order of the pixels is the order they are connected in the chain

+output 0,0 = 0,0 1,0 2,0 3,0 4,0 5,0 6,0 7,0 7,1 6,1 5,1 4,1 3,1 2,1 1,1 0,1 0,2 1,2 2,2 3,2 4,2 5,2 6,2 7,2 7,3 6,3 5,3 4,3 3,3 2,3 1,3 0,3 0,4 1,4 2,4 3,4 4,4 5,4 6,4 7,4 7,5 6,5 5,5 4,5 3,5 2,5 1,5 0,5 0,6 1,6 2,6 3,6 4,6 5,6 6,6 7,6 7,7 6,7 5,7 4,7 3,7 2,7 1,7 0,7

+

@@ -14,7 +14,8 @@ distributor 0 = 6,64

 # those lines introduce a mapping between the channel values in the video and the values transmitted to the display

 #  - mapping is done per distributor and applies to all pixels connected to it

-#  - the general format is: mapping <distributor number> (red|green|blue) = <base> <factor> <gamma>

+#  - RGB distributors use red, green and blue, monochrone distributors use white

+#  - the general format is: mapping <distributor number> (red|green|blue|white) = <base> <factor> <gamma>

 #  - the mapping formula is: <display value> := <base> + <factor> * <original value> ^ (1 / <gamma>)

 mapping 0 red = 0.0 1.0 1.0

 mapping 0 green = 0.0 1.0 1.0

@@ -185,11 +185,17 @@ class Display(object):

         # color channel

         color_str = fields[2]

         if color_str == "red":

+            channels = 3

             color = Mapping.RED

         elif color_str == "green":

+            channels = 3

             color = Mapping.GREEN

         elif color_str == "blue":

+            channels = 3

             color = Mapping.BLUE

+        elif color_str == "white":

+            channels = 1

+            color = Mapping.WHITE

         else:

             self._msg.msg(Msg.ERR, "invalid color channel \"%s\""

                                    " in line %u of config file" %

@@ -233,6 +239,8 @@ class Display(object):

              return False

         # set mapping

         self._distris[distri_no].set_mapping(color, base, factor, gamma)

+        # update number of channels

+        self._distris[distri_no].set_channels(channels)

         return True

     def _proc_config_output(self, setting, value, lineno):

@@ -41,9 +41,8 @@ class Distributor(object):

             self._mappings.append(Mapping())

         # pixel coordinates: all unknown

         self._pixel_coords = [[None] * self._pixels] * self._outputs

-        # header for UDP packets

-        self._udp_hdr = struct.pack("!I4H", 0x23542666,

-                                    outputs, pixels, Mapping.CHANNELS, 255)

+        # initialize channels and header for UDP packets

+        self.set_channels(Mapping.CHANNELS)

         # initial image data is cleared

         self.data_clear()

@@ -75,7 +74,7 @@ class Distributor(object):

         """clear image data, i.e. set entire image to black"""

         # prepare message buffer with all pixels cleared (black)

         clr = bytearray()

-        for channel in range(Mapping.CHANNELS):

+        for channel in range(self._channels):

             clr += self._mappings[channel].table[0]

         self._buffer = self._udp_hdr + (clr * (self._outputs * self._pixels))

@@ -99,7 +98,13 @@ class Distributor(object):

                         # get pixel from image

                         pix = image.getpixel(x_y)

                 # add pixel to pixel data

-                for channel in range(Mapping.CHANNELS):

+                #   monochrome (convert, emphasize green)

+                if self._channels == 1:

+                    mono = (pix[0] + (pix[1] << 1) + pix[2] + 2) >> 2

+                    data += self._mappings[0].table[mono]

+                #   RGB

+                elif self._channels == 3:

+                    for channel in range(3):

                         data += self._mappings[channel].table[pix[channel]]

         # store UDP message

         self._buffer = data

@@ -113,6 +118,18 @@ class Distributor(object):

             except:

                 pass

+    def set_channels(self, channels):

+        """set number of channels, supported values: 1 or 3"""

+        if channels == 1 or channels == 3:

+            self._channels = channels

+            # header for UDP packets

+            self._udp_hdr = struct.pack("!I4H", 0x23542666, self._outputs,

+                                        self._pixels, self._channels, 255)

+

+    def set_mapping(self, color, base, factor, gamma):

+        """set distributor mapping for one color channel"""

+        self._mappings[color].set_params(base, factor, gamma)

+

     def set_pixel_coords(self, output_no, pixel_coords):

         """set distributor address

            output_no: number of output

@@ -123,7 +140,3 @@ class Distributor(object):

             pad_cnt = self._pixels - len(self._pixel_coords[output_no])

             self._pixel_coords[output_no] += [None] * pad_cnt

-    def set_mapping(self, color, base, factor, gamma):

-        """set distributor mapping for one color channel"""

-        self._mappings[color].set_params(base, factor, gamma)

-

@@ -21,6 +21,7 @@ from struct import Struct

 class Mapping(object):

     RED = 0

+    WHITE = 0 # red and white share first mapping

     GREEN = 1

     BLUE = 2

     CHANNELS = 3

@@ -1,7 +1,7 @@

 from setuptools import setup

 setup(name='pyetherpix',

-      version='0.2',

+      version='0.3',

       description='python implementation of EtherPix output library',

       url='https://git.blinkenarea.org?p=pyetherpix',

       author='Stefan Schuermans',