linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,463 Commits 1 Branch 0 Tags
62acdb79a21594cd43c8b81e4f73b136dc90304a
Commit Graph

1047 Commits

Author SHA1 Message Date
Ferdi Franceschini
177d5f3ed6 Provide a parameters and parameters/derived_parameters section as a one stop shop for all your instrument parameter needs. 
r2625 | ffr | 2008-06-12 12:42:17 +1000 (Thu, 12 Jun 2008) | 2 lines
 2012-11-15 13:39:14 +11:00
Ferdi Franceschini
3a40ea5693 Merged release 2.0 patch-set 1 (RELEASE-2_0P1 ) 
r2624 | ffr | 2008-06-12 09:05:36 +1000 (Thu, 12 Jun 2008) | 2 lines
 2012-11-15 13:39:10 +11:00
Ferdi Franceschini
528d125efe Fixes SICS-144 
target value was wrong when checking scan variable.

r2623 | ffr | 2008-06-11 16:26:36 +1000 (Wed, 11 Jun 2008) | 3 lines
 2012-11-15 13:39:06 +11:00
Ferdi Franceschini
3d3ecdd83e Merged configuration from release 2.0P1 
Added appropriate defaults for frame source for each instrument.

r2619 | ffr | 2008-06-10 14:40:30 +1000 (Tue, 10 Jun 2008) | 3 lines
 2012-11-15 13:39:02 +11:00
Douglas Clowes
17e0c0b5bc get msd into gumtree 
r2612 | dcl | 2008-06-05 16:24:32 +1000 (Thu, 05 Jun 2008) | 2 lines
 2012-11-15 13:38:54 +11:00
Douglas Clowes
c61c709b11 add msd klass unitsa and long_name 
r2611 | dcl | 2008-06-05 15:32:42 +1000 (Thu, 05 Jun 2008) | 2 lines
 2012-11-15 13:38:50 +11:00
Douglas Clowes
03853605c9 Redo stth and sz 
r2610 | dcl | 2008-06-04 17:00:46 +1000 (Wed, 04 Jun 2008) | 2 lines
 2012-11-15 13:38:46 +11:00
Douglas Clowes
419a746c77 Update sample stage limits and speeds 
r2607 | dcl | 2008-06-04 16:08:08 +1000 (Wed, 04 Jun 2008) | 2 lines
 2012-11-15 13:38:41 +11:00
Douglas Clowes
62de717b11 adjust limits and add Mono-Samp Distance (msd) simulated motor 
r2606 | dcl | 2008-06-04 15:21:36 +1000 (Wed, 04 Jun 2008) | 2 lines
 2012-11-15 13:38:37 +11:00
Douglas Clowes
588a44305a Change sz to temporary replacement 
r2605 | dcl | 2008-06-02 14:41:14 +1000 (Mon, 02 Jun 2008) | 2 lines
 2012-11-15 13:38:33 +11:00
Douglas Clowes
6af0b58582 Change cntsPerX 
r2604 | dcl | 2008-06-02 11:59:50 +1000 (Mon, 02 Jun 2008) | 2 lines
 2012-11-15 13:38:30 +11:00
Douglas Clowes
e462982897 Change slit gaps to floating point to avoid integer truncation in expressions 
r2603 | dcl | 2008-05-30 17:39:29 +1000 (Fri, 30 May 2008) | 2 lines
 2012-11-15 13:38:26 +11:00
Douglas Clowes
bc7e224820 Changed to reflect different value on loaner tilt stage 
r2602 | dcl | 2008-05-30 17:38:22 +1000 (Fri, 30 May 2008) | 2 lines
 2012-11-15 13:38:21 +11:00
Ferdi Franceschini
0749b0effa Merging release 2.0 branch with CVS trunk 
r2601 | ffr | 2008-05-30 10:26:57 +1000 (Fri, 30 May 2008) | 2 lines
 2012-11-15 13:38:17 +11:00
Ferdi Franceschini
4a937e1608 extraconfig.tcl should not be kept on CVS or deployed to ics boxes. 
We should put commissioning configurations in a config/commissioning directory

r2600 | ffr | 2008-05-30 10:14:56 +1000 (Fri, 30 May 2008) | 3 lines
 2012-11-15 13:38:11 +11:00
Douglas Clowes
55a5f2c538 add "-x" option for "executable only" to deply patched SICServer 
r2599 | dcl | 2008-05-29 14:57:42 +1000 (Thu, 29 May 2008) | 2 lines
 2012-11-15 13:38:07 +11:00
Douglas Clowes
4b81f0836b temporary addition of separate sample Z motors 
r2598 | dcl | 2008-05-29 14:56:27 +1000 (Thu, 29 May 2008) | 2 lines
 2012-11-15 13:38:03 +11:00
Douglas Clowes
be033cddcd stth and monochromator focussing 
r2597 | dcl | 2008-05-29 14:55:49 +1000 (Thu, 29 May 2008) | 2 lines
 2012-11-15 13:37:59 +11:00
Douglas Clowes
0f4b77cce0 take out extraconfig 
r2596 | dcl | 2008-05-29 14:55:08 +1000 (Thu, 29 May 2008) | 2 lines
 2012-11-15 13:37:55 +11:00
Douglas Clowes
a0ddc569b2 Make like an echidna 
r2595 | dcl | 2008-05-29 14:54:42 +1000 (Thu, 29 May 2008) | 2 lines
 2012-11-15 13:37:51 +11:00
Douglas Clowes
a9746d1190 Monochromator focussing 
r2594 | dcl | 2008-05-29 14:54:06 +1000 (Thu, 29 May 2008) | 2 lines
 2012-11-15 13:37:48 +11:00
Douglas Clowes
a16d3d38d4 fix typo 
r2593 | dcl | 2008-05-29 14:53:32 +1000 (Thu, 29 May 2008) | 2 lines
 2012-11-15 13:37:44 +11:00
Douglas Clowes
1087dcf7ce Implement SC (stop code) 
r2523 | dcl | 2008-05-12 11:08:15 +1000 (Mon, 12 May 2008) | 2 lines
 2012-11-15 13:37:05 +11:00
Douglas Clowes
fba2b55fb9 Adjust sx,sy homes 
r2522 | dcl | 2008-05-12 11:06:54 +1000 (Mon, 12 May 2008) | 2 lines
 2012-11-15 13:37:01 +11:00
Douglas Clowes
e235fd85cc Adjust limits to reflect reality 
r2521 | dcl | 2008-05-12 11:06:18 +1000 (Mon, 12 May 2008) | 2 lines
 2012-11-15 13:36:57 +11:00
Douglas Clowes
2a469d6b89 Dan's changes for small sample Z stage (temporary) 
r2510 | dcl | 2008-05-08 16:50:32 +1000 (Thu, 08 May 2008) | 2 lines
 2012-11-15 13:36:49 +11:00
Douglas Clowes
3076fccac3 change speeds add focussing motors 
r2509 | dcl | 2008-05-08 16:50:04 +1000 (Thu, 08 May 2008) | 2 lines
 2012-11-15 13:36:45 +11:00
Douglas Clowes
b5d157c67a incorporate Dan's change to resolver code 
r2508 | dcl | 2008-05-08 16:48:32 +1000 (Thu, 08 May 2008) | 2 lines
 2012-11-15 13:36:41 +11:00
Douglas Clowes
0e4be397d5 Rework to make more like updated Echidna and Wombat programs 
r2495 | dcl | 2008-04-30 11:57:55 +1000 (Wed, 30 Apr 2008) | 2 lines
 2012-11-15 13:36:25 +11:00
Douglas Clowes
fe682b39ac Change over to Quokka SIS PLC address 
r2494 | dcl | 2008-04-30 11:57:08 +1000 (Wed, 30 Apr 2008) | 2 lines
 2012-11-15 13:36:21 +11:00
Douglas Clowes
8ced552998 Change comments 
r2493 | dcl | 2008-04-30 11:56:22 +1000 (Wed, 30 Apr 2008) | 2 lines
 2012-11-15 13:36:17 +11:00
Douglas Clowes
d5db9de5a6 Change over to Platypus SIS PLC address 
r2492 | dcl | 2008-04-30 11:55:37 +1000 (Wed, 30 Apr 2008) | 2 lines
 2012-11-15 13:36:13 +11:00
Douglas Clowes
0937bc2ba2 Handle simulated PLC 
r2486 | dcl | 2008-04-24 12:11:51 +1000 (Thu, 24 Apr 2008) | 2 lines
 2012-11-15 13:36:06 +11:00
Douglas Clowes
1eda12ffb6 Change sphi home position after running it off the end of the screw with Nan and broken limit switch. 
r2485 | dcl | 2008-04-24 12:11:01 +1000 (Thu, 24 Apr 2008) | 2 lines
 2012-11-15 13:36:02 +11:00
Douglas Clowes
a9d493382f Fix Chopper IP address 
r2484 | dcl | 2008-04-24 12:10:00 +1000 (Thu, 24 Apr 2008) | 2 lines
 2012-11-15 13:35:58 +11:00
Douglas Clowes
b8711e9bc4 Motor Off Delay is in milliSeconds 
r2483 | dcl | 2008-04-24 12:09:25 +1000 (Thu, 24 Apr 2008) | 2 lines
 2012-11-15 13:35:54 +11:00
Douglas Clowes
fd0ab1a3b5 Update to version on controller - adjust comments 
r2457 | dcl | 2008-04-16 10:57:40 +1000 (Wed, 16 Apr 2008) | 2 lines
 2012-11-15 13:35:42 +11:00
Douglas Clowes
1c86cbc665 Update to version on controller - remove comment text on end of line 
r2456 | dcl | 2008-04-16 10:57:21 +1000 (Wed, 16 Apr 2008) | 2 lines
 2012-11-15 13:35:39 +11:00
Douglas Clowes
bdf5e24cc0 Remove extraconfig 
r2453 | dcl | 2008-04-14 13:53:40 +1000 (Mon, 14 Apr 2008) | 2 lines
 2012-11-15 13:35:35 +11:00
Douglas Clowes
6009f273c8 Add two theta virtual motor 
r2452 | dcl | 2008-04-14 13:53:18 +1000 (Mon, 14 Apr 2008) | 2 lines
 2012-11-15 13:35:31 +11:00
Douglas Clowes
4562daf398 Implement changes made on instrument during commissioning 
r2451 | dcl | 2008-04-14 13:51:07 +1000 (Mon, 14 Apr 2008) | 2 lines
 2012-11-15 13:35:27 +11:00
Douglas Clowes
76e63de5a3 adjustments to timings 
r2433 | dcl | 2008-04-14 10:30:07 +1000 (Mon, 14 Apr 2008) | 2 lines
 2012-11-15 13:35:23 +11:00
Douglas Clowes
4b17ca99da Bring into line with changes made on Echidna and Wombat 
r2432 | dcl | 2008-04-14 10:28:07 +1000 (Mon, 14 Apr 2008) | 2 lines
 2012-11-15 13:35:19 +11:00
Douglas Clowes
03394dcc9e tweak sz configuration 
r2431 | dcl | 2008-04-14 09:51:48 +1000 (Mon, 14 Apr 2008) | 2 lines
 2012-11-15 13:35:15 +11:00
Douglas Clowes
7220f040ef wait for motion to complete before turning air and motor off (was crashing thread 0) 
r2430 | dcl | 2008-04-14 09:50:38 +1000 (Mon, 14 Apr 2008) | 2 lines
 2012-11-15 13:35:11 +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
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