linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,868 Commits 1 Branch 0 Tags
d85d6127fe9496a112a828817275fe540ee965dd
Commit Graph

95 Commits

Author SHA1 Message Date
Douglas Clowes
c3bb4a9591 Merge branch 'RELEASE-3_1' into RELEASE-3_2 
Conflicts:
	sics/site_ansto/instrument/config/beamline/sct_he3_polanal.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
	sics/site_ansto/instrument/pelican/pelican_configuration.tcl
 2015-01-07 13:09:27 +11:00
Douglas Clowes
34f748e426 Set the driver name and the ip_address/tcp_port for nosctcontroller 2014-11-27 15:15:13 +11:00
Douglas Clowes
d4de7d4ea1 Pretty-up the spacing around the conditional code in gen_sct.py 2014-11-20 14:49:46 +11:00
Douglas Clowes
c838e4ffe2 Pretty-up the spacing around the conditional code in gen_sct.py 2014-11-20 14:42:50 +11:00
Douglas Clowes
2ee490b5ce Bug! missing ' else {' in gen_sct 2014-11-13 13:42:10 +11:00
Douglas Clowes
8dea026181 Change log_file_name to add _date for sct driver logfiles 2014-11-13 12:40:33 +11:00
Douglas Clowes
0ae1d966c3 Change log_file_name to add _date for sct driver logfiles 2014-11-13 12:36:19 +11:00
Douglas Clowes
a42030ff41 Bug! missing ' else {' in gen_sct 2014-11-10 18:58:29 +11:00
Douglas Clowes
4b9ed0bf7f Merge changes from RELEASE-3_1 in gen_sct.py 
Now the only difference is sct defauly of before/after
 2014-11-07 09:41:43 +11:00
Douglas Clowes
c488733bcd Set default sct=before, add ${name} to mkDriver call 2014-11-06 18:16:02 +11:00
Douglas Clowes
6bed30d5d4 Reduce spurious differences in generated code 2014-11-06 16:37:46 +11:00
Douglas Clowes
00574586ea Import of changes in 3.2 2014-11-06 16:14:51 +11:00
Douglas Clowes
a9932f8ae8 Slight change to the way we do PID in SCT files 2014-11-06 16:09:44 +11:00
Douglas Clowes
58ca10883f Refactor the output filename handling and sct position in the name 
add --sct options for before (sct_*.tcl) or after (*_sct.tcl) the driver name
 2014-11-06 15:40:40 +11:00
Douglas Clowes
47c92518a9 Make protocol_args like {add,make}_args and add nosctcontroller in read_config 2014-11-06 12:54:21 +11:00
Douglas Clowes
aa9942b2b6 calling makesctcontroller and mkDriver from read_config 2014-11-06 12:53:06 +11:00
Douglas Clowes
cd64a3de3d Allow sendterminator and replyterminator in .ini file 2014-11-06 12:52:37 +11:00
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
9adb5cb907 Handle missing read_command 2014-11-03 14:25:42 +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
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
Douglas Clowes
c6abb1fabd Slight change to the way we do PID in SCT files 2014-09-30 17:24:58 +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
Douglas Clowes
65b50f3fcc Allow sct drivers to get device_class and simulation_group from ini file 2014-09-11 13:27:09 +10:00
Douglas Clowes
ef0c7cc0d5 Extend poll_period to (1,3600) seconds 2014-09-04 11:29:19 +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