Bring config INI files up to date with new drivers and fix some errors.

site_ansto/instrument/reflectometer/platypus_configuration.tcl

@@ -41,6 +41,7 @@ fileeval $cfPath(environment)/temperature/sct_ls336.tcl
 fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl
 fileeval $cfPath(environment)/temperature/sct_ls340.tcl
 fileeval $cfPath(environment)/temperature/sct_julabo_lh45_gen.tcl
+fileeval $cfPath(environment)/temperature/sct_oxford_mercury.tcl
 fileeval $cfPath(hmm)/hmm_configuration.tcl
 fileeval $cfPath(nexus)/nxscripts.tcl
 fileeval $cfPath(hmm)/detector.tcl

site_ansto/instrument/reflectometer/util/sics_config.ini

@@ -235,27 +235,47 @@ terminator = \r\n
 tol1 = 1.0
 tol2 = 1.0
 
-[mercury_scpi_01]
-desc = "Oxford Mercury temperature controller in Mercury mode"
-driver = "mercury_scpi"
+[mercury_01]
+assoc = 00000124
+cards = HHHVLTTP
+desc = "Oxford Mercury temperature controller (12T)"
+driver = "oxford_mercury"
 imptype = temperature
 ip = 10.157.205.5
-permlink = LT
 port = 7020
-terminator = \r\n
-tol = 1.0
-valve_tol = 2
+ptol = 5
+terminator = \n
+timeout = 2000
+ttol = 1.0
+vtol = 5
 
-[mercury_scpi_02]
-desc = "Oxford Mercury temperature controller in Mercury mode"
-driver = "mercury_scpi"
+[mercury_02]
+assoc = 00000124
+cards = HHTVTTTP
+desc = "Oxford Mercury temperature controller (CF10)"
+driver = "oxford_mercury"
+imptype = temperature
+ip = 10.157.205.46
+port = 7020
+ptol = 5
+terminator = \n
+timeout = 2000
+ttol = 1.0
+vtol = 5
+
+[mercury_03]
+assoc = 00000123
+cards = HHHNNTTT
+desc = "Oxford Mercury temperature controller ()"
+driver = "oxford_mercury"
 imptype = temperature
 ip = 10.157.205.47
-permlink = LT
 port = 7020
-terminator = \r\n
-tol = 1.0
-valve_tol = 2
+ptol = 5
+terminator = \n
+timeout = 2000
+ttol = 1.0
+vtol = 5
 
 [mvp]
 desc = "Valve controller"