linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,211 Commits 1 Branch 0 Tags
9b19ddf4e61e3feeee5a7c22aeb87411de325881
Commit Graph

3211 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ferdi Franceschini
5c76f7a243 SICS-587 (in progress) Put IP and PORT configurations in a single file. 
TODO environment
 2013-05-06 20:41:37 +10:00
Ferdi Franceschini
3e33a7b8b2 Merged in-situ modifications from ics1-taipan. 2013-05-06 20:13:36 +10:00
Ferdi Franceschini
33059d6493 ID of velocity selector currently used on Quokka 
TODO This should be at the /usr/local/sics level.
 2013-05-05 23:03:17 +10:00
Ferdi Franceschini
7c2796aa4f Added MIRROTRON's ammendments to Quokka's guide configuration. 2013-05-05 23:01:26 +10:00
Ferdi Franceschini
f11612bc5b SICS-601: Provide a command to get the textstatus list from the histogram server. 2013-05-05 23:00:05 +10:00
Ferdi Franceschini
c09968b72e Attempt a reconnect for astvels protocol if a command times out. 
This lets us re-use the astvel protovol to support SICS-601 so that HTTP
connections will reconnect after the connection times out.
 2013-05-05 21:19:05 +10:00
Ferdi Franceschini
7e1e4e2d45 Don't allow change of direction if the fermimotor speed != 0. 
Added an "idle" subcommand so the speed can be set to zero without
delevitating.  Also added alarm reset command.
 2013-05-03 00:36:53 +10:00
Ferdi Franceschini
90d05682e2 Fix x_pixel_angular_offset spacing in hdf file. 2013-05-02 19:17:00 +10:00
Ferdi Franceschini
68c45ff183 Add 'idle' subcommand to fermi motors. 2013-05-02 14:08:59 +10:00
Ferdi Franceschini
ce78ec9b87 Add idle toggle to Fermi chopper sim and control verbosity. 2013-05-02 14:07:05 +10:00
Ferdi Franceschini
7be5d2f326 Set correct IP address for Pelican beam monitors. 2013-05-01 07:40:43 +10:00
Ferdi Franceschini
ecd9707eb2 Set fermi chopper direction when setting speed. 2013-05-01 07:32:31 +10:00
Ferdi Franceschini
82afa86fa0 Cosmetic changes to the simulated fermi chopper controller. 2013-04-29 20:45:50 +10:00
Ferdi Franceschini
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
Ferdi Franceschini
961f581bf2 Fixed parsing of intlck_status. It's 16 bits not 8 bits! 2013-04-29 20:41:06 +10:00
Ferdi Franceschini
b3a2c5c976 Merge in changes from taipan branch. 2013-04-28 17:15:45 +10:00
Ferdi Franceschini
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
Ferdi Franceschini
a6cfbe8b7f SICS-597: Don't drive a motor if it is within precision of the target. 2013-04-27 18:16:30 +10:00
Ferdi Franceschini
44579ee8aa SICS-595: Added "busy" checks to the callbacks used by asynnet.c:anetRead() 2013-04-27 18:00:36 +10:00
Ferdi Franceschini
c6f1dd6591 Load test IP and PORT numbers when SICS_SIMULATION is set. 2013-04-25 11:16:25 +10:00
Ferdi Franceschini
d8b48728b4 SICS-587 (in progress) IP and PORT configurations DONE for Quokka. 
TODO Environment controllers etc.
 2013-04-24 16:54:22 +10:00
Ferdi Franceschini
20a3dff71e New Neutron Velocity Selector simulatin for Quokka. 2013-04-24 16:49:06 +10:00
Ferdi Franceschini
e28b1f77da SICS-593 (in progress) Protocol handlers should return 0 from the 
AsconReading state.
 2013-04-24 16:44:53 +10:00
Ferdi Franceschini
bdf1c24c57 SICS-587 (in progress) Get host and port from the HISTMEM_HOSTPORT 
dictionary.
 2013-04-23 16:54:09 +10:00
Ferdi Franceschini
e28ef59bd0 Added fake disk chopper controller. 2013-04-23 14:32:24 +10:00
Ferdi Franceschini
2ea0e042ee Implements run and drive wrappers which set allowed target values when 
driving the fermi motors.
 2013-04-23 10:29:41 +10:00
Ferdi Franceschini
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
Ferdi Franceschini
bda409da04 Fix host names and port numbers. 2013-04-23 10:25:09 +10:00
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