linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
697 Commits 1 Branch 0 Tags
691ea5dbf05bf5e1dec3649873053c4f8330a169
Commit Graph

697 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ferdi Franceschini
691ea5dbf0 Reverted support for text value parameters. 
This has been made obsolete by the pActionRoutine.

r1954 | ffr | 2007-05-10 16:09:04 +1000 (Thu, 10 May 2007) | 3 lines
 2012-11-15 13:16:47 +11:00
Ferdi Franceschini
5b683ecbe0 Fixed botched merge. 
The merge effectively created  duplicate setmode procs.

r1953 | ffr | 2007-05-10 13:28:27 +1000 (Thu, 10 May 2007) | 3 lines
 2012-11-15 13:16:44 +11:00
Ferdi Franceschini
a151a2a163 Set motor_driver_type to "asim" when motor_simulation flag is true, otherwise set it to DMC2280. 
r1952 | ffr | 2007-05-10 13:24:28 +1000 (Thu, 10 May 2007) | 2 lines
 2012-11-15 13:16:40 +11:00
Ferdi Franceschini
ebba5a8052 Added motor_simulation flag. If true then the motor_configuration.tcl files should create ANSTO simulated motor drivers. 
r1951 | ffr | 2007-05-10 13:21:51 +1000 (Thu, 10 May 2007) | 2 lines
 2012-11-15 13:16:37 +11:00
Ferdi Franceschini
717f9beea7 Tidied up indents etc, to make it easy to compare diffs against the echidna config. 
r1950 | ffr | 2007-05-10 13:18:06 +1000 (Thu, 10 May 2007) | 2 lines
 2012-11-15 13:16:34 +11:00
Ferdi Franceschini
73d144340d Modified the ANSTO simulated motor driver so that it now accepts a list of named parameters, and supports the extra metadata parameters needed for generating hipadaba interfaces. 
This means that ASIM motor drivers  can now be configured with the same configuration file as the DMC2280 driver.
Also ensured that motors drive instantly to there target position, this streamlines testing and is useful for the script validation server.

r1949 | ffr | 2007-05-10 13:15:21 +1000 (Thu, 10 May 2007) | 4 lines
 2012-11-15 13:16:30 +11:00
Dan Bartlett
cb7d9fc8ae no message 
r1947 | dbx | 2007-05-09 12:27:37 +1000 (Wed, 09 May 2007) | 2 lines
 2012-11-15 13:16:27 +11:00
Ferdi Franceschini
55347984ec Checked files modified by the merge with: 
cvs diff -u -rRELEASE-1_2-MERGEPOINT -rHEAD <filepath>
and found no modifications on the trunk between the release 1.2 mergepoint and cvs HEAD

r1946 | ffr | 2007-05-08 15:01:16 +1000 (Tue, 08 May 2007) | 4 lines
 2012-11-15 13:16:23 +11:00
Ferdi Franceschini
86b99280d4 Merged the simulation mode setup from the trunk with the modified setmode command from the branch. 
r1945 | ffr | 2007-05-08 14:59:26 +1000 (Tue, 08 May 2007) | 2 lines
 2012-11-15 13:16:20 +11:00
Ferdi Franceschini
4594b23f13 Merged in favour of branch. 
Get the horizontal and vertical axis names for the data from the _hmm_{hor,vert}_axis SICS variables when saving data.
These variables are set by the command which collects the data.

r1944 | ffr | 2007-05-08 14:58:51 +1000 (Tue, 08 May 2007) | 4 lines
 2012-11-15 13:16:16 +11:00
Ferdi Franceschini
e6c78ef4d6 Resolved conflict in favour of release 1.3 
r1943 | ffr | 2007-05-07 16:27:07 +1000 (Mon, 07 May 2007) | 2 lines
 2012-11-15 13:16:13 +11:00
Ferdi Franceschini
4ce126650e Refactored kowari configuration layout. 
r1942 | ffr | 2007-05-07 16:10:55 +1000 (Mon, 07 May 2007) | 2 lines
 2012-11-15 13:16:10 +11:00
Ferdi Franceschini
a33918149c Bringing kowari layout and config inline with the current requirements of 
the deployment script.

r1941 | ffr | 2007-05-07 15:54:09 +1000 (Mon, 07 May 2007) | 3 lines
 2012-11-15 13:16:06 +11:00
Ferdi Franceschini
6fc1a8feca Bringing kowari layout and config inline with the current requirements of 
the deployment script.

r1940 | ffr | 2007-05-07 15:30:02 +1000 (Mon, 07 May 2007) | 3 lines
 2012-11-15 13:16:03 +11:00
Douglas Clowes
84f883f5d7 Implement finite state machine model. Improved backlash (unidirectional motor driving). Precision motor creeping. Ensure thread zero is operating. Floating point steps and counts per unit. "send", "reset", "state" and "trace" commands. 
r1939 | dcl | 2007-05-04 14:01:19 +1000 (Fri, 04 May 2007) | 2 lines
 2012-11-15 13:15:59 +11:00
Douglas Clowes
bbdc2f820d minor, trivial and cosmetic changes not related to state machine implementation 
r1938 | dcl | 2007-05-04 13:47:21 +1000 (Fri, 04 May 2007) | 2 lines
 2012-11-15 13:15:56 +11:00
Dan Bartlett
911c0d8450 no message 
r1937 | dbx | 2007-05-03 16:53:56 +1000 (Thu, 03 May 2007) | 2 lines
 2012-11-15 13:15:53 +11:00
Douglas Clowes
4e3e0e7247 Bug fix - when inserting timers into timer queue timer could go missing. Also clear next pointer on insert into tail and clear vrfy on free. 
r1918 | dcl | 2007-04-24 17:18:57 +1000 (Tue, 24 Apr 2007) | 2 lines
 2012-11-15 13:15:49 +11:00
Ferdi Franceschini
c01188bc8b Fixed order of histogram memory data axes. 
r1903 | ffr | 2007-04-23 10:34:44 +1000 (Mon, 23 Apr 2007) | 2 lines
 2012-11-15 13:15:46 +11:00
Ferdi Franceschini
83744c2e15 Added "master" motor name lists for configurable virtualmotors. 
r1901 | ffr | 2007-04-20 12:47:27 +1000 (Fri, 20 Apr 2007) | 2 lines
 2012-11-15 13:15:43 +11:00
Ferdi Franceschini
65a1fc1a1d Added safety plc configuration files. 
r1900 | ffr | 2007-04-20 12:46:11 +1000 (Fri, 20 Apr 2007) | 2 lines
 2012-11-15 13:15:39 +11:00
Douglas Clowes
56cdbec451 remove trailing spaces on numerous lines 
r1898 | dcl | 2007-04-20 11:56:22 +1000 (Fri, 20 Apr 2007) | 2 lines
 2012-11-15 13:15:36 +11:00
Ferdi Franceschini
ade5216ea9 Merged Release 1.2 
r1897 | ffr | 2007-04-20 11:53:31 +1000 (Fri, 20 Apr 2007) | 2 lines
 2012-11-15 13:15:32 +11:00
Douglas Clowes
d0957b18d5 Move things around, fix typo 
r1896 | dcl | 2007-04-20 09:11:03 +1000 (Fri, 20 Apr 2007) | 2 lines
 2012-11-15 13:15:29 +11:00
Douglas Clowes
093bf92438 cosmetic changes 
r1895 | dcl | 2007-04-20 09:08:32 +1000 (Fri, 20 Apr 2007) | 2 lines
 2012-11-15 13:15:25 +11:00
Douglas Clowes
8b27116358 backlash preseek made internal 
r1891 | dcl | 2007-04-19 15:56:56 +1000 (Thu, 19 Apr 2007) | 2 lines
 2012-11-15 13:15:22 +11:00
Douglas Clowes
34da43b4ee Update slit gearing ratio to computed 6 * 7:3 stages 
r1885 | dcl | 2007-04-19 10:08:59 +1000 (Thu, 19 Apr 2007) | 2 lines
 2012-11-15 13:15:19 +11:00
Douglas Clowes
4b33abe79c change comment and reposition stepsPerX in list command 
r1871 | dcl | 2007-04-18 09:59:04 +1000 (Wed, 18 Apr 2007) | 2 lines
 2012-11-15 13:15:15 +11:00
Douglas Clowes
a77d9feb59 Add MakeStateMon 
r1870 | dcl | 2007-04-18 09:38:07 +1000 (Wed, 18 Apr 2007) | 2 lines
 2012-11-15 13:15:12 +11:00
Douglas Clowes
4693ad1686 move string parameters from "list" to "slist" because non-numerics in "list" upset hipadaba stuff. Also implement motor "setpos" command with two arguments. 
r1869 | dcl | 2007-04-18 09:35:32 +1000 (Wed, 18 Apr 2007) | 2 lines
 2012-11-15 13:15:09 +11:00
Douglas Clowes
98a2081f99 Update safety PLC multichan to remove RS232 controller 
r1868 | dcl | 2007-04-18 09:32:58 +1000 (Wed, 18 Apr 2007) | 2 lines
 2012-11-15 13:15:05 +11:00
Ferdi Franceschini
c8558d0a5b Reverted hipadaba paths to original settings. 
r1861 | ffr | 2007-04-16 16:16:57 +1000 (Mon, 16 Apr 2007) | 2 lines
 2012-11-15 13:15:02 +11:00
Ferdi Franceschini
784b391415 Added part and type info to motors and modified hpaths to work with new hipadaba config code. 
r1858 | ffr | 2007-04-16 14:46:49 +1000 (Mon, 16 Apr 2007) | 2 lines
 2012-11-15 13:14:59 +11:00
Ferdi Franceschini
487f370d5e Added extended hmake "xhmake" to make it easier to create long paths. 
r1857 | ffr | 2007-04-16 14:44:25 +1000 (Mon, 16 Apr 2007) | 2 lines
 2012-11-15 13:14:55 +11:00
Douglas Clowes
40e1042cda reverse comparison operators 
r1856 | dcl | 2007-04-16 10:46:55 +1000 (Mon, 16 Apr 2007) | 2 lines
 2012-11-15 13:14:52 +11:00
Ferdi Franceschini
3e5a3d1201 motor_hpath now maps part identifiers to hipadaba nodes 
r1855 | ffr | 2007-04-13 16:37:02 +1000 (Fri, 13 Apr 2007) | 2 lines
 2012-11-15 13:14:49 +11:00
Ferdi Franceschini
e2f968c923 Added part identifiers to support the new hipadaba path generation code. 
Added long_name fields to support nexus file writing.

r1854 | ffr | 2007-04-13 16:33:48 +1000 (Fri, 13 Apr 2007) | 3 lines
 2012-11-15 13:14:45 +11:00
Ferdi Franceschini
f48217e383 Added option to select simulation mode for SICS. 
r1853 | ffr | 2007-04-13 13:13:22 +1000 (Fri, 13 Apr 2007) | 2 lines
 2012-11-15 13:14:42 +11:00
Ferdi Franceschini
d0b8de93b1 Provided option to use simulated hmm drivers. 
r1852 | ffr | 2007-04-13 12:57:17 +1000 (Fri, 13 Apr 2007) | 2 lines
 2012-11-15 13:14:39 +11:00
Ferdi Franceschini
1c65171e4e Create beam monitor in instrument specific configuration and provide option for creating simulated beam monitor driver. 
r1851 | ffr | 2007-04-13 12:52:49 +1000 (Fri, 13 Apr 2007) | 2 lines
 2012-11-15 13:14:35 +11:00
Douglas Clowes
57a2cff61c typo 
r1850 | dcl | 2007-04-12 17:08:41 +1000 (Thu, 12 Apr 2007) | 2 lines
 2012-11-15 13:14:32 +11:00
Douglas Clowes
a3ec8b98a0 First pass at Universal Unidirectional Motor Driving (UUMD) 
r1849 | dcl | 2007-04-12 16:59:32 +1000 (Thu, 12 Apr 2007) | 2 lines
 2012-11-15 13:14:29 +11:00
Douglas Clowes
cff3ac6553 Added code for counter source filtering 
r1848 | dcl | 2007-04-12 15:54:04 +1000 (Thu, 12 Apr 2007) | 2 lines
 2012-11-15 13:14:25 +11:00
Dan Bartlett
f95142b219 no message 
r1846 | dbx | 2007-04-10 13:40:09 +1000 (Tue, 10 Apr 2007) | 2 lines
 2012-11-15 13:14:22 +11:00
Douglas Clowes
3534fcefb9 Remove trailing spaces to reduce differences with echidna 
r1845 | dcl | 2007-04-10 10:31:41 +1000 (Tue, 10 Apr 2007) | 2 lines
 2012-11-15 13:14:19 +11:00
Douglas Clowes
7363a846e1 motion is OK if motor has no absolute encoder 
r1844 | dcl | 2007-04-10 10:17:01 +1000 (Tue, 10 Apr 2007) | 2 lines
 2012-11-15 13:14:15 +11:00
Douglas Clowes
466e1bf4a9 Change stepsPerX and CountsPerX calculations to floating point 
r1843 | dcl | 2007-04-10 09:56:18 +1000 (Tue, 10 Apr 2007) | 2 lines
 2012-11-15 13:14:12 +11:00
Douglas Clowes
36dab66dc7 Change timer calculation based on feedback from PSI. Remove some duplicate code. 
r1842 | dcl | 2007-04-10 09:53:22 +1000 (Tue, 10 Apr 2007) | 2 lines
 2012-11-15 13:14:09 +11:00
Douglas Clowes
a7a480c5d1 Change stepsPerX and CountsPerX to float and revise PA calculation to avoid floting point limitation in GALIL 
r1841 | dcl | 2007-04-10 09:50:47 +1000 (Tue, 10 Apr 2007) | 2 lines
 2012-11-15 13:14:05 +11:00
Dan Bartlett
72fd4d9ff5 no message 
r1839 | dbx | 2007-04-10 08:08:20 +1000 (Tue, 10 Apr 2007) | 2 lines
 2012-11-15 13:14:02 +11:00