linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 7eaa8242bd Always show selected_imp in the implementation list for an option. Fix imp_statechange bug (imp undefined for disabled options). Ferdi Franceschini 2014-07-06 09:40:37 +10:00
  • 37e75ab5b4 Make harmless changes to reduce pylint noise. Work out what to do about warnings and apparent errors later. Ferdi Franceschini 2014-07-05 22:32:34 +10:00
  • a0465541b3 set indent to four spaces. Ferdi Franceschini 2014-07-05 20:16:09 +10:00
  • 30791324ac Always enable permanent options when changing instrument configuration. Ferdi Franceschini 2014-07-05 20:09:47 +10:00
  • fb93daeb46 Provide set_imp(opt,imp) method to keep opt and imp mappings in sync. Added convenience method iter_implementations(opt) to enable looping over an option's implementation list. Setting option labels now works properly when switching configurations. Ferdi Franceschini 2014-07-05 19:37:23 +10:00
  • 6625060fa0 Set opt:imp as the label on option checkboxes. Do this when selecting an implementation and when enabling an option. TODO: When an option is disabled insert its implementation into the implementation list. Ferdi Franceschini 2014-07-04 17:19:36 +10:00
  • a802f98a24 Remove unavailable implementations from the impelementation list when an option is selected. Ferdi Franceschini 2014-07-04 13:46:47 +10:00
  • 522a5544a8 Reindent *.py with reindent.py Douglas Clowes 2014-07-04 11:28:11 +10:00
  • 7129c0608b Make .sct hook code match newer generated code Douglas Clowes 2014-07-04 10:55:27 +10:00
  • 9eefc46e3b Reindent gen_sct.py with reindent.py Douglas Clowes 2014-07-04 10:44:39 +10:00
  • abcf19553b Copy original file in backup_files method instead of renaming it in case write_config_file fails. Add a 'none' entry to the implementation list. Ferdi Franceschini 2014-07-03 23:36:43 +10:00
  • 294b6fa776 Make config_edit.py easier to browse by grouping order of class declarations. Ferdi Franceschini 2014-07-03 18:29:39 +10:00
  • 7a4ce1f234 Write option id into driver implementation section when saving the sics_config.ini Ferdi Franceschini 2014-07-02 14:40:22 +10:00
  • a439601d7d Source mercury scpi driver for Wombat Ferdi Franceschini 2014-07-02 14:39:36 +10:00
  • 0fb4519876 Changes to logging Douglas Clowes 2014-07-03 15:28:05 +10:00
  • 45a1102b59 Remove duplicate read_config section from sct_protek_common.tcl Douglas Clowes 2014-07-03 12:47:50 +10:00
  • 81554ee0d7 Adjust motor oscillation and SetRadCol command Douglas Clowes 2014-07-03 12:12:52 +10:00
  • 1134aa815b Changes to sics_test.py for Wombat testing Douglas Clowes 2014-07-02 13:45:22 +10:00
  • 5454dfb009 Change statemon uninterest or hdbuninterest Douglas Clowes 2014-07-02 09:49:11 +10:00
  • 3224422d60 Implement hlistprop $path tclnames Douglas Clowes 2014-07-02 12:28:41 +10:00
  • 87bf34c7b1 Renamed type to optype in sics_config.ini so devices like multimeters can set a data type parameter eg datype config_edit.py uses optype instead of type Also the listwalker is now being generated dynamically so that in the future unavailable drivers can be moved from the list of radiobuttons. Ferdi Franceschini 2014-07-02 08:50:17 +10:00
  • 89edcef811 Modified the last two of the old drivers for the new sics_config.ini format. Ferdi Franceschini 2014-07-02 08:40:45 +10:00
  • 5ee2634d30 Modified some more old drivers to use config_dict as in gen_sct.py TODO environment/sct_keithley_2700.tcl environment/sct_protek_common.tcl Ferdi Franceschini 2014-07-01 20:12:42 +10:00
  • d9255be951 Use the 'oscillate' subcommand on oct instead of oscmd Ferdi Franceschini 2014-07-01 13:44:11 +10:00
  • 132af9d225 Add a "tclesc[ape]" variant of hlistprop / tcl{,list,esc,escape} Douglas Clowes 2014-07-01 11:22:42 +10:00
  • 4f397350cb Modified some older drivers to use the tcl dict code from gen_sct.py TODO sct_keithley_2700.tcl magneticField/sct_oxford_labview.tcl magneticField/sct_bruker_BEC1.tcl temperature/sct_watlow_st4.tcl temperature/sct_oxford_mercury.tcl temperature/sct_mercury_pres.tcl temperature/sct_julabo_lh45.tcl temperature/sct_lakeshore_340.tcl temperature/sct_julabo_lh45_gen.tcl temperature/sct_watlow_rm.tcl temperature/sct_eurotherm_2000.tcl temperature/sct_lakeshore_336.tcl temperature/sct_watlow_pm.tcl temperature/sct_oxford_itc.tcl temperature/sct_lakeshore_370.tcl temperature/west400.tcl Ferdi Franceschini 2014-06-30 13:47:03 +10:00
  • 7960cb73a0 Change puts to clientput to avoid error on stdout undefined Douglas Clowes 2014-06-30 13:44:14 +10:00
  • 202004766a Check for existence of config dict fields before using them in generated drivers Douglas Clowes 2014-06-30 12:49:22 +10:00
  • 62f1170a6d Restore sorted ini files on output Douglas Clowes 2014-06-30 12:47:21 +10:00
  • bd93c34875 copy.copy() doesn't work with urwid on the SL6 VMs. Explicitly make a new listwalker imp_lw to avoid overwriting the first entry in self.imp_lw_dict[opt] Python 2.6 requires field numbers for format strings. Ferdi Franceschini 2014-06-30 10:09:34 +10:00
  • e971cd8b64 New sicsconfig.ini file configuration editor. Updated wombat sics_config.ini and gen_sct.py Generated new tcl files from sct templates and modified some old sct_*.tcl drivers. Ferdi Franceschini 2014-06-30 09:08:19 +10:00
  • 4fb94efe9a This is the first version of the newly refactored status code handling. Status codes are now determined by a special task which inspects SICS for what is going on. Before this was a global variable which caused conflicts when multiple instances in the code tried to set it. koennecke 2014-06-27 11:05:27 +02:00
  • c960a3bb2d Added sample changer motor configuration Ferdi Franceschini 2014-06-27 18:38:23 +10:00
  • a363bc3c2c Fix bug introduced when AttrWrap was replaced by AttrMap. AttrWrap transparently passes method calls through to the widget but you need to use the original_widget attribute with AttrMap to access methods on the underlying widget. Ferdi Franceschini 2014-06-24 12:45:18 +10:00
  • bd97a75e9d Replace deprecated urwid AttrWrap() with AttrMap() Ferdi Franceschini 2014-06-20 09:11:25 +10:00
  • ac24d330c2 Absolute encoders/resolvers changed on PCX, PCR and MOM on Echidna Douglas Clowes 2014-06-27 14:28:28 +10:00
  • 27f1f1dfa0 Merge from Echidna Douglas Clowes 2014-06-26 16:24:25 +10:00
  • 8bed9404e4 Pelican merge: pelican_configuration.tcl, motor_configuration.tcl Douglas Clowes 2014-06-26 15:15:58 +10:00
  • 8bf1764dd9 SICS-754 Use "clientput" instead of "puts stdout" in non-generated drivers Douglas Clowes 2014-06-26 14:08:20 +10:00
  • fe3489b61f SICS-754 Use "clientput" instead of "puts stdout" in generated drivers Douglas Clowes 2014-06-26 13:48:44 +10:00
  • e2ab77fca7 Make the Fake Galil display window support the 8 controllers Douglas Clowes 2014-06-26 12:38:59 +10:00
  • 03aa895403 Extract common setup code and add wombat Douglas Clowes 2014-06-26 12:38:06 +10:00
  • 3ffcdb08da Merge from Quokka quokka_configuration.tcl (partial) Douglas Clowes 2014-06-25 17:04:49 +10:00
  • d404bdbb06 Merge from Quokka sans sct_flipper, environment, motor_config Douglas Clowes 2014-06-25 16:41:54 +10:00
  • 7d36bb0508 Merge from Quokka sct_protek_common.tcl Douglas Clowes 2014-06-25 16:35:22 +10:00
  • 2d48093820 Merge from Quokka runsics.py move the commented out debug print Douglas Clowes 2014-06-25 16:27:03 +10:00
  • 6530c54483 Merge from Quokka sct_positmotor_common.tcl set driving false Douglas Clowes 2014-06-25 16:25:01 +10:00
  • 5b48df31ba Merge from Quokka hvcommands.tcl and pulser.tcl Douglas Clowes 2014-06-25 16:08:16 +10:00
  • d6faaa593a - Removed trim in sicsget: caused line breaks in text to disappear which was not desired koennecke 2014-06-25 08:46:54 +02:00
  • ba16ebb992 Add _trial_temp to .gitignore for unit testing from the repository Douglas Clowes 2014-06-25 13:50:49 +10:00
  • 2676ab9282 Rework the LS-218 driver to make it flexible. Douglas Clowes 2014-06-25 12:19:35 +10:00
  • 648c8003b7 Merge from Wombat, except sics_config.ini Douglas Clowes 2014-06-24 17:20:27 +10:00
  • 3f8f5fcba7 Merge from Wombat hmm_object.tcl Douglas Clowes 2014-06-25 12:28:16 +10:00
  • c5f7a7375e Merge from Wombat west400.tcl Douglas Clowes 2014-06-25 12:27:41 +10:00
  • ccc47a4c57 Pull in Wombat changes to hvcommands.tcl Douglas Clowes 2014-06-25 13:20:20 +10:00
  • 95974df5e4 Pick up some obvious changes from Wombat Douglas Clowes 2014-06-24 17:32:22 +10:00
  • e3377553bd Sort the *.ini files so we can better compare them Douglas Clowes 2014-06-24 15:23:52 +10:00
  • e9191c1d62 Pull back Platypus Command changes Douglas Clowes 2014-06-24 12:36:53 +10:00
  • 3ea1f3bf5f Pull back Platypus detector config change Douglas Clowes 2014-06-24 12:33:59 +10:00
  • 126187473c Add ServerOption LoggerDir as the data directory Douglas Clowes 2014-06-24 12:28:14 +10:00
  • ffef4e208f SCT driver for Lakeshore 218S Temperature Monitor Douglas Clowes 2014-06-23 17:40:10 +10:00
  • 9388b5941d Trivial changes to unit test Douglas Clowes 2014-06-23 12:41:23 +10:00
  • 6b18de0a03 Add huber asyncprotocol and make huber_ap and omron_ap to remove name conflicts Douglas Clowes 2014-06-23 12:47:33 +10:00
  • 565ba9d10d SICS-752 Escape all embedded braces in hlistprop tcllist output Douglas Clowes 2014-06-23 12:40:26 +10:00
  • 6dba13a5ab Add CF1 to Wombat INI file and fix ordering of LS336 sections. Ferdi Franceschini 2014-06-20 08:16:23 +10:00
  • 0b293e5399 Use the new make_vmot command to make a virtual motor has the same klass as the real motor it is chained to. Ferdi Franceschini 2014-06-20 08:15:43 +10:00
  • 35c5ccbb19 Added command to make virtual motor which hdbchains to a real motor. Ferdi Franceschini 2014-06-20 08:14:40 +10:00
  • 84fa02a5a5 Add a fake Huber bath Douglas Clowes 2014-06-20 14:52:29 +10:00
  • ff342dc16d Add unimplemented message to fake NHQ Douglas Clowes 2014-06-20 14:53:04 +10:00
  • 68afbed2ce Prevent SEGV in ansto_sctdriveadapter on node not found and add names to messages Douglas Clowes 2014-06-20 13:15:26 +10:00
  • fc85619eac NHQ-2xx SCT driver and fake device Douglas Clowes 2014-06-20 12:25:46 +10:00
  • cd80196583 add declaration for OMRONInitProtocol Douglas Clowes 2014-06-19 14:26:13 +10:00
  • 25346f5e02 Include a header file for the omron protocol Douglas Clowes 2014-06-18 10:40:41 +10:00
  • 881fce1feb SICS-750 Restrict sensitive motor commands to debug+manager or initialization Douglas Clowes 2014-06-19 14:27:57 +10:00
  • 1da5fc9062 Create and use sicsglobal.h and add isDuringInitialization Douglas Clowes 2014-06-19 14:24:46 +10:00
  • 0d39693c3b Add 'make sct' to generate sct_*.tcl from all *.sct files in tree below Douglas Clowes 2014-06-18 10:39:38 +10:00
  • 786a6ef2a8 SICS-749: Allow INT and FLOAT nodes for SCT Drive Adapter (and list) Douglas Clowes 2014-06-19 16:25:18 +10:00
  • 713452aac6 Added sap ten position virtual motor for sample aperture. Ferdi Franceschini 2014-06-18 16:52:20 +10:00
  • 0711340da7 The biggest aperture has been setup as the zero position on the sample aperture. The changes have been sent to Dan for inclusion in the Bilby motion control spreadsheet. Ferdi Franceschini 2014-06-18 16:01:19 +10:00
  • e32e46b84e Added sap eleven position virtual motor to select apertures via sapmot. Ferdi Franceschini 2014-06-17 22:29:56 +10:00
  • 3bffbf720f Added sapmot sample aperture motor from new Bilby motion control spreadsheet. Ferdi Franceschini 2014-06-17 22:29:13 +10:00
  • fa63ed8eed Dont create control alias unless there is a name to use Douglas Clowes 2014-06-17 17:25:17 +10:00
  • bcb28e68c1 Add some more read-only fields to the huber Douglas Clowes 2014-06-17 17:17:41 +10:00
  • 171342c97e Make driver nodes mutable and regen Douglas Clowes 2014-06-17 15:45:03 +10:00
  • 6ce8d3d577 Tidy omron sct file, change id poll rate then regenerate Douglas Clowes 2014-06-17 14:24:49 +10:00
  • ed7c371080 Add the huber bath Pilot ONE driver Douglas Clowes 2014-06-17 14:02:05 +10:00
  • 27ed29aea5 Allow SCT files to have numbers with a leading minus Douglas Clowes 2014-06-17 13:57:45 +10:00
  • eadb336ef3 Simple hack to allow reading inputs on the fake Galil. This was done for the shutter.sct on Bilby. Ferdi Franceschini 2014-06-17 12:29:50 +10:00
  • 79cedd58dc Fix return value for simulated t0_chopper_id. Also save value as an array, this is useful when testing the code. Ferdi Franceschini 2014-06-17 12:29:24 +10:00
  • e0edfb8d0a Implement the Ltof_<det> time of flight length calculations and the nguide selection command. Ferdi Franceschini 2014-06-17 12:08:29 +10:00
  • 2996889ea5 The timing chopper isn't necessarily the same as the master chopper. Ferdi Franceschini 2014-06-17 07:20:27 +10:00
  • c00c317b69 Changed aperture rule to allow driving apertures up past 5 degrees. This was done to facilitate implementation of the nguide guide selection command. Also fixed miscount of collimator sections. Ferdi Franceschini 2014-06-17 07:17:23 +10:00
  • e817fc9ed7 New aperture encoders and beamstops 4 and 5 added to Bilby. Ferdi Franceschini 2014-06-16 11:37:58 +10:00
  • f9a8b2b005 Save the tank position as an array just to be consistent with the other motion axes. Ferdi Franceschini 2014-06-17 12:27:28 +10:00
  • 40afb4a829 Set klass attribute on vessel_y variable. Ferdi Franceschini 2014-06-16 14:42:14 +10:00
  • fce610a142 Add a driver for the Omron ZS-HLDC Laser Displacement device Douglas Clowes 2014-06-16 17:37:20 +10:00
  • fa3154bdcd Update non-templated drivers to log to ../log/ instead of /tmp/ Douglas Clowes 2014-06-16 10:42:17 +10:00
  • 1010003d6c Regenerate templated drivers to get changes to logging and simulation tests Douglas Clowes 2014-06-16 10:37:10 +10:00
  • 18d40f69d9 Make generated drivers log to "../log" instead of "/tmp" Douglas Clowes 2014-06-16 10:30:05 +10:00
  • 84dfd1f50b Take out the CRLF (it was a buffer overrun anyway) Douglas Clowes 2014-06-13 17:50:34 +10:00