82afa86fa0
Cosmetic changes to the simulated fermi chopper controller.
2013-04-29 20:45:50 +10:00
c452e8982b
Fermi chopper motors should ignore INT1712 interrupts.
...
Don't halt choppers just because someone tried to interrupt a scan.
Also make slave chopper optional in mkFermiMotors.
2013-04-29 20:44:46 +10:00
961f581bf2
Fixed parsing of intlck_status. It's 16 bits not 8 bits!
2013-04-29 20:41:06 +10:00
b3a2c5c976
Merge in changes from taipan branch.
2013-04-28 17:15:45 +10:00
50a2545f97
tasdrive now only monitors motors which are driving.
...
Fixes SICS-568 Because tasdrive now stops calling status checking on a
motor which has terminated for any reason.
SICS-570: The correct motor names are now reported by tasdrive.
SICS-575: Use ANSTO motor names when reporting limit violations.
2013-04-28 16:28:02 +10:00
a6cfbe8b7f
SICS-597: Don't drive a motor if it is within precision of the target.
2013-04-27 18:16:30 +10:00
44579ee8aa
SICS-595: Added "busy" checks to the callbacks used by asynnet.c:anetRead()
2013-04-27 18:00:36 +10:00
c6f1dd6591
Load test IP and PORT numbers when SICS_SIMULATION is set.
2013-04-25 11:16:25 +10:00
d8b48728b4
SICS-587 (in progress) IP and PORT configurations DONE for Quokka.
...
TODO Environment controllers etc.
2013-04-24 16:54:22 +10:00
20a3dff71e
New Neutron Velocity Selector simulatin for Quokka.
2013-04-24 16:49:06 +10:00
e28b1f77da
SICS-593 (in progress) Protocol handlers should return 0 from the
...
AsconReading state.
2013-04-24 16:44:53 +10:00
bdf1c24c57
SICS-587 (in progress) Get host and port from the HISTMEM_HOSTPORT
...
dictionary.
2013-04-23 16:54:09 +10:00
e28ef59bd0
Added fake disk chopper controller.
2013-04-23 14:32:24 +10:00
2ea0e042ee
Implements run and drive wrappers which set allowed target values when
...
driving the fermi motors.
2013-04-23 10:29:41 +10:00
b15014bfd5
The mchs and schs motors can now be driven via run and drive command
...
wrappers.
Running mchs and schs sets the motor gain parameters.
Uses new ANSTO tclmotor implementation.
2013-04-23 10:26:28 +10:00
bda409da04
Fix host names and port numbers.
2013-04-23 10:25:09 +10:00
34f22ea669
Use real chopper drivers when env var SICS_SIMULATION=fakedev
2013-04-23 10:23:27 +10:00
b5ff1e82f5
Fix sics_simulation check.
2013-04-23 10:22:20 +10:00
99a4ccc2ee
Deploy the fake controllers with SICS.
2013-04-23 10:05:17 +10:00
579ad59ebf
Simple simulation of Fermi chopper control.
...
Currently it lets you set coils and registers for three controllers.
It will also set the up_to_speed, lev_complete, and run flags for the
system status.
TODO Phase control and locking.
2013-04-23 09:56:44 +10:00
013398d0da
Use a port number which normal users have permission to access.
2013-04-21 17:51:48 +10:00
a9bd5cc5da
SICS-587 (in progress) Put IP and PORT configurations in a single file.
...
Pelican DONE motor, counter, chopper. TODO hmm, environment.
2013-04-21 14:57:57 +10:00
e5d6d44d8d
Code cleanup.
2013-04-21 14:55:41 +10:00
49e6a584c0
SICS-587 (in progress) Put IP and PORT configuration in one file.
...
Platypus TODO hmm, environment, and devices like multimeters and the
sylvac.
2013-04-21 11:14:10 +10:00
73ba1b0dba
Merge branch 'merge-replace' of /home/ferdi/workspace/GIT/sicsdev_git into merge-replace
2013-04-20 18:57:53 +10:00
a22d403c87
Added sicsdebug flag to control verbosity of log files.
...
If sicsdebug == 0 log output from commands executed in macros is
suppressed.
2013-04-20 18:55:38 +10:00
cdafe4d650
Set default "movecount" to 500 ms.
2013-04-20 18:43:41 +10:00
91d6e52a41
SICS-580 Pom precision was too high.
...
The encoder resolution is 0.044 degrees so made precisoin = 0.05
2013-04-20 18:37:55 +10:00
a5c097cedc
Treat Tcl procs prefixed with imot_, hdb_ and get_ specially.
...
hdb_, Parameter will be added to hdb tree.
imot_, Motor interface function, eg run, status.
get_, Tcl code will be evaluated when "mot list" is called.
Add debug info.
2013-04-20 18:35:52 +10:00
b98ff24528
Added configuration file changes from ics1-pelican
2013-04-20 17:53:17 +10:00
98cf4d5dc4
SICS-572: Reverted fix. This was actually a job for GumTree and has been fixed by Norman.
2013-04-19 08:31:32 +10:00
1edad9fa2f
SICS-586: Set sicspoll interval to one second on max_binrate and total_maprate hdb nodes.
2013-04-19 07:55:09 +10:00
afd7b3879d
Generic fake Galil derived from Taipan version.
...
Added instrument name as a command line argument.
2013-04-18 12:40:56 +10:00
47a1d0aa4e
Added configuration file modifications from ics1-platypus
2013-04-18 07:00:17 +10:00
1d7681e326
Reduce verbosity of log files when using JSON protocol.
2013-04-10 19:54:24 +10:00
c466d85bba
pSock is obsolete, see conman.h SConnection struct.
2013-04-10 18:45:51 +10:00
278c64b377
Set scan=1ms and scans per sample=10 on the counters when SICS starts up.
2013-04-10 17:03:30 +10:00
2dc1657d66
Reversed configuration tables for the autosample changers.
...
Because the load side was changed to the opposite side.
2013-04-09 14:38:39 +10:00
16e744be12
Moved MakeDrive to instrument specific configuration.
...
This lets us make run and drive wrappers for the fermi motors on pelican
by renaming the SICS run and drive.
2013-04-09 14:15:55 +10:00
191e3719b7
Use ns instead of micro-seconds for veto-windows.
2013-03-14 15:29:31 +11:00
1079f6e702
Always return 0 from the AsconReading state to make sure we exit the AsconTask().
...
Since the PSI update the AsconTask() function will loop forever unless you return 0.
2013-03-13 19:06:57 +11:00
94f21f832e
SICS-561: Wait for the hmm COUNTEND event in blocking mode.
...
Also allow veto when scanning.
2013-03-04 18:03:55 +11:00
ed95f3aaaf
SICS-555: ANSTO hmcontrol now releases locks on the counters after pausing.
2013-03-04 18:02:31 +11:00
a00ca3872f
Addpython motor simulation for taipan
2013-02-21 14:26:26 +11:00
e7a478489e
Copied in-situ modifications from ics1-quokka.
2013-02-20 18:19:44 +11:00
b5b4d7a747
Add some comments to deploySICS.sh
2013-02-15 13:27:55 +11:00
0e52709cdc
Report SICS version information on "SICServer -v"
2013-02-15 13:27:03 +11:00
639e7af80c
Add indicator of local changes relative to commit checksum
2013-02-15 13:25:34 +11:00
d3a7249649
Add FileEvalGlob command for multipath config files
2013-02-15 13:23:51 +11:00
ba128520da
Add motor runtime to motor stopped log message
2013-02-15 09:49:39 +11:00
Ferdi Franceschini