Commit Graph

2266 Commits

Author SHA1 Message Date
Ferdi Franceschini
3bffbf720f Added sapmot sample aperture motor from new Bilby motion control spreadsheet. 2014-06-17 22:31:38 +10:00
Douglas Clowes
fa63ed8eed Dont create control alias unless there is a name to use 2014-06-17 17:25:17 +10:00
Douglas Clowes
bcb28e68c1 Add some more read-only fields to the huber 2014-06-17 17:17:41 +10:00
Douglas Clowes
171342c97e Make driver nodes mutable and regen 2014-06-17 15:45:03 +10:00
Douglas Clowes
6ce8d3d577 Tidy omron sct file, change id poll rate then regenerate 2014-06-17 14:53:48 +10:00
Douglas Clowes
ed7c371080 Add the huber bath Pilot ONE driver 2014-06-17 14:53:48 +10:00
Douglas Clowes
27ed29aea5 Allow SCT files to have numbers with a leading minus 2014-06-17 14:53:48 +10:00
Ferdi Franceschini
eadb336ef3 Simple hack to allow reading inputs on the fake Galil.
This was done for the shutter.sct on Bilby.
2014-06-17 12:30:54 +10:00
Ferdi Franceschini
79cedd58dc Fix return value for simulated t0_chopper_id.
Also save value as an array, this is useful when testing the code.
2014-06-17 12:30:54 +10:00
Ferdi Franceschini
e0edfb8d0a Implement the Ltof_<det> time of flight length calculations and the nguide selection command. 2014-06-17 12:30:53 +10:00
Ferdi Franceschini
2996889ea5 The timing chopper isn't necessarily the same as the master chopper. 2014-06-17 12:30:52 +10:00
Ferdi Franceschini
c00c317b69 Changed aperture rule to allow driving apertures up past 5 degrees.
This was done to facilitate implementation of the nguide guide selection command.
Also fixed miscount of collimator sections.
2014-06-17 12:30:52 +10:00
Ferdi Franceschini
e817fc9ed7 New aperture encoders and beamstops 4 and 5 added to Bilby. 2014-06-17 12:30:51 +10:00
Ferdi Franceschini
f9a8b2b005 Save the tank position as an array just to be consistent with the other motion axes. 2014-06-17 12:27:28 +10:00
Ferdi Franceschini
40afb4a829 Set klass attribute on vessel_y variable. 2014-06-17 07:23:00 +10:00
Douglas Clowes
fce610a142 Add a driver for the Omron ZS-HLDC Laser Displacement device 2014-06-16 17:37:20 +10:00
Douglas Clowes
fa3154bdcd Update non-templated drivers to log to ../log/ instead of /tmp/ 2014-06-16 10:42:17 +10:00
Douglas Clowes
1010003d6c Regenerate templated drivers to get changes to logging and simulation tests 2014-06-16 10:37:10 +10:00
Douglas Clowes
18d40f69d9 Make generated drivers log to "../log" instead of "/tmp" 2014-06-16 10:30:19 +10:00
Douglas Clowes
84dfd1f50b Take out the CRLF (it was a buffer overrun anyway) 2014-06-13 17:50:34 +10:00
Douglas Clowes
f2d051e2a5 Add a protocol module for Omron Compoway/F protocol on asyncqueue 2014-06-13 14:57:48 +10:00
Ferdi Franceschini
58f23cc91d Motor configuration updates from Bilby motion control spreadsheets. 2014-06-13 09:04:53 +10:00
Douglas Clowes
09c82c0644 Try separating Quokka and taipan tests 2014-06-11 15:45:40 +10:00
Douglas Clowes
2ff336f1ee Check for fake/simulated motors 2014-06-11 14:57:18 +10:00
Douglas Clowes
f4f29c2d84 Massage the test suite for non-taipan instruments 2014-06-11 14:54:54 +10:00
Douglas Clowes
3ae5310af9 Massage the mercury pressure card driver 2014-06-11 10:50:07 +10:00
Ferdi Franceschini
5df6300255 Updated detector carriage minimum separation after correcting curtaindet configuration.
NOTE: The stepsperx and cntsperx were changed in the Bilby motion control spreadsheet after SICS was deployed.
2014-06-10 19:57:54 +10:00
Ferdi Franceschini
df7ad295ed Enabled detector carriage anticollider rule. 2014-06-10 19:27:18 +10:00
Ferdi Franceschini
70e9ce99e4 Updated motor configuration from Bilby_motion_control_SICS.xls, 10-06-2014T16:45 2014-06-10 19:26:58 +10:00
Ferdi Franceschini
1baf4faa90 Add tank position and set vessel_y SICS variable for Ltof calculation. 2014-06-10 19:24:57 +10:00
Ferdi Franceschini
ea7f7b8b9d Generate posit_n parameters from posn attributes in the motor configuration CSV files. 2014-06-10 19:23:29 +10:00
Ferdi Franceschini
8da11e0ff2 The fake Galil can now handle 'MG _LFH' and 'MG _LFR' to get limit switch states. 2014-06-10 19:21:51 +10:00
Ferdi Franceschini
cb1652835a Added 'unpad' command to remove leading zeros from base 10 numbers. 2014-06-10 19:20:41 +10:00
Ferdi Franceschini
96526c7866 Trim whitespace from description when generating motor configuration. 2014-06-10 19:16:53 +10:00
Douglas Clowes
e2fae66199 Update the mercury pressure loop for the pressure card 2014-06-10 17:17:28 +10:00
Douglas Clowes
21c9193a4b Minor fixes to compareSICS, gitrefer and gitloader 2014-06-05 16:35:49 +10:00
Douglas Clowes
1f3aa6676e Create the gitloader and gitrefer progs and tie in with compareSICS 2014-06-05 11:36:29 +10:00
Douglas Clowes
49361e3430 Pull back configurations changes from Bilby 2014-06-04 15:17:35 +10:00
Douglas Clowes
393f050338 Update sics_test.py to add position_names and embedded python tests 2014-05-30 17:48:17 +10:00
Douglas Clowes
61700fbae3 Update test code 2014-05-30 17:48:09 +10:00
Douglas Clowes
1a1f00c49a motor verbose/debug, position_names, hard<->soft and refactor
Make debug mode and verbose mode separate modes

Implement position names in the "posit" code as alternate to numbers

Refactor to use hard/soft conversion functions
2014-05-30 17:32:47 +10:00
Douglas Clowes
c7a2d05832 Add posit2soft to get soft position from position 2014-05-30 17:19:36 +10:00
Douglas Clowes
a1572f3152 Add astrium chopper field 'master' to driver 2014-05-30 17:18:29 +10:00
Douglas Clowes
bd0c0b5556 Bilby Astrium Chopper Driver and Fake Chopper 2014-05-29 12:36:54 +10:00
Douglas Clowes
2517f71c67 Improve handling and logging for xxx_simulation case 2014-05-28 12:24:20 +10:00
Douglas Clowes
28ea3befb6 Allow setting driver debug_threshold in SCT file 2014-05-28 11:59:30 +10:00
Douglas Clowes
6a9b64d3d6 Catch errors in the hval/hget and return the message as the value 2014-05-26 12:55:34 +10:00
Douglas Clowes
f62fb5a91c Longer timeout and fiddling around the edges (debug, callback args) 2014-05-26 12:55:22 +10:00
Douglas Clowes
70e1cdcd01 Push test_suite, sicsconfig and hipadaba down to base class setup 2014-05-26 10:55:37 +10:00
Douglas Clowes
9c08424524 Update tests to include drive_one and getgumtreexmlvalues 2014-05-26 10:55:32 +10:00