Commit Graph

217 Commits

Author SHA1 Message Date
Douglas Clowes
899daa8d83 Add defaults to .ini args and refactor add_driver 2014-11-06 12:51:53 +11:00
Douglas Clowes
f59daef96b Clean up argument handling in gen_sct for add_args and make_args 2014-11-03 16:30:33 +11:00
Douglas Clowes
a57852954e Fix some problems handling multiple filenames 2014-10-30 13:41:02 +11:00
Douglas Clowes
ff260fd737 Fix %s bug in simulated property 2014-10-22 16:02:17 +11:00
Douglas Clowes
000e799800 Add whatsthere.py to RELEASE-3_2 2014-10-22 12:47:30 +11:00
Douglas Clowes
f86dc33081 Allow driving when simulated and add generated comments 2014-10-03 09:58:11 +10:00
Douglas Clowes
713e88d236 Allow conditional groups and vars in sct drivers 2014-10-03 09:58:11 +10:00
Douglas Clowes
814c8741c3 Refactor put_var processing for gen_sct 2014-10-03 09:58:11 +10:00
Douglas Clowes
6ebc085f68 Add %include facility to SCT template files 2014-10-03 09:58:11 +10:00
Douglas Clowes
214b5252a1 Add %include facility to SCT template files 2014-10-03 09:58:11 +10:00
Douglas Clowes
aa29f85d14 Revamp file reading and error messages 2014-10-03 09:58:11 +10:00
Douglas Clowes
334d9d0e0c Check function code for balanced parentheses, brackets, and braces 2014-10-03 09:58:11 +10:00
Douglas Clowes
94bd7f32eb Redo the error reporting 2014-10-03 09:58:11 +10:00
Douglas Clowes
75eddb7eea Add preamble and postamble code hooks 2014-10-03 09:58:11 +10:00
Douglas Clowes
cfe389838b Handle missing read_command 2014-10-03 09:58:11 +10:00
Douglas Clowes
850845415e Reduce some of the noise in the logfile 2014-10-03 09:58:11 +10:00
Douglas Clowes
6c0dfe4c4d Allow empty strings 2014-10-03 09:58:10 +10:00
Ferdi Franceschini
a9c0cf3df6 prun and pdrive macros now check arguments and allow driving non posit motors too. 2014-09-30 15:12:42 +10:00
Douglas Clowes
ba72e77d4c Merge branch 'RELEASE-3_1' into RELEASE-3_2
Conflicts:
	sics/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl
	sics/site_ansto/instrument/bilby/config/motors/shutters_sct.tcl
	sics/site_ansto/instrument/bilby/config/motors/tank_sct.tcl
	sics/site_ansto/instrument/bilby/util/sics_config.ini
	sics/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl
	sics/site_ansto/instrument/config/environment/huber_pilot_sct.tcl
	sics/site_ansto/instrument/config/environment/isotech_ps_sct.tcl
	sics/site_ansto/instrument/config/environment/keithley_m2700_sct.tcl
	sics/site_ansto/instrument/config/environment/magneticField/oxford12tlv_sct.tcl
	sics/site_ansto/instrument/config/environment/magneticField/tsi_smc_sct.tcl
	sics/site_ansto/instrument/config/environment/nhq_200_sct.tcl
	sics/site_ansto/instrument/config/environment/omron_hldc_sct.tcl
	sics/site_ansto/instrument/config/environment/protekmm_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/eurotherm_m2000_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/julabo_lh45_gen_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/lakeshore_218_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/ls336_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/ls340_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_base_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_level_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_pres_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_scpi_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_temp_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_valve_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/nprvasm2_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/pfeiffer_hg_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/watlow_mpm_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/watlow_mrm_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/watlow_mst4_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/west_6100.sct
	sics/site_ansto/instrument/config/source/reactor_status_sct.tcl
	sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
	sics/site_ansto/instrument/sans/quokka_configuration.tcl
	sics/site_ansto/instrument/tas/config/motors/motor_configuration.tcl
	sics/site_ansto/instrument/util/gen_sct.py
	sics/site_ansto/instrument/util/motor_utility.tcl
2014-09-26 17:04:19 +10:00
Ferdi Franceschini
4a4f464485 Copied prun and pdrive from RELEASE-3_2 branch. 2014-09-11 14:29:24 +10:00
Douglas Clowes
65b50f3fcc Allow sct drivers to get device_class and simulation_group from ini file 2014-09-11 13:27:09 +10:00
Ferdi Franceschini
f0202fad51 Use the new anstocapture command SICS-764 2014-09-10 15:01:23 +10:00
Douglas Clowes
bc0606394b Make gitloader and gitrefer executable 2014-09-08 11:37:10 +10:00
Douglas Clowes
ef0c7cc0d5 Extend poll_period to (1,3600) seconds 2014-09-04 11:29:19 +10:00
Douglas Clowes
67c3bc7964 Add hupdateif <path> <value> [<format>] for conditional update of hipadaba 2014-08-19 15:05:51 +10:00
Douglas Clowes
2cb70741b1 Add hupdateif <path> <value> [<format>] for conditional update of hipadaba 2014-08-19 15:05:32 +10:00
Douglas Clowes
44f6b65aef Merge branch 'RELEASE-3_1' into RELEASE-3_2
Conflicts:
	sics/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl
2014-08-19 11:46:24 +10:00
Douglas Clowes
04a87e5ff2 Change IP/PORT to ip_address/tcp_port and add to mkDriver sig
This facilitates use in mkDriver hook code
2014-08-19 11:21:45 +10:00
Douglas Clowes
6266bcdad7 Make a sctcontroller with a NULL aqadapter in simulation mode 2014-08-18 14:50:51 +10:00
Douglas Clowes
10b7e8029f Merge branch 'RELEASE-3_1' into RELEASE-3_2 2014-08-18 13:34:56 +10:00
Douglas Clowes
2c8f1131f6 Add wrapper_property nosctcontroller = <anything> to gen_sct 2014-08-18 12:34:24 +10:00
Douglas Clowes
ea9de2c617 Add @TCL/@END code to gen_sct 2014-08-18 11:39:24 +10:00
Douglas Clowes
da17516491 Add wrapper_property and mkWrapper code for SCT wrappers 2014-08-18 11:39:17 +10:00
Douglas Clowes
507ddafb2a Merge branch 'RELEASE-3_1' into RELEASE-3_2
Conflicts:
	sics/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/pelican/pelican_configuration.tcl
2014-08-06 13:53:18 +10:00
Douglas Clowes
c86ff4c883 Prettyfy the dump routines 2014-08-05 17:45:30 +10:00
Douglas Clowes
973f844186 Allow Group_Property override for klass and type and set topleve data true 2014-08-05 17:07:02 +10:00
Douglas Clowes
a1f509d96a Force branch klass to '@none' and type to 'part' 2014-08-05 16:45:42 +10:00
Douglas Clowes
5fb4bc9adc If data is true default klass to parameter in SCT 2014-08-05 16:38:41 +10:00
Douglas Clowes
5be03cc63b make default mutable 'true' and data on branches 2014-08-05 16:04:55 +10:00
Douglas Clowes
d330d7874a Add the FOPDT and PID modules
The First Order Plus Delay Time module is a model of a
controlled system that is useful in modelling and
simulating process control systems.

The Proportional Integral Differential module is a control
system that is useful in controlling process control
systems.

This is not fully functional yet.
2014-08-05 11:44:27 +10:00
Douglas Clowes
e04785f3a8 Code to generate the move/rename 2014-07-23 17:14:13 +10:00
Ferdi Franceschini
b9b386e3f6 Capture error messages in prun and pdrive. 2014-07-20 20:49:20 +10:00
Ferdi Franceschini
b5c64c2a03 Add convenience commands prun and pdrive for posit motors. 2014-07-17 09:44:18 +10:00
Douglas Clowes
b217eb0dcf Add whatsthere.py to check revs on instruments 2014-07-16 12:57:33 +10:00
Ferdi Franceschini
6112c8afa0 Don't copy 'id' from the option section into the implementation section.
The read_config procs should fetch arguments from both the option and implemention sections.
2014-07-15 08:59:16 +10:00
Ferdi Franceschini
deb6716f9b make_args can now be set in the option section of a sics_config.ini 2014-07-15 08:59:16 +10:00
Ferdi Franceschini
9305d6da53 Don't fetch an implementation if an option is disabled. 2014-07-15 08:59:15 +10:00
Ferdi Franceschini
47fbb1979e You can now set the privilege and type for MakeSICSObj in an sct template. 2014-07-11 17:14:08 +10:00
Douglas Clowes
4f72bcaaf5 allow legacy sct controllers in generated drivers 2014-07-11 13:37:50 +10:00
Douglas Clowes
5ee7e6719f Defer makesctdrive to end of mkDriver to avoid possible forward references. 2014-07-11 13:37:35 +10:00