linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,954 Commits 1 Branch 0 Tags
9ee22521384780b02311fe5c69a212c017211c2d
Commit Graph

627 Commits

Author SHA1 Message Date
Douglas Clowes
9ee2252138 Merge branch 'RELEASE-3_1' into RELEASE-3_2 
Conflicts:
	sics/site_ansto/instrument/dingo/dingo_configuration.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl
	sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl
	sics/site_ansto/instrument/sans/quokka_configuration.tcl
 2015-03-13 15:44:32 +11:00
Ferdi Franceschini
88c1f007fa Fix up whitespace. 2015-03-13 11:57:56 +11:00
Ferdi Franceschini
e7e2e87b83 Copy changes from ics1-wombat 2015-03-13 11:54:50 +11:00
Ferdi Franceschini
f72e20b120 SICS-128: Added HB1 and HB2 fields to the reactor status. 2015-03-06 12:01:32 +11:00
Douglas Clowes
386db5d424 Rename and move the Rheometer drivers for Kookaburra 2015-03-05 14:11:54 +11:00
Douglas Clowes
f269a17ef3 Merge branch 'RELEASE-3_1' into RELEASE-3_2 
Conflicts:
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
	sics/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl
	sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl
	sics/site_ansto/instrument/sans/config/environment/sct_antonparr_MCR500.tcl
	sics/site_ansto/instrument/tas/taipan_configuration.tcl
 2015-03-05 13:53:47 +11:00
Douglas Clowes
8b4ab411fd Merge branch 'Wombat' into temp 
Conflicts:
	sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
	sics/site_ansto/instrument/hipd/config/commands/commands.tcl
	sics/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl
	sics/site_ansto/instrument/hipd/util/sics_config.ini
 2015-02-19 15:26:13 +11:00
Douglas Clowes
106d61a883 Merge branch 'Taipan_R31' into temp 
Conflicts:
	sics/site_ansto/instrument/config/environment/temperature/sct_lakeshore_m370.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_west_6100.tcl
	sics/site_ansto/instrument/tas/config/motors/motor_configuration.tcl
	sics/site_ansto/instrument/tas/taipan_configuration.tcl
	sics/site_ansto/instrument/tas/util/sics_config.ini
 2015-02-19 14:50:39 +11:00
Douglas Clowes
14be249401 Pullback from Wombat 2015-02-19 2015-02-19 11:51:51 +11:00
Douglas Clowes
666a70cb96 Dubious diffs from Taipan 2015-02-19 2015-02-19 10:34:31 +11:00
Douglas Clowes
fbdd46e258 Pullback from Taipan 2015-02-19 2015-02-19 10:34:12 +11:00
Douglas Clowes
8c4eed9bfe Merged changes from Quokka as at 2015-02-18 2015-02-19 09:40:49 +11:00
Douglas Clowes
287b671569 Regenerate for limit changes 2015-02-19 09:14:23 +11:00
Douglas Clowes
45d4663816 Pullback limit adjustments from Quokka to sct template drivers 2015-02-19 09:04:43 +11:00
Douglas Clowes
cad4f64dcc Regenerate the 3He driver for the coils 2015-02-16 12:38:43 +11:00
Douglas Clowes
f80bec1403 Changes to get and set the field coil values 2015-02-16 12:38:02 +11:00
Douglas Clowes
a924b657e0 Generate the TCL from the new Oxford 2015-02-13 10:58:50 +11:00
Douglas Clowes
3486b75d47 Generate the TCL from the new Oxford 2015-02-13 10:57:58 +11:00
Douglas Clowes
2993a04485 Alternative Oxford Magnet Labview interface 2015-02-13 10:56:50 +11:00
Douglas Clowes
fcb47cea5a Alternative Oxford Magnet Labview interface 2015-02-13 10:56:42 +11:00
Ferdi Franceschini
f1eb273db6 Allow selecting histogram memory server as source of beam monitor counts. 2015-02-06 08:48:11 +11:00
Douglas Clowes
7f066d75d7 Remove RELEASE-3_1 artifacts 2015-01-22 13:19:05 +11:00
Douglas Clowes
1851154b6b Remove sct_epson_pandp.tcl artifact from RELEASE-3_1 2015-01-07 14:14:18 +11:00
Douglas Clowes
34b16fafe7 Remove sct_srs_sr630 and sct_west_6100 artifacts from RELEASE-3_1 2015-01-07 14:12:39 +11:00
Douglas Clowes
f4314fc215 Remove sct_eurotherm_3200.tcl artifact from RELEASE-3_1 2015-01-07 14:10:21 +11:00
Douglas Clowes
cf1385d3f9 Remove sct_mvp_valve.tcl artifact from RELEASE-3_1 2015-01-07 14:06:59 +11:00
Douglas Clowes
9e76c7d60d Remove sct_keysight_N8740A.tcl artifact from RELEASE-3_1 2015-01-07 14:04:35 +11:00
Douglas Clowes
d85d6127fe Remove sct_he3_polanal.tcl artifact from RELEASE-3_1 2015-01-07 14:00:20 +11:00
Douglas Clowes
c3bb4a9591 Merge branch 'RELEASE-3_1' into RELEASE-3_2 
Conflicts:
	sics/site_ansto/instrument/config/beamline/sct_he3_polanal.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
	sics/site_ansto/instrument/pelican/pelican_configuration.tcl
 2015-01-07 13:09:27 +11:00
Douglas Clowes
679838eac3 Port new Aerolas Doppler driver from RELEASE-3_1 2015-01-07 10:29:07 +11:00
Douglas Clowes
76d7191754 SICS-839 Change TCL var from nominal_outp_current to NominalOutpCurrent 2015-01-07 10:20:40 +11:00
Douglas Clowes
2d4c725d10 Regen keysight 2014-12-12 15:24:50 +11:00
Douglas Clowes
f09cf4d080 move keysight from environment to instrument class 2014-12-12 15:24:25 +11:00
Douglas Clowes
159184cb30 Regen SCT driver for Keysight PS 2014-12-12 14:28:48 +11:00
Douglas Clowes
b81b226fe8 Allow output voltage to be ramped on Keysight PS 2014-12-12 14:27:40 +11:00
Douglas Clowes
ff03b1108b Regen the omron SCT driver 2014-12-08 16:27:03 +11:00
Douglas Clowes
bdc11e914f Change the protocol to omron_ap for the omron driver 2014-12-08 16:26:03 +11:00
Douglas Clowes
33fbe4ed01 Regen the doppler SCT driver 2014-12-08 16:24:44 +11:00
Douglas Clowes
82f81b4b02 Change the byte order and start addresses for the doppler modbus driver 2014-12-08 16:24:30 +11:00
Douglas Clowes
06a0ebad19 Regen SCT driver 2014-12-03 12:12:28 +11:00
Douglas Clowes
f28115552a Add additional doppler modbus registers 2014-12-03 12:12:17 +11:00
Douglas Clowes
99671f2aa5 New driver for AeroLas Doppler drive for Emu 2014-12-02 16:16:36 +11:00
Douglas Clowes
8ff7368f34 develop keysight_N8740A.sct 2014-12-02 13:25:03 +11:00
Douglas Clowes
0aa292bc96 develop keysight_N8740A.sct 2014-12-02 13:24:51 +11:00
Douglas Clowes
5f2223510f Regenerate SCT drivers 2014-12-02 10:09:17 +11:00
Ferdi Franceschini
e64b7bf409 Instructed bruker_BEC1 wrapper to not make a script context controller. 2014-12-01 14:32:54 +11:00
Douglas Clowes
7adec62e61 Driver for Agilent/Keysight N8740A Power Supply 2014-12-01 12:59:49 +11:00
Douglas Clowes
99f23cda50 Regen the Oxford Mercury SCT driver 2014-11-24 12:45:12 +11:00
Douglas Clowes
f5994bb760 Add auto/manual switch and setting, change to all lowercase 2014-11-24 12:44:29 +11:00
Douglas Clowes
de766e465e Regen of Mercury driver 2014-11-20 17:37:58 +11:00