Commit Graph

  • c608e5e641 Merge changes from Dingo 2014-09-09 Douglas Clowes 2014-09-09 16:38:44 +10:00
  • 499c5c422d Break simulation flagss out of the server_config.tcl Douglas Clowes 2014-09-09 15:14:57 +10:00
  • c8057a89aa Changes pulled back from Wombat 2014-09-09 Douglas Clowes 2014-09-09 14:52:47 +10:00
  • c2a73720e9 Add "restore cleanerr [locked|missing]" to clean status.tcl error messages Douglas Clowes 2014-09-09 14:17:01 +10:00
  • 6738a0844d Add the Robots (Robbie and Rosie) for Echidna Douglas Clowes 2014-09-08 15:56:20 +10:00
  • ab6a70ad97 Add an external sics_simulation file for Echidna Douglas Clowes 2014-09-08 15:54:29 +10:00
  • 5e28264909 Allow sics_config and device simulation flags in another file Douglas Clowes 2014-09-08 15:53:52 +10:00
  • e6925423e3 Regenerate the SR630 driver with 600 second polls Douglas Clowes 2014-09-08 13:45:40 +10:00
  • bc0606394b Make gitloader and gitrefer executable Douglas Clowes 2014-09-08 11:37:10 +10:00
  • eb4746652f Create a PATCH.TXT with "git diff" and include in the deplopment Douglas Clowes 2014-09-05 15:29:25 +10:00
  • fb0f746b96 Create a PATCH.TXT with "git diff" and include in the deplopment Douglas Clowes 2014-09-05 15:29:25 +10:00
  • fb9671531c West 6100 driver Douglas Clowes 2014-09-05 16:12:37 +10:00
  • 55a0055bd3 West 6100 driver Douglas Clowes 2014-09-05 16:09:36 +10:00
  • 830ed5a45c A bit of reformatting and set the ADUlen in the default case Douglas Clowes 2014-09-04 13:40:02 +10:00
  • 13a0547f5d A bit of reformatting and set the ADUlen in the default case Douglas Clowes 2014-08-29 12:34:53 +10:00
  • 378170280f Make nwatch independent of SICS Douglas Clowes 2014-08-29 16:32:32 +10:00
  • ef0c7cc0d5 Extend poll_period to (1,3600) seconds Douglas Clowes 2014-09-04 10:53:07 +10:00
  • 24c8792467 SR630 reduce to 8 channels and 600 second polls, change driver name Douglas Clowes 2014-09-04 09:26:03 +10:00
  • 8af9116667 Update the Stanford SR630 SCT file for ten channels Douglas Clowes 2014-09-03 13:01:35 +10:00
  • 6070706571 Stanford Research Systems Model SR630 Thermocouple Monitor Douglas Clowes 2014-09-02 12:00:56 +10:00
  • 8ea20b87f4 Added reflist relabel Mark Koennecke 2014-09-01 11:17:18 +02:00
  • cf24ac127b Update motor configuration from ics1-taipan. Ferdi Franceschini 2014-08-28 17:08:30 +10:00
  • e497cad374 Update motor configuration from ics1-taipan Ferdi Franceschini 2014-08-28 17:04:50 +10:00
  • 9500b59f04 Fixed SICSType to recognize exponential numbers Mark Koennecke 2014-08-28 09:03:41 +02:00
  • 555031aa7d Histogram memory configuration for Taipan Be filter configuration. Ferdi Franceschini 2014-08-28 13:58:28 +10:00
  • c3fe7555db Fixed an incommensurate problem Mark Koennecke 2014-08-27 16:26:44 +02:00
  • 8f704ebab9 Improvements for BOA Mark Koennecke 2014-08-27 16:24:39 +02:00
  • 4ea8678b44 Pull in Makefile changes from RELEASE-3_2 Douglas Clowes 2014-08-27 16:49:56 +10:00
  • e76f6376ee Added Modbus Protocol Douglas Clowes 2014-08-26 14:30:43 +10:00
  • a43461b200 Reworked AsyncQueue sendCommand processing Douglas Clowes 2014-08-26 14:30:19 +10:00
  • ee40adceb2 Add asyncqueue 'transact' command and list the protocol Douglas Clowes 2014-08-26 13:30:39 +10:00
  • 3ff6377f85 Copy the protocol name and adjust the kill code in asyncprotocol Douglas Clowes 2014-08-22 17:10:31 +10:00
  • 748b6a0cc5 Added Modbus Protocol Douglas Clowes 2014-08-26 14:30:43 +10:00
  • eb41f23ee2 Reworked AsyncQueue sendCommand processing Douglas Clowes 2014-08-26 14:30:19 +10:00
  • 87a9270288 Add asyncqueue 'transact' command and list the protocol Douglas Clowes 2014-08-26 13:30:39 +10:00
  • f216ec83c5 Copy the protocol name and adjust the kill code in asyncprotocol Douglas Clowes 2014-08-22 17:10:31 +10:00
  • 47d3d0a7e8 Pelican doesn't seem to have a PLC interface. Ferdi Franceschini 2014-08-25 08:44:08 +10:00
  • 78cfe7f5a9 SICS-770 Fixed SICS reports 'bad status code' when scanning the schp motor Ferdi Franceschini 2014-08-22 12:00:33 +10:00
  • a0acd1e5b4 SICS-458: Add dsc command to run a DSC acquisition on Quokka. Also added dsc.py utility which finds the start of a DSC profile in hdf files. Ferdi Franceschini 2014-08-21 10:19:55 +10:00
  • 6388f7e003 Restructure free_command to afford protocol module more control Douglas Clowes 2014-08-21 17:23:42 +10:00
  • 6054eeeae9 Restructure free_command to afford protocol module more control Douglas Clowes 2014-08-21 17:23:42 +10:00
  • 33d0280090 Refactor free of command/transaction code to function Douglas Clowes 2014-08-21 09:42:19 +10:00
  • 99dea317f0 Refactor free of command/transaction code to function Douglas Clowes 2014-08-21 09:42:19 +10:00
  • 0ed0c016ad Merge branch 'RELEASE-3_1' into RELEASE-3_2 Douglas Clowes 2014-08-20 13:45:59 +10:00
  • f1f9ee2c01 Add protocol support for the Knauer HPLC pump Douglas Clowes 2014-08-20 13:35:13 +10:00
  • 5fa021ce88 Move some definitions and add something private Douglas Clowes 2014-08-20 13:34:15 +10:00
  • 3d475d3598 Change some names for consistency Douglas Clowes 2014-08-20 13:05:29 +10:00
  • 67c3bc7964 Add hupdateif <path> <value> [<format>] for conditional update of hipadaba Douglas Clowes 2014-08-19 13:57:46 +10:00
  • 2cb70741b1 Add hupdateif <path> <value> [<format>] for conditional update of hipadaba Douglas Clowes 2014-08-19 13:57:46 +10:00
  • 3650e68f9a Regenerate template drivers Douglas Clowes 2014-08-19 12:04:53 +10:00
  • 44f6b65aef Merge branch 'RELEASE-3_1' into RELEASE-3_2 Douglas Clowes 2014-08-19 11:46:24 +10:00
  • a93819572a Regenerate template drivers Douglas Clowes 2014-08-19 11:43:45 +10:00
  • 6f5892f07d Change SCT wrappers to use ip_address and tcp_port Douglas Clowes 2014-08-19 11:27:43 +10:00
  • 04a87e5ff2 Change IP/PORT to ip_address/tcp_port and add to mkDriver sig Douglas Clowes 2014-08-19 11:21:45 +10:00
  • 6266bcdad7 Make a sctcontroller with a NULL aqadapter in simulation mode Douglas Clowes 2014-08-18 14:50:51 +10:00
  • 10b7e8029f Merge branch 'RELEASE-3_1' into RELEASE-3_2 Douglas Clowes 2014-08-18 13:34:56 +10:00
  • 288be8f1c2 Generate the green magnet wrapper TCL code Douglas Clowes 2014-08-18 12:48:01 +10:00
  • 273c26cc22 Add a wrapper for the green magnet Douglas Clowes 2014-08-18 12:46:48 +10:00
  • 6f5f2b69cf Make Agilent use mkWrapper Douglas Clowes 2014-08-18 12:42:35 +10:00
  • 2c8f1131f6 Add wrapper_property nosctcontroller = <anything> to gen_sct Douglas Clowes 2014-08-18 12:34:24 +10:00
  • ea9de2c617 Add @TCL/@END code to gen_sct Douglas Clowes 2014-08-15 16:35:38 +10:00
  • da17516491 Add wrapper_property and mkWrapper code for SCT wrappers Douglas Clowes 2014-08-18 11:20:44 +10:00
  • 9e898d1476 Fixed addauxref for the triple axis code Added a writing state to status boa 2014-08-15 13:36:36 +02:00
  • 8541f7cd90 Remove extra makesctcontroller from Agilent Douglas Clowes 2014-08-15 12:21:36 +10:00
  • 13003126a6 Use configured magnet name in OxfordSet commands. Also T3 is really pressure. Ferdi Franceschini 2014-08-08 11:50:26 +10:00
  • 944902c9d4 Added sct wrapper to load legacy sct_oxford_labview.tcl driver. Ferdi Franceschini 2014-08-08 09:19:11 +10:00
  • c95d2d6885 Add temperature subdirectory to lakeshore 218 and m370 fileeval Douglas Clowes 2014-08-08 09:45:30 +10:00
  • 3fae7edced Experimental changes to Makefile to build better and faster Douglas Clowes 2014-08-07 16:28:05 +10:00
  • b95edfbec8 Only run extract_version.sh once Douglas Clowes 2014-08-07 16:26:19 +10:00
  • ca553c68e6 export SICS_* and new way to get changed file count Douglas Clowes 2014-08-07 16:25:38 +10:00
  • bd4dfdee79 Remove _trial_temp* directories and *.orig files from TARDIR Douglas Clowes 2014-08-07 09:42:47 +10:00
  • d398c57a05 Remove _trial_temp* directories and *.orig files from TARDIR Douglas Clowes 2014-08-07 09:42:47 +10:00
  • 3c53392b34 Regenerate bilby's astrium_chopper SCT driver Douglas Clowes 2014-08-06 13:54:28 +10:00
  • 507ddafb2a Merge branch 'RELEASE-3_1' into RELEASE-3_2 Douglas Clowes 2014-08-06 13:53:18 +10:00
  • 639e4dc3c8 Generated sct tcl drivers from sct templates. Ferdi Franceschini 2014-08-06 10:59:14 +10:00
  • 18c862a609 Adding config INI file to Pelican. Ferdi Franceschini 2014-08-06 10:30:10 +10:00
  • 08f29ef255 Move "Timeout trace" in asyncqueue trace logging Douglas Clowes 2014-08-06 10:32:27 +10:00
  • 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. Ferdi Franceschini 2014-08-05 13:51:34 +10:00
  • 2c753a3f18 Make sample stages configurable and add Oxford magnet sample stick motor as an option. Ferdi Franceschini 2014-08-05 13:49:10 +10:00
  • 7b6b11eef2 Let everyone have a magnet sample stick motor. Ferdi Franceschini 2014-08-05 13:01:33 +10:00
  • 6b8d9d88fa The default interval of five seconds seems to be working for everyone so let it be. Ferdi Franceschini 2014-08-05 12:23:54 +10:00
  • 379f12fdac SICS-764: An alternative to the PSI capture command which works when capturing the "run" command. Ferdi Franceschini 2014-08-05 12:22:13 +10:00
  • fc7771f359 SICS-764: Provide access to the asynnet socket descriptor's write buffer. We need this to implement a "capture" command that doesn't cause SICS to commit suicide if you capture a "run" command. NOTE: This is a bit dodgy because we're trusting callers not to modify the write buffer. Ferdi Franceschini 2014-08-05 12:20:11 +10:00
  • 8a6da09326 Deploy all environment control drivers. Ferdi Franceschini 2014-08-05 12:01:21 +10:00
  • 72fcb82a65 Add "Timeout trace" to asyncqueue trace logging Douglas Clowes 2014-08-06 10:04:45 +10:00
  • c86ff4c883 Prettyfy the dump routines Douglas Clowes 2014-08-05 17:45:30 +10:00
  • 973f844186 Allow Group_Property override for klass and type and set topleve data true Douglas Clowes 2014-08-05 17:07:02 +10:00
  • a1f509d96a Force branch klass to '@none' and type to 'part' Douglas Clowes 2014-08-05 16:45:42 +10:00
  • 5fb4bc9adc If data is true default klass to parameter in SCT Douglas Clowes 2014-08-05 16:38:41 +10:00
  • 5be03cc63b make default mutable 'true' and data on branches Douglas Clowes 2014-08-05 16:04:55 +10:00
  • a761136b48 Regenerate modified drivers Douglas Clowes 2014-08-05 12:23:33 +10:00
  • d8056ae46a Changes to Makefile for building on 64-bit RHEL Douglas Clowes 2014-07-30 11:40:47 +10:00
  • d330d7874a Add the FOPDT and PID modules Douglas Clowes 2014-08-05 11:44:27 +10:00
  • 17315b15c7 Remove hand-coded config for generated in Oxford ITC-500 Douglas Clowes 2014-08-01 16:46:38 +10:00
  • 39519d8c1c Don't register poll/write when simulating in LS-3xx drivers Douglas Clowes 2014-08-04 15:45:59 +10:00
  • 5112af83fd SICS-697 Decorate LS-370 with permlink Douglas Clowes 2014-08-01 16:44:23 +10:00
  • 94beedd885 We need dingo.hdd for the scan command. NOTE SICS crashes without it, see SICS-763 Ferdi Franceschini 2014-08-01 11:35:09 +10:00
  • e16e192d01 Use the camera driver auxiliary command cm1_cmd to set motor position meta data. Ferdi Franceschini 2014-07-31 15:48:30 +10:00
  • fdbb0456ad The camera driver can now send meta data such as the motor positions to the camera server. An auxiliary command has been added so we can set string values on the camera driver for the meta data. Ferdi Franceschini 2014-07-31 15:45:03 +10:00
  • 05dc1958ff SICS-696 Explicity include the namespace on mk_sct_ calls Douglas Clowes 2014-07-31 11:36:22 +10:00