4195 Commits

Author SHA1 Message Date
2246c58837 Allow up to eight fake Galil controllers when testing. 2014-02-05 15:51:01 +11:00
b257413fd0 Added chopper id command 2014-02-03 23:28:56 +11:00
2fc161713a Configure OAT_TABLE for Bilby. TODO Set correct tube spacing 2014-02-03 23:15:52 +11:00
baa28e41d4 Added PLC config 2014-02-03 23:14:37 +11:00
c3f5087ea4 Added PLC_HOSTPORT dictionary. TODO set IP PORT 2014-02-03 23:14:20 +11:00
f14b2c0a82 Script Context driver generator files for Hiden XCS and Isotech Power Supply 2014-02-03 11:05:04 +11:00
964d218a20 Start of sct generator description file for Julabo LH45 2014-02-03 11:05:03 +11:00
a2120c79e8 Make args optional and fix some issues 2014-02-03 11:05:03 +11:00
a0c9b78f30 Describes CSV files. 2014-02-02 22:17:52 +11:00
1a6f5df36b The D10 apertures are actually at posit 1 not 5. 2014-02-02 17:48:22 +11:00
53f14de642 Set default speed, accel, decel to conservative values for ap and col motors. 2014-02-02 17:45:58 +11:00
658dab2ac9 Separate the max speed, accel, decel, parameters so we can set recommended values.
We should also put the "home" parameters in userdef_attlist if their actual positions
differ from the default of zero.
2014-02-02 17:43:38 +11:00
64b7de358c We don't need to lookup socket numbers for the Galil controllers in the services file. 2014-02-02 17:35:14 +11:00
4f65f5281f Don't insert date in generated motor configuration file. 2014-02-02 17:31:56 +11:00
95d37fea12 - inserted ANETProcess into "How are you" test 2014-01-31 14:53:44 +00:00
3522f409db Had to generated a new sicsmot_attlist.csv because the spreadsheet was updated.
This should be done each time there's an update.
2014-01-31 14:01:53 +11:00
04906c8ca5 The aperture arm must be up to allow driving the guide.
Low encoder values = aperture arm up.
2014-01-31 14:00:23 +11:00
8f2a1adec4 Make genmotconf a bit quieter.
But it would be good to generate labels for the posit_n values.
2014-01-31 13:52:22 +11:00
1678c5a73e New version of the Bilby_motion_control_commissioning_checklist.xls spreadsheet.
Generated new motor configuration.
2014-01-31 09:20:19 +11:00
7be4438b59 Generate anticollider rules for the collimation system on Bilby. 2014-01-31 09:15:09 +11:00
64870e7bc8 Refactor anticollision script so that we can add more scripts to the anticollision module. 2014-01-31 09:15:09 +11:00
901c6603fb Generate virtual motors for the collimation system. 2014-01-31 09:15:08 +11:00
4a134cf2d0 genmotconf.tcl now sorts the posit_n parameters by value.
Sort is ascending if cntsperx is positive, descending if negative.
Improve error and report logs generated by genmotconf.tcl
It is not an error if a missing attributed can be initialised with a
default value by genmotconf.tcl.
Replace the COLLIMATOR_POSITIONS.csv with Bilby_motion_control_commissioning_checklist.csv
Generate new "generated_motor_configuration.tcl" file.
2014-01-31 09:15:07 +11:00
f6ae3c62f7 SICS-719: Acknowledge errors when in protocol 2 or 3 2014-01-31 09:15:06 +11:00
c2c7128245 Put the generated driver where we got the input 2014-01-30 17:22:09 +11:00
172e69f9e3 Make gen_sct python program executable 2014-01-30 17:15:11 +11:00
fcb1a6086d Ignore the parser output artifact files from gen_sct.py 2014-01-30 17:10:53 +11:00
aebcd90f9b Python program to generate script context driver from a definition file 2014-01-30 13:17:55 +11:00
4dacb502ec Initial Bilby motor configuration. Just collimation system for now.
sicsmot_attlist.csv was generated by first running
../../../util/genmotconf.tcl Bilby_Motion_control_axes.csv COLLIMATOR_POSITIONS_D.csv hdb_info.csv
in the Bilby motor config directory and renaming the missing_attlist.csv to
sicsmot_attlist.csv.
NOTE
generated_motor_configuration.tcl was then made by running genmotconf again
with Bilby_Motion_control_axes.csv COLLIMATOR_POSITIONS_D.csv sicsmot_attlist.csv hdb_info.csv
2014-01-15 16:31:15 +11:00
883ebcd5d7 Some descriptive info for Bilby motors. 2014-01-15 16:31:15 +11:00
882d8306bf Bilby motor configuration data extracted from Excel spreadsheets.
The spreadsheets were provided by the electrical team and currently only define the translation tables and aperture selectors for the collimation system.
2014-01-15 16:31:14 +11:00
2481abb8af Scripts which generate a motor configuration file from CSV data files. 2014-01-15 16:31:14 +11:00
e984619d77 Initial bilby configuration. 2014-01-15 16:31:14 +11:00
b1f09c3dd3 Fixed error message typo. We don't want to miss errors when searching logs. 2014-01-15 16:31:13 +11:00
68a746d46a SICS-710: Make the watlow_rm driveable block until a drive has finished.
Also clear the geterror property to make sure that the driver recovers from Modbus error messages.
2014-01-15 16:31:13 +11:00
e27aea0169 SICS-709: Refresh the count status whenever the current counts are fetched (eg before saving data).
This was broken as a side effect of SICS-664 (ie removing the unnecessary hmcontrol object).
2014-01-15 16:31:13 +11:00
03c00623ee Allow two LS336 and two LS340 temperature controllers to be selected. 2013-12-20 09:09:03 +11:00
5d40914ee0 Fix typo to stop the scan command from checking thread0 on tclmot motors. 2013-12-20 09:09:02 +11:00
fc02a71882 Make display window optional for SIM_GALIL.py 2013-12-20 09:09:01 +11:00
d2ac198251 Updates from ics1-wombat 2013-12-20 09:09:00 +11:00
6ce3f8bd45 SICS-706 Create sics_config.ini for SICS upgrade on Wombat. 2013-12-20 09:08:59 +11:00
37879b9144 The ID and TYPE were the wrong way around when calling add_oxford_mercury. 2013-12-20 09:08:58 +11:00
216e2b3529 SICS-697 Make named links in data group for LS336 and Oxford Mercury.
SICS-705 Fixed log file name bug in Mercury controller.
2013-12-20 09:08:57 +11:00
d60710a3e1 Updated configuration from ics1-kookaburra. 2013-12-20 09:08:57 +11:00
315d51541e Updated scan configuration from ics1-kookaburra. 2013-12-20 09:08:56 +11:00
48edc7322a Updated motor configuration from ics1-kookaburra. 2013-12-20 09:08:56 +11:00
2d96d3de69 Updated histmem configuration from ics1-kookaburra. 2013-12-20 09:08:56 +11:00
0bf0af0847 Updated detector voltage range and OAT_TABLE configuration from ics1-platypus 2013-12-20 09:08:55 +11:00
2cf513c4bb FIX: Create driver interface for each syringe pump on Platypus 2013-12-20 09:08:55 +11:00
52f28117ef Updated from ics2-quokka 2013-12-20 09:08:54 +11:00