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

3900 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ferdi Franceschini
55744da3b5 Use nhq200 driver for Bilby detector voltage control. 2014-09-10 15:01:25 +10:00
Ferdi Franceschini
7bd9409144 SICS-771 Save name of selected sample aperture and improve nguide command. 2014-09-10 15:01:25 +10:00
Ferdi Franceschini
b70fb72e8f Always allow driving collimation table into the aperture position or higher. 2014-09-10 15:01:24 +10:00
Ferdi Franceschini
3c51b17eb9 Fix beamstop targets in Bilby selbs command. 2014-09-10 15:01:24 +10:00
Ferdi Franceschini
f0202fad51 Use the new anstocapture command SICS-764 2014-09-10 15:01:23 +10:00
Ferdi Franceschini
ea7ce034b0 Make sure we return a value when querying nguide. 2014-09-10 15:01:23 +10:00
Ferdi Franceschini
2d2b76dcb5 Fix chopper frequency modification. 2014-09-10 15:01:22 +10:00
Ferdi Franceschini
9a7f4608b7 SICS-771 Add sample_aperture size macro. 
Make sure that positions are saved as -9999 if the guides are misaligned.
 2014-09-10 15:01:04 +10:00
Ferdi Franceschini
6ec4cf66cb Fix direction for beamstop motors. 2014-09-10 15:01:04 +10:00
Ferdi Franceschini
c827933d0d SICS-771 Implement selbs command and set beamstop ID in data file. 2014-09-10 15:01:03 +10:00
Ferdi Franceschini
b6b4c4fb72 Return frequency for reference chopper 2014-09-10 15:01:03 +10:00
Ferdi Franceschini
23df15f7e8 SICS-771 Add frequency for each chopper disk. 2014-09-10 15:01:03 +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
eb4746652f 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:59 +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
fb9671531c West 6100 driver 2014-09-05 16:12:37 +10:00
Douglas Clowes
55a0055bd3 West 6100 driver 2014-09-05 16:09:36 +10:00
Douglas Clowes
830ed5a45c A bit of reformatting and set the ADUlen in the default case 2014-09-04 13:41:50 +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
378170280f Make nwatch independent of SICS 2014-09-04 13:18:16 +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
Ferdi Franceschini
e497cad374 Update motor configuration from ics1-taipan 2014-08-28 17:04:50 +10:00
Ferdi Franceschini
555031aa7d Histogram memory configuration for Taipan Be filter configuration. 2014-08-28 13:59:35 +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
Douglas Clowes
748b6a0cc5 Added Modbus Protocol 2014-08-26 14:30:43 +10:00
Douglas Clowes
eb41f23ee2 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-26 14:30:19 +10:00