Commit Graph

3352 Commits

Author SHA1 Message Date
Douglas Clowes
87bf23eb6e tweak spacing and code, generate new drivers 2014-04-14 14:25:11 +10:00
Douglas Clowes
53d6274e7d Add 'permlink' code to generated drivers 2014-04-14 14:25:11 +10:00
Nick Hauser
3869b55380 Merge branch 'RELEASE-3_0' of ics2-dev.nbi.ansto.gov.au:/opt/sicsdev_git into RELEASE-3_0 2014-04-14 13:25:50 +10:00
Nick Hauser
6db328f882 First commit for Oxford 12T and Oxford Mercury manual chapters 2014-04-14 13:20:41 +10:00
Douglas Clowes
d08f5b6541 Update generated driver code 2014-04-14 10:34:43 +10:00
Douglas Clowes
ff43028b1a Add missing braces 2014-04-14 10:20:45 +10:00
Douglas Clowes
76baa21f64 Generate code to auto-create devices based on the config file 2014-04-14 10:19:35 +10:00
Douglas Clowes
419da766c5 driveable=nxalias, add make_args to debug_log, don't suppress unreferenced
we might want to use unreferenced functions in hook code
2014-04-14 10:19:23 +10:00
Douglas Clowes
d9dad4dd88 Allow single and double quotes, expressions for values, @@NOSEND@@ 2014-04-14 10:19:06 +10:00
Douglas Clowes
1692e0d4d4 Sanitize error text to reduce TCL errors 2014-04-04 12:27:40 +11:00
Douglas Clowes
f9bff7f4f2 Remove duplicate init and move sics dependency out of nwatch 2014-04-03 12:11:53 +11:00
Douglas Clowes
719fd7dc5a Make valgrind header inclusion conditional 2014-04-03 12:09:24 +11:00
Douglas Clowes
79be4c9422 Include outcode and continuation marker, move testlog test command up.
Moving the testlog command up reduces the dependency loops in servlog
2014-04-03 11:59:26 +11:00
Douglas Clowes
bab07abab8 Revised macro log suppression 2014-04-03 11:56:56 +11:00
Douglas Clowes
f2c5f515c4 Add radio buttons to ini files (radio = radio_group_name) 2014-03-28 10:57:13 +11:00
Ferdi Franceschini
9e6d04c693 Get reactor status from portal.nbi because neutron.ansto now requires SSL. 2014-03-26 10:34:45 +11:00
Ferdi Franceschini
a7f3b54a2f Copied changes made on ics1-kowari. 2014-03-26 09:05:54 +11:00
Ferdi Franceschini
fbf1f7bbf9 Add some extra controllers to kowari just in case they're needed in the future. 2014-03-26 08:23:00 +11:00
Ferdi Franceschini
50ea059237 Updated Bilby motor configuration. Adds beamstop 3
From Bilby commissioning xsl dated 2014-02-20
2014-03-25 12:27:29 +11:00
Ferdi Franceschini
bea943ddf2 Add new reactor status object to instruments. 2014-03-25 09:23:57 +11:00
Ferdi Franceschini
a3e975457b Allow new reactor status SCT_OBJECT to be added as a Nexus NXsource group. 2014-03-24 22:23:50 +11:00
Ferdi Franceschini
aaa07895c6 Added new reactor status driver. 2014-03-24 22:22:14 +11:00
Ferdi Franceschini
f5da28a8a0 runscan breaks on Taipan. Calling bm status here causes a recursive loop.
The "bm status" calls were added in SICS-705
2014-03-24 21:18:29 +11:00
Ferdi Franceschini
a785c5ceac Only return AsconTimeout in the aqadapter if no characters have been read.
Otherwise the DevQueueTask will skip fetching the reply.
2014-03-24 21:18:29 +11:00
Ferdi Franceschini
e2f2f1bc0c Escape illegal xml characters returned by the getgumtreexml command. 2014-03-24 21:18:28 +11:00
Douglas Clowes
8964750835 Implement "settle_time" in generated drivers 2014-03-24 10:21:28 +11:00
Douglas Clowes
0581b2b8e1 Allow for nested groups in gen_sct 2014-03-24 10:21:22 +11:00
Douglas Clowes
ef4d4d0235 Regenerate with nxalias and sdsinfo 2014-03-24 10:21:12 +11:00
Douglas Clowes
957ca1db19 Separate out the PID related code into pid_function blocks 2014-03-24 10:21:01 +11:00
Douglas Clowes
f257de6c34 Add implicit sdsinfo and nxalias properties. 2014-03-24 10:20:54 +11:00
Douglas Clowes
f44dc410cf Remove spurious file close from generated drivers 2014-03-24 10:13:19 +11:00
Douglas Clowes
988cb87371 Fix typo 2014-03-21 11:49:27 +11:00
Douglas Clowes
acf9d75941 Change display of values for posit_count, motorhome, and legacy_fsm
For hdb and writeTree issues
2014-03-19 16:59:33 +11:00
Douglas Clowes
9f8eabd3ec Implicit setting type to part/drivable if not set explicitly 2014-03-18 15:02:39 +11:00
Douglas Clowes
2db71ba537 Wrap generated driver code in 'catch' and handle_exception blocks 2014-03-18 14:57:43 +11:00
Douglas Clowes
94e2e06f22 Wrap generated driver code in 'catch' and handle_exception blocks 2014-03-18 12:42:56 +11:00
Douglas Clowes
7269776484 Remove obsolete function no longer used 2014-03-18 10:17:29 +11:00
Douglas Clowes
ad06ef1711 Remove 'create_node' from driver generator and '*.sct' files
It wasn't in working condition nor was it being used in any drivers
2014-03-18 09:29:30 +11:00
Douglas Clowes
ef236ecb1b Refinements to motion reporting for motors 2014-03-13 16:00:24 +11:00
Douglas Clowes
0536c16843 Add motion reporting for driver run and ascillate commands 2014-03-13 12:15:58 +11:00
Douglas Clowes
5eec1a9cd5 Impliment motor "oscillate" and "status" commands and prefix "driver run" 2014-03-11 17:17:57 +11:00
Ferdi Franceschini
9b19ddf4e6 SICS-720 Add autofocussing on Taipan using the following energy relations,
Avfocus = 115 + 2.13 * Ef
Mvfocus = 102.2 + 1.78 * Ei

Ahfocus = 45.68 - (-105.7) * (0.945) ^ Ef
Mhfocus = 184.42 - (60.1) * (0.951) ^ Ei

NOTE: Parameters are set via tasub mono/ana  VB1/VB2/HB1/HB2/HB3
2014-03-10 14:06:22 +11:00
Douglas Clowes
879a573e05 Propagate make CC variable to SICS and hardup makes
Allows "CC=clang" or "CC='clang --analyze'" type games
2014-03-07 15:27:29 +11:00
Douglas Clowes
4225f79d88 Fix previous overzealous leak fix 2014-03-07 10:28:22 +11:00
Douglas Clowes
012de6d735 More Gumtree-friendly driver changes 2014-03-04 16:38:08 +11:00
Douglas Clowes
8be48b16a5 refactor and regenerate hiden driver - make more Gumtree friendly 2014-03-04 15:18:06 +11:00
Douglas Clowes
cec264a252 Generate sct_hiden_xcs.tcl with new PID parameters and range check 2014-03-04 11:07:41 +11:00
Douglas Clowes
9e65849964 Fix some memory leaks and use-after-free (cppcheck) 2014-03-03 17:18:52 +11:00
Douglas Clowes
be347e813c Clean up the space/tab mess and trailing whitespace 2014-03-03 17:11:12 +11:00
Douglas Clowes
0a012cabc3 Fix possible buffer overruns 2014-03-03 17:04:31 +11:00