Commit Graph

3229 Commits

Author SHA1 Message Date
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
Douglas Clowes
579b78e30b Clean up the space/tab mess and trailing whitespace 2014-03-03 17:00:14 +11:00
Douglas Clowes
bcefc2db60 Hiden XCS Vapor system generated driver 2014-02-28 16:38:12 +11:00
Douglas Clowes
1fd74bef01 Improved PI control of Hiden XCS 2014-02-28 13:35:26 +11:00
Douglas Clowes
de575757e4 Implement "@@NOSEND@@" in generated drivers 2014-02-28 13:31:45 +11:00
Douglas Clowes
05d25257b3 Add total flow and PID-ish control 2014-02-28 11:16:36 +11:00
Douglas Clowes
c0f4805a6c Add a PID function for each variable 2014-02-28 11:15:03 +11:00
Douglas Clowes
23c7b0f000 Fix for driveable/driving generated code 2014-02-28 09:04:39 +11:00
Douglas Clowes
3abc6c9e60 Move pathname and basename utility functions to extra_utility
This makes them generally available to SICS (and it's early)
2014-02-27 12:28:21 +11:00
Douglas Clowes
91d0dc86f5 Spelling error in output message 2014-02-24 15:02:31 +11:00
Douglas Clowes
b558f9d696 Add files to Echidna manifest and configuration to reflect changes out there 2014-02-24 14:17:06 +11:00
Ferdi Franceschini
9d33923bf2 Move the attenuator posit motor to the instrument group with the att motor. 2014-02-21 16:53:30 +11:00
Ferdi Franceschini
a81d120c94 Bilby only has one beam monitor 2014-02-21 12:51:50 +11:00
Ferdi Franceschini
da781de657 The anticollider proximity_script should not raise an error if no proximity_rules have been defined. 2014-02-20 16:44:13 +11:00
Douglas Clowes
3d8fd84f70 Move stuff up from collimator to instrument and add virtual motors for slits and attentuator 2014-02-20 14:58:29 +11:00
Ferdi Franceschini
c036a05035 Fix type and units on kookaburra parameters. 2014-02-20 10:56:29 +11:00
Ferdi Franceschini
df49a9d5b6 Merge branch 'RELEASE-3_0' of ics2-dev.nbi.ansto.gov.au:workspace/GIT/sicsdev_git into RELEASE-3_0 2014-02-20 07:53:00 +11:00
Ferdi Franceschini
fcbdfd51d1 Added parameters requested by Christine. 2014-02-20 07:52:46 +11:00
Ferdi Franceschini
d187f888fb Override common antohm_linked.xml with config from ics1-kookaburra.
The OAT_TABLE command doesn't support <IX> tables.
2014-02-20 07:52:02 +11:00
Ferdi Franceschini
aedc3f9168 Update from ics1-kookaburra 2014-02-20 07:46:01 +11:00
Douglas Clowes
867b783ab9 Rename bilby rough_20 to rough_100 2014-02-19 17:20:16 +11:00
Douglas Clowes
4bfa758667 Fix some compiler warnings and mixed space/tab indentation 2014-02-19 14:37:13 +11:00
Douglas Clowes
54e217af78 Bilby Script Context drivers for galil-attached devices 2014-02-19 14:33:19 +11:00
Douglas Clowes
0ea068cc31 Generate code to report errors in script context hook code 2014-02-19 12:06:22 +11:00