Merge branch 'RELEASE-3_1' into RELEASE-3_2

Conflicts:
	sics/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl
	sics/site_ansto/instrument/bilby/config/motors/shutters_sct.tcl
	sics/site_ansto/instrument/bilby/config/motors/tank_sct.tcl
	sics/site_ansto/instrument/bilby/util/sics_config.ini
	sics/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl
	sics/site_ansto/instrument/config/environment/huber_pilot_sct.tcl
	sics/site_ansto/instrument/config/environment/isotech_ps_sct.tcl
	sics/site_ansto/instrument/config/environment/keithley_m2700_sct.tcl
	sics/site_ansto/instrument/config/environment/magneticField/oxford12tlv_sct.tcl
	sics/site_ansto/instrument/config/environment/magneticField/tsi_smc_sct.tcl
	sics/site_ansto/instrument/config/environment/nhq_200_sct.tcl
	sics/site_ansto/instrument/config/environment/omron_hldc_sct.tcl
	sics/site_ansto/instrument/config/environment/protekmm_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/eurotherm_m2000_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/julabo_lh45_gen_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/lakeshore_218_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/ls336_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/ls340_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_base_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_level_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_pres_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_scpi_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_temp_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_valve_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/nprvasm2_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/pfeiffer_hg_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/watlow_mpm_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/watlow_mrm_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/watlow_mst4_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/west_6100.sct
	sics/site_ansto/instrument/config/source/reactor_status_sct.tcl
	sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
	sics/site_ansto/instrument/sans/quokka_configuration.tcl
	sics/site_ansto/instrument/tas/config/motors/motor_configuration.tcl
	sics/site_ansto/instrument/util/gen_sct.py
	sics/site_ansto/instrument/util/motor_utility.tcl

site_ansto/instrument/bilby/MANIFEST.TXT

@@ -4,3 +4,4 @@ config
 util
 hostport_config.tcl
 hostport_config_test.tcl
+sics_simulation.tcl

site_ansto/instrument/bilby/sics_simulation.tcl

@@ -0,0 +1,23 @@
+# Simulation flags, possible values = true or false
+# true: The simulated driver will be used.
+# false: The real driver will be used.
+# icsval column = settings when running on the Instrument Control Server (ie SICS_SIMULATION not defined)
+# fakedev column = settings for test platforms (ie SICS_SIMULATION=fakedev)
+foreach {simflag         icsval    fakedev} {
+  opal_simulation        false     true
+  detector_simulation    false     true
+  hmm_simulation         false     true
+  environment_simulation false     false
+  counter_simulation     true      true
+  motor_simulation       false     false
+  chopper_simulation     false     true
+  velsel_simulation      false     true
+  plc_simulation         false     true
+  rfgen_simulation       false     true
+  goniometer_simulation  false     true
+  magnetic_simulation    false     true
+} {
+  dict set SIMFLAG_VAL $simflag ICSVAL  $icsval
+  dict set SIMFLAG_VAL $simflag FAKEDEV $fakedev
+  VarMake $simflag Text internal
+}

site_ansto/instrument/bilby/util/sics_config.ini

@@ -8,4 +8,4 @@ driver = astrium_chopper
 imptype = disk_chopper
 ip = 137.157.203.39
 port = 3302
-
+terminator = \r\n