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

3603 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
fb9671531c West 6100 driver 2014-09-05 16:12:37 +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
378170280f Make nwatch independent of SICS 2014-09-04 13:18:16 +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
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
Douglas Clowes
87a9270288 Add asyncqueue 'transact' command and list the protocol 2014-08-26 14:20:23 +10:00
Douglas Clowes
f216ec83c5 Copy the protocol name and adjust the kill code in asyncprotocol 2014-08-26 14:08:08 +10:00
Douglas Clowes
6388f7e003 Restructure free_command to afford protocol module more control 
This allows the protocol module first cleanup opportunity on Txn
 2014-08-21 17:24:47 +10:00
Douglas Clowes
33d0280090 Refactor free of command/transaction code to function 2014-08-21 16:14:40 +10:00
Douglas Clowes
0ed0c016ad Merge branch 'RELEASE-3_1' into RELEASE-3_2 2014-08-20 13:45:59 +10:00
Douglas Clowes
f1f9ee2c01 Add protocol support for the Knauer HPLC pump 2014-08-20 13:35:13 +10:00
Douglas Clowes
5fa021ce88 Move some definitions and add something private 
definitions from asyncqueue to asyncprotocol to reduce dependency loops
add protocol-private data structure and killer routine
 2014-08-20 13:34:15 +10:00
Douglas Clowes
3d475d3598 Change some names for consistency 2014-08-20 13:05:29 +10:00
Douglas Clowes
67c3bc7964 Add hupdateif <path> <value> [<format>] for conditional update of hipadaba 2014-08-19 15:05:51 +10:00
Douglas Clowes
2cb70741b1 Add hupdateif <path> <value> [<format>] for conditional update of hipadaba 2014-08-19 15:05:32 +10:00
Douglas Clowes
3650e68f9a Regenerate template drivers 2014-08-19 12:04:53 +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
a93819572a Regenerate template drivers 2014-08-19 11:43:45 +10:00
Douglas Clowes
6f5892f07d Change SCT wrappers to use ip_address and tcp_port 2014-08-19 11:27:43 +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
288be8f1c2 Generate the green magnet wrapper TCL code 2014-08-18 12:48:01 +10:00
Douglas Clowes
273c26cc22 Add a wrapper for the green magnet 2014-08-18 12:46:48 +10:00
Douglas Clowes
6f5f2b69cf Make Agilent use mkWrapper 2014-08-18 12:42:35 +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
8541f7cd90 Remove extra makesctcontroller from Agilent 2014-08-15 12:21:36 +10:00
Ferdi Franceschini
13003126a6 Use configured magnet name in OxfordSet commands. 
Also T3 is really pressure.
 2014-08-08 11:52:04 +10:00
Ferdi Franceschini
944902c9d4 Added sct wrapper to load legacy sct_oxford_labview.tcl driver. 2014-08-08 11:51:49 +10:00
Douglas Clowes
c95d2d6885 Add temperature subdirectory to lakeshore 218 and m370 fileeval 2014-08-08 09:45:30 +10:00
Douglas Clowes
3fae7edced Experimental changes to Makefile to build better and faster 2014-08-07 16:28:05 +10:00
Douglas Clowes
b95edfbec8 Only run extract_version.sh once 2014-08-07 16:26:19 +10:00
Douglas Clowes
ca553c68e6 export SICS_* and new way to get changed file count 2014-08-07 16:25:38 +10:00
Douglas Clowes
bd4dfdee79 Remove _trial_temp* directories and *.orig files from TARDIR 2014-08-07 09:43:26 +10:00
Douglas Clowes
d398c57a05 Remove _trial_temp* directories and *.orig files from TARDIR 2014-08-07 09:42:47 +10:00
Douglas Clowes
3c53392b34 Regenerate bilby's astrium_chopper SCT driver 2014-08-06 13:54:28 +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
Ferdi Franceschini
639e4dc3c8 Generated sct tcl drivers from sct templates. 2014-08-06 11:20:46 +10:00
Ferdi Franceschini
18c862a609 Adding config INI file to Pelican. 2014-08-06 11:20:45 +10:00
Douglas Clowes
08f29ef255 Move "Timeout trace" in asyncqueue trace logging 2014-08-06 10:43:02 +10:00
Ferdi Franceschini
bf355fb9ed Load all kinds of environment for Pelican and Wombat because we should be 
able to just add a new device to the sics_config.ini and load it.
 2014-08-06 10:08:12 +10:00
Ferdi Franceschini
2c753a3f18 Make sample stages configurable and add Oxford magnet sample stick motor as an option. 2014-08-06 10:08:12 +10:00
Ferdi Franceschini
7b6b11eef2 Let everyone have a magnet sample stick motor. 2014-08-06 10:08:12 +10:00
Ferdi Franceschini
6b8d9d88fa The default interval of five seconds seems to be working for everyone so let it be. 2014-08-06 10:08:11 +10:00
Ferdi Franceschini
379f12fdac SICS-764: An alternative to the PSI capture command which works when capturing the "run" command. 2014-08-06 10:08:11 +10:00