Commit Graph

1205 Commits

Author SHA1 Message Date
Ferdi Franceschini
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
2012-11-15 17:11:48 +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
Jing Chen
30d9edb0dd update group for motors
r3117 | jgn | 2011-04-28 10:39:23 +1000 (Thu, 28 Apr 2011) | 1 line
2012-11-15 17:11:35 +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
Jing Chen
e73eed8807 add Pelican
r3114 | jgn | 2011-04-20 12:48:38 +1000 (Wed, 20 Apr 2011) | 1 line
2012-11-15 17:11:22 +11:00
Jing Chen
576e0b86b4 add Pelican
r3113 | jgn | 2011-04-20 12:47:25 +1000 (Wed, 20 Apr 2011) | 1 line
2012-11-15 17:11:18 +11:00
Jing Chen
506a265815 add Pelican
r3112 | jgn | 2011-04-20 12:44:37 +1000 (Wed, 20 Apr 2011) | 1 line
2012-11-15 17:11:13 +11:00
Jing Chen
baf6961a82 add Pelican
r3111 | jgn | 2011-04-20 12:41:59 +1000 (Wed, 20 Apr 2011) | 1 line
2012-11-15 17:11:09 +11:00
Jing Chen
6d2ad89ab6 add Pelican
r3110 | jgn | 2011-04-20 12:40:19 +1000 (Wed, 20 Apr 2011) | 1 line
2012-11-15 17:11:04 +11:00
Jing Chen
73ec03ca81 add Pelican
r3109 | jgn | 2011-04-20 12:38:09 +1000 (Wed, 20 Apr 2011) | 1 line
2012-11-15 17:11:00 +11:00
Jing Chen
22b22ffa25 add Pelican
r3108 | jgn | 2011-04-20 12:29:55 +1000 (Wed, 20 Apr 2011) | 1 line
2012-11-15 17:10:56 +11:00
Jing Chen
1fa3d21486 add Pelican
r3107 | jgn | 2011-04-20 12:10:04 +1000 (Wed, 20 Apr 2011) | 1 line
2012-11-15 17:10:50 +11:00
Jing Chen
3f6a01d405 add Pelican
r3106 | jgn | 2011-04-20 12:09:49 +1000 (Wed, 20 Apr 2011) | 1 line
2012-11-15 17:10:45 +11:00
Jing Chen
8b1d0103f4 update for Lyrebird deployment
r3105 | jgn | 2011-04-20 08:48:12 +1000 (Wed, 20 Apr 2011) | 1 line
2012-11-15 17:10:41 +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
Ferdi Franceschini
4ae629c08e Revert setting of "driving" flag.
r3102 | ffr | 2011-04-13 15:01:15 +1000 (Wed, 13 Apr 2011) | 1 line
2012-11-15 17:10:27 +11:00
Jing Chen
5153e16e86 update for Lyrebird
r3101 | jgn | 2011-04-11 15:09:26 +1000 (Mon, 11 Apr 2011) | 1 line
2012-11-15 17:10:23 +11:00
Jing Chen
8eb9a86c01 r3100 | jgn | 2011-04-11 11:34:11 +1000 (Mon, 11 Apr 2011) | 1 line 2012-11-15 17:10:18 +11:00
Jing Chen
cf4660747a update for Taipan purpose
r3099 | jgn | 2011-04-11 10:50:10 +1000 (Mon, 11 Apr 2011) | 1 line
2012-11-15 17:10:14 +11:00
Jing Chen
729a4c6eff r3098 | jgn | 2011-04-08 16:16:38 +1000 (Fri, 08 Apr 2011) | 1 line 2012-11-15 17:10:10 +11:00
Jing Chen
a9f7812e47 r3097 | jgn | 2011-04-08 16:05:02 +1000 (Fri, 08 Apr 2011) | 1 line 2012-11-15 17:10:06 +11:00
Jing Chen
bda5f46596 r3096 | jgn | 2011-04-08 15:44:27 +1000 (Fri, 08 Apr 2011) | 1 line 2012-11-15 17:10:01 +11:00
Jing Chen
1671ec3612 r3095 | jgn | 2011-04-08 12:34:34 +1000 (Fri, 08 Apr 2011) | 1 line 2012-11-15 17:09:57 +11:00
Jing Chen
cf9a94abd3 remove quokka stuff
r3094 | jgn | 2011-04-08 12:15:13 +1000 (Fri, 08 Apr 2011) | 1 line
2012-11-15 17:09:53 +11:00
Douglas Clowes
665adbf4a6 double the timeout to make errors less likely
r3093 | dcl | 2011-04-05 17:37:51 +1000 (Tue, 05 Apr 2011) | 1 line
2012-11-15 17:09:49 +11:00
Jing Chen
074344f63d comment out initxmlscan
r3089 | jgn | 2011-03-31 14:06:28 +1100 (Thu, 31 Mar 2011) | 1 line
2012-11-15 17:09:44 +11:00
Jing Chen
735d4948dc inlcude tasmad
r3088 | jgn | 2011-03-30 12:51:31 +1100 (Wed, 30 Mar 2011) | 1 line
2012-11-15 17:09:40 +11:00
Jing Chen
31b6381a40 inlcude tasmad
r3087 | jgn | 2011-03-30 12:50:57 +1100 (Wed, 30 Mar 2011) | 2 lines
2012-11-15 17:09:36 +11:00
Jing Chen
66e3096b24 move folder tasmad
r3086 | jgn | 2011-03-29 15:32:07 +1100 (Tue, 29 Mar 2011) | 1 line
2012-11-15 17:09:32 +11:00
Jing Chen
e92dce3948 add folder tasmad
r3084 | jgn | 2011-03-29 11:50:43 +1100 (Tue, 29 Mar 2011) | 1 line
2012-11-15 17:09:27 +11:00
Jing Chen
503bb1a196 add tasUB
r3083 | jgn | 2011-03-25 15:07:19 +1100 (Fri, 25 Mar 2011) | 1 line
2012-11-15 17:09:22 +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
Jing Chen
c15a4ca1d6 r3078 | jgn | 2011-03-10 09:56:54 +1100 (Thu, 10 Mar 2011) | 1 line 2012-11-15 17:09:07 +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
3ca3bdf30a Get updated motor encoder readings.
r3074 | ffr | 2011-02-25 19:29:16 +1100 (Fri, 25 Feb 2011) | 1 line
2012-11-15 17:08:59 +11:00
Ferdi Franceschini
08898a04f4 Get resolver changes for monochromator motors.
r3073 | ffr | 2011-02-25 19:25:31 +1100 (Fri, 25 Feb 2011) | 1 line
2012-11-15 17:08:54 +11:00
Ferdi Franceschini
71b71e262c Added eulerscan.tcl from ics1-wombat
Updated to get in-situ changes to motor configurations (eg monochromator resolvers)
r3072 | ffr | 2011-02-25 19:12:19 +1100 (Fri, 25 Feb 2011) | 2 lines
2012-11-15 17:08:50 +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
Jing Chen
009fdbfc29 r3070 | jgn | 2011-02-24 10:27:40 +1100 (Thu, 24 Feb 2011) | 1 line 2012-11-15 17:08:39 +11:00
Jing Chen
c21177047e r3069 | jgn | 2011-02-24 10:15:51 +1100 (Thu, 24 Feb 2011) | 1 line 2012-11-15 17:08:35 +11:00
Jing Chen
0808b54652 r3068 | jgn | 2011-02-24 09:23:22 +1100 (Thu, 24 Feb 2011) | 1 line 2012-11-15 17:08:31 +11:00
Jing Chen
102b722b5a updated/added file to support galil contoller in Lyrebird - jgn
r3067 | jgn | 2011-02-24 09:12:56 +1100 (Thu, 24 Feb 2011) | 3 lines
2012-11-15 17:08:27 +11:00
Ferdi Franceschini
ea087769dc Reorganise archive structure
r3065 | ffr | 2011-02-22 00:44:51 +1100 (Tue, 22 Feb 2011) | 1 line
2012-11-15 17:08:18 +11:00
Ferdi Franceschini
48f8c75ac4 Rheometer controlled data acquisition via protek multimeter driver.
r3064 | ffr | 2011-02-22 00:33:12 +1100 (Tue, 22 Feb 2011) | 1 line
2012-11-15 17:08:14 +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
7f4b0de463 Modify makefiles to find libraries on more platforms
r3060 | dcl | 2011-02-18 11:04:57 +1100 (Fri, 18 Feb 2011) | 1 line
2012-11-15 17:07:57 +11:00