Commit Graph

383 Commits

Author SHA1 Message Date
Ferdi Franceschini
ef4763e68f common_instrument_dictionary.tcl
Removed "reduce" group, the parameters in this group will be moved to the NXparameters group.
r3137 | ffr | 2011-05-19 08:39:48 +1000 (Thu, 19 May 2011) | 2 lines
2012-11-15 17:12:57 +11:00
Ferdi Franceschini
579fd8ebd0 sct_oxford_itc.tcl
Revert changes to drving state.
r3136 | ffr | 2011-05-19 08:39:00 +1000 (Thu, 19 May 2011) | 2 lines
2012-11-15 17:12:52 +11:00
Ferdi Franceschini
12b524cfbb sct_bruker_BEC1.tcl
Arndt's latest updates, this is sct_bruker_BEC1_20100625.tcl
r3135 | ffr | 2011-05-19 08:38:09 +1000 (Thu, 19 May 2011) | 2 lines
2012-11-15 17:12:48 +11:00
Douglas Clowes
c62f3dd24b Adjust ramp rate to 1/45 instead of 1/32 and calculate ramp anyway
r3130 | dcl | 2011-05-11 10:11:50 +1000 (Wed, 11 May 2011) | 1 line
2012-11-15 17:12:31 +11:00
Douglas Clowes
4303047433 Lift limit on profile size and partial implementation of drive command
r3129 | dcl | 2011-05-10 16:13:07 +1000 (Tue, 10 May 2011) | 1 line
2012-11-15 17:12:27 +11:00
Douglas Clowes
b543716643 Allow ASCII CSV profile input
In the format
<type>,<time>,<value>,<ramp>
r3126 | dcl | 2011-05-06 12:34:08 +1000 (Fri, 06 May 2011) | 4 lines
2012-11-15 17:12:14 +11:00
Douglas Clowes
3be707a269 Add load_status, final_time and idle_temp as properties of profile
r3125 | dcl | 2011-05-04 16:33:42 +1000 (Wed, 04 May 2011) | 1 line
2012-11-15 17:12:09 +11:00
Ferdi Franceschini
9620ce4ae5 Added NXdisk_chopper class to the instrument path and refactored the reduce group (SICS-365)
r3119 | ffr | 2011-04-29 08:45:02 +1000 (Fri, 29 Apr 2011) | 1 line
2012-11-15 17:11:43 +11:00
Ferdi Franceschini
b7187a2d0a Added histogram memory start and stop times for RVA data on Quokka
r3118 | ffr | 2011-04-29 08:12:39 +1000 (Fri, 29 Apr 2011) | 1 line
2012-11-15 17:11:39 +11:00
Ferdi Franceschini
c7929ccc4e The "inTolerance" proc now updates the "timecheck" and "timecheck2" values when the setpoint command has been sent and transitions the "writestatus" to "ws_monitor". This ensures that the timeout for the settletime is reset when a new setpoint has been sent.
r3116 | ffr | 2011-04-27 15:38:29 +1000 (Wed, 27 Apr 2011) | 1 line
2012-11-15 17:11:31 +11:00
Ferdi Franceschini
db80d30cc2 Revert code so that the "driving" status is set by the tcl setpoint procedure.
The "inTolerance" script only resets the "driving" flag after the setpoint has been sent, ie after "writestatus" transitions to the sent state.
The "checktol" script now compares the sensor reading against the setpoint "target" value instead of the setpoint reading from the lakeshore, this should allow the drive command to work properly if ramping has been enabled on the lakeshore
r3115 | ffr | 2011-04-27 11:11:00 +1000 (Wed, 27 Apr 2011) | 3 lines
2012-11-15 17:11:26 +11:00
Douglas Clowes
9acffeb772 WIP update
r3104 | dcl | 2011-04-18 14:42:07 +1000 (Mon, 18 Apr 2011) | 1 line
2012-11-15 17:10:35 +11:00
Douglas Clowes
c8d5ead3cc revert "driving" and update ROTATE
r3103 | dcl | 2011-04-14 17:33:18 +1000 (Thu, 14 Apr 2011) | 1 line
2012-11-15 17:10:31 +11:00
Douglas Clowes
1e7b9b2e38 first pass Autolab SC driver
r3082 | dcl | 2011-03-24 16:25:52 +1100 (Thu, 24 Mar 2011) | 1 line
2012-11-15 17:09:17 +11:00
Douglas Clowes
3cf7bfbf50 Add RVA SC driver and associated Newport protocol
r3081 | dcl | 2011-03-24 14:51:13 +1100 (Thu, 24 Mar 2011) | 1 line
2012-11-15 17:09:12 +11:00
Ferdi Franceschini
ed35192f0f Don't add robot from the pickandplace configuration
The deploy script should only change ownership of the files in the newserver directory
r3075 | ffr | 2011-02-25 20:04:13 +1100 (Fri, 25 Feb 2011) | 2 lines
2012-11-15 17:09:03 +11:00
Ferdi Franceschini
7371a561d9 Make sure spin flipper code in rfamp.c is initialised
Fixed drive bugs in lakeshore drivers.
r3071 | ffr | 2011-02-25 18:27:31 +1100 (Fri, 25 Feb 2011) | 2 lines
2012-11-15 17:08:46 +11:00
Douglas Clowes
d83b346ef7 Changes to ROTATE in driver to match changes in Robots
r3063 | dcl | 2011-02-18 11:22:21 +1100 (Fri, 18 Feb 2011) | 1 line
2012-11-15 17:08:10 +11:00
Douglas Clowes
84d02dec64 update initialisation and add code to use controller limit function
r3058 | dcl | 2011-02-16 16:31:01 +1100 (Wed, 16 Feb 2011) | 1 line
2012-11-15 17:07:49 +11:00
Jing Chen
eb74c04e2b update Lyrebird
r3042 | jgn | 2010-12-15 14:05:41 +1100 (Wed, 15 Dec 2010) | 1 line
2012-11-15 17:07:20 +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
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
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
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
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
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
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
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
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
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
a0923650d9 sct_flipper.tcl
Fixed simulated driver mode.

ascon.c
Added host and port to ascon error messages.

r2937 | ffr | 2010-05-24 14:24:04 +1000 (Mon, 24 May 2010) | 6 lines
2012-11-15 17:03:25 +11:00
Ferdi Franceschini
b1bfbb08b5 SICS-309 nxscript_common_1.tcl
The savetree function now checks to see if an hdb node has a "permlink" property set when making data links
SICS-309 quokka parameters.tcl, sct_velsel.tcl

r2933 | ffr | 2010-05-23 15:12:59 +1000 (Sun, 23 May 2010) | 4 lines
2012-11-15 17:03:21 +11:00
Ferdi Franceschini
b8811330f1 script_context_util.tcl
hinitprops can now be called with a list of parameters.
SICS-403 hinitprops will now check for "argtype" and "values" attributes on script context objects to create drop down lists valid arguments for GumTree

sct_positmotor_common.tcl
SICS-403 Now sets "argtype" and a list of "values" properties so GumTree can create drop-down lists of arguments.

quokka positmotor_configuration.tcl
SICS-401 diameter and sampleNum selectors report communications errors

sct_rfamp.c
The controller state should be set before calling AsconError.

r2931 | ffr | 2010-05-22 13:56:13 +1000 (Sat, 22 May 2010) | 13 lines
2012-11-15 17:03:11 +11:00
Ferdi Franceschini
8b1e84eac6 Report zero for reactor power and temperatures when using dummy reactor info.
r2924 | ffr | 2010-05-18 15:10:20 +1000 (Tue, 18 May 2010) | 2 lines
2012-11-15 17:02:39 +11:00
Ferdi Franceschini
80cc542086 Code cleanup
r2923 | ffr | 2010-05-18 15:08:58 +1000 (Tue, 18 May 2010) | 2 lines
2012-11-15 17:02:34 +11:00