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

1425 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jing Chen
c66c59df9f init config 
r3277 | jgn | 2011-11-24 15:00:52 +1100 (Thu, 24 Nov 2011) | 1 line
 2012-11-15 17:18:06 +11:00
Douglas Clowes
cece6638f7 Burhan's WIP version from 2008-01-07 
I believe that this was working, at least to a point, but may not be his final version.
r3276 | dcl | 2011-11-24 10:18:34 +1100 (Thu, 24 Nov 2011) | 2 lines
 2012-11-15 17:18:02 +11:00
Douglas Clowes
2fd7540445 Burhan's WIP version 6.1 from 2007-10-25 
r3275 | dcl | 2011-11-24 10:02:28 +1100 (Thu, 24 Nov 2011) | 1 line
 2012-11-15 17:17:57 +11:00
Douglas Clowes
66064554a8 Burhan's WIP version 6.0 from 2007-10-04 
r3274 | dcl | 2011-11-24 10:01:02 +1100 (Thu, 24 Nov 2011) | 1 line
 2012-11-15 17:17:53 +11:00
Douglas Clowes
ed1258ba5d Add history of the GALIL controller. 
First is a WIP version of Burhan's code from 2007-07-13.

r3273 | dcl | 2011-11-24 09:44:02 +1100 (Thu, 24 Nov 2011) | 3 lines
 2012-11-15 17:17:48 +11:00
Douglas Clowes
5143937f00 Adjustment to accomodate "make incflags" correctly 
r3272 | dcl | 2011-11-24 09:34:46 +1100 (Thu, 24 Nov 2011) | 1 line
 2012-11-15 17:17:44 +11:00
Jing Chen
4e6891ece4 rename file 
r3271 | jgn | 2011-11-21 09:22:26 +1100 (Mon, 21 Nov 2011) | 1 line
 2012-11-15 17:17:40 +11:00
Jing Chen
5af594c967 setup pelican config 
r3270 | jgn | 2011-11-18 15:44:54 +1100 (Fri, 18 Nov 2011) | 1 line
 2012-11-15 17:17:35 +11:00
Jing Chen
e13f8b37c8 setup pelican config 
r3269 | jgn | 2011-11-18 15:44:40 +1100 (Fri, 18 Nov 2011) | 1 line
 2012-11-15 17:17:31 +11:00
Jing Chen
fac72e3abb setup pelican config 
r3268 | jgn | 2011-11-18 15:44:28 +1100 (Fri, 18 Nov 2011) | 1 line
 2012-11-15 17:17:27 +11:00
Jing Chen
1ef8a8a5ac setup pelican config 
r3267 | jgn | 2011-11-18 15:44:12 +1100 (Fri, 18 Nov 2011) | 1 line
 2012-11-15 17:17:22 +11:00
Jing Chen
f0ce45b66c configurationi init 
r3266 | jgn | 2011-11-18 14:14:15 +1100 (Fri, 18 Nov 2011) | 1 line
 2012-11-15 17:17:18 +11:00
Jing Chen
5596b9fd99 configurationi init 
r3265 | jgn | 2011-11-18 14:14:06 +1100 (Fri, 18 Nov 2011) | 1 line
 2012-11-15 17:17:13 +11:00
Jing Chen
f2b4fd96a4 configurationi init 
r3264 | jgn | 2011-11-18 14:13:31 +1100 (Fri, 18 Nov 2011) | 1 line
 2012-11-15 17:17:09 +11:00
Jing Chen
86da9cca93 configurationi init 
r3263 | jgn | 2011-11-18 14:13:20 +1100 (Fri, 18 Nov 2011) | 1 line
 2012-11-15 17:17:05 +11:00
Jing Chen
361b6dda58 configurationi init 
r3262 | jgn | 2011-11-18 14:13:10 +1100 (Fri, 18 Nov 2011) | 1 line
 2012-11-15 17:17:00 +11:00
Jing Chen
a5d0ed919d configurationi init 
r3261 | jgn | 2011-11-18 14:12:45 +1100 (Fri, 18 Nov 2011) | 1 line
 2012-11-15 17:16:56 +11:00
Jing Chen
e11fa134b5 configurationi init 
r3260 | jgn | 2011-11-18 14:12:02 +1100 (Fri, 18 Nov 2011) | 1 line
 2012-11-15 17:16:52 +11:00
Douglas Clowes
a172bed449 Add ";*IDN?" in SetValue and setPoint functions (after commands that don't elicit a response) to force a response that avoids the timeout and reconnect sequence that gives problems on the LS336 
r3259 | dcl | 2011-10-18 16:13:01 +1100 (Tue, 18 Oct 2011) | 1 line
 2012-11-15 17:16:47 +11:00
Douglas Clowes
27cb364855 Use libjson.so if available (SL 6.0) 
r3258 | dcl | 2011-10-17 17:22:27 +1100 (Mon, 17 Oct 2011) | 1 line
 2012-11-15 17:16:43 +11:00
Jing Chen
638c160310 r3257 | jgn | 2011-10-17 16:31:36 +1100 (Mon, 17 Oct 2011) | 1 line 2012-11-15 17:16:38 +11:00
Jing Chen
ebc62a676a recent changes at Pelican Lyrebird 
r3256 | jgn | 2011-10-17 15:37:22 +1100 (Mon, 17 Oct 2011) | 1 line
 2012-11-15 17:16:34 +11:00
Jing Chen
3b6dc490ab recent changes at Pelican Lyrebird 
r3255 | jgn | 2011-10-17 15:37:09 +1100 (Mon, 17 Oct 2011) | 1 line
 2012-11-15 17:16:30 +11:00
Jing Chen
dd10a410e7 recent changes at Pelican Lyrebird 
r3254 | jgn | 2011-10-17 15:36:55 +1100 (Mon, 17 Oct 2011) | 1 line
 2012-11-15 17:16:25 +11:00
Jing Chen
86cd8dee4e recent changes at Pelican Lyrebird 
r3253 | jgn | 2011-10-17 15:36:16 +1100 (Mon, 17 Oct 2011) | 1 line
 2012-11-15 17:16:21 +11:00
Ferdi Franceschini
d416695b4b Merged in-situ changes from Echidna 
r3252 | ffr | 2011-09-23 14:21:09 +1000 (Fri, 23 Sep 2011) | 2 lines
 2012-11-15 17:16:17 +11:00
Ferdi Franceschini
d778dd2bfe sicshipacaba.c 
SICS-418 Make sure hnotify sends messages as hdbevents when using the
JSON protocl

site_ansto/instrument/config/hmm/hmm_object.tcl
Initialise the hmm object to make sure the read type is set.

nxscripts_common_1.tcl
Set the read type when saving the hmm data.

server_config.tcl
Fix the autosave command so that you can enable/disable autosave while
the histogram memory is running.

protocol.c
Reduce noise in log files when using the JSON protocol.  Don't log
messages generated during macro execution (ie within a TCL proc).

motor.c:MotorStatus
Abort the current operation, the scan command and batch files when a
motor object returns a hardware fault status value.

motor_dmc2280.c
set driver status to HWFault when the driver is in the error state.

r3251 | ffr | 2011-09-23 08:49:00 +1000 (Fri, 23 Sep 2011) | 25 lines
 2012-11-15 17:16:12 +11:00
Douglas Clowes
c765c33f6d Make instance data properties of a params node instead of namespace global variables 
This is to allow multiple instance of the same device type without clashing of persistent data
r3248 | dcl | 2011-08-22 11:30:20 +1000 (Mon, 22 Aug 2011) | 3 lines
 2012-11-15 17:16:07 +11:00
Ferdi Franceschini
89bfef55b0 This is a simple LS336 simulation. It just implements the commands which 
the sct_lakeshore_336.tcl driver uses.  You can set the temperature and
the sensor readings have a random one degree fluctuation.

r3238 | ffr | 2011-08-12 08:46:21 +1000 (Fri, 12 Aug 2011) | 4 lines
 2012-11-15 17:16:03 +11:00
Ferdi Franceschini
5e50f2cb43 Removed the dependency on some global variables so that you can drive 
two lakeshore controllers.  Most of the remaining globals are harmless
or unused but they should be removed.

r3237 | ffr | 2011-08-12 08:41:56 +1000 (Fri, 12 Aug 2011) | 4 lines
 2012-11-15 17:15:59 +11:00
Ferdi Franceschini
a8203ffa6e Copied changes which were made in-situ. 
r3236 | ffr | 2011-08-02 14:20:46 +1000 (Tue, 02 Aug 2011) | 2 lines
 2012-11-15 17:15:54 +11:00
Ferdi Franceschini
169aa5ed2f Display/Value and setpoint should be numeric to save arrays of readings. 
We can't save arrays of text.

r3235 | ffr | 2011-07-25 17:06:35 +1000 (Mon, 25 Jul 2011) | 3 lines
 2012-11-15 17:15:50 +11:00
Ferdi Franceschini
0b90dfc0dc Remove files accidentally added in rev 3071 
D    site_ansto/hardsup/oldsct_modbusprot.c
D    site_ansto/hardsup/libhlib.a
D    site_ansto/instrument/deploySICS.sh.new
D    site_ansto/instrument/reflectometer/config/beamline/old_polanal.tcl
D    site_ansto/instrument/reflectometer/config/beamline/old_sct_RFGen.tcl
D    .cproject
D    cscope.out
D    tags
D    psi/hardsup/libhlib.a
D    psi/tecs/libtecsl.a

r3234 | ffr | 2011-07-24 13:13:46 +1000 (Sun, 24 Jul 2011) | 13 lines
 2012-11-15 17:15:46 +11:00
Jing Chen
3c82aacfa1 modify config file 
r3233 | jgn | 2011-07-22 15:35:14 +1000 (Fri, 22 Jul 2011) | 1 line
 2012-11-15 17:15:41 +11:00
Douglas Clowes
d33a957d01 differentiate rdValue and rdData and add experimental treewalk 
r3232 | dcl | 2011-07-20 14:45:17 +1000 (Wed, 20 Jul 2011) | 1 line
 2012-11-15 17:15:37 +11:00
Douglas Clowes
cffc765197 Add ;*IDN? after writes to get a response 
r3231 | dcl | 2011-07-06 10:00:25 +1000 (Wed, 06 Jul 2011) | 1 line
 2012-11-15 17:15:32 +11:00
Douglas Clowes
a76803c242 Keithley 2700 DMM 
r3230 | dcl | 2011-07-05 16:23:52 +1000 (Tue, 05 Jul 2011) | 1 line
 2012-11-15 17:15:28 +11:00
Ferdi Franceschini
3404e4670c Set chnspeed as actual speed instead of the requested speed. 
r3229 | ffr | 2011-06-26 12:19:01 +1000 (Sun, 26 Jun 2011) | 1 line
 2012-11-15 17:15:24 +11:00
Ferdi Franceschini
6b1c629a43 Guard against misinterpreting readings that have a leading zero as octal. 
Set the current to the target value when we're within one step rather than within tolerance to avoid undershooting the target.
Do not try and get the state when initialising the driver because it will fail to create the driver properly if the RF generator is unavailable on SICS startup.  The current is zero when the RF gen is power cycled so it is safe to set the current reading and target current as zero in initialisation so we just set the operating frequency and everything else is left at zero.
r3228 | ffr | 2011-06-26 12:18:27 +1000 (Sun, 26 Jun 2011) | 3 lines
 2012-11-15 17:15:19 +11:00
Ferdi Franceschini
edc7639d65 Set operation current for polariser and analyser 
r3227 | ffr | 2011-06-26 12:17:28 +1000 (Sun, 26 Jun 2011) | 1 line
 2012-11-15 17:15:15 +11:00
Douglas Clowes
eaf924eb73 incorporate syringe pump protocol 
r3226 | dcl | 2011-06-24 13:05:51 +1000 (Fri, 24 Jun 2011) | 1 line
 2012-11-15 17:15:11 +11:00
Douglas Clowes
5b94e43689 log catch messages 
r3225 | dcl | 2011-06-24 13:02:38 +1000 (Fri, 24 Jun 2011) | 1 line
 2012-11-15 17:15:06 +11:00
Douglas Clowes
cd2dafceb3 Syringe Pump Driver 
for New Era Pump Systems Inc NE-1000 syringe pumps
r3224 | dcl | 2011-06-24 13:01:08 +1000 (Fri, 24 Jun 2011) | 3 lines
 2012-11-15 17:15:02 +11:00
Douglas Clowes
992e32bc10 Driver for the Hamilton Modular Valve Positioner (MVP) 
r3223 | dcl | 2011-06-22 17:09:21 +1000 (Wed, 22 Jun 2011) | 1 line
 2012-11-15 17:14:58 +11:00
Douglas Clowes
6a157ede79 Add "hamilton" protocol same as oxford with echo suppression 
r3222 | dcl | 2011-06-20 11:54:20 +1000 (Mon, 20 Jun 2011) | 1 line
 2012-11-15 17:14:53 +11:00
Ferdi Franceschini
6c654d7c5d Added config for 10 sample changer. 
r3221 | ffr | 2011-06-20 11:27:09 +1000 (Mon, 20 Jun 2011) | 1 line
 2012-11-15 17:14:49 +11:00
Ferdi Franceschini
d5d9bdeb30 If srce or att are off position by more than the "precision" set in the driver then SICS will report the selected aperture as being UNKNOWN. 
So we increase the precision to 0.1 degrees to prevent this.
r3220 | ffr | 2011-06-20 11:25:46 +1000 (Mon, 20 Jun 2011) | 2 lines
 2012-11-15 17:14:45 +11:00
Ferdi Franceschini
355c204598 Parameterise the wavelength/speed conversion functions so that you can choose velocity selector. 
r3219 | ffr | 2011-06-20 10:03:50 +1000 (Mon, 20 Jun 2011) | 1 line
 2012-11-15 17:14:40 +11:00
Ferdi Franceschini
7a92bfb4dd Trigger acquisition when within tolerance of the next step for the required settletime. 
Also made generic so you can create a temperature control for example instead of a speed based control.
r3218 | ffr | 2011-06-20 10:02:04 +1000 (Mon, 20 Jun 2011) | 2 lines
 2012-11-15 17:14:36 +11:00
Ferdi Franceschini
d1bc6cda97 Load RVA driver. 
r3217 | ffr | 2011-06-20 09:58:33 +1000 (Mon, 20 Jun 2011) | 1 line
 2012-11-15 17:14:32 +11:00