Use two I18Managers but just one I18PMACManager

This fixes a problem where two I18PMACManagers would try to reset Brick
GPIO at the same time, causing an error.

examples/I18-MALC01.yaml

@@ -4,11 +4,8 @@
    pvPrefix: BL18I-EA-XSP3-01
    mriPrefix: I18-XSP3
 
-- blocks.demo.I18Table01PMACManager:
-    mriPrefix: I18-TABLE01
-
-- blocks.demo.I18Table03PMACManager:
-    mriPrefix: I18-TABLE03
+- blocks.demo.I18PMACManager:
+    mriPrefix: I18-BRICK06
 
 - blocks.pandabox.PandABoxManager:
     pvPrefix: BL18I-MO-PANDA-01
@@ -18,13 +15,13 @@
 - blocks.demo.I18Table01Manager:
     mri: I18-SCAN01
     det: I18-XSP3
-    brick: I18-TABLE01
+    brick: I18-BRICK06
     pandabox: I18-PANDA01
 
 - blocks.demo.I18Table03Manager:
     mri: I18-SCAN03
     det: I18-XSP3
-    brick: I18-TABLE03
+    brick: I18-BRICK06
     pandabox: I18-PANDA01
 
 - comms.pva.PvaServerComms:

malcolm/blocks/demo/I18Table03PMACManager.yaml → malcolm/blocks/demo/I18PMACManager.yaml

@@ -5,6 +5,16 @@
 - controllers.RunnableController:
     mri: $(mriPrefix)
 
+- includes.pmac.compoundmotor_collection:
+    mri: I18-T1-Y
+    prefix: BL18I-MO-TABLE-01:HEIGHT
+    scannable: sc_MicroFocusSampleY
+
+- includes.pmac.compoundmotor_collection:
+    mri: I18-T1-X
+    prefix: BL18I-MO-TABLE-01:CSX
+    scannable: sc_MicroFocusSampleX
+
 - includes.pmac.rawmotor_collection:
     mri: I18-T3-Y
     prefix: BL18I-MO-STEP-06:GB:M8