From 7e7e95f9aed94c6ebc9a83b6cd76ed82f2271197 Mon Sep 17 00:00:00 2001
From: Tom <tom@BRIX>
Date: Tue, 25 Jul 2017 11:02:03 +0100
Subject: [PATCH] Added icons for pandabox

---
 .../pandablocksmanagercontroller.py           |  84 ++++-
 malcolm/modules/pandablocks/icons/CLOCKS.svg  | 103 ++++++
 malcolm/modules/pandablocks/icons/COUNTER.svg | 178 +++++++++++
 malcolm/modules/pandablocks/icons/DIV.svg     |  94 ++++++
 malcolm/modules/pandablocks/icons/INENC.svg   | 292 ++++++++++++++++++
 malcolm/modules/pandablocks/icons/LUT.svg     | 245 ++++++---------
 malcolm/modules/pandablocks/icons/LVDSIN.svg  | 119 +++++++
 malcolm/modules/pandablocks/icons/LVDSOUT.svg | 118 +++++++
 malcolm/modules/pandablocks/icons/OUTENC.svg  | 276 +++++++++++++++++
 malcolm/modules/pandablocks/icons/PULSE.svg   | 110 +++++++
 malcolm/modules/pandablocks/icons/TTLOUT.svg  | 158 ++++++++++
 setup.cfg                                     |   2 +-
 .../test_pandablocksmanagercontroller.py      |  39 ++-
 13 files changed, 1664 insertions(+), 154 deletions(-)
 create mode 100644 malcolm/modules/pandablocks/icons/CLOCKS.svg
 create mode 100644 malcolm/modules/pandablocks/icons/COUNTER.svg
 create mode 100644 malcolm/modules/pandablocks/icons/DIV.svg
 create mode 100644 malcolm/modules/pandablocks/icons/INENC.svg
 create mode 100644 malcolm/modules/pandablocks/icons/LVDSIN.svg
 create mode 100644 malcolm/modules/pandablocks/icons/LVDSOUT.svg
 create mode 100644 malcolm/modules/pandablocks/icons/OUTENC.svg
 create mode 100644 malcolm/modules/pandablocks/icons/PULSE.svg
 create mode 100644 malcolm/modules/pandablocks/icons/TTLOUT.svg

diff --git a/malcolm/modules/pandablocks/controllers/pandablocksmanagercontroller.py b/malcolm/modules/pandablocks/controllers/pandablocksmanagercontroller.py
index 30d3c6958..bf062752b 100644
--- a/malcolm/modules/pandablocks/controllers/pandablocksmanagercontroller.py
+++ b/malcolm/modules/pandablocks/controllers/pandablocksmanagercontroller.py
@@ -1,7 +1,9 @@
 import time
 import os
+import operator
+from xml.etree import cElementTree as ET
 
-from malcolm.compat import OrderedDict, maybe_import_cothread
+from malcolm.compat import OrderedDict, maybe_import_cothread, et_to_string
 from malcolm.core import method_also_takes, Queue, TimeoutError, \
     call_with_params
 from malcolm.modules.builtin.controllers import BasicController, \
@@ -15,13 +17,17 @@
 
 SVG_DIR = os.path.join(os.path.dirname(__file__), "..", "icons")
 
+LUT_CONSTANTS = dict(
+    A=0xffff0000, B=0xff00ff00, C=0xf0f0f0f0, D=0xcccccccc, E=0xaaaaaaaa)
+
 
 @method_also_takes(
     "hostname", StringMeta("Hostname of the box"), "localhost",
     "port", NumberMeta("uint32", "Port number of the server client"), 8888)
 class PandABlocksManagerController(ManagerController):
     def __init__(self, process, parts, params):
-        super(PandABlocksManagerController, self).__init__(process, parts, params)
+        super(PandABlocksManagerController, self).__init__(
+            process, parts, params)
         # {block_name: BlockData}
         self._blocks_data = {}
         # {block_name: {field_name: Part}}
@@ -35,6 +41,9 @@ def __init__(self, process, parts, params):
         # fields that need to inherit UNITS, SCALE and OFFSET from upstream
         self._inherit_scale = {}
         self._inherit_offset = {}
+        # lut elements to be displayed or not
+        # {fnum: {id: visible}}
+        self._lut_elements = {}
         # changes left over from last time
         self.changes = OrderedDict()
         # The PandABlock client that does the comms
@@ -144,7 +153,7 @@ def _make_parts(self, block_name, block_data):
         self._blocks_parts[block_name] = maker.parts
 
         # Set the initial block_url
-        self._set_icon_url(block_name)
+        self._set_icon_svg(block_name)
 
         # setup param pos on a block with pos_out to inherit SCALE OFFSET UNITS
         pos_fields = []
@@ -183,18 +192,77 @@ def _map_scale_offset(self, block_name, src_field, dest_field):
             self._mirrored_fields.setdefault(full_src_field, []).append(
                 full_dest_field)
 
-    def _set_icon_url(self, block_name):
+    def _set_icon_svg(self, block_name):
         icon_attr = self._blocks_parts[block_name]["icon"].attr
         fname = block_name.rstrip("0123456789") + ".svg"
         svg_text = "<svg/>"
         if fname in os.listdir(SVG_DIR):
             svg_text = open(os.path.join(SVG_DIR, fname)).read()
-            if fname == "LUT":
+            if fname == "LUT.svg":
                 fnum = int(self.client.get_field(block_name, "FUNC.RAW"))
-                # TODO: Hide bits not needed here
-                pass
+                invis = self._get_lut_icon_elements(fnum)
+                root = ET.fromstring(svg_text)
+                for i in invis:
+                    # Find the first parent which has a child with id i
+                    parent = root.find('.//*[@id=%r]/..' % i)
+                    # Find the child and remove it
+                    child = parent.find('./*[@id=%r]' % i)
+                    parent.remove(child)
+                svg_text = et_to_string(root)
         icon_attr.set_value(svg_text)
 
+    def _get_lut_icon_elements(self, fnum):
+        if not self._lut_elements:
+            # Generate the lut element table
+            # Do the general case funcs
+            funcs = [("AND", operator.and_), ("OR", operator.or_)]
+            for func, op in funcs:
+                for nargs in (2, 3, 4, 5):
+                    # 2**nargs permutations
+                    for permutation in range(2 ** nargs):
+                        self._calc_visibility(func, op, nargs, permutation)
+            # Add in special cases for NOT
+            for ninp in "ABCDE":
+                invis = {"AND", "OR", "LUT"}
+                for inp in "ABCDE":
+                    if inp != ninp:
+                        invis.add(inp)
+                    invis.add("not%s" % inp)
+                self._lut_elements[~LUT_CONSTANTS[ninp] & (2 ** 32 - 1)] = invis
+            # And catchall for LUT in 0
+            invis = {"AND", "OR", "NOT"}
+            for inp in "ABCDE":
+                invis.add("not%s" % inp)
+            self._lut_elements[0] = invis
+        return self._lut_elements.get(fnum, self._lut_elements[0])
+
+    def _calc_visibility(self, func, op, nargs, permutations):
+        # Visibility dictionary defaults
+        invis = {"AND", "OR", "LUT", "NOT"}
+        invis.remove(func)
+        args = []
+        for i, inp in enumerate("EDCBA"):
+            # xxxxx where x is 0 or 1
+            # EDCBA
+            negations = format(permutations, '05b')
+            if (5 - i) > nargs:
+                # invisible
+                invis.add(inp)
+                invis.add("not%s" % inp)
+            else:
+                # visible
+                if negations[i] == "1":
+                    args.append(~LUT_CONSTANTS[inp] & (2 ** 32 - 1))
+                else:
+                    invis.add("not%s" % inp)
+                    args.append(LUT_CONSTANTS[inp])
+
+        # Insert into table
+        fnum = op(args[0], args[1])
+        for a in args[2:]:
+            fnum = op(fnum, a)
+        self._lut_elements[fnum] = invis
+
     def handle_changes(self, changes):
         for k, v in changes.items():
             self.changes[k] = v
@@ -210,7 +278,7 @@ def handle_changes(self, changes):
                 self.changes.pop(full_field)
             # If it was LUT.FUNC then recalculate icon
             if block_name.startswith("LUT") and field_name == "FUNC":
-                self._set_icon_url(block_name)
+                self._set_icon_svg(block_name)
 
     def update_attribute(self, block_name, field_name, val):
         ret = None
diff --git a/malcolm/modules/pandablocks/icons/CLOCKS.svg b/malcolm/modules/pandablocks/icons/CLOCKS.svg
new file mode 100644
index 000000000..01949a45e
--- /dev/null
+++ b/malcolm/modules/pandablocks/icons/CLOCKS.svg
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="120"
+   height="120"
+   id="svg2816"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="CLOCKS.svg">
+  <defs
+     id="defs2818" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4.0000001"
+     inkscape:cx="60.057799"
+     inkscape:cy="74.17417"
+     inkscape:current-layer="layer2"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1861"
+     inkscape:window-height="1056"
+     inkscape:window-x="59"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:snap-others="false"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="false"
+     showguides="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="false"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-bbox-midpoints="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3706"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2821">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Frederic TA</dc:title>
+          </cc:Agent>
+        </dc:creator>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,88)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Layer 2"
+     transform="translate(0,50)">
+    <path
+       id="path4149"
+       d="M 84.000002,10 A 39.499994,39.500002 0 0 1 44.500007,49.499997 39.499994,39.500002 0 0 1 5,10 39.499994,39.500002 0 0 1 44.500007,-29.500004 39.499994,39.500002 0 0 1 84.000002,10 Z"
+       style="fill:#e6e6e6;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 45,-20 45,10 60,0"
+       id="path4155"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path4149-3"
+       d="M 47.5,10.000004 A 2.5,2.4999968 0 0 1 45,12.5 2.5,2.4999968 0 0 1 42.5,10.000004 2.5,2.4999968 0 0 1 45,7.5 a 2.5,2.4999968 0 0 1 2.5,2.500004 z"
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/malcolm/modules/pandablocks/icons/COUNTER.svg b/malcolm/modules/pandablocks/icons/COUNTER.svg
new file mode 100644
index 000000000..e15a968fe
--- /dev/null
+++ b/malcolm/modules/pandablocks/icons/COUNTER.svg
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="120"
+   height="80"
+   id="svg2816"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="COUNTER.svg">
+  <defs
+     id="defs2818" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8284272"
+     inkscape:cx="90.888444"
+     inkscape:cy="-62.175302"
+     inkscape:current-layer="layer2"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1861"
+     inkscape:window-height="1056"
+     inkscape:window-x="59"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:snap-others="false"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="false"
+     showguides="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="false"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-bbox-midpoints="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3706"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2821">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Frederic TA</dc:title>
+          </cc:Agent>
+        </dc:creator>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,48)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Layer 2"
+     transform="translate(0,10)">
+    <rect
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4136"
+       width="70"
+       height="10"
+       x="25"
+       y="55" />
+    <rect
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4138"
+       width="5"
+       height="60"
+       x="30"
+       y="-5" />
+    <rect
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#000000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4140"
+       width="4.5"
+       height="60"
+       x="85.5"
+       y="-5" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 35,40 50,0"
+       id="path4142"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 35,20 50,0"
+       id="path4144"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 85,0 35,0"
+       id="path4146"
+       inkscape:connector-curvature="0" />
+    <circle
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4148"
+       cx="45"
+       cy="40"
+       r="5" />
+    <circle
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4150"
+       cx="55"
+       cy="40"
+       r="5" />
+    <circle
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4152"
+       cx="80"
+       cy="40"
+       r="5" />
+    <circle
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4154"
+       cx="40"
+       cy="20"
+       r="5" />
+    <circle
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4156"
+       cx="70"
+       cy="20"
+       r="5" />
+    <circle
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4158"
+       cx="80"
+       cy="20"
+       r="5" />
+    <circle
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4160"
+       cx="70"
+       cy="0"
+       r="5" />
+    <circle
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4162"
+       cx="60"
+       cy="0"
+       r="5" />
+    <circle
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4164"
+       cx="50"
+       cy="0"
+       r="5" />
+  </g>
+</svg>
diff --git a/malcolm/modules/pandablocks/icons/DIV.svg b/malcolm/modules/pandablocks/icons/DIV.svg
new file mode 100644
index 000000000..a90c7b72e
--- /dev/null
+++ b/malcolm/modules/pandablocks/icons/DIV.svg
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="120"
+   height="80"
+   id="svg2816"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="DIV.svg">
+  <defs
+     id="defs2818" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6568544"
+     inkscape:cx="-12.568123"
+     inkscape:cy="12.910454"
+     inkscape:current-layer="layer2"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1861"
+     inkscape:window-height="1056"
+     inkscape:window-x="59"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:snap-others="false"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="false"
+     showguides="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="false"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-bbox-midpoints="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3706"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2821">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Frederic TA</dc:title>
+          </cc:Agent>
+        </dc:creator>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,48)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Layer 2"
+     transform="translate(0,10)">
+    <path
+       style="fill:#e6e6e6;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="m 30,45 c 16.739553,-1.18756 25,-2 51,-2 l -4,4 6,0 7,-7 -7,-7 -6,0 4,4 C 66.448888,37 43,36 43,36 54,30 57,21 63,21 l 23,0 -2,2 3,0 3,-3 -3,-3 -3,0 2,2 -23,0 C 53.007637,19.908397 53,31 38,35 l -8,0"
+       id="path4138"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccccccccc" />
+  </g>
+</svg>
diff --git a/malcolm/modules/pandablocks/icons/INENC.svg b/malcolm/modules/pandablocks/icons/INENC.svg
new file mode 100644
index 000000000..eed1600b4
--- /dev/null
+++ b/malcolm/modules/pandablocks/icons/INENC.svg
@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="120"
+   height="160"
+   id="svg2816"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="INENC.svg">
+  <defs
+     id="defs2818" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4.0000001"
+     inkscape:cx="-7.0836587"
+     inkscape:cy="55.180312"
+     inkscape:current-layer="layer2"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1861"
+     inkscape:window-height="1056"
+     inkscape:window-x="59"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:snap-others="false"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="false"
+     showguides="false"
+     inkscape:snap-bbox="false"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="false"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-midpoints="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3706"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2821">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Frederic TA</dc:title>
+          </cc:Agent>
+        </dc:creator>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,128)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Layer 2"
+     transform="translate(0,90)">
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 69.999994,-60.000002 20.000005,0"
+       id="path2843"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 69.999998,-40 19.999999,0"
+       id="path2843-3"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc"
+       id="path4155"
+       d="m 69.999998,-20 19.999999,0"
+       style="fill:none;stroke:#000000;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 69.999998,0 89.999997,0"
+       id="path4157"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc"
+       id="path4159"
+       d="m 69.999998,20 19.999999,0"
+       style="fill:none;stroke:#000000;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 69.999998,40 19.999999,0"
+       id="path4161"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4852"
+       width="20"
+       height="120"
+       x="55"
+       y="-70" />
+    <path
+       sodipodi:nodetypes="cccccc"
+       inkscape:connector-curvature="0"
+       id="path4796"
+       d="m 45,-53 c 9,0 14,0 17,0 5,0 8,5 8,10 l 0,66 c 0,5 -3,10 -8,10 -3,0 -10,0 -17,0"
+       style="fill:#e6e6e6;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:#e6e6e6;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 45,-53 c 5,0 8,5 8,10 l 0,66 c 0,5 -3,10 -8,10 -3,0 -5,-2 -5,-5 l 0,-76 c 0,-3.001026 2,-5 5,-5 z"
+       id="path4163"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccssc" />
+    <ellipse
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.38490018;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3456"
+       cx="-50"
+       cy="-10"
+       transform="scale(-1,1)"
+       rx="1.5"
+       ry="2.75" />
+    <ellipse
+       ry="2.75"
+       rx="1.5"
+       transform="scale(-1,1)"
+       cy="-45"
+       cx="-45"
+       id="ellipse4151"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.38490018;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <ellipse
+       ry="2.75"
+       rx="1.5"
+       transform="scale(-1,1)"
+       cy="-20"
+       cx="-50"
+       id="ellipse4165"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.38490018;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <ellipse
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.38490018;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="ellipse4167"
+       cx="-50"
+       cy="-30"
+       transform="scale(-1,1)"
+       rx="1.5"
+       ry="2.75" />
+    <ellipse
+       ry="2.75"
+       rx="1.5"
+       transform="scale(-1,1)"
+       cy="-40"
+       cx="-50"
+       id="ellipse4169"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.38490018;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <ellipse
+       ry="2.75"
+       rx="1.5"
+       transform="scale(-1,1)"
+       cy="20"
+       cx="-50"
+       id="ellipse4165-6"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.38490018;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <ellipse
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.38490018;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="ellipse4167-7"
+       cx="-50"
+       cy="10"
+       transform="scale(-1,1)"
+       rx="1.5"
+       ry="2.75" />
+    <ellipse
+       ry="2.75"
+       rx="1.5"
+       transform="scale(-1,1)"
+       cy="0"
+       cx="-50"
+       id="ellipse4169-5"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.38490018;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <ellipse
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.38490018;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3456-3"
+       cx="-45"
+       cy="5"
+       transform="scale(-1,1)"
+       rx="1.5"
+       ry="2.75" />
+    <ellipse
+       ry="2.75"
+       rx="1.5"
+       transform="scale(-1,1)"
+       cy="-5"
+       cx="-45"
+       id="ellipse4165-5"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.38490018;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <ellipse
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.38490018;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="ellipse4167-6"
+       cx="-45"
+       cy="-15"
+       transform="scale(-1,1)"
+       rx="1.5"
+       ry="2.75" />
+    <ellipse
+       ry="2.75"
+       rx="1.5"
+       transform="scale(-1,1)"
+       cy="-25"
+       cx="-45"
+       id="ellipse4169-2"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.38490018;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <ellipse
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.38490018;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="ellipse4167-7-1"
+       cx="-45"
+       cy="25"
+       transform="scale(-1,1)"
+       rx="1.5"
+       ry="2.75" />
+    <ellipse
+       ry="2.75"
+       rx="1.5"
+       transform="scale(-1,1)"
+       cy="15"
+       cx="-45"
+       id="ellipse4169-5-2"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.38490018;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <ellipse
+       ry="2.75"
+       rx="1.5"
+       transform="scale(-1,1)"
+       cy="-35"
+       cx="-45"
+       id="ellipse4169-2-7"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.38490018;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 60,44 5,0 c 1,0 2,-2 2,-4 0,-2 -1,-4 -2,-4 l -5,0"
+       id="ellipse4167-7-1-0"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csssc" />
+    <ellipse
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="ellipse4167-7-1-0-9"
+       transform="scale(-1,1)"
+       ry="4"
+       rx="2"
+       cy="40"
+       cx="-60" />
+    <path
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 61,-56 4,0 c 1,0 2,-2 2,-4 0,-2 -1,-4 -2,-4 l -5,0"
+       id="ellipse4167-7-1-0-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csssc" />
+    <ellipse
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="ellipse4167-7-1-0-9-6"
+       transform="scale(-1,1)"
+       ry="4"
+       rx="2"
+       cy="-60"
+       cx="-60" />
+  </g>
+</svg>
diff --git a/malcolm/modules/pandablocks/icons/LUT.svg b/malcolm/modules/pandablocks/icons/LUT.svg
index f475c801c..2736fb14a 100644
--- a/malcolm/modules/pandablocks/icons/LUT.svg
+++ b/malcolm/modules/pandablocks/icons/LUT.svg
@@ -13,53 +13,10 @@
    height="140"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.91 r13725"
    sodipodi:docname="LUT.svg">
   <defs
-     id="defs2818">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 35 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="70 : 35 : 1"
-       inkscape:persp3d-origin="35 : 23.333333 : 1"
-       id="perspective28" />
-    <pattern
-       y="0"
-       x="0"
-       height="6"
-       width="6"
-       patternUnits="userSpaceOnUse"
-       id="EMFhbasepattern" />
-    <inkscape:perspective
-       id="perspective4149"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4184"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4206"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4228"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
+     id="defs2818" />
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -67,18 +24,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.89"
-     inkscape:cx="23.95396"
-     inkscape:cy="68.222208"
+     inkscape:zoom="11.78"
+     inkscape:cx="55.438143"
+     inkscape:cy="67.202632"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1147"
-     inkscape:window-x="1920"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1">
+     inkscape:window-width="1861"
+     inkscape:window-height="1056"
+     inkscape:window-x="59"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-global="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true">
     <inkscape:grid
        type="xygrid"
        id="grid3706"
@@ -110,36 +77,29 @@
      inkscape:groupmode="layer"
      transform="translate(0,108)">
     <path
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:0.99913186;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 90,-38 -15,0"
-       id="INPC-2"
-       sodipodi:nodetypes="cc"
-       inkscape:label=""
-       inkscape:connector-curvature="0" />
-    <path
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:0.99913186;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 55,-38 -25,0"
-       id="INPC"
-       sodipodi:nodetypes="cc"
+       style="color:#000000;fill:none;stroke:#000000;stroke-width:0.98615944;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 55,-18 40,-18 40,2 30,2"
+       id="E"
+       sodipodi:nodetypes="cccc"
        inkscape:label=""
        inkscape:connector-curvature="0" />
     <path
        sodipodi:nodetypes="cccc"
-       id="INPD"
+       id="D"
        d="m 55,-28 -20,0 0,10 -5,0"
        style="color:#000000;fill:none;stroke:#000000;stroke-width:0.98983508;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        inkscape:label=""
        inkscape:connector-curvature="0" />
     <path
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:0.98615944;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 55,-18 40,-18 40,2 30,2"
-       id="INPE"
-       sodipodi:nodetypes="cccc"
+       style="color:#000000;fill:none;stroke:#000000;stroke-width:0.99913186;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 55,-38 -25,0"
+       id="C"
+       sodipodi:nodetypes="cc"
        inkscape:label=""
        inkscape:connector-curvature="0" />
     <path
        sodipodi:nodetypes="cccc"
-       id="INPB"
+       id="B"
        d="m 55,-48 -20,0 0,-10 -5,0"
        style="color:#000000;fill:none;stroke:#000000;stroke-width:0.99963295;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        inkscape:label=""
@@ -147,100 +107,97 @@
     <path
        style="color:#000000;fill:none;stroke:#000000;stroke-width:1.00168586;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        d="m 55,-58 -15,0 0,-20 -10,0"
-       id="INPA"
+       id="A"
        sodipodi:nodetypes="cccc"
        inkscape:label=""
        inkscape:connector-curvature="0" />
     <ellipse
-       ry="1.5000001"
-       rx="1.5"
-       cy="-13"
-       cx="32"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="notINPA"
-       inkscape:label=""
-       d="m 33.5,-13 c 0,0.828427 -0.671573,1.5 -1.5,1.5 -0.828427,0 -1.5,-0.671573 -1.5,-1.5 0,-0.828427 0.671573,-1.5 1.5,-1.5 0.828427,0 1.5,0.671573 1.5,1.5 z"
-       sodipodi:cx="32"
-       sodipodi:cy="-13"
-       sodipodi:rx="1.5"
-       sodipodi:ry="1.5000001"
-       transform="translate(16.5,-45)" />
+       ry="2.8303585"
+       rx="2.8176346"
+       cy="-18.169641"
+       cx="46.817635"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="notE"
+       inkscape:label="" />
     <ellipse
-       ry="1.5000001"
-       rx="1.5"
-       cy="-8"
-       cx="37"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="notINPB"
-       inkscape:label=""
-       d="m 38.5,-8 c 0,0.8284272 -0.671573,1.5000001 -1.5,1.5000001 -0.828427,0 -1.5,-0.6715729 -1.5,-1.5000001 0,-0.8284272 0.671573,-1.5000001 1.5,-1.5000001 0.828427,0 1.5,0.6715729 1.5,1.5000001 z"
-       sodipodi:cx="37"
-       sodipodi:cy="-8"
-       sodipodi:rx="1.5"
-       sodipodi:ry="1.5000001"
-       transform="translate(11.5,-40)" />
+       ry="2.9151783"
+       rx="2.8176346"
+       cy="-28.084822"
+       cx="46.817635"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="notD"
+       inkscape:label="" />
     <ellipse
-       ry="1.5000001"
-       rx="1.5"
-       cy="-3"
-       cx="37.5"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="notINPD"
-       inkscape:label=""
-       d="m 39,-3 c 0,0.8284272 -0.671573,1.5000001 -1.5,1.5000001 -0.828427,0 -1.5,-0.6715729 -1.5,-1.5000001 0,-0.8284272 0.671573,-1.5000001 1.5,-1.5000001 0.828427,0 1.5,0.6715729 1.5,1.5000001 z"
-       sodipodi:cx="37.5"
-       sodipodi:cy="-3"
-       sodipodi:rx="1.5"
-       sodipodi:ry="1.5000001"
-       transform="translate(11,-25)" />
+       ry="3"
+       rx="2.8176346"
+       cy="-38"
+       cx="46.817635"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="notC"
+       inkscape:label="" />
     <ellipse
-       ry="1.5000001"
-       rx="1.5"
-       cy="1.5"
-       cx="36"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="notINPE"
-       inkscape:label=""
-       d="M 37.5,1.5 C 37.5,2.3284272 36.828427,3.0000001 36,3.0000001 35.171573,3.0000001 34.5,2.3284272 34.5,1.5 34.5,0.67157281 35.171573,-1.1920929e-7 36,-1.1920929e-7 36.828427,-1.1920929e-7 37.5,0.67157281 37.5,1.5 z"
-       sodipodi:cx="36"
-       sodipodi:cy="1.5"
-       sodipodi:rx="1.5"
-       sodipodi:ry="1.5000001"
-       transform="translate(12.5,-19.5)" />
+       ry="3.0848198"
+       rx="2.8176346"
+       cy="-47.91518"
+       cx="46.817635"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="notB"
+       inkscape:label="" />
     <ellipse
-       ry="1.5000001"
-       rx="1.5"
-       cy="6.5"
-       cx="32"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="notINPC"
+       cy="-57.830357"
+       cx="46.817635"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="notA"
        inkscape:label=""
-       d="m 33.5,6.5 c 0,0.8284272 -0.671573,1.5000001 -1.5,1.5000001 -0.828427,0 -1.5,-0.6715729 -1.5,-1.5000001 0,-0.8284272 0.671573,-1.5000001 1.5,-1.5000001 0.828427,0 1.5,0.6715729 1.5,1.5000001 z"
-       sodipodi:cx="32"
-       sodipodi:cy="6.5"
-       sodipodi:rx="1.5"
-       sodipodi:ry="1.5000001"
-       transform="translate(16.5,-44.5)" />
+       ry="3.1696434"
+       rx="2.8176346" />
     <path
-       style="color:#000000;fill:#e6e6e6;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.99516135;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 45,-68 c 5,5 9.99235,12.568992 10,30 0.0076,17.431008 -5,20 -10,30 l 15,0 c 15,0 20,-16.216598 20,-30 0,-13.783403 -5,-30 -20,-30 l -15,0 z"
-       id="OR"
-       sodipodi:nodetypes="czccscc"
+       style="color:#000000;fill:none;stroke:#000000;stroke-width:0.99913186;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 90,-38 -15,0"
+       id="OUT"
+       sodipodi:nodetypes="cc"
        inkscape:label=""
        inkscape:connector-curvature="0" />
+    <rect
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="LUT"
+       width="35"
+       height="60"
+       x="45"
+       y="-68"
+       inkscape:label="#rect4191" />
     <path
-       style="color:#000000;fill:#e6e6e6;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.99516135;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 50,-68 c 0,15 -0.0076,12.568992 0,30 0.0076,17.431008 0,20 0,30 l 10,7e-7 c 15,0 20,-16.2165977 20,-29.9999997 C 80,-51.783402 75,-68 60,-68 l -10,0 z"
-       id="AND"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#e6e6e6;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.99516135;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       d="m 45,-68 c 5,10 10,15 10,30 0,15 -5,20 -10,30 l 15,0 c 15,0 20,-16.216598 20,-30 0,-13.783403 -5,-30 -20,-30 z"
+       id="OR"
        sodipodi:nodetypes="czccscc"
        inkscape:label=""
        inkscape:connector-curvature="0" />
     <path
        style="color:#000000;fill:#e6e6e6;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.99516135;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 45,-68.000001 c 5,5 9.99235,12.568993 10,30.000001 0.0076,17.431008 -5,20 -10,30 l 15,0 c 15,0 20,-16.216598 20,-30 0,-13.783403 -5,-30.000001 -20,-30.000001 l -15,0 z"
-       id="OR-9"
+       d="m 50,-68 c 0,15 -0.0076,12.568992 0,30 0.0076,17.431008 0,20 0,30 l 10,7e-7 c 15,0 20,-16.2165977 20,-29.9999997 C 80,-51.783402 75,-68 60,-68 l -10,0 z"
+       id="AND"
        sodipodi:nodetypes="czccscc"
        inkscape:label=""
        inkscape:connector-curvature="0" />
+    <g
+       id="NOT"
+       inkscape:label="#g4202"
+       transform="translate(-0.00120963,0)">
+      <path
+         inkscape:connector-curvature="0"
+         inkscape:label=""
+         sodipodi:nodetypes="cccc"
+         id="AND-6"
+         d="m 45,-68 0,60 35,-30 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#e6e6e6;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.99516135;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <circle
+         inkscape:label=""
+         id="as"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         cy="-38"
+         cx="80"
+         r="3" />
+    </g>
   </g>
 </svg>
diff --git a/malcolm/modules/pandablocks/icons/LVDSIN.svg b/malcolm/modules/pandablocks/icons/LVDSIN.svg
new file mode 100644
index 000000000..1cc0201bb
--- /dev/null
+++ b/malcolm/modules/pandablocks/icons/LVDSIN.svg
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="120"
+   height="60"
+   id="svg2816"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="LVDSIN.svg">
+  <defs
+     id="defs2818" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4142136"
+     inkscape:cx="-279.70625"
+     inkscape:cy="253.7876"
+     inkscape:current-layer="layer2"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1861"
+     inkscape:window-height="1056"
+     inkscape:window-x="59"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:snap-others="false"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="false"
+     showguides="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="false"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3706"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2821">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Frederic TA</dc:title>
+          </cc:Agent>
+        </dc:creator>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,28)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Layer 2"
+     transform="translate(0,-10)">
+    <path
+       style="fill:#e6e6e6;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 40.000002,24.999999 c 15.000001,0 26.686288,-4e-6 29.999998,-2e-6 3.313708,0 6,6.71573 6,15.000002 C 76,48.28427 73.313708,55 70,55 c -3.31371,2e-6 -19.999997,-2e-6 -29.999998,-2e-6"
+       id="path3374-5-9"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csssc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 76,40 14,0"
+       id="path2843"
+       sodipodi:nodetypes="cc" />
+    <path
+       id="path4149"
+       d="m 46.000004,40 a 6.0000003,15.000002 0 0 1 -6,15 6.0000003,15.000002 0 0 1 -6.000002,-15 6.0000003,15.000002 0 0 1 6.000002,-15.000003 6.0000003,15.000002 0 0 1 6,15.000003 z"
+       style="fill:#e6e6e6;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+    <ellipse
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.38490018;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3456"
+       cx="-43.5"
+       cy="35"
+       transform="scale(-1,1)"
+       rx="1.5"
+       ry="2.75" />
+    <ellipse
+       ry="2.75"
+       rx="1.5"
+       transform="scale(-1,1)"
+       cy="45"
+       cx="-43.5"
+       id="ellipse4151"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.38490018;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/malcolm/modules/pandablocks/icons/LVDSOUT.svg b/malcolm/modules/pandablocks/icons/LVDSOUT.svg
new file mode 100644
index 000000000..f3a1bfffc
--- /dev/null
+++ b/malcolm/modules/pandablocks/icons/LVDSOUT.svg
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="120"
+   height="60"
+   id="svg2816"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="LVDSOUT.svg">
+  <defs
+     id="defs2818" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8.0000002"
+     inkscape:cx="58.88349"
+     inkscape:cy="29.920867"
+     inkscape:current-layer="layer2"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1861"
+     inkscape:window-height="1056"
+     inkscape:window-x="59"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:snap-others="false"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="false"
+     showguides="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="false"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3706"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2821">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Frederic TA</dc:title>
+          </cc:Agent>
+        </dc:creator>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,28)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Layer 2"
+     transform="translate(0,-10)">
+    <path
+       style="fill:#e6e6e6;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 79.999998,24.999999 c -15.000001,0 -26.686288,-4e-6 -29.999998,-2e-6 -3.313708,0 -6,6.71573 -6,15.000002 C 44,48.28427 46.686292,55 50,55 c 3.31371,2e-6 19.999997,-2e-6 29.999998,-2e-6"
+       id="path3374-5-9"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csssc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 44,40 30,40"
+       id="path2843"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path4149"
+       d="m 73.999996,40 a 6.0000003,15.000002 0 0 0 6,15 6.0000003,15.000002 0 0 0 6.000002,-15 6.0000003,15.000002 0 0 0 -6.000002,-15.000003 6.0000003,15.000002 0 0 0 -6,15.000003 z"
+       style="fill:#e6e6e6;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+    <ellipse
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.38490018;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3456"
+       cx="76.5"
+       cy="35"
+       rx="1.5"
+       ry="2.75" />
+    <ellipse
+       ry="2.75"
+       rx="1.5"
+       cy="45"
+       cx="76.5"
+       id="ellipse4151"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.38490018;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/malcolm/modules/pandablocks/icons/OUTENC.svg b/malcolm/modules/pandablocks/icons/OUTENC.svg
new file mode 100644
index 000000000..f808e00ec
--- /dev/null
+++ b/malcolm/modules/pandablocks/icons/OUTENC.svg
@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="120"
+   height="160"
+   id="svg2816"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="OUTENC.svg">
+  <defs
+     id="defs2818" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4.0000001"
+     inkscape:cx="-45.333658"
+     inkscape:cy="55.180312"
+     inkscape:current-layer="layer2"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1861"
+     inkscape:window-height="1056"
+     inkscape:window-x="59"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:snap-others="false"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="false"
+     showguides="false"
+     inkscape:snap-bbox="false"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="false"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-midpoints="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3706"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2821">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Frederic TA</dc:title>
+          </cc:Agent>
+        </dc:creator>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,128)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Layer 2"
+     transform="translate(0,90)">
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 50.000005,-60.000002 -20.000005,0"
+       id="path2843"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 50.000001,-40 -19.999999,0"
+       id="path2843-3"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc"
+       id="path4155"
+       d="m 50.000001,-20 -19.999999,0"
+       style="fill:none;stroke:#000000;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 50.000001,0 30.000002,0"
+       id="path4157"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc"
+       id="path4159"
+       d="M 50.000001,20 30.000002,20"
+       style="fill:none;stroke:#000000;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 50.000001,40 30.000002,40"
+       id="path4161"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4852"
+       width="20"
+       height="120"
+       x="-65"
+       y="-70"
+       transform="scale(-1,1)" />
+    <path
+       sodipodi:nodetypes="cccccc"
+       inkscape:connector-curvature="0"
+       id="path4796"
+       d="m 74.999999,-53 c -9,0 -14,0 -17,0 -5,0 -8,5 -8,10 l 0,66 c 0,5 3,10 8,10 3,0 10,0 17,0"
+       style="fill:#e6e6e6;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:#e6e6e6;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 74.999999,-53 c -5,0 -8,5 -8,10 l 0,66 c 0,5 3,10 8,10 3,0 5,-2 5,-5 l 0,-76 c 0,-3.001026 -2,-5 -5,-5 z"
+       id="path4163"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccssc" />
+    <ellipse
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.38490018;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3456"
+       cx="70"
+       cy="-10"
+       rx="1.5"
+       ry="2.75" />
+    <ellipse
+       ry="2.75"
+       rx="1.5"
+       cy="-45"
+       cx="75"
+       id="ellipse4151"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.38490018;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <ellipse
+       ry="2.75"
+       rx="1.5"
+       cy="-20"
+       cx="70"
+       id="ellipse4165"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.38490018;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <ellipse
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.38490018;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="ellipse4167"
+       cx="70"
+       cy="-30"
+       rx="1.5"
+       ry="2.75" />
+    <ellipse
+       ry="2.75"
+       rx="1.5"
+       cy="-40"
+       cx="70"
+       id="ellipse4169"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.38490018;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <ellipse
+       ry="2.75"
+       rx="1.5"
+       cy="20"
+       cx="70"
+       id="ellipse4165-6"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.38490018;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <ellipse
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.38490018;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="ellipse4167-7"
+       cx="70"
+       cy="10"
+       rx="1.5"
+       ry="2.75" />
+    <ellipse
+       ry="2.75"
+       rx="1.5"
+       cy="0"
+       cx="70"
+       id="ellipse4169-5"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.38490018;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <ellipse
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.38490018;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3456-3"
+       cx="75"
+       cy="5"
+       rx="1.5"
+       ry="2.75" />
+    <ellipse
+       ry="2.75"
+       rx="1.5"
+       cy="-5"
+       cx="75"
+       id="ellipse4165-5"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.38490018;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <ellipse
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.38490018;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="ellipse4167-6"
+       cx="75"
+       cy="-15"
+       rx="1.5"
+       ry="2.75" />
+    <ellipse
+       ry="2.75"
+       rx="1.5"
+       cy="-25"
+       cx="75"
+       id="ellipse4169-2"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.38490018;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <ellipse
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.38490018;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="ellipse4167-7-1"
+       cx="75"
+       cy="25"
+       rx="1.5"
+       ry="2.75" />
+    <ellipse
+       ry="2.75"
+       rx="1.5"
+       cy="15"
+       cx="75"
+       id="ellipse4169-5-2"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.38490018;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <ellipse
+       ry="2.75"
+       rx="1.5"
+       cy="-35"
+       cx="75"
+       id="ellipse4169-2-7"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.38490018;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 59.999999,44 -5,0 c -1,0 -2,-2 -2,-4 0,-2 1,-4 2,-4 l 5,0"
+       id="ellipse4167-7-1-0"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csssc" />
+    <ellipse
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="ellipse4167-7-1-0-9"
+       ry="4"
+       rx="2"
+       cy="40"
+       cx="60" />
+    <path
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 58.999999,-56 -4,0 c -1,0 -2,-2 -2,-4 0,-2 1,-4 2,-4 l 5,0"
+       id="ellipse4167-7-1-0-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csssc" />
+    <ellipse
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="ellipse4167-7-1-0-9-6"
+       ry="4"
+       rx="2"
+       cy="-60"
+       cx="60" />
+  </g>
+</svg>
diff --git a/malcolm/modules/pandablocks/icons/PULSE.svg b/malcolm/modules/pandablocks/icons/PULSE.svg
new file mode 100644
index 000000000..00ad919af
--- /dev/null
+++ b/malcolm/modules/pandablocks/icons/PULSE.svg
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="120"
+   height="80"
+   id="svg2816"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="PULSE.svg">
+  <defs
+     id="defs2818" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8.0000002"
+     inkscape:cx="49.464806"
+     inkscape:cy="34.321718"
+     inkscape:current-layer="layer2"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1861"
+     inkscape:window-height="1056"
+     inkscape:window-x="59"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:snap-others="false"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="false"
+     showguides="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="false"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-bbox-midpoints="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3706"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2821">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Frederic TA</dc:title>
+          </cc:Agent>
+        </dc:creator>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,48)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Layer 2"
+     transform="translate(0,10)">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 35,45 5,0 0,-10 5,0 0,10 15,0 0,-10 5,0 0,10 10,0 0,-10 5,0"
+       id="path4150"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 85,15 -5,0 0,10 -5,0 0,-10 -10,0 0,10 -10,0 0,-10 -10,0 0,10 -5,0"
+       id="path4152"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccc" />
+    <path
+       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="m 30,40 5,5 -5,5 z"
+       id="path4154"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 85,10 0,10 5,-5 z"
+       id="path4156"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/malcolm/modules/pandablocks/icons/TTLOUT.svg b/malcolm/modules/pandablocks/icons/TTLOUT.svg
new file mode 100644
index 000000000..51105bf26
--- /dev/null
+++ b/malcolm/modules/pandablocks/icons/TTLOUT.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="120"
+   height="60"
+   id="svg2816"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="TTLOUT.svg">
+  <defs
+     id="defs2818" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.78"
+     inkscape:cx="43.949287"
+     inkscape:cy="30.094414"
+     inkscape:current-layer="layer2"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1861"
+     inkscape:window-height="1056"
+     inkscape:window-x="59"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:snap-others="false"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="false"
+     showguides="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3706"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2821">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Frederic TA</dc:title>
+          </cc:Agent>
+        </dc:creator>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,28)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Layer 2"
+     transform="translate(0,-10)">
+    <ellipse
+       style="fill:#e6e6e6;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.28315055px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path3374-5-0-9"
+       cx="-54.935181"
+       cy="40"
+       rx="11.000002"
+       ry="28"
+       transform="scale(-1,1)" />
+    <ellipse
+       style="fill:#e6e6e6;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.97825742px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path3374-5-9"
+       cx="-54.935181"
+       cy="40"
+       rx="6.0000005"
+       ry="20"
+       transform="scale(-1,1)" />
+    <rect
+       style="fill:#e6e6e6;fill-opacity:1"
+       id="rect3429-4"
+       width="29.999998"
+       height="40"
+       x="-84.935173"
+       y="20"
+       transform="scale(-1,1)" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1.00090218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 54.935177,20 c 30,0 30,0 30,0"
+       id="path3419-2"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1.00090218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 54.935178,60 c 29.999999,0 29.999999,0 29.999999,0"
+       id="path3421-3"
+       inkscape:connector-curvature="0" />
+    <ellipse
+       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.11159451px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path3374-56-9"
+       cx="-70.935173"
+       cy="30.578545"
+       rx="1.3933344"
+       ry="1.4214561"
+       transform="scale(-1,1)" />
+    <ellipse
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="path3374-56-7-0"
+       cx="-69.935181"
+       cy="29.578545"
+       rx="1.3933344"
+       ry="1.4214561"
+       transform="scale(-1,1)" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 43.935177,40 -14,0"
+       id="path2843"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
+    <ellipse
+       style="fill:#e6e6e6;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.97825742px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path3374-5-9-9"
+       cx="-84.935173"
+       cy="40"
+       rx="6.0000005"
+       ry="20"
+       transform="scale(-1,1)" />
+    <ellipse
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.97825748px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path3374-5-9-9-2"
+       cx="-81.935173"
+       cy="40"
+       rx="3.0000007"
+       ry="10"
+       transform="scale(-1,1)" />
+    <ellipse
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.38490018;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3456"
+       cx="80.435173"
+       cy="39.999996"
+       rx="1.5"
+       ry="4.5" />
+  </g>
+</svg>
diff --git a/setup.cfg b/setup.cfg
index 1f0102bb0..b4d7d86bf 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,2 @@
 [tool:pytest]
-addopts = --tb=native -vv
+addopts = --tb=native -vv --continue-on-collection-errors
diff --git a/tests/test_modules/test_pandablocks/test_pandablocksmanagercontroller.py b/tests/test_modules/test_pandablocks/test_pandablocksmanagercontroller.py
index c97b1ebd3..53bdfb9cd 100644
--- a/tests/test_modules/test_pandablocks/test_pandablocksmanagercontroller.py
+++ b/tests/test_modules/test_pandablocks/test_pandablocksmanagercontroller.py
@@ -1,6 +1,7 @@
 from collections import OrderedDict
 import unittest
-from mock import call, Mock, patch, ANY
+from mock import call, Mock, patch, ANY, MagicMock
+from xml.etree import cElementTree as ET
 
 from malcolm.core import call_with_params
 from malcolm.modules.pandablocks.controllers import PandABlocksManagerController
@@ -134,3 +135,39 @@ def test_scale_offset_following(self):
             call('PCOMP.STEP.SCALE=1\n'),
             call('PCOMP.STEP.UNITS=\n')
         ]
+
+    def test_lut(self):
+        # LUT symbol
+        assert self.o._get_lut_icon_elements(0) == {
+            'AND', 'NOT', 'OR', 'notA', 'notB', 'notC', 'notD', 'notE'}
+        # A&B&C&D&E
+        assert self.o._get_lut_icon_elements(0x80000000) == {
+            'LUT', 'NOT', 'OR', 'notA', 'notB', 'notC', 'notD', 'notE'}
+        # !A&!B&!C&!D&!E
+        assert self.o._get_lut_icon_elements(0x1) == {
+            'LUT', 'NOT', 'OR'}
+        # A&!B
+        assert self.o._get_lut_icon_elements(0xff0000) == {
+            'C', 'D', 'E', 'LUT', 'NOT', 'OR', 'notA', 'notC', 'notD', 'notE'}
+        # A&C should be LUT
+        assert self.o._get_lut_icon_elements(0xf0f00000) == {
+             'AND', 'NOT', 'OR', 'notA', 'notB', 'notC', 'notD', 'notE'}
+        # !C
+        assert self.o._get_lut_icon_elements(0xf0f0f0f) == {
+            'A', 'AND', 'B', 'D', 'E', 'LUT', 'OR', 'notA', 'notB', 'notC', 'notD', 'notE'}\
+        # A|B
+        assert self.o._get_lut_icon_elements(0xffffff00) == {
+            'AND', 'C', 'D', 'E', 'LUT', 'NOT', 'notA', 'notB', 'notC', 'notD', 'notE'}
+
+    def test_symbol(self):
+        m = MagicMock()
+        self.o._blocks_parts["LUT1"] = dict(icon=m)
+        # !A&!B&!C&!D&!E
+        self.client.get_field.return_value = "1"
+        self.o._set_icon_svg("LUT1")
+        svg_text = m.attr.set_value.call_args[0][0]
+        root = ET.fromstring(svg_text)
+        assert len(root.findall(".//*[@id='A']")) == 1
+        assert len(root.findall(".//*[@id='notA']")) == 1
+        assert len(root.findall(".//*[@id='OR']")) == 0
+        assert len(root.findall(".//*[@id='AND']")) == 1