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

67 Commits

Author SHA1 Message Date
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
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
Douglas Clowes
5be03cc63b make default mutable 'true' and data on branches 2014-08-05 16:04:55 +10:00
Douglas Clowes
e04785f3a8 Code to generate the move/rename 2014-07-23 17:14:13 +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
Douglas Clowes
0dbe7bd53e Allow empty braces on sct vars and remove semicolons from python code 2014-07-11 13:37:21 +10:00
Douglas Clowes
35067c3673 Clean up Nagelfar warnings in generated drivers 2014-07-11 13:37:17 +10:00
Douglas Clowes
a9e4c80a87 Reindent gen_sct.py to 4 spaces 2014-07-11 13:37:02 +10:00
Douglas Clowes
202004766a Check for existence of config dict fields before using them in generated drivers 2014-06-30 12:49:22 +10:00
Ferdi Franceschini
e971cd8b64 New sicsconfig.ini file configuration editor. 
Updated wombat sics_config.ini and gen_sct.py
Generated new tcl files from sct templates and
modified some old sct_*.tcl drivers.

TODO
sct_keithley_2700.tcl
magneticField/sct_oxford_labview.tcl
magneticField/sct_bruker_BEC1.tcl
temperature/sct_watlow_st4.tcl
temperature/sct_oxford_mercury.tcl
temperature/sct_mercury_pres.tcl
temperature/sct_julabo_lh45.tcl
temperature/sct_lakeshore_340.tcl
temperature/sct_julabo_lh45_gen.tcl
temperature/sct_watlow_rm.tcl
temperature/sct_eurotherm_2000.tcl
temperature/sct_lakeshore_336.tcl
temperature/sct_watlow_pm.tcl
temperature/sct_oxford_itc.tcl
temperature/sct_lakeshore_370.tcl
temperature/west400.tcl
 2014-06-30 09:08:19 +10:00
Douglas Clowes
fe3489b61f SICS-754 Use "clientput" instead of "puts stdout" in generated drivers 2014-06-26 13:48:44 +10:00
Douglas Clowes
27ed29aea5 Allow SCT files to have numbers with a leading minus 2014-06-17 14:53:48 +10:00
Douglas Clowes
18d40f69d9 Make generated drivers log to "../log" instead of "/tmp" 2014-06-16 10:30:19 +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
86673f6a8f Only require the IP and PORT in the config.ini if we will use them 2014-05-16 15:39:58 +10:00
Douglas Clowes
bf84f65e5a Changes to generated driver logging 2014-05-01 10:54:09 +10:00
Douglas Clowes
fd23ee2443 TCL mode, async{queue,protocol}, and reset line number 
The TCL mode allows a begin/end construct and TCL code without the
    leading '@' characters.

    Add the function name to the hook code comments that are generated.

    Reset the line counter to 1 between driver modules for error reporting.
 2014-05-01 10:54:09 +10:00
Douglas Clowes
6bca9566e3 Fix Double underscore bug in generated code 
061f19a52e3c40e30add262db95cea57655b893b introduced an extra underscore
in the make_path function for un-named groups.
 2014-04-17 13:43:57 +10:00
Douglas Clowes
6f0e0b80f8 Handle terminator and timeout attributes in sics_config.ini files 2014-04-16 09:44:20 +10:00
Douglas Clowes
53d6274e7d Add 'permlink' code to generated drivers 2014-04-14 14:25:11 +10:00
Douglas Clowes
76baa21f64 Generate code to auto-create devices based on the config file 2014-04-14 10:19:35 +10:00
Douglas Clowes
419da766c5 driveable=nxalias, add make_args to debug_log, don't suppress unreferenced 
we might want to use unreferenced functions in hook code
 2014-04-14 10:19:23 +10:00
Douglas Clowes
d9dad4dd88 Allow single and double quotes, expressions for values, @@NOSEND@@ 2014-04-14 10:19:06 +10: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