Douglas Clowes d698c302fd Merge branch 'RELEASE-3_1' into temp ...

Conflicts:
	sics/site_ansto/instrument/config/environment/temperature/julabo_lh45.sct
	sics/site_ansto/instrument/util/config_edit.py
	sics/site_ansto/instrument/util/gen_sct.py

2014-07-16 12:56:40 +10:00

..

counterclient.py

Addpython motor simulation for taipan

2013-02-21 14:26:26 +11:00

galilcontroller.py

Simple hack to allow reading inputs on the fake Galil.

2014-06-17 12:30:54 +10:00

galilfactory.py

Reindent *.py with reindent.py

2014-07-04 11:28:11 +10:00

galilmotor.py

Zeroing rotary encoder motor steps fix

2014-07-15 18:52:05 +10:00

powdersample.py

Remove superfluous trailing white space from Python files

2014-05-16 17:23:54 +10:00

SIM_GALIL_taipan.py

Add the name and link count to the fake motors

2013-07-01 13:10:46 +10:00

SIM_GALIL.py

Make the Fake Galil display window support the 8 controllers

2014-06-26 12:38:59 +10:00