From 018ba901897eb1321f933c5dedff686f5aa46657 Mon Sep 17 00:00:00 2001
From: Ferdi Franceschini <ffr@ansto.gov.au>
Date: Thu, 18 Sep 2014 17:05:01 +1000
Subject: [PATCH] SICS-783 Load extra environment driver configurations for
 Echidna.

---
 .../instrument/hrpd/echidna_configuration.tcl | 36 ++++++++++++++-----
 .../instrument/hrpd/util/sics_config.ini      |  8 +++++
 2 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/site_ansto/instrument/hrpd/echidna_configuration.tcl b/site_ansto/instrument/hrpd/echidna_configuration.tcl
index d8b7e518..975afd82 100644
--- a/site_ansto/instrument/hrpd/echidna_configuration.tcl
+++ b/site_ansto/instrument/hrpd/echidna_configuration.tcl
@@ -25,19 +25,37 @@ source $cfPath(hipadaba)/hipadaba_configuration.tcl
 fileeval $cfPath(motors)/positmotor_configuration.tcl
 fileeval $cfPath(plc)/plc.tcl
 fileeval $cfPath(counter)/counter.tcl
-#TODO Provide method for choosing environment controller
+fileeval $cfPath(environment)/sct_agilent_33220A.tcl
+fileeval $cfPath(environment)/sct_hiden_xcs.tcl
+fileeval $cfPath(environment)/sct_huber_pilot.tcl
+fileeval $cfPath(environment)/sct_isotech_ps.tcl
 fileeval $cfPath(environment)/temperature/sct_eurotherm_2000.tcl
+fileeval $cfPath(environment)/temperature/sct_eurotherm_m2000.tcl
 fileeval $cfPath(environment)/sct_keithley_2700.tcl
-fileeval $cfPath(environment)/magneticField/sct_green_magnet.tcl
+fileeval $cfPath(environment)/sct_keithley_m2700.tcl
+fileeval $cfPath(environment)/temperature/sct_lakeshore_218.tcl
+fileeval $cfPath(environment)/temperature/sct_lakeshore_336.tcl
+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_lakeshore_370.tcl
+fileeval $cfPath(environment)/temperature/sct_lakeshore_m370.tcl
+fileeval $cfPath(environment)/temperature/sct_mercury_base.tcl
+fileeval $cfPath(environment)/temperature/sct_mercury_level.tcl
+fileeval $cfPath(environment)/temperature/sct_mercury_pres.tcl
+fileeval $cfPath(environment)/temperature/sct_mercury_scpi.tcl
+fileeval $cfPath(environment)/temperature/sct_mercury_temp.tcl
+fileeval $cfPath(environment)/temperature/sct_mercury_valve.tcl
+fileeval $cfPath(environment)/sct_protek_common.tcl
+fileeval $cfPath(environment)/sct_protekmm.tcl
+fileeval $cfPath(environment)/temperature/west400.tcl
+fileeval $cfPath(environment)/temperature/sct_west4100.tcl
+fileeval $cfPath(environment)/temperature/sct_watlow_pm.tcl
 fileeval $cfPath(environment)/magneticField/sct_oxford_labview.tcl
 fileeval $cfPath(environment)/magneticField/sct_oxford12tlv.tcl
-fileeval $cfPath(environment)/sct_keithley_2700.tcl
-fileeval $cfPath(environment)/temperature/sct_lakeshore_336.tcl
-fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl
-fileeval $cfPath(environment)/temperature/sct_oxford_mercury.tcl
-fileeval $cfPath(environment)/temperature/sct_mercury_scpi.tcl
-fileeval $cfPath(environment)/temperature/west400.tcl
-fileeval $cfPath(environment)/temperature/sct_watlow_pm.tcl
+fileeval $cfPath(environment)/he3/sct_he3.tcl
+fileeval $cfPath(environment)/magneticField/sct_green_magnet.tcl
+fileeval $cfPath(environment)/magneticField/sct_green_magnet_labview.tcl
 fileeval $cfPath(hmm)/hmm_configuration.tcl
 fileeval $cfPath(nexus)/nxscripts.tcl
 fileeval $cfPath(scan)/scan.tcl
diff --git a/site_ansto/instrument/hrpd/util/sics_config.ini b/site_ansto/instrument/hrpd/util/sics_config.ini
index b8011634..41b97e48 100644
--- a/site_ansto/instrument/hrpd/util/sics_config.ini
+++ b/site_ansto/instrument/hrpd/util/sics_config.ini
@@ -246,6 +246,14 @@ terminator = \r\n
 tol1 = 1.0
 tol2 = 1.0
 
+[ls370_1]
+desc = "Lakeshore 370 Resistance Bridge"
+driver = "lakeshore_m370"
+imptype = temperature
+ip = 10.157.205.42
+port = 4001
+tol = 1.0
+
 [mercury_scpi_01]
 desc = "Oxford Mercury temperature controller in Mercury mode"
 driver = "mercury_scpi"