Commit Graph

3607 Commits

Author SHA1 Message Date
Douglas Clowes
a5498a2a77 Pull some changes from RELEASE-3_1 in gen_sct and *.sct 2015-02-19 09:48:38 +11:00
Douglas Clowes
bf8be461ee Add in from Quokka 2015-02-18 14:46:54 +11:00
Douglas Clowes
4619a57eff Pullback from Quokka 2015-02-18 2015-02-18 14:14:11 +11:00
Douglas Clowes
042119898d SICS-778 Fix crash in conman.c hookFunc 2014-09-12 13:00:26 +10:00
Douglas Clowes
cc9d59ee73 SICS-777 Use SICS_INIT_LOGPATH to move script_validator logs in runsics.py 2014-09-12 10:42:00 +10:00
Douglas Clowes
c93b4d30a3 SICS-777 Allow the log directory to be set by SICS_INIT_LOGPATH environement variable 2014-09-12 10:41:22 +10:00
Douglas Clowes
e8ec81ad5d SICS-776 Close the anti-collider file 2014-09-12 10:40:56 +10:00
Douglas Clowes
00f4dfe588 Fix directories for quokka_configuration.tcl 2014-09-11 15:35:31 +10:00
Ferdi Franceschini
4a4f464485 Copied prun and pdrive from RELEASE-3_2 branch. 2014-09-11 14:29:24 +10:00
Ferdi Franceschini
863eef2378 SICS-753: Add named positions for kookaburra sample changer samz. 2014-09-11 14:29:24 +10:00
Ferdi Franceschini
48794002f6 Moved dOmega and gDQv on Kookaburra as requested by Christine.
See email Subj RE:Slight Modification ..., Date 7/5/2014
2014-09-11 14:29:23 +10:00
Douglas Clowes
6b6fd5131c Add vactex.tcl found on wombat (fixed) 2014-09-11 13:48:38 +10:00
Douglas Clowes
0cb3f4f91c Regenerated drivers 2014-09-11 13:29:52 +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
8b4bcc4c9e Pelican does not currently have a PLC interface 2014-09-10 17:03:00 +10:00
Ferdi Franceschini
1fa1595821 SICS-733 Added gumtree_version, gumtree_status and gumtree_time_estimate to /experiment.
Only gumtree_version is saved to the hdf file.
2014-09-10 16:00:26 +10:00
Douglas Clowes
d1920069ae Pullback motor changes on Taipan 2014-09-10 15:25:26 +10:00
Douglas Clowes
f4eb6c63d8 Pullback sics_config changes from Quokka 2014-09-10 15:15:53 +10:00
Douglas Clowes
5ce8677195 Pull back config changes from Wombat and add the west_6100 blue furnaces 2014-09-10 15:15:20 +10:00
Douglas Clowes
b0812e5fea Pullback Bilby sics_config.ini to new bilby/util directory 2014-09-10 14:57:07 +10:00
Douglas Clowes
377405d2a4 Pullback ls340_pelican and ls218 changes on Pelican 2014-09-10 14:39:00 +10:00
Douglas Clowes
a9a20b4855 Regenerate the ls218, nhq200 and sr630 drivers 2014-09-10 14:27:11 +10:00
Douglas Clowes
c6d2245941 Move ls218, nhq200, sr630 from environment to detector 2014-09-10 14:26:16 +10:00
Douglas Clowes
0867f5a315 Update "Decimal" processing for 4100/6100 2014-09-10 14:22:50 +10:00
Douglas Clowes
99fae91ff9 Add sics_simulation.tcl to each instrument MANIFEST.TXT file 2014-09-10 10:14:46 +10:00
Douglas Clowes
b127f49b33 Pullback change from Quokka 2014-09-09 2014-09-09 16:56:29 +10:00
Douglas Clowes
d0d2b38177 Kookaburra local changes
Conflicts:
	sics/site_ansto/instrument/config/hmm/hmm_configuration_common_1.tcl
2014-09-09 16:50:08 +10:00
Douglas Clowes
c608e5e641 Merge changes from Dingo 2014-09-09 2014-09-09 16:38:44 +10:00
Douglas Clowes
499c5c422d Break simulation flagss out of the server_config.tcl
These are the most frequent instrument-specific changes
2014-09-09 15:14:57 +10:00
Douglas Clowes
c8057a89aa Changes pulled back from Wombat 2014-09-09 2014-09-09 14:52:47 +10:00
Douglas Clowes
c2a73720e9 Add "restore cleanerr [locked|missing]" to clean status.tcl error messages
"cleanerr" removes duplicate message
"cleanerr locked" removes locked variable errors as well
"cleanerr missing" removes variable not found errors as well
2014-09-09 14:20:02 +10:00
Douglas Clowes
6738a0844d Add the Robots (Robbie and Rosie) for Echidna 2014-09-08 15:56:20 +10:00
Douglas Clowes
ab6a70ad97 Add an external sics_simulation file for Echidna 2014-09-08 15:54:29 +10:00
Douglas Clowes
5e28264909 Allow sics_config and device simulation flags in another file 2014-09-08 15:53:52 +10:00
Douglas Clowes
e6925423e3 Regenerate the SR630 driver with 600 second polls 2014-09-08 13:45:40 +10:00
Douglas Clowes
bc0606394b Make gitloader and gitrefer executable 2014-09-08 11:37:10 +10:00
Douglas Clowes
fb0f746b96 Create a PATCH.TXT with "git diff" and include in the deplopment
This allows us to track what the differences are to the git version
We also include it into .gitignore.
2014-09-05 16:21:22 +10:00
Douglas Clowes
55a0055bd3 West 6100 driver 2014-09-05 16:09:36 +10:00
Douglas Clowes
13a0547f5d A bit of reformatting and set the ADUlen in the default case 2014-09-04 13:30:20 +10:00
Douglas Clowes
ef0c7cc0d5 Extend poll_period to (1,3600) seconds 2014-09-04 11:29:19 +10:00
Douglas Clowes
24c8792467 SR630 reduce to 8 channels and 600 second polls, change driver name 2014-09-04 09:26:03 +10:00
Douglas Clowes
8af9116667 Update the Stanford SR630 SCT file for ten channels 2014-09-03 13:01:35 +10:00
Douglas Clowes
6070706571 Stanford Research Systems Model SR630 Thermocouple Monitor 2014-09-02 12:01:47 +10:00
Ferdi Franceschini
cf24ac127b Update motor configuration from ics1-taipan. 2014-08-28 17:08:30 +10:00
Douglas Clowes
4ea8678b44 Pull in Makefile changes from RELEASE-3_2 2014-08-27 16:52:13 +10:00
Douglas Clowes
e76f6376ee Added Modbus Protocol 2014-08-27 16:52:13 +10:00
Douglas Clowes
a43461b200 Reworked AsyncQueue sendCommand processing
Squashed commit of the following:

commit 42fb7d3cde591d40060cc740ccbc47f1ae7a5a50
Author: Douglas Clowes <dcl@ansto.gov.au>
Date:   Tue Aug 26 13:31:11 2014 +1000

    Get the MODBUS_AP working

commit da785c1434a04c4186d4174eb2dfbaefc850c8e7
Author: Douglas Clowes <dcl@ansto.gov.au>
Date:   Mon Aug 25 18:01:50 2014 +1000

    Bring Modbus protocol closer to Huber, Knauer and Omron

commit ef06ed7b6911cb49b35c19fe73e55f7c57cfd049
Author: Douglas Clowes <dcl@ansto.gov.au>
Date:   Mon Aug 25 18:01:18 2014 +1000

    Make Huber, Knauer and Omron protocols more aligned (diffable)

commit 3ef1bb06b3f865502ad7dffc4bf5dba4814d9334
Author: Douglas Clowes <dcl@ansto.gov.au>
Date:   Fri Aug 22 17:47:50 2014 +1000

    Get the Huber and Knauer protocols to be more alike

commit 2c9932e83f6735e894278648afdcadece654d43b
Author: Douglas Clowes <dcl@ansto.gov.au>
Date:   Fri Aug 22 17:12:31 2014 +1000

    Clean up the Knauer dual-mode protocol and refactor

commit 333300b19b0e61916e261300ac6ae2b6bab5df09
Author: Douglas Clowes <dcl@ansto.gov.au>
Date:   Thu Aug 21 15:38:39 2014 +1000

    Get the Knauer dual-mode protocol working(-ish)

commit b1f9d82f1b9eb8a1ff54694adc3482984b0d3d72
Author: Douglas Clowes <dcl@ansto.gov.au>
Date:   Thu Aug 21 15:37:44 2014 +1000

    Make private functions static (and not duplicated)

commit 0b077414eef9e4351956a2b971d7751cced0d3cd
Author: Douglas Clowes <dcl@ansto.gov.au>
Date:   Thu Aug 21 12:46:10 2014 +1000

    Knauer moving toward dual protocol

commit 13199bea38a1595ce06923e83474b738b10db94d
Author: Douglas Clowes <dcl@ansto.gov.au>
Date:   Thu Aug 21 12:42:48 2014 +1000

    Restructure default sendCommand processing in asyncqueue

commit 99a8ea3174ca0636503b0ce0cdb6016790315558
Author: Douglas Clowes <dcl@ansto.gov.au>
Date:   Thu Aug 21 09:48:50 2014 +1000

    Add a Modbus Protocol handler derived from sct_tcpmodbus

commit 3adf49fb7c8402c8260a0bb20729d551ac88537b
Author: Douglas Clowes <dcl@ansto.gov.au>
Date:   Thu Aug 21 09:43:54 2014 +1000

    Leave the free of private data to the asyncqueue mechanism
2014-08-27 16:52:13 +10:00
Douglas Clowes
ee40adceb2 Add asyncqueue 'transact' command and list the protocol 2014-08-27 16:52:13 +10:00
Douglas Clowes
3ff6377f85 Copy the protocol name and adjust the kill code in asyncprotocol 2014-08-27 16:52:13 +10:00
Ferdi Franceschini
47d3d0a7e8 Pelican doesn't seem to have a PLC interface. 2014-08-26 10:33:14 +10:00