linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,781 Commits 1 Branch 0 Tags
4c82c0b1cb8376fffae5db2bb800982ec6073755
Commit Graph
2781 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ferdi FranceschiniandDouglas Clowes 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
 2012-11-15 17:13:01 +11:00
Ferdi FranceschiniandDouglas Clowes 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 FranceschiniandDouglas Clowes 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 FranceschiniandDouglas Clowes 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
Ferdi FranceschiniandDouglas Clowes 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
 2012-11-15 17:12:44 +11:00
Jing ChenandDouglas Clowes 3c9db46bd7 update 
r3132 | jgn | 2011-05-12 15:13:47 +1000 (Thu, 12 May 2011) | 1 line
 2012-11-15 17:12:39 +11:00
Jing ChenandDouglas Clowes d1aea5ae48 update accelation values 
r3131 | jgn | 2011-05-12 13:52:54 +1000 (Thu, 12 May 2011) | 1 line
 2012-11-15 17:12:35 +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
Jing ChenandDouglas Clowes 5d564ac666 update Pelican 
r3128 | jgn | 2011-05-06 16:06:57 +1000 (Fri, 06 May 2011) | 1 line
 2012-11-15 17:12:22 +11:00
Jing ChenandDouglas Clowes a57343e828 update Pelican 
r3127 | jgn | 2011-05-06 16:00:36 +1000 (Fri, 06 May 2011) | 1 line
 2012-11-15 17:12:18 +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
Jing ChenandDouglas Clowes d275ce5509 r3124 | jgn | 2011-05-03 11:25:15 +1000 (Tue, 03 May 2011) | 1 line 2012-11-15 17:12:05 +11:00
Jing ChenandDouglas Clowes 25a2e6d839 update motor grouping for Lyrebird 
r3123 | jgn | 2011-05-02 12:26:12 +1000 (Mon, 02 May 2011) | 1 line
 2012-11-15 17:12:01 +11:00
Ferdi FranceschiniandDouglas Clowes 33e6611b14 Reverted 
r3122 | ffr | 2011-04-29 10:53:41 +1000 (Fri, 29 Apr 2011) | 1 line
 2012-11-15 17:11:56 +11:00
Jing ChenandDouglas Clowes 0105298d79 update motor class for Taipan/Lyrebird 
r3121 | jgn | 2011-04-29 10:45:37 +1000 (Fri, 29 Apr 2011) | 1 line
 2012-11-15 17:11:52 +11:00
Ferdi FranceschiniandDouglas Clowes 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 FranceschiniandDouglas Clowes 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 FranceschiniandDouglas Clowes 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 ChenandDouglas Clowes 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 FranceschiniandDouglas Clowes 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 FranceschiniandDouglas Clowes 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 ChenandDouglas Clowes 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 ChenandDouglas Clowes 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 ChenandDouglas Clowes 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 ChenandDouglas Clowes 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 ChenandDouglas Clowes 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 ChenandDouglas Clowes 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 ChenandDouglas Clowes 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 ChenandDouglas Clowes 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 ChenandDouglas Clowes 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 ChenandDouglas Clowes 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 FranceschiniandDouglas Clowes 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 ChenandDouglas Clowes 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 ChenandDouglas Clowes 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 ChenandDouglas Clowes 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 ChenandDouglas Clowes 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 ChenandDouglas Clowes 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 ChenandDouglas Clowes 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 ChenandDouglas Clowes 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 ChenandDouglas Clowes 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 ChenandDouglas Clowes 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 ChenandDouglas Clowes 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 ChenandDouglas Clowes 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 ChenandDouglas Clowes 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 ChenandDouglas Clowes 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