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

146 Commits

Author SHA1 Message Date
Jing Chen
3a1bd2192c comment out the driver line 
r3767 | jgn | 2012-10-15 14:11:04 +1100 (Mon, 15 Oct 2012) | 1 line
 2012-11-15 17:40:36 +11:00
Jing Chen
935a45cbf5 update formats of displayed strings 
r3766 | jgn | 2012-10-15 12:01:50 +1100 (Mon, 15 Oct 2012) | 1 line
 2012-11-15 17:40:31 +11:00
Jing Chen
18a3a0b028 r3762 | jgn | 2012-10-09 13:42:17 +1100 (Tue, 09 Oct 2012) | 1 line 2012-11-15 17:40:11 +11:00
Jing Chen
a545823330 add He3 SICS controller 
r3760 | jgn | 2012-10-08 13:29:25 +1100 (Mon, 08 Oct 2012) | 1 line
 2012-11-15 17:40:01 +11:00
Jing Chen
5ceb583d26 update the driver 
r3743 | jgn | 2012-09-24 09:56:27 +1000 (Mon, 24 Sep 2012) | 1 line
 2012-11-15 17:38:39 +11:00
Jing Chen
5d5c6bed54 new SICS driver for Green Magnet 
r3742 | jgn | 2012-09-20 16:16:00 +1000 (Thu, 20 Sep 2012) | 1 line
 2012-11-15 17:38:35 +11:00
Douglas Clowes
62d894b9e7 First Working Version against "SCPI" protocol Mercury 
r3733 | dcl | 2012-09-11 11:40:48 +1000 (Tue, 11 Sep 2012) | 1 line
 2012-11-15 17:37:52 +11:00
Douglas Clowes
81605a11a1 Driver for the Oxford Mercury Temperature Controller (WIP) 
r3732 | dcl | 2012-09-03 13:37:30 +1000 (Mon, 03 Sep 2012) | 1 line
 2012-11-15 17:37:47 +11:00
Douglas Clowes
84842c901f Add voltage, status and "end-of-driving" 
r3731 | dcl | 2012-09-03 09:03:12 +1000 (Mon, 03 Sep 2012) | 1 line
 2012-11-15 17:37:42 +11:00
Douglas Clowes
200d539adc Simple driver for the "Green Magnet" 
r3710 | dcl | 2012-08-28 15:06:20 +1000 (Tue, 28 Aug 2012) | 1 line
 2012-11-15 17:37:09 +11:00
Douglas Clowes
39735092d7 Update to drive the rest of the way 
r3696 | dcl | 2012-08-08 13:36:40 +1000 (Wed, 08 Aug 2012) | 1 line
 2012-11-15 17:36:02 +11:00
Jing Chen
a311f331cd add Dlition Sample temperautre contorl 
r3686 | jgn | 2012-08-01 09:50:08 +1000 (Wed, 01 Aug 2012) | 1 line
 2012-11-15 17:35:19 +11:00
Douglas Clowes
d6ad841174 Set auto by default on startup - as per Paolo 
r3679 | dcl | 2012-07-26 15:45:13 +1000 (Thu, 26 Jul 2012) | 1 line
 2012-11-15 17:34:46 +11:00
Ferdi Franceschini
a6fd5af72c Made the isobus address configurable for the Oxford Mercury ITC. 
NOTE: Address is option and defaults to @1
Eg Set tol=5.0 and isobus address= @8 for the Mercury ITC
add_itc500 tc1 localhost 7777 5.0 "@8"

r3642 | ffr | 2012-07-13 15:48:30 +1000 (Fri, 13 Jul 2012) | 5 lines
 2012-11-15 17:33:03 +11:00
Ferdi Franceschini
d99d9cc7ee SICS-435: Save setpoint in data file. 
r3612 | ffr | 2012-06-19 20:42:15 +1000 (Tue, 19 Jun 2012) | 2 lines
 2012-11-15 17:31:11 +11:00
Jing Chen
5b4b52c627 add progress reminder at changing temperature and field 
r3399 | jgn | 2012-02-27 12:13:47 +1100 (Mon, 27 Feb 2012) | 1 line
 2012-11-15 17:24:52 +11:00
Ferdi Franceschini
3b4247c8d2 Moved the pre_count and post_count procs to quokka's environment.tcl because 
their definition is specific to quokka.  They have also been modified to
include the lakeshore readings.

r3364 | ffr | 2012-02-12 18:55:07 +1100 (Sun, 12 Feb 2012) | 4 lines
 2012-11-15 17:24:34 +11:00
Douglas Clowes
b64217e6de Map range to +/-180 and limit step motion for A-axis 
r3362 | dcl | 2012-01-30 14:21:31 +1100 (Mon, 30 Jan 2012) | 1 line
 2012-11-15 17:24:25 +11:00
Ferdi Franceschini
f498b3ce6a sct_julabo_lh45.tcl 
Add bath temperature to feedback.   Allow switching between reading the
bath or external sensor for the sensor value. Check the data type of
replies from the Julabo because it can return values like "___.__" if
you're reading the wrong sensor.

sct_lakeshore_340.tcl, sct_lakeshore_336.tcl
Use the tolerance set on the control/tolerance node so the user can
change it while running.

r3348 | ffr | 2012-01-20 15:25:46 +1100 (Fri, 20 Jan 2012) | 10 lines
 2012-11-15 17:23:22 +11:00
Douglas Clowes
b7bb5f7e9b Lakeshore 370 AC "Resistance Bridge" Temperature Controller 
r3343 | dcl | 2012-01-16 17:39:14 +1100 (Mon, 16 Jan 2012) | 1 line
 2012-11-15 17:23:00 +11:00
Ferdi Franceschini
1026dbb808 Change driveable motor names to GA GB GC 
r3339 | ffr | 2012-01-13 13:59:20 +1100 (Fri, 13 Jan 2012) | 2 lines
 2012-11-15 17:22:42 +11:00
Jing Chen
acd1b9e036 add sct_oxford_labview.tcl 
r3324 | jgn | 2012-01-03 12:00:22 +1100 (Tue, 03 Jan 2012) | 1 line
 2012-11-15 17:21:34 +11:00
Douglas Clowes
2954216d2d A driver for the Cybaman goniometer 
r3317 | dcl | 2011-12-12 16:17:39 +1100 (Mon, 12 Dec 2011) | 1 line
 2012-11-15 17:21:03 +11:00
Douglas Clowes
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
 2012-11-15 17:16:47 +11:00
Douglas Clowes
c765c33f6d Make instance data properties of a params node instead of namespace global variables 
This is to allow multiple instance of the same device type without clashing of persistent data
r3248 | dcl | 2011-08-22 11:30:20 +1000 (Mon, 22 Aug 2011) | 3 lines
 2012-11-15 17:16:07 +11:00
Ferdi Franceschini
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.

r3237 | ffr | 2011-08-12 08:41:56 +1000 (Fri, 12 Aug 2011) | 4 lines
 2012-11-15 17:15:59 +11:00
Ferdi Franceschini
169aa5ed2f Display/Value and setpoint should be numeric to save arrays of readings. 
We can't save arrays of text.

r3235 | ffr | 2011-07-25 17:06:35 +1000 (Mon, 25 Jul 2011) | 3 lines
 2012-11-15 17:15:50 +11:00
Douglas Clowes
d33a957d01 differentiate rdValue and rdData and add experimental treewalk 
r3232 | dcl | 2011-07-20 14:45:17 +1000 (Wed, 20 Jul 2011) | 1 line
 2012-11-15 17:15:37 +11:00
Douglas Clowes
cffc765197 Add ;*IDN? after writes to get a response 
r3231 | dcl | 2011-07-06 10:00:25 +1000 (Wed, 06 Jul 2011) | 1 line
 2012-11-15 17:15:32 +11:00
Douglas Clowes
a76803c242 Keithley 2700 DMM 
r3230 | dcl | 2011-07-05 16:23:52 +1000 (Tue, 05 Jul 2011) | 1 line
 2012-11-15 17:15:28 +11:00
Douglas Clowes
5b94e43689 log catch messages 
r3225 | dcl | 2011-06-24 13:02:38 +1000 (Fri, 24 Jun 2011) | 1 line
 2012-11-15 17:15:06 +11:00
Douglas Clowes
cd2dafceb3 Syringe Pump Driver 
for New Era Pump Systems Inc NE-1000 syringe pumps
r3224 | dcl | 2011-06-24 13:01:08 +1000 (Fri, 24 Jun 2011) | 3 lines
 2012-11-15 17:15:02 +11:00
Douglas Clowes
992e32bc10 Driver for the Hamilton Modular Valve Positioner (MVP) 
r3223 | dcl | 2011-06-22 17:09:21 +1000 (Wed, 22 Jun 2011) | 1 line
 2012-11-15 17:14:58 +11:00
Ferdi Franceschini
f66a91d6d6 Remove accidental commit 
r3214 | ffr | 2011-06-20 09:45:22 +1000 (Mon, 20 Jun 2011) | 1 line
 2012-11-15 17:14:19 +11:00
Ferdi Franceschini
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
 2012-11-15 17:13:57 +11:00
Douglas Clowes
afa42563a0 Implement a reset capability 
r3150 | dcl | 2011-05-20 10:26:59 +1000 (Fri, 20 May 2011) | 1 line
 2012-11-15 17:13:53 +11:00
Douglas Clowes
df6f44a2ac Change limits and tolerance 
r3149 | dcl | 2011-05-20 10:25:05 +1000 (Fri, 20 May 2011) | 1 line
 2012-11-15 17:13:49 +11:00
Douglas Clowes
f0ac8f82d9 Implement driveable and end of drive condition 
r3148 | dcl | 2011-05-20 10:21:08 +1000 (Fri, 20 May 2011) | 1 line
 2012-11-15 17:13:44 +11:00
Douglas Clowes
e65cc662c6 Add read of tower down switch 
Must be down to run test
r3146 | dcl | 2011-05-19 12:47:06 +1000 (Thu, 19 May 2011) | 3 lines
 2012-11-15 17:13:36 +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
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
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