linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
984 Commits 1 Branch 0 Tags
895e52bfe9ed6e540803dd5e89c3f75f332ad9dd
Commit Graph

862 Commits

Author SHA1 Message Date
Douglas Clowes
895e52bfe9 Remove unused variables and code 
r2414 | dcl | 2008-04-14 08:33:45 +1000 (Mon, 14 Apr 2008) | 2 lines
 2012-11-15 13:34:10 +11:00
Douglas Clowes
04568a34f2 Bugfixes from commissioning. Use _SCx, send STx and HLTx=1. Fix missing TRACE output. Change 'has_airpads' to 'protocol'. 
r2389 | dcl | 2008-03-10 08:19:23 +1100 (Mon, 10 Mar 2008) | 2 lines
 2012-11-15 13:33:51 +11:00
Douglas Clowes
106159ca58 Substantially modified controller software: mainly limit switches and deceleration. 
r2388 | dcl | 2008-03-07 16:12:47 +1100 (Fri, 07 Mar 2008) | 2 lines
 2012-11-15 13:33:47 +11:00
Douglas Clowes
2ea2923399 modify limits on som 
r2387 | dcl | 2008-03-07 16:11:52 +1100 (Fri, 07 Mar 2008) | 2 lines
 2012-11-15 13:33:43 +11:00
Douglas Clowes
b3d5464454 Interim iteration 
r2383 | dcl | 2008-03-05 15:25:32 +1100 (Wed, 05 Mar 2008) | 2 lines
 2012-11-15 13:33:39 +11:00
Douglas Clowes
02508cfcda Remove previous comment from end of line which kills thread0 
r2373 | dcl | 2008-02-27 09:47:54 +1100 (Wed, 27 Feb 2008) | 2 lines
 2012-11-15 13:33:35 +11:00
Douglas Clowes
c97b23fbcb Fix some typos and add deferred state/event trace reporting 
r2365 | dcl | 2008-02-21 14:59:25 +1100 (Thu, 21 Feb 2008) | 2 lines
 2012-11-15 13:33:28 +11:00
Ferdi Franceschini
f3d798689b Merge changes from release 2.0 branch 
r2364 | ffr | 2008-02-20 09:00:24 +1100 (Wed, 20 Feb 2008) | 2 lines
 2012-11-15 13:33:24 +11:00
Douglas Clowes
ed9f92c6ef rotary beam attenuator motor 
r2363 | dcl | 2008-02-19 15:27:19 +1100 (Tue, 19 Feb 2008) | 2 lines
 2012-11-15 13:33:20 +11:00
Mark Lesha
1cd243f1f4 Added uploading of server parameters srv_xxx in order to allow SICS to control various server features and access/release its control and configuration features. 
r2362 | mle | 2008-02-19 14:19:26 +1100 (Tue, 19 Feb 2008) | 2 lines
 2012-11-15 13:33:16 +11:00
Mark Lesha
0f2cde7ed9 Changed SICS username and password to 'SICS' to suit new histogram server. Port is still 8080. 
r2361 | mle | 2008-02-19 12:40:12 +1100 (Tue, 19 Feb 2008) | 2 lines
 2012-11-15 13:33:12 +11:00
Douglas Clowes
a095e0d6da Add 'encoderAxis' parameter so encoder can be on a different axis from the motor. 
r2360 | dcl | 2008-02-18 08:22:02 +1100 (Mon, 18 Feb 2008) | 2 lines
 2012-11-15 13:33:09 +11:00
Douglas Clowes
0787189156 Changes to backlash, creep and precision for many motors 
r2315 | dcl | 2008-02-04 12:30:44 +1100 (Mon, 04 Feb 2008) | 2 lines
 2012-11-15 13:33:01 +11:00
Douglas Clowes
7fe22cd172 use REQx/RSPx for braked motors and improve sequencing of braking 
r2314 | dcl | 2008-02-04 10:41:32 +1100 (Mon, 04 Feb 2008) | 2 lines
 2012-11-15 13:32:57 +11:00
Douglas Clowes
4f92b60077 Incremental commissioning and calibration 
r2302 | dcl | 2008-01-31 10:32:41 +1100 (Thu, 31 Jan 2008) | 2 lines
 2012-11-15 13:32:53 +11:00
Douglas Clowes
e3a9c18322 Accumulated changes including RUN and HALT command everywhere 
r2298 | dcl | 2008-01-30 13:38:29 +1100 (Wed, 30 Jan 2008) | 2 lines
 2012-11-15 13:32:46 +11:00
Douglas Clowes
0fc5f6b303 Initial Oak Ridge High Voltage Power Supply for ORDELA detector 
r2289 | dcl | 2008-01-21 09:57:53 +1100 (Mon, 21 Jan 2008) | 2 lines
 2012-11-15 13:32:42 +11:00
Douglas Clowes
c6ce627760 Make SEND managers only 
r2288 | dcl | 2008-01-21 09:56:27 +1100 (Mon, 21 Jan 2008) | 2 lines
 2012-11-15 13:32:38 +11:00
Douglas Clowes
7fffc9f97a lots of changes 
r2287 | dcl | 2008-01-21 09:55:49 +1100 (Mon, 21 Jan 2008) | 2 lines
 2012-11-15 13:32:34 +11:00
Douglas Clowes
6016d8d46b Textify logging for binary protocols 
r2286 | dcl | 2008-01-21 09:54:20 +1100 (Mon, 21 Jan 2008) | 2 lines
 2012-11-15 13:32:30 +11:00
Douglas Clowes
168e0d1bfa Add encoder initialisation for changed encoders (not working) 
r2285 | dcl | 2008-01-16 16:34:15 +1100 (Wed, 16 Jan 2008) | 2 lines
 2012-11-15 13:32:27 +11:00
Ferdi Franceschini
cb89c02daf Use ::histogram_memory::upload_config instead of the deprecated ::histogram_memory::configure_server procedure. 
r2284 | ffr | 2008-01-15 15:03:41 +1100 (Tue, 15 Jan 2008) | 2 lines
 2012-11-15 13:32:23 +11:00
Ferdi Franceschini
e7547a18ab Use ::histogram_memory::upload_config instead of the deprecated ::histogram_memory::configure_server procedure. 
r2283 | ffr | 2008-01-15 14:56:36 +1100 (Tue, 15 Jan 2008) | 2 lines
 2012-11-15 13:32:19 +11:00
Ferdi Franceschini
1732ecdb99 Made sure that we run "hmm init" in a catch block to catch any attempt to modify an hmm parameter when it's not allowed. 
The histmem command now returns clean error messages.
Stack traces are displayed for errors which are triggered from the second call level with the histmem command.
Made sure that catch blocks don't enclose a 'return' because this triggers the catch to report the contents of errorInfo.
Removed obsolete setup procedure.
Made sure that uploading of configuration files to the histogram server is only enabled for the 'hmm' object in the ::histogram_memory::upload_config procedure.  Uploading config files is disabled for all other histmem objects at all times.

r2282 | ffr | 2008-01-15 14:53:47 +1100 (Tue, 15 Jan 2008) | 7 lines
 2012-11-15 13:32:15 +11:00
Douglas Clowes
b8c0f9ac5b Add mechanism to pop up beam stops small(1) to (large(5) 
r2281 | dcl | 2008-01-15 12:39:04 +1100 (Tue, 15 Jan 2008) | 2 lines
 2012-11-15 13:32:11 +11:00
Douglas Clowes
cad1e0a4d5 Handle change to asyncqueue to handle binary protocols 
r2280 | dcl | 2008-01-15 12:37:52 +1100 (Tue, 15 Jan 2008) | 2 lines
 2012-11-15 13:32:08 +11:00
Douglas Clowes
2ebe674425 Detector Y motor initial configuration 
r2279 | dcl | 2008-01-15 12:36:59 +1100 (Tue, 15 Jan 2008) | 2 lines
 2012-11-15 13:32:04 +11:00
Douglas Clowes
2c334ba3c2 commissioning refinement 
r2278 | dcl | 2008-01-15 12:36:08 +1100 (Tue, 15 Jan 2008) | 2 lines
 2012-11-15 13:32:00 +11:00
Douglas Clowes
8bd0037997 Add ORHVPS and FSM 
r2275 | dcl | 2008-01-15 12:30:01 +1100 (Tue, 15 Jan 2008) | 2 lines
 2012-11-15 13:31:49 +11:00
Douglas Clowes
24621a0562 Add ORHVPS initialisation 
r2274 | dcl | 2008-01-15 12:29:35 +1100 (Tue, 15 Jan 2008) | 2 lines
 2012-11-15 13:31:45 +11:00
Douglas Clowes
722fd4b539 Oak Ridge (Ordella) High Voltage Power Supply environment controller 
r2273 | dcl | 2008-01-15 12:28:38 +1100 (Tue, 15 Jan 2008) | 2 lines
 2012-11-15 13:31:41 +11:00
Douglas Clowes
ebdcc7be0b Extracted abstract Finite State Machine (from DMC2280 motor driver) 
r2272 | dcl | 2008-01-15 12:27:25 +1100 (Tue, 15 Jan 2008) | 2 lines
 2012-11-15 13:31:37 +11:00
Douglas Clowes
c75e16d4bd Handle change to asyncqueue to handle binary protocols 
r2271 | dcl | 2008-01-15 12:25:16 +1100 (Tue, 15 Jan 2008) | 2 lines
 2012-11-15 13:31:34 +11:00
Douglas Clowes
5874e38152 text formatting 
r2270 | dcl | 2008-01-15 12:23:36 +1100 (Tue, 15 Jan 2008) | 2 lines
 2012-11-15 13:31:30 +11:00
Douglas Clowes
8325c68cea Fix uninitialized variable 
r2269 | dcl | 2008-01-15 12:21:08 +1100 (Tue, 15 Jan 2008) | 2 lines
 2012-11-15 13:31:26 +11:00
Douglas Clowes
3926e47ab5 Change floats to doubles, controller virtual motor variables, a little refactoring 
r2264 | dcl | 2007-12-07 10:38:34 +1100 (Fri, 07 Dec 2007) | 2 lines
 2012-11-15 13:31:08 +11:00
Douglas Clowes
32595554bc Incremental commissioning and calibration 
r2261 | dcl | 2007-12-07 10:22:38 +1100 (Fri, 07 Dec 2007) | 2 lines
 2012-11-15 13:30:56 +11:00
Douglas Clowes
a2fb2b9571 Redirect from Echidna to Kowari PLC inputs 
r2260 | dcl | 2007-12-07 10:21:00 +1100 (Fri, 07 Dec 2007) | 2 lines
 2012-11-15 13:30:53 +11:00
Douglas Clowes
0634295e45 Detector Y axis 
r2259 | dcl | 2007-12-07 10:19:54 +1100 (Fri, 07 Dec 2007) | 2 lines
 2012-11-15 13:30:49 +11:00
Douglas Clowes
034cb7a6ac Detector and beam stop commissioning 
r2258 | dcl | 2007-12-07 10:19:01 +1100 (Fri, 07 Dec 2007) | 2 lines
 2012-11-15 13:30:45 +11:00
Ferdi Franceschini
b07f75f756 Added frame source option to histmem. 
Allow forcing of frame source to internal (useful for scans on Platypus)

r2257 | ffr | 2007-11-09 17:09:36 +1100 (Fri, 09 Nov 2007) | 3 lines
 2012-11-15 13:30:41 +11:00
Ferdi Franceschini
21796674c3 Changed names to protect the innocent. 
r2256 | ffr | 2007-11-09 17:07:30 +1100 (Fri, 09 Nov 2007) | 2 lines
 2012-11-15 13:30:37 +11:00
Douglas Clowes
2cb9e55f63 change counts and steps to integer for 31bit encoder handling 
r2255 | dcl | 2007-11-09 14:08:46 +1100 (Fri, 09 Nov 2007) | 2 lines
 2012-11-15 13:30:34 +11:00
Douglas Clowes
83ac14eeac commissioning refinement 
r2254 | dcl | 2007-11-09 10:38:23 +1100 (Fri, 09 Nov 2007) | 2 lines
 2012-11-15 13:30:30 +11:00
Douglas Clowes
52a5be7c0d A bit of refactoring and a bug fix 
r2253 | dcl | 2007-11-09 09:49:19 +1100 (Fri, 09 Nov 2007) | 2 lines
 2012-11-15 13:30:26 +11:00
Douglas Clowes
5eb6f4330b commissioning refinement 
r2252 | dcl | 2007-11-09 09:47:47 +1100 (Fri, 09 Nov 2007) | 2 lines
 2012-11-15 13:30:22 +11:00
Ferdi Franceschini
3d81b204d6 Frame source now defaults to EXTERNAL if setting a non-zero frame frequency. 
r2251 | ffr | 2007-11-09 08:34:17 +1100 (Fri, 09 Nov 2007) | 2 lines
 2012-11-15 13:30:19 +11:00
Ferdi Franceschini
3489c4c7cc You can now save data in the toplevel of an NXentry 
r2250 | ffr | 2007-11-08 17:05:26 +1100 (Thu, 08 Nov 2007) | 2 lines
 2012-11-15 13:30:15 +11:00
Ferdi Franceschini
643b2bad1b Now supports adding toplevel entries to an NXentry. 
Added start_time and end_time.

r2249 | ffr | 2007-11-08 17:04:07 +1100 (Thu, 08 Nov 2007) | 3 lines
 2012-11-15 13:30:11 +11:00
Ferdi Franceschini
a9617da982 Don't make plc object when in simulated mode. 
r2248 | ffr | 2007-11-08 17:02:24 +1100 (Thu, 08 Nov 2007) | 2 lines
 2012-11-15 13:30:07 +11:00