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

1445 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jing Chen 46bc7a3166 r3297 | jgn | 2011-11-30 15:19:20 +1100 (Wed, 30 Nov 2011) | 1 line 2012-11-15 17:19:34 +11:00
Douglas Clowes 254db51d26 WIP commissioning 
r3296 | dcl | 2011-11-29 18:59:09 +1100 (Tue, 29 Nov 2011) | 1 line
 2012-11-15 17:19:30 +11:00
Douglas Clowes bd2f7a6853 Implement Echidna Airpad Control 
r3295 | dcl | 2011-11-29 18:52:18 +1100 (Tue, 29 Nov 2011) | 1 line
 2012-11-15 17:19:26 +11:00
Douglas Clowes f3763033d8 Don't need to turn on multiple solenoids as one-way valve appears to be fitted 
r3294 | dcl | 2011-11-29 18:51:35 +1100 (Tue, 29 Nov 2011) | 1 line
 2012-11-15 17:19:21 +11:00
Douglas Clowes 66a87d9d01 Revise AIRPAD CONTROL to be more like Echidna et al 
r3293 | dcl | 2011-11-28 14:31:06 +1100 (Mon, 28 Nov 2011) | 1 line
 2012-11-15 17:19:17 +11:00
Douglas Clowes baf2206efe Content downloaded from GALIL controllers before conversion to SICS 
r3292 | dcl | 2011-11-28 14:23:41 +1100 (Mon, 28 Nov 2011) | 1 line
 2012-11-15 17:19:12 +11:00
Douglas Clowes 1bb2e24df8 Version given before migration to SICS 
r3291 | dcl | 2011-11-28 13:46:22 +1100 (Mon, 28 Nov 2011) | 1 line
 2012-11-15 17:19:08 +11:00
Douglas Clowes d66223f78c Dan's version of the airpad and wedge control 
r3290 | dcl | 2011-11-28 13:45:21 +1100 (Mon, 28 Nov 2011) | 1 line
 2012-11-15 17:19:03 +11:00
Ferdi Franceschini 1b6d046394 Revert the SICS scan object to allow multidimensional scans. 
r3289 | ffr | 2011-11-25 15:05:19 +1100 (Fri, 25 Nov 2011) | 2 lines
 2012-11-15 17:18:59 +11:00
Jing Chen 9c97678a45 add smooth func to the scan data 
r3288 | jgn | 2011-11-25 14:24:29 +1100 (Fri, 25 Nov 2011) | 1 line
 2012-11-15 17:18:55 +11:00
Jing Chen 9b7fd70774 add smooth func to the scan data 
r3287 | jgn | 2011-11-25 14:24:26 +1100 (Fri, 25 Nov 2011) | 1 line
 2012-11-15 17:18:50 +11:00
Jing Chen 5bd8e4ae3a add oscillator motors to the file 
r3286 | jgn | 2011-11-25 12:25:17 +1100 (Fri, 25 Nov 2011) | 1 line
 2012-11-15 17:18:46 +11:00
Jing Chen 1069dbc6e9 add pelican to the animal list 
r3285 | jgn | 2011-11-25 12:18:37 +1100 (Fri, 25 Nov 2011) | 1 line
 2012-11-15 17:18:41 +11:00
Jing Chen c45d1472e6 remove those commands being commented out. 
r3284 | jgn | 2011-11-25 10:46:10 +1100 (Fri, 25 Nov 2011) | 3 lines
 2012-11-15 17:18:37 +11:00
Jing Chen 89678f4bc7 r3283 | jgn | 2011-11-25 10:35:03 +1100 (Fri, 25 Nov 2011) | 1 line 2012-11-15 17:18:33 +11:00
Ferdi Franceschini e5431d5e97 tas/config/hmm/hmm_configuration.tcl 
Taipan doesn't not have a histogram memory server.

tas/config/motors/positmotor_configuration.tcl
Taipan doesn't currently have discrete position motors

config/commands/commands_common.tcl
Taipan doesn't have a histogram memory server.

config/nexus/nxscripts_common_1.tcl
Specify internal path name convention for Taipan hdf files

r3282 | ffr | 2011-11-25 10:11:59 +1100 (Fri, 25 Nov 2011) | 13 lines
 2012-11-15 17:18:28 +11:00
Jing Chen 2c3a32f2e3 add oscillator control 
r3281 | jgn | 2011-11-24 15:02:45 +1100 (Thu, 24 Nov 2011) | 1 line
 2012-11-15 17:18:24 +11:00
Jing Chen bfe2507e2d init config 
r3280 | jgn | 2011-11-24 15:01:39 +1100 (Thu, 24 Nov 2011) | 1 line
 2012-11-15 17:18:19 +11:00
Jing Chen 4ab35a325f init config 
r3279 | jgn | 2011-11-24 15:01:23 +1100 (Thu, 24 Nov 2011) | 1 line
 2012-11-15 17:18:15 +11:00
Jing Chen a973912aff init config 
r3278 | jgn | 2011-11-24 15:01:06 +1100 (Thu, 24 Nov 2011) | 1 line
 2012-11-15 17:18:10 +11:00
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