linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,771 Commits 1 Branch 0 Tags
445a8c2fce0f9fc16a9655121b596d1cb9b99739
Commit Graph

25 Commits

Author SHA1 Message Date
Ferdi Franceschini
445a8c2fce Fix eulerian spelling. 2015-02-23 10:22:29 +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
14be249401 Pullback from Wombat 2015-02-19 2015-02-19 11:51:51 +11:00
Douglas Clowes
f629ea24ed Pull various config files closer into alignment 2014-11-20 15:56:30 +11:00
Ferdi Franceschini
22d81d4195 Add ls370 to Wombat sics_config.ini 2014-11-07 09:44:34 +11:00
Ferdi Franceschini
e396657851 Fix west 6100 driver name in Wombat sics_config.ini 2014-10-12 17:26:54 +11:00
Ferdi Franceschini
d8f5030a8d SICS-795 Bring GIT up to date with changes made on ics1-wombat. 2014-10-08 20:29:23 +11:00
Douglas Clowes
5ce8677195 Pull back config changes from Wombat and add the west_6100 blue furnaces 2014-09-10 15:15:20 +10:00
Ferdi Franceschini
944902c9d4 Added sct wrapper to load legacy sct_oxford_labview.tcl driver. 2014-08-08 11:51:49 +10:00
Ferdi Franceschini
b29eecc549 Use V1 with I1 for autolab setup on wombat 2014-07-16 09:28:26 +10:00
Ferdi Franceschini
739ab393a5 Add an Autolab setup to the Wombat config and fix the mercury configuration. 2014-07-15 15:20:20 +10:00
Ferdi Franceschini
c83e5d681c Update sics_config.ini files for Wombat and Quokka. 2014-07-15 08:59:19 +10:00
Ferdi Franceschini
867c6c8eaa Generate a wrapper for the old protek driver from a protekmm.sct template. 2014-07-11 13:52:37 +10:00
Ferdi Franceschini
6aa229ee75 Driver changes made on ics1-wombat-test. 2014-07-11 08:49:40 +10:00
Ferdi Franceschini
7a4ce1f234 Write option id into driver implementation section when saving the sics_config.ini 2014-07-03 16:04:00 +10:00
Ferdi Franceschini
87bf34c7b1 Renamed type to optype in sics_config.ini so devices 
like multimeters can set a data type parameter eg datype
config_edit.py uses optype instead of type
Also the listwalker is now being generated dynamically so that in the
future unavailable drivers can be moved from the list of radiobuttons.
 2014-07-02 08:50:17 +10:00
Ferdi Franceschini
e971cd8b64 New sicsconfig.ini file configuration editor. 
Updated wombat sics_config.ini and gen_sct.py
Generated new tcl files from sct templates and
modified some old sct_*.tcl drivers.

TODO
sct_keithley_2700.tcl
magneticField/sct_oxford_labview.tcl
magneticField/sct_bruker_BEC1.tcl
temperature/sct_watlow_st4.tcl
temperature/sct_oxford_mercury.tcl
temperature/sct_mercury_pres.tcl
temperature/sct_julabo_lh45.tcl
temperature/sct_lakeshore_340.tcl
temperature/sct_julabo_lh45_gen.tcl
temperature/sct_watlow_rm.tcl
temperature/sct_eurotherm_2000.tcl
temperature/sct_lakeshore_336.tcl
temperature/sct_watlow_pm.tcl
temperature/sct_oxford_itc.tcl
temperature/sct_lakeshore_370.tcl
temperature/west400.tcl
 2014-06-30 09:08:19 +10:00
Douglas Clowes
e3377553bd Sort the *.ini files so we can better compare them 2014-06-24 17:22:46 +10:00
Ferdi Franceschini
6dba13a5ab Add CF1 to Wombat INI file and fix ordering of LS336 sections. 2014-06-23 10:29:20 +10:00
Ferdi Franceschini
d7acb7c16c Load drivers which have been enabled in the SICS config ini files. 
Lakeshore 336 drivers with known IP addresses have been added to the ini files with unique IDs.
All entries in the ini files now have unique IDs
The wombat ini now has radio buttons to select sample stage motor configurations.
 2014-05-05 12:25:00 +10:00
Ferdi Franceschini
6af68dcb46 Add radio buttons to wombat sics_config.ini for sample stage motor configurations. 2014-05-01 09:03:25 +10:00
Ferdi Franceschini
03c00623ee Allow two LS336 and two LS340 temperature controllers to be selected. 2013-12-20 09:09:03 +11:00
Ferdi Franceschini
6ce3f8bd45 SICS-706 Create sics_config.ini for SICS upgrade on Wombat. 2013-12-20 09:08:59 +11:00
Ferdi Franceschini
fd6a955d6b Remove keywords to simplify merging branches. 
r2859 | ffr | 2010-01-13 15:41:46 +1100 (Wed, 13 Jan 2010) | 2 lines
 2012-11-15 16:59:06 +11:00
Ferdi Franceschini
583cdae8c2 Use new dir structure. 
r1519 | ffr | 2007-02-20 08:10:41 +1100 (Tue, 20 Feb 2007) | 2 lines
 2012-11-15 13:00:30 +11:00