a172bed449
Add ";*IDN?" in SetValue and setPoint functions (after commands that don't elicit a response) to force a response that avoids the timeout and reconnect sequence that gives problems on the LS336 r3259 | dcl | 2011-10-18 16:13:01 +1100 (Tue, 18 Oct 2011) | 1 line
Douglas Clowes
2011-10-18 16:13:01 +11:00
27cb364855
Use libjson.so if available (SL 6.0) r3258 | dcl | 2011-10-17 17:22:27 +1100 (Mon, 17 Oct 2011) | 1 line
Douglas Clowes
2011-10-17 17:22:27 +11:00
638c160310
r3257 | jgn | 2011-10-17 16:31:36 +1100 (Mon, 17 Oct 2011) | 1 line
Jing Chen
2011-10-17 16:31:36 +11:00
ebc62a676a
recent changes at Pelican Lyrebird r3256 | jgn | 2011-10-17 15:37:22 +1100 (Mon, 17 Oct 2011) | 1 line
Jing Chen
2011-10-17 15:37:22 +11:00
3b6dc490ab
recent changes at Pelican Lyrebird r3255 | jgn | 2011-10-17 15:37:09 +1100 (Mon, 17 Oct 2011) | 1 line
Jing Chen
2011-10-17 15:37:09 +11:00
dd10a410e7
recent changes at Pelican Lyrebird r3254 | jgn | 2011-10-17 15:36:55 +1100 (Mon, 17 Oct 2011) | 1 line
Jing Chen
2011-10-17 15:36:55 +11:00
86cd8dee4e
recent changes at Pelican Lyrebird r3253 | jgn | 2011-10-17 15:36:16 +1100 (Mon, 17 Oct 2011) | 1 line
Jing Chen
2011-10-17 15:36:16 +11:00
d778dd2bfe
sicshipacaba.c SICS-418 Make sure hnotify sends messages as hdbevents when using the JSON protocl
Ferdi Franceschini
2011-09-23 08:49:00 +10:00
c765c33f6d
Make instance data properties of a params node instead of namespace global variables
Douglas Clowes
2011-08-22 11:30:20 +10:00
89bfef55b0
This is a simple LS336 simulation. It just implements the commands which the sct_lakeshore_336.tcl driver uses. You can set the temperature and the sensor readings have a random one degree fluctuation.
Ferdi Franceschini
2011-08-12 08:46:21 +10:00
5e50f2cb43
Removed the dependency on some global variables so that you can drive two lakeshore controllers. Most of the remaining globals are harmless or unused but they should be removed.
Ferdi Franceschini
2011-08-12 08:41:56 +10:00
a8203ffa6e
Copied changes which were made in-situ.
Ferdi Franceschini
2011-08-02 14:20:46 +10:00
169aa5ed2f
Display/Value and setpoint should be numeric to save arrays of readings. We can't save arrays of text.
Ferdi Franceschini
2011-07-25 17:06:35 +10:00
d33a957d01
differentiate rdValue and rdData and add experimental treewalk r3232 | dcl | 2011-07-20 14:45:17 +1000 (Wed, 20 Jul 2011) | 1 line
Douglas Clowes
2011-07-20 14:45:17 +10:00
cffc765197
Add ;*IDN? after writes to get a response r3231 | dcl | 2011-07-06 10:00:25 +1000 (Wed, 06 Jul 2011) | 1 line
Douglas Clowes
2011-07-06 10:00:25 +10:00
3404e4670c
Set chnspeed as actual speed instead of the requested speed. r3229 | ffr | 2011-06-26 12:19:01 +1000 (Sun, 26 Jun 2011) | 1 line
Ferdi Franceschini
2011-06-26 12:19:01 +10:00
6b1c629a43
Guard against misinterpreting readings that have a leading zero as octal. Set the current to the target value when we're within one step rather than within tolerance to avoid undershooting the target. Do not try and get the state when initialising the driver because it will fail to create the driver properly if the RF generator is unavailable on SICS startup. The current is zero when the RF gen is power cycled so it is safe to set the current reading and target current as zero in initialisation so we just set the operating frequency and everything else is left at zero. r3228 | ffr | 2011-06-26 12:18:27 +1000 (Sun, 26 Jun 2011) | 3 lines
Ferdi Franceschini
2011-06-26 12:18:27 +10:00
edc7639d65
Set operation current for polariser and analyser r3227 | ffr | 2011-06-26 12:17:28 +1000 (Sun, 26 Jun 2011) | 1 line
Ferdi Franceschini
2011-06-26 12:17:28 +10:00
eaf924eb73
incorporate syringe pump protocol r3226 | dcl | 2011-06-24 13:05:51 +1000 (Fri, 24 Jun 2011) | 1 line
Douglas Clowes
2011-06-24 13:05:51 +10:00
5b94e43689
log catch messages r3225 | dcl | 2011-06-24 13:02:38 +1000 (Fri, 24 Jun 2011) | 1 line
Douglas Clowes
2011-06-24 13:02:38 +10:00
cd2dafceb3
Syringe Pump Driver
Douglas Clowes
2011-06-24 13:01:08 +10:00
992e32bc10
Driver for the Hamilton Modular Valve Positioner (MVP) r3223 | dcl | 2011-06-22 17:09:21 +1000 (Wed, 22 Jun 2011) | 1 line
Douglas Clowes
2011-06-22 17:09:21 +10:00
6a157ede79
Add "hamilton" protocol same as oxford with echo suppression r3222 | dcl | 2011-06-20 11:54:20 +1000 (Mon, 20 Jun 2011) | 1 line
Douglas Clowes
2011-06-20 11:54:20 +10:00
6c654d7c5d
Added config for 10 sample changer. r3221 | ffr | 2011-06-20 11:27:09 +1000 (Mon, 20 Jun 2011) | 1 line
Ferdi Franceschini
2011-06-20 11:27:09 +10:00
d5d9bdeb30
If srce or att are off position by more than the "precision" set in the driver then SICS will report the selected aperture as being UNKNOWN. So we increase the precision to 0.1 degrees to prevent this. r3220 | ffr | 2011-06-20 11:25:46 +1000 (Mon, 20 Jun 2011) | 2 lines
Ferdi Franceschini
2011-06-20 11:25:46 +10:00
355c204598
Parameterise the wavelength/speed conversion functions so that you can choose velocity selector. r3219 | ffr | 2011-06-20 10:03:50 +1000 (Mon, 20 Jun 2011) | 1 line
Ferdi Franceschini
2011-06-20 10:03:50 +10:00
7a92bfb4dd
Trigger acquisition when within tolerance of the next step for the required settletime. Also made generic so you can create a temperature control for example instead of a speed based control. r3218 | ffr | 2011-06-20 10:02:04 +1000 (Mon, 20 Jun 2011) | 2 lines
Ferdi Franceschini
2011-06-20 10:02:04 +10:00
ea79b86986
modify motor group of s2 and m2 r3212 | jgn | 2011-06-09 14:08:38 +1000 (Thu, 09 Jun 2011) | 1 line
Jing Chen
2011-06-09 14:08:38 +10:00
5a9a5baeed
r3211 | jgn | 2011-06-08 09:39:20 +1000 (Wed, 08 Jun 2011) | 1 line
Jing Chen
2011-06-08 09:39:20 +10:00
ee2ab3867d
update motor configution parameters r3210 | jgn | 2011-06-08 09:11:18 +1000 (Wed, 08 Jun 2011) | 1 line
Jing Chen
2011-06-08 09:11:18 +10:00
c1b90c4f7d
Added rva_datafile name and added rva to /sample group r3151 | ffr | 2011-05-20 12:02:45 +1000 (Fri, 20 May 2011) | 1 line
Ferdi Franceschini
2011-05-20 12:02:45 +10:00
afa42563a0
Implement a reset capability r3150 | dcl | 2011-05-20 10:26:59 +1000 (Fri, 20 May 2011) | 1 line
Douglas Clowes
2011-05-20 10:26:59 +10:00
df6f44a2ac
Change limits and tolerance r3149 | dcl | 2011-05-20 10:25:05 +1000 (Fri, 20 May 2011) | 1 line
Douglas Clowes
2011-05-20 10:25:05 +10:00
f0ac8f82d9
Implement driveable and end of drive condition r3148 | dcl | 2011-05-20 10:21:08 +1000 (Fri, 20 May 2011) | 1 line
Douglas Clowes
2011-05-20 10:21:08 +10:00
8b995f6d71
Use physical units for speeds and accelerations. r3147 | ffr | 2011-05-20 10:12:34 +1000 (Fri, 20 May 2011) | 1 line
Ferdi Franceschini
2011-05-20 10:12:34 +10:00
e65cc662c6
Add read of tower down switch
Douglas Clowes
2011-05-19 12:47:06 +10:00
a2a4a3cd39
quokka sct_velsel.tcl Renamed LambdaResFWHM_percent to wavelength_spread and added wavelength_spread_nominal which will be the wavelength_spread calculated from speed and tilt angle. Lambda -> wavelength_nominal, added wavelength for analysis code. r3145 | ffr | 2011-05-19 08:49:08 +1000 (Thu, 19 May 2011) | 3 lines
Ferdi Franceschini
2011-05-19 08:49:08 +10:00
3660b95ee4
quokka parameters.tcl Moved Attfactor, Transmission, BeamCenterX, and BeamCenterZ back to the parameters group. r3144 | ffr | 2011-05-19 08:48:16 +1000 (Thu, 19 May 2011) | 2 lines
Ferdi Franceschini
2011-05-19 08:48:16 +10:00
41a4f28517
platypus sct_batmotor.tcl Check for motor on when changing state to idle. r3142 | ffr | 2011-05-19 08:45:25 +1000 (Thu, 19 May 2011) | 2 lines
Ferdi Franceschini
2011-05-19 08:45:25 +10:00
dea8c2c1bb
platypus chopper.tcl Configures the new chopper driver. r3140 | ffr | 2011-05-19 08:44:20 +1000 (Thu, 19 May 2011) | 2 lines
Ferdi Franceschini
2011-05-19 08:44:20 +10:00
8ddb808119
Don't load Bruker driver by default. This should really go in the extraconfig file. r3139 | ffr | 2011-05-19 08:43:49 +1000 (Thu, 19 May 2011) | 1 line
Ferdi Franceschini
2011-05-19 08:43:49 +10:00
b43ea76fc4
hmm_configuration_common_1.tcl Added daq_dirname to data files for Platypus. r3138 | ffr | 2011-05-19 08:41:58 +1000 (Thu, 19 May 2011) | 2 lines
Ferdi Franceschini
2011-05-19 08:41:58 +10:00
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
Ferdi Franceschini
2011-05-19 08:39:48 +10:00
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
Ferdi Franceschini
2011-05-19 08:38:09 +10:00
8514dace59
motor_dmc2280.c When a motor stops and power saving is enabled (ie motor left on) the driver should check for faults and then transition to the idle state. r3134 | ffr | 2011-05-19 08:37:16 +1000 (Thu, 19 May 2011) | 2 lines
Ferdi Franceschini
2011-05-19 08:37:16 +10:00
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
Douglas Clowes
2011-05-04 16:33:42 +10:00
d275ce5509
r3124 | jgn | 2011-05-03 11:25:15 +1000 (Tue, 03 May 2011) | 1 line
Jing Chen
2011-05-03 11:25:15 +10:00
25a2e6d839
update motor grouping for Lyrebird r3123 | jgn | 2011-05-02 12:26:12 +1000 (Mon, 02 May 2011) | 1 line
Jing Chen
2011-05-02 12:26:12 +10:00
0105298d79
update motor class for Taipan/Lyrebird r3121 | jgn | 2011-04-29 10:45:37 +1000 (Fri, 29 Apr 2011) | 1 line
Jing Chen
2011-04-29 10:45:37 +10:00
4de3107771
SICS-365 Moved Transmission and AttFactor to the reduce group r3120 | ffr | 2011-04-29 08:51:32 +1000 (Fri, 29 Apr 2011) | 1 line
Ferdi Franceschini
2011-04-29 08:51:32 +10:00
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
Ferdi Franceschini
2011-04-29 08:45:02 +10:00
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
Ferdi Franceschini
2011-04-29 08:12:39 +10:00
30d9edb0dd
update group for motors r3117 | jgn | 2011-04-28 10:39:23 +1000 (Thu, 28 Apr 2011) | 1 line
Jing Chen
2011-04-28 10:39:23 +10:00
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
Ferdi Franceschini
2011-04-27 15:38:29 +10:00
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
Ferdi Franceschini
2011-04-27 11:11:00 +10:00
Douglas Clowes