Commit Graph

1278 Commits

Author SHA1 Message Date
Jing Chen
26df0a884a update Taipan
r3040 | jgn | 2010-12-14 10:20:42 +1100 (Tue, 14 Dec 2010) | 1 line
2012-11-15 17:07:11 +11:00
Jing Chen
fb70b8af0b added Lyrebird instrument
r3039 | jgn | 2010-12-13 16:32:54 +1100 (Mon, 13 Dec 2010) | 1 line
2012-11-15 17:07:06 +11:00
Jing Chen
28772f6ec2 added Lyrebird instrument config
r3038 | jgn | 2010-12-13 16:10:57 +1100 (Mon, 13 Dec 2010) | 1 line
2012-11-15 17:07:02 +11:00
Ferdi Franceschini
a3d551c8bb The new xxx_sics users which SICS now runs as don't have
permission to write the robot log files to /tmp

r3037 | ffr | 2010-12-04 11:53:11 +1100 (Sat, 04 Dec 2010) | 3 lines
2012-11-15 17:06:57 +11:00
Ferdi Franceschini
8d066dec11 hmm_configuration_common_1.tcl
The post_count callback should be called when the count ends.

quokka_configuration.tcl
Added lakeshore 336, qlink, and rheometer configurations.

quokka sct_flipper.tcl
Report "-1" for fields which return corrupt or invalid readings.

quokka environment.tcl
Implement histogram memory pre_count and post_count callbacks to record temperature before and after an acquisition.

quokka motor_configuration.tcl
Set correct max speed for detector motor, ie it is now 53mm/s instead of 40

wombat_configuration.tcl
Added lakeshore 336 driver and julabo and qlink.
r3034 | ffr | 2010-12-03 11:07:49 +1100 (Fri, 03 Dec 2010) | 17 lines
2012-11-15 17:06:53 +11:00
Ferdi Franceschini
e7e857b70e Added rheometer and qlink.
r3033 | ffr | 2010-12-02 14:05:44 +1100 (Thu, 02 Dec 2010) | 1 line
2012-11-15 17:06:49 +11:00
Ferdi Franceschini
202bb2869a servlog.c
Fix month in logfile name and put date in all log file names.
sct_protek_common.tcl
Catch non-numeric readings from main multimeter display
Added support for a callbank function which is called after reportVal

sct_julabo_lh45.tcl
Clear the geterror property when getting a new reading.
Don't set the overtemp and subtemp warning limits because this can cause the julabo to alarm.
Do nothing if the setpoint hasn't been updated.
Set default settletime to 60s and the default error handler to "lazy".
Added start_temperature and end_temperature which are updated by callbacks on the histogram memory control.

sct_lakeshore_340.tcl
Set the type for the setpoint nodes to drivable
r3032 | ffr | 2010-12-02 14:03:44 +1100 (Thu, 02 Dec 2010) | 15 lines
2012-11-15 17:06:45 +11:00
Ferdi Franceschini
7bf2d4d9f0 Don't create robot object when loading the configuration.
r3031 | ffr | 2010-12-01 10:45:59 +1100 (Wed, 01 Dec 2010) | 1 line
2012-11-15 17:06:41 +11:00
Ferdi Franceschini
d274698ff4 echidna_configuration.tcl
Load sct_lakeshore 340 and 336 configurations.  Load new robot pick and place configuration

hmm_configuration.tcl
Override proc CAT_TABLE to add offset and magnification configuration.

motor_configuration.tcl
Modularised for tilt and euler configurations.

Added euler_configuration.tcl and put tilt stage configuration in tilt_configuration.tcl
r3030 | ffr | 2010-12-01 10:29:42 +1100 (Wed, 01 Dec 2010) | 10 lines
2012-11-15 17:06:37 +11:00
Douglas Clowes
2e658ff4a9 Add Floating point read/write commands
r3029 | dcl | 2010-11-12 14:56:28 +1100 (Fri, 12 Nov 2010) | 1 line
2012-11-15 17:06:33 +11:00
Douglas Clowes
2e0780f2b1 Watlow PM
r3028 | dcl | 2010-11-12 14:54:14 +1100 (Fri, 12 Nov 2010) | 1 line
2012-11-15 17:06:28 +11:00
Douglas Clowes
1f3a585b6e Quad Watlow ST controller Sample Changer
r3027 | dcl | 2010-11-12 14:53:12 +1100 (Fri, 12 Nov 2010) | 1 line
2012-11-15 17:06:24 +11:00
Douglas Clowes
f776135904 reset error message on good read and adjust code indent
r3026 | dcl | 2010-09-14 11:34:59 +1000 (Tue, 14 Sep 2010) | 2 lines
2012-11-15 17:06:20 +11:00
Douglas Clowes
33cfcefa8a implement device address and refactor modbus-command to send functions
device address was hard coded and command was embedded in each node

r3025 | dcl | 2010-09-14 11:33:41 +1000 (Tue, 14 Sep 2010) | 4 lines
2012-11-15 17:06:16 +11:00
Douglas Clowes
88d8ff904f add timeout processing timestamp at start of read
r3024 | dcl | 2010-09-14 11:24:41 +1000 (Tue, 14 Sep 2010) | 1 line
2012-11-15 17:06:12 +11:00
Douglas Clowes
8263b6916c add timeout processing and allow modbus device id to 39
r3023 | dcl | 2010-09-14 11:23:02 +1000 (Tue, 14 Sep 2010) | 1 line
2012-11-15 17:06:08 +11:00
Douglas Clowes
4ac338f4af replace stropts.h with sys/ioctl.h to define ioctl
r3020 | dcl | 2010-08-13 15:00:40 +1000 (Fri, 13 Aug 2010) | 1 line
2012-11-15 17:06:04 +11:00
Douglas Clowes
82801c301c Adjust limits on Oxford Magnet to +/- 10T
r3019 | dcl | 2010-08-10 16:22:09 +1000 (Tue, 10 Aug 2010) | 1 line
2012-11-15 17:06:00 +11:00
Douglas Clowes
eabb3de24d add the LakeShore 460 Gaussmeter driver
r3018 | dcl | 2010-08-06 15:12:24 +1000 (Fri, 06 Aug 2010) | 1 line
2012-11-15 17:05:56 +11:00
Douglas Clowes
e87cc117b8 add Epson robot pick and place driver
r3017 | dcl | 2010-08-06 15:11:17 +1000 (Fri, 06 Aug 2010) | 1 line
2012-11-15 17:05:52 +11:00
Douglas Clowes
190a1bb7f4 add Oxford IPS
r3016 | dcl | 2010-08-06 15:09:40 +1000 (Fri, 06 Aug 2010) | 1 line
2012-11-15 17:05:48 +11:00
Douglas Clowes
fbeb721abd rename 3xx to 336/340
r3015 | dcl | 2010-08-06 15:08:32 +1000 (Fri, 06 Aug 2010) | 1 line
2012-11-15 17:05:44 +11:00
Douglas Clowes
86b9e56b6e remove .obj in psi for clean
r3014 | dcl | 2010-08-06 15:05:33 +1000 (Fri, 06 Aug 2010) | 1 line
2012-11-15 17:05:39 +11:00
Ferdi Franceschini
6c6ba7de86 sct_oxford_ips.tcl
Set the "setpoint" type to drivable for GumTree and clear the "geterror" property when we get a new reading.

r2981 | ffr | 2010-07-19 17:38:02 +1000 (Mon, 19 Jul 2010) | 3 lines
2012-11-15 17:05:31 +11:00
Jing Chen
0cdd7119e1 add Goniometer
r2980 | jgn | 2010-07-19 14:43:13 +1000 (Mon, 19 Jul 2010) | 2 lines
2012-11-15 17:05:26 +11:00
Jing Chen
acb291e2e0 add spin_goniometer.tcl
r2979 | jgn | 2010-07-19 14:23:12 +1000 (Mon, 19 Jul 2010) | 2 lines
2012-11-15 17:05:22 +11:00
Jing Chen
4d9997bede add /goniometer/sct_goniometer.tcl
r2978 | jgn | 2010-07-19 14:22:38 +1000 (Mon, 19 Jul 2010) | 2 lines
2012-11-15 17:05:17 +11:00
Ferdi Franceschini
33ba0ed3fd Remove obsolete commands and set sample/temperature paramter
r2976 | ffr | 2010-07-02 14:49:51 +1000 (Fri, 02 Jul 2010) | 2 lines
2012-11-15 17:05:13 +11:00
Ferdi Franceschini
b30b783fde Added new lakeshore drivers
r2975 | ffr | 2010-07-02 14:37:24 +1000 (Fri, 02 Jul 2010) | 2 lines
2012-11-15 17:05:08 +11:00
Ferdi Franceschini
6a3f6889e0 New lakeshore drivers separated out from the 3xx driver.
r2974 | ffr | 2010-07-02 14:04:58 +1000 (Fri, 02 Jul 2010) | 2 lines
2012-11-15 17:05:03 +11:00
Ferdi Franceschini
d185647cbb Removed obsolete lakeshore configurations.
r2973 | ffr | 2010-07-02 14:03:08 +1000 (Fri, 02 Jul 2010) | 2 lines
2012-11-15 17:04:58 +11:00
Ferdi Franceschini
77932a4d15 Set the setpoint in the setpoint node.
r2972 | ffr | 2010-07-02 12:12:31 +1000 (Fri, 02 Jul 2010) | 2 lines
2012-11-15 17:04:54 +11:00
Ferdi Franceschini
2e64619bd0 Add ips120 power supply control to 11T Magnet configuration.
r2971 | ffr | 2010-07-02 07:37:08 +1000 (Fri, 02 Jul 2010) | 2 lines
2012-11-15 17:04:49 +11:00
Ferdi Franceschini
39d25dcf95 sct_flipper.tcl
If the current, frequency or voltage readings are invalid then set the corresponding parameter in SICS to -1

r2970 | ffr | 2010-07-01 23:48:47 +1000 (Thu, 01 Jul 2010) | 3 lines
2012-11-15 17:04:44 +11:00
Ferdi Franceschini
bbc133dab9 Quokka environment.tcl
Don't make the temperature getset-macro or select the control sensor for the script validator instance of SICS. (fixed in-situ)
Use new ls340 and ls336 controllers.

script_context_util.tcl
Modified hinitprops so that it can take sub-paths

nxscripts_common_1.tcl
Added ::nexus::OnFirstsave ::nexus:OnLastSave to register commands which will be executed on the first and last save of a data file.

sct_julabo_lh45.tcl
Added start_temperature and end_temperature parameters to record the initial and final temperature readings in the data files.
Also only set the setpoint if the Julabo is in remote mode.

sct_positmotor_common.tcl
Report 99999 if a posit motor table is out of range.

quokka guide_configuration.tcl
Updated aperture size for p1, p1lp, p1lens in the guide configuration table.

r2969 | ffr | 2010-07-01 22:09:09 +1000 (Thu, 01 Jul 2010) | 20 lines
2012-11-15 17:04:40 +11:00
Ferdi Franceschini
d94cf7b011 sct_oxford_ips.tcl
Fixed properties so the controller gets linked into /sample

INSTCFCOMMON.TXT quokka_configuration.tcl
Added ips120 controller to quokka

r2968 | ffr | 2010-07-01 21:03:54 +1000 (Thu, 01 Jul 2010) | 6 lines
2012-11-15 17:04:35 +11:00
Douglas Clowes
eebe078118 implement HALT and improve recovery
r2967 | dcl | 2010-07-01 12:39:42 +1000 (Thu, 01 Jul 2010) | 2 lines
2012-11-15 17:04:30 +11:00
Douglas Clowes
9ec08cbf85 correct some bitwise operators and permit debugger breakpoints
r2966 | dcl | 2010-07-01 12:38:34 +1000 (Thu, 01 Jul 2010) | 2 lines
2012-11-15 17:04:26 +11:00
Douglas Clowes
9ba11580ad update Oxford ITC and IPS
r2965 | dcl | 2010-06-25 15:19:17 +1000 (Fri, 25 Jun 2010) | 2 lines
2012-11-15 17:04:21 +11:00
Douglas Clowes
4afb1a765c Oxford Intelligent Power Supply IPS120-10
r2964 | dcl | 2010-06-25 15:16:28 +1000 (Fri, 25 Jun 2010) | 2 lines
2012-11-15 17:04:17 +11:00
Douglas Clowes
0fbb07f31a rename sct_oxford_500.tcl to sct_oxford_itc.tcl
r2963 | dcl | 2010-06-25 15:14:46 +1000 (Fri, 25 Jun 2010) | 2 lines
2012-11-15 17:04:12 +11:00
Douglas Clowes
7dc623d47f code tidy and bug fixes
r2962 | dcl | 2010-06-25 15:11:25 +1000 (Fri, 25 Jun 2010) | 2 lines
2012-11-15 17:04:07 +11:00
Douglas Clowes
aaac832181 add oxford protocol
r2961 | dcl | 2010-06-25 15:10:25 +1000 (Fri, 25 Jun 2010) | 2 lines
2012-11-15 17:04:03 +11:00
Douglas Clowes
cebd4d5600 code cleanup
r2960 | dcl | 2010-06-25 15:06:37 +1000 (Fri, 25 Jun 2010) | 2 lines
2012-11-15 17:03:58 +11:00
Jing Chen
687ed01c01 add delay factor after sending a S command and before sending a L command
r2947 | jgn | 2010-06-01 15:10:12 +1000 (Tue, 01 Jun 2010) | 2 lines
2012-11-15 17:03:53 +11:00
Ferdi Franceschini
e8a0c8222f Could you please update the extraconfig.tcl so that we can drive samy more quickly? Currently it’s set at 1 mm/sec. Can we increase this to something a little faster, say, 5 mm/sec? (from Elliot 2010-06-01).
r2944 | ffr | 2010-06-01 11:26:58 +1000 (Tue, 01 Jun 2010) | 2 lines
2012-11-15 17:03:49 +11:00
Ferdi Franceschini
a3d0a90616 Fixed L2 and DetPosYOffset regression
r2943 | ffr | 2010-05-31 12:01:51 +1000 (Mon, 31 May 2010) | 2 lines
2012-11-15 17:03:44 +11:00
Ferdi Franceschini
01dcc14d5a quokka environment.tcl
Added a /sample/temperature node which links to the sensor reading for the ls340 on the 11T magnet

sct_julabo_lh45.tcl
Fixed regression which stopped tc1 interface from being linked into sample group.

r2942 | ffr | 2010-05-28 16:32:28 +1000 (Fri, 28 May 2010) | 6 lines
2012-11-15 17:03:39 +11:00
Ferdi Franceschini
3d5d94c1dd sct_rfamp.c
SICS-405 Protocol handler always reports "SET" failed. Implemented workaround so that it always succeeds until we have a proper fix.

server_config.tcl
Set opal_simulation=true until we implement the new LSS feedback

r2940 | ffr | 2010-05-28 11:36:25 +1000 (Fri, 28 May 2010) | 6 lines
2012-11-15 17:03:35 +11:00
Ferdi Franceschini
9926044c35 Switch off spin flipper if voltage exceeds 34V in voltage control mode
r2939 | ffr | 2010-05-26 13:32:42 +1000 (Wed, 26 May 2010) | 2 lines
2012-11-15 17:03:30 +11:00