linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,933 Commits 1 Branch 0 Tags
5970a05aaadadba40e8b92bd3403771ced8d11f5
Commit Graph

2933 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ferdi Franceschini
34f22ea669 Use real chopper drivers when env var SICS_SIMULATION=fakedev 2013-04-23 10:23:27 +10:00
Ferdi Franceschini
b5ff1e82f5 Fix sics_simulation check. 2013-04-23 10:22:20 +10:00
Ferdi Franceschini
99a4ccc2ee Deploy the fake controllers with SICS. 2013-04-23 10:05:17 +10:00
Ferdi Franceschini
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
Ferdi Franceschini
013398d0da Use a port number which normal users have permission to access. 2013-04-21 17:51:48 +10:00
Ferdi Franceschini
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
Ferdi Franceschini
e5d6d44d8d Code cleanup. 2013-04-21 14:55:41 +10:00
Ferdi Franceschini
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
Ferdi Franceschini
73ba1b0dba Merge branch 'merge-replace' of /home/ferdi/workspace/GIT/sicsdev_git into merge-replace 2013-04-20 18:57:53 +10:00
Ferdi Franceschini
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
Ferdi Franceschini
cdafe4d650 Set default "movecount" to 500 ms. 2013-04-20 18:43:41 +10:00
Ferdi Franceschini
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
Ferdi Franceschini
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
Ferdi Franceschini
b98ff24528 Added configuration file changes from ics1-pelican 2013-04-20 17:53:17 +10:00
Ferdi Franceschini
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
Ferdi Franceschini
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
Ferdi Franceschini
afd7b3879d Generic fake Galil derived from Taipan version. 
Added instrument name as a command line argument.
 2013-04-18 12:40:56 +10:00
Ferdi Franceschini
47a1d0aa4e Added configuration file modifications from ics1-platypus 2013-04-18 07:00:17 +10:00
Ferdi Franceschini
1d7681e326 Reduce verbosity of log files when using JSON protocol. 2013-04-10 19:54:24 +10:00
Ferdi Franceschini
c466d85bba pSock is obsolete, see conman.h SConnection struct. 2013-04-10 18:45:51 +10:00
Ferdi Franceschini
278c64b377 Set scan=1ms and scans per sample=10 on the counters when SICS starts up. 2013-04-10 17:03:30 +10:00
Ferdi Franceschini
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
Ferdi Franceschini
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
Ferdi Franceschini
191e3719b7 Use ns instead of micro-seconds for veto-windows. 2013-03-14 15:29:31 +11:00
Ferdi Franceschini
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
Ferdi Franceschini
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
Ferdi Franceschini
ed95f3aaaf SICS-555: ANSTO hmcontrol now releases locks on the counters after pausing. 2013-03-04 18:02:31 +11:00
Ferdi Franceschini
86379e8038 Added functions to create the camera driver and init the camera protocol 
to site_ansto.c
 2013-02-28 12:57:41 +11:00
Ferdi Franceschini
abbe619a10 Merge remote-tracking branch 'origin/merge-replace' into dingo 2013-02-26 01:35:58 +11:00
Ferdi Franceschini
ad27488d3d Initial implementation of Dingo Camera driver. 
Takes a single shot or a multishot.
If the user changes the camera configuration in SICS the new config will
be uploaded when the next take shot/multishot command is sent.
This driver allows the scan object in SICS to drive the scan variable to
the next target while the camera is processing and saving data after
acquiring an image.
TODO
Implement "set file,..." command.
 2013-02-26 01:20:02 +11:00
Ferdi Franceschini
87559bf411 Upload camera configuration if it has changed before sending 
a "take shot" or "take multi on" command.  Incorporate Vijay's changes
to the "set camera," parameters.
 2013-02-26 01:02:25 +11:00
Douglas Clowes
a00ca3872f Addpython motor simulation for taipan 2013-02-21 14:26:26 +11:00
Ferdi Franceschini
743c52d905 Remove duplicate camera code 2013-02-21 14:00:57 +11:00
Ferdi Franceschini
e7a478489e Copied in-situ modifications from ics1-quokka. 2013-02-20 18:19:44 +11:00
Ferdi Franceschini
ed9a2aff16 Moved camera to hardsup and started adding parameters. 2013-02-18 11:21:04 +11:00
Douglas Clowes
b5b4d7a747 Add some comments to deploySICS.sh 2013-02-15 13:27:55 +11:00
Douglas Clowes
0e52709cdc Report SICS version information on "SICServer -v" 2013-02-15 13:27:03 +11:00
Douglas Clowes
639e7af80c Add indicator of local changes relative to commit checksum 2013-02-15 13:25:34 +11:00
Douglas Clowes
d3a7249649 Add FileEvalGlob command for multipath config files 2013-02-15 13:23:51 +11:00
Douglas Clowes
ba128520da Add motor runtime to motor stopped log message 2013-02-15 09:49:39 +11:00
Douglas Clowes
48bb76ac58 At ANSTO we use JSON so do not bypass the formatting 2013-02-15 09:47:06 +11:00
Douglas Clowes
fcac36591e Adjust site_ansto/Makefile to define SITE_ANSTO for common SICS files 2013-02-15 09:45:57 +11:00
Ferdi Franceschini
49a2cbff50 Merge branch 'merge-replace' of ics2-dev.nbi.ansto.gov.au:/opt/sicsdev_git into merge-replace 2013-02-14 11:36:43 +11:00
Ferdi Franceschini
9e30a158fb server_config.tcl 
Remove call to obsolete ::utility::set_sctobj_attributes because it
returns an error and aborts the server_set_sobj_attributes proc.
This bug meant that script context objects weren't being linked into the
hdb tree.

util/utility.tcl
Removed obselete ::utility::set_sctobj_attributes proc because
sctcontrollers are no longer being added to the root of the hdb tree.
 2013-02-14 11:32:36 +11:00
Ferdi Franceschini
5ae5a826a4 Deleted 2013-02-11 19:24:24 +11:00
Ferdi Franceschini
f2befda1a2 Dingo camera driver 2013-02-11 19:14:03 +11:00
Douglas Clowes
eb1d042440 set driver_status to HWIdle on HALT in motor Idle state 2013-02-06 10:27:00 +11:00
Douglas Clowes
4fa515c351 Add hdbnode to diffscan 2012-12-18 14:03:58 +11:00
Douglas Clowes
907f0e2ba6 add sicsvar output to diffscan 2012-12-14 08:48:05 +11:00
Douglas Clowes
43346d6ea5 add hostnam and portnum commands 2012-12-13 14:07:38 +11:00