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

3987 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Douglas Clowes
eff54a5fd9 Implement task priorities and message queues 2015-07-29 17:47:46 +10:00
Douglas Clowes
0db57b9bae Reference count async queue transactions 
so we can put them of task message queues
 2015-07-29 17:47:15 +10:00
Douglas Clowes
7ccbf7e0bd Change LLDstringDelete to LLDdeleteString 2015-07-29 17:46:34 +10:00
Ferdi Franceschini
64b212c4a0 Resolved a conflict that was missed during 'git merge' conflict resolution. 2015-04-24 13:36:59 +10:00
Ferdi Franceschini
10d29d597c Cleaned up ANSTO code to merge with sinqdev.sics 
This is our new RELEASE-4_0 branch which was taken from ansto/93d9a7c
Conflicts:
	.gitignore
	SICSmain.c
	asynnet.c
	confvirtualmot.c
	counter.c
	devexec.c
	drive.c
	event.h
	exebuf.c
	exeman.c
	histmem.c
	interface.h
	motor.c
	motorlist.c
	motorsec.c
	multicounter.c
	napi.c
	napi.h
	napi4.c
	network.c
	nwatch.c
	nxscript.c
	nxxml.c
	nxxml.h
	ofac.c
	reflist.c
	scan.c
	sicshipadaba.c
	sicsobj.c
	site_ansto/docs/Copyright.txt
	site_ansto/instrument/lyrebird/config/tasmad/sicscommon/nxsupport.tcl
	site_ansto/instrument/lyrebird/config/tasmad/taspub_sics/tasscript.tcl
	statusfile.c
	tasdrive.c
	tasub.c
	tasub.h
	tasublib.c
	tasublib.h
 2015-04-23 20:49:26 +10:00
Douglas Clowes
c650788a2c Merge branch 'RELEASE-3_1' into RELEASE-3_2 2015-04-17 14:05:39 +10:00
Douglas Clowes
49a8bdc96c Merge branch 'Quokka' into RELEASE-3_1 2015-04-17 14:05:23 +10:00
Douglas Clowes
c09781fed7 Change gumtree_time_estimate from float to text 2015-04-17 14:04:17 +10:00
Douglas Clowes
4bb05ed67e Merge branch 'RELEASE-3_1' into RELEASE-3_2 
Conflicts:
	sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl
 2015-04-17 13:54:48 +10:00
Douglas Clowes
21c96297f3 Merge branch 'Wombat' into RELEASE-3_1 2015-04-17 13:17:45 +10:00
Douglas Clowes
f2568b681d Pullback from Wombat 2015-04-17 2015-04-17 13:12:42 +10:00
Douglas Clowes
2925bdedc5 Merge branch 'Platypus' into RELEASE-3_1 2015-04-17 12:52:59 +10:00
Douglas Clowes
843a9f46be Pullback changes from Platypus 2015-04-17 12:52:17 +10:00
Douglas Clowes
1a93e494d9 Add a test setup for Pelican 2015-04-17 12:38:19 +10:00
Douglas Clowes
94663632e4 Merge branch 'Quokka' into RELEASE-3_1 
Conflicts:
	sics/site_ansto/instrument/config/environment/sct_hiden_xcs.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_julabo_lh45_gen.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
	sics/site_ansto/instrument/sans/quokka_configuration.tcl
	sics/site_ansto/instrument/util/gen_sct.py
 2015-04-17 12:27:57 +10:00
Douglas Clowes
1f9dd8da95 Pullback from Quokka 2015-04-17 2015-04-17 12:15:01 +10:00
Douglas Clowes
49a43f4d9b Merge branch 'Taipan_R31' into RELEASE-3_1 2015-04-17 11:50:03 +10:00
Douglas Clowes
d07a0418b6 Add Taipan euler_config 2015-04-17 11:49:10 +10:00
Douglas Clowes
349171e8ec Minor changes from Taipan motor_config 2015-04-17 11:45:05 +10:00
Douglas Clowes
65b8f93cea Merge tag 'Taipan_2014-09-19' into Taipan_R31 
Deployed to Taipan

Conflicts:
	sics/site_ansto/instrument/tas/config/motors/motor_configuration.tcl
	sics/site_ansto/instrument/tas/taipan_configuration.tcl
 2015-04-17 11:36:01 +10:00
Douglas Clowes
c6b9a3ab97 Merge branch 'Dingo' into RELEASE-3_1 
Conflicts:
	sics/site_ansto/instrument/dingo/util/sics_config.ini
 2015-04-17 10:57:32 +10:00
Douglas Clowes
fea223beff Add motor soma to dingo configuration 2015-04-17 10:48:20 +10:00
Douglas Clowes
7891c9195f Remove more files to match with PSI cleanup 2015-03-19 13:41:42 +11:00
Douglas Clowes
3661e1fc77 Remove .{h,c} files to match with PSI cleanup 2015-03-19 11:55:23 +11:00
Douglas Clowes
42500aca38 Remove TCL files to match with PSI cleanup 2015-03-19 11:55:23 +11:00
Ferdi Franceschini
a43b106c25 Add instrument specific initialisation for commands on emu. 2015-03-18 11:27:11 +11:00
Ferdi Franceschini
418faae4e8 PLC status is currently unavailable on emu. 2015-03-18 11:13:07 +11:00
Ferdi Franceschini
613dbe0a91 Fix histogram memory configuration. 2015-03-18 11:12:38 +11:00
Ferdi Franceschini
8c4c5aa5ec Add new options to hmm simulated object. 2015-03-18 11:04:23 +11:00
Ferdi Franceschini
9d98cb15ea Created emu specific histmem configuration. 2015-03-17 14:53:14 +11:00
Douglas Clowes
9ee2252138 Merge branch 'RELEASE-3_1' into RELEASE-3_2 
Conflicts:
	sics/site_ansto/instrument/dingo/dingo_configuration.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl
	sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl
	sics/site_ansto/instrument/sans/quokka_configuration.tcl
 2015-03-13 15:44:32 +11:00
Douglas Clowes
6ef97197ee Handle nested GROUP and VAR constructs in gen_sct.py 2015-03-13 15:31:56 +11:00
Douglas Clowes
125ebc9f6d Make getlog commands less flakey 
getlog {kill,none}
getlog what
getlog list
getlog err,wrn[,...]
 2015-03-13 15:31:56 +11:00
Douglas Clowes
b9954651d5 Make getlog commands less flakey 
getlog {kill,none}
getlog what
getlog list
getlog err,wrn[,...]
 2015-03-13 15:16:31 +11:00
Ferdi Franceschini
25d73eb17a Bring config INI files up to date with new drivers and fix some errors. 2015-03-13 13:09:15 +11:00
Ferdi Franceschini
88c1f007fa Fix up whitespace. 2015-03-13 11:57:56 +11:00
Ferdi Franceschini
e7e2e87b83 Copy changes from ics1-wombat 2015-03-13 11:54:50 +11:00
Ferdi Franceschini
d751146090 Rename mtth to chom for chopper rotation and set nexus groups. 2015-03-12 10:46:13 +11:00
Ferdi Franceschini
fa92f61433 The mchi fwd limit switch is in the wrong place so we need to compensate. 2015-03-12 10:24:54 +11:00
Ferdi Franceschini
6d87ae05cb Add some configuration files which might be useful later. 2015-03-12 10:21:15 +11:00
Ferdi Franceschini
e89200999f Inlcude derived parameters when generating motor configuration. 2015-03-11 14:35:47 +11:00
Ferdi Franceschini
3e11532bd0 my encoder limits swapped in Elec Eng spreadsheet. 2015-03-11 14:21:30 +11:00
Ferdi Franceschini
760d5f3067 Corrections made to Emu_motion_control... spreadsheet during testing. 
Also renamed axes and added reference positions from spreadsheet.
 2015-03-11 13:42:30 +11:00
Ferdi Franceschini
a76f5d9143 First implementation of an Emu. 
TODO: Review motor names.
 2015-03-10 14:13:11 +11:00
Ferdi Franceschini
f72e20b120 SICS-128: Added HB1 and HB2 fields to the reactor status. 2015-03-06 12:01:32 +11:00
Ferdi Franceschini
64a47de78c SICS-128: The reactor status protocol now just searches for a line containing "Power:" and returns it as the reactor status. 2015-03-06 12:01:32 +11:00
Douglas Clowes
386db5d424 Rename and move the Rheometer drivers for Kookaburra 2015-03-05 14:11:54 +11:00
Douglas Clowes
6f8e7b5429 Pull over sct_antonparr_MCR500.tcl from RELEASE-3_1 2015-03-05 14:11:51 +11:00
Douglas Clowes
f269a17ef3 Merge branch 'RELEASE-3_1' into RELEASE-3_2 
Conflicts:
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
	sics/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl
	sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl
	sics/site_ansto/instrument/sans/config/environment/sct_antonparr_MCR500.tcl
	sics/site_ansto/instrument/tas/taipan_configuration.tcl
 2015-03-05 13:53:47 +11:00
Ferdi Franceschini
b75e0b5efb Make sure that the Lt0 command returns an error if the master_chopper_id isn't set. 2015-02-26 10:51:18 +11:00