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 |
|
Douglas Clowes
|
acec319ee3
|
Zeroing rotary encoder motor steps fix
|
2014-07-15 18:52:05 +10:00 |
|
Douglas Clowes
|
522a5544a8
|
Reindent *.py with reindent.py
|
2014-07-04 11:28:11 +10:00 |
|
Douglas Clowes
|
e2ab77fca7
|
Make the Fake Galil display window support the 8 controllers
|
2014-06-26 12:38:59 +10:00 |
|
Ferdi Franceschini
|
eadb336ef3
|
Simple hack to allow reading inputs on the fake Galil.
This was done for the shutter.sct on Bilby.
|
2014-06-17 12:30:54 +10:00 |
|
Ferdi Franceschini
|
8da11e0ff2
|
The fake Galil can now handle 'MG _LFH' and 'MG _LFR' to get limit switch states.
|
2014-06-10 19:21:51 +10:00 |
|
Douglas Clowes
|
4f7fe09f35
|
Implement a turn counter for wrap-around rotary encoders
|
2014-05-20 12:26:44 +10:00 |
|
Douglas Clowes
|
89e4e37f9e
|
Remove superfluous trailing white space from Python files
|
2014-05-16 17:23:54 +10:00 |
|
Ferdi Franceschini
|
2246c58837
|
Allow up to eight fake Galil controllers when testing.
|
2014-02-05 15:51:01 +11:00 |
|
Ferdi Franceschini
|
fc02a71882
|
Make display window optional for SIM_GALIL.py
|
2013-12-20 09:09:01 +11:00 |
|
Douglas Clowes
|
6287e0ba7f
|
Add the name and link count to the fake motors
|
2013-07-01 13:10:46 +10:00 |
|
Douglas Clowes
|
a0bf852024
|
Move displayscreen to the general utility directory "instrument/util"
|
2013-07-01 12:20:11 +10:00 |
|
Douglas Clowes
|
fbf6112cea
|
Update to show motor position on display screen
|
2013-06-27 16:36:56 +10:00 |
|
Douglas Clowes
|
99f18f8798
|
Add a display screen for motor position to taipan fake motors
|
2013-06-27 16:36:38 +10:00 |
|
Douglas Clowes
|
1c6a2abdcc
|
Handle the non-AbsoluteEncoder motor
|
2013-06-27 16:08:46 +10:00 |
|
Douglas Clowes
|
bff8cc2c16
|
Implement limit switches and the SC and TS commands on fake Galil motors
|
2013-06-17 12:05:29 +10:00 |
|
Ferdi Franceschini
|
0c49dc21f7
|
Add dingo, bilby and emu baseports.
|
2013-06-14 09:56:33 +10:00 |
|
Ferdi Franceschini
|
afd7b3879d
|
Generic fake Galil derived from Taipan version.
Added instrument name as a command line argument.
|
2013-04-18 12:40:56 +10:00 |
|
Douglas Clowes
|
a00ca3872f
|
Addpython motor simulation for taipan
|
2013-02-21 14:26:26 +11:00 |
|