From 5ce867719548538807f3f73a53ba9618fb40abe4 Mon Sep 17 00:00:00 2001
From: Douglas Clowes <dcl@ansto.gov.au>
Date: Wed, 10 Sep 2014 15:15:20 +1000
Subject: [PATCH] Pull back config changes from Wombat and add the west_6100
 blue furnaces

---
 .../instrument/hipd/util/sics_config.ini      | 41 ++++++++++++++++---
 1 file changed, 36 insertions(+), 5 deletions(-)

diff --git a/site_ansto/instrument/hipd/util/sics_config.ini b/site_ansto/instrument/hipd/util/sics_config.ini
index 6e3403e8..ab40aac9 100644
--- a/site_ansto/instrument/hipd/util/sics_config.ini
+++ b/site_ansto/instrument/hipd/util/sics_config.ini
@@ -103,7 +103,6 @@ implementation = normal_sample_stage
 name = sample_stage
 optype = motion_axis
 [12tmagnet_oxford]
-asyncqueue = sct
 desc = "12 Tesla Oxford Magnet"
 driver = "oxford_labview"
 imptype = magnetic_field
@@ -130,6 +129,7 @@ desc = "Function Generator"
 driver = agilent_33220A
 imptype = function_generator
 ip = 10.157.205.16
+name = pulser
 port = 5025
 
 [eularian_cradle]
@@ -185,7 +185,7 @@ asyncqueue = sct
 desc = "Lakeshore 336 temperature controller"
 driver = "ls336"
 imptype = temperature
-ip = 137.157.201.21
+ip = 10.157.205.30
 port = 7777
 terminator = \r\n
 tol1 = 1.0
@@ -290,10 +290,41 @@ port = 4001
 desc = "Load the small omega configuration"
 imptype = motion_axis
 
-[west4100]
-desc = "Blue furnace temperature controller"
+[vf1_west4100]
+asyncqueue = sct
+desc = "VF1 Blue furnace temperature controller"
 dev_id = 1
 driver = "west4100"
 imptype = temperature
-ip = 10.157.205.19
+ip = 10.157.205.24
+port = 502
+
+[vf1_west6100]
+asyncprotocol = modbus_ap
+desc = "VF1 Blue furnace 6100 temperature controller"
+dev_id = 1
+driver = "west_6100"
+imptype = temperature
+ip = 10.157.205.24
+port = 502
+timeout = 2000
+
+[vf2_west4100]
+asyncqueue = sct
+desc = "VF2 Blue furnace temperature controller"
+dev_id = 1
+driver = "west4100"
+imptype = temperature
+ip = 10.157.205.25
+port = 502
+
+[vf2_west6100]
+asyncprotocol = modbus_ap
+desc = "VF2 Blue furnace 6100 temperature controller"
+dev_id = 1
+driver = "west_6100"
+imptype = temperature
+ip = 10.157.205.25
+port = 502
+timeout = 2000