Douglas Clowes
|
94663632e4
|
Merge branch 'Quokka' into RELEASE-3_1
Conflicts:
sics/site_ansto/instrument/config/environment/sct_hiden_xcs.tcl
sics/site_ansto/instrument/config/environment/temperature/sct_julabo_lh45_gen.tcl
sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
sics/site_ansto/instrument/sans/quokka_configuration.tcl
sics/site_ansto/instrument/util/gen_sct.py
|
2015-04-17 12:27:57 +10:00 |
|
Douglas Clowes
|
1f9dd8da95
|
Pullback from Quokka 2015-04-17
|
2015-04-17 12:15:01 +10:00 |
|
Douglas Clowes
|
a5498a2a77
|
Pull some changes from RELEASE-3_1 in gen_sct and *.sct
|
2015-02-19 09:48:38 +11:00 |
|
Douglas Clowes
|
8c4eed9bfe
|
Merged changes from Quokka as at 2015-02-18
|
2015-02-19 09:40:49 +11:00 |
|
Douglas Clowes
|
287b671569
|
Regenerate for limit changes
|
2015-02-19 09:14:23 +11:00 |
|
Douglas Clowes
|
45d4663816
|
Pullback limit adjustments from Quokka to sct template drivers
|
2015-02-19 09:04:43 +11:00 |
|
Douglas Clowes
|
4619a57eff
|
Pullback from Quokka 2015-02-18
|
2015-02-18 14:14:11 +11:00 |
|
Douglas Clowes
|
5f2223510f
|
Regenerate SCT drivers
|
2014-12-02 10:09:17 +11:00 |
|
Douglas Clowes
|
99f23cda50
|
Regen the Oxford Mercury SCT driver
|
2014-11-24 12:45:12 +11:00 |
|
Douglas Clowes
|
f5994bb760
|
Add auto/manual switch and setting, change to all lowercase
|
2014-11-24 12:44:29 +11:00 |
|
Douglas Clowes
|
de766e465e
|
Regen of Mercury driver
|
2014-11-20 17:37:58 +11:00 |
|
Douglas Clowes
|
7960bab345
|
Changes to Mercury driver
|
2014-11-20 17:37:34 +11:00 |
|
Douglas Clowes
|
7269314220
|
Regenerate SCT drivers (new spacing, new Oxford Mercury)
|
2014-11-20 14:48:00 +11:00 |
|
Douglas Clowes
|
a7e6017fd5
|
New driver for the Oxford Mercury (using conditional and exec)
|
2014-11-20 14:46:24 +11:00 |
|
Douglas Clowes
|
225c4c5ee7
|
Regenerate SCT drivers
|
2014-11-13 14:54:36 +11:00 |
|
Douglas Clowes
|
89b23eda07
|
Make the Lakeshore 218 driver less noisy and have less channels
|
2014-11-13 14:54:25 +11:00 |
|
Douglas Clowes
|
ee4cd27f0e
|
Regenerate SCT drivers
|
2014-11-13 14:20:52 +11:00 |
|
Douglas Clowes
|
8f977bb98f
|
Realign SCT drivers with R3.2
|
2014-11-13 14:18:45 +11:00 |
|
Douglas Clowes
|
5fefe5f009
|
Regenerate SCT drivers
|
2014-11-13 12:41:22 +11:00 |
|
Douglas Clowes
|
674fae9115
|
Regenerate SCT drivers
|
2014-11-13 12:40:18 +11:00 |
|
Douglas Clowes
|
fe0bc8f0c0
|
Regen two sct drivers
|
2014-11-10 18:58:42 +11:00 |
|
Douglas Clowes
|
14237f734b
|
Change limites on e3200 setpoint
|
2014-11-10 18:57:46 +11:00 |
|
Douglas Clowes
|
9909c1412e
|
Regenerate all the SCT drivers with new generator
|
2014-11-07 09:14:09 +11:00 |
|
Douglas Clowes
|
f1595151cd
|
Changes to protocol_args to add defaults
|
2014-11-06 16:27:15 +11:00 |
|
Douglas Clowes
|
8a61f65701
|
Developing the Eurotherm 3200 SCT driver
|
2014-11-06 12:35:21 +11:00 |
|
Douglas Clowes
|
0010cef179
|
Call the add instead of make function for the Eurotherm 2000 wrapper
|
2014-11-06 12:34:45 +11:00 |
|
Douglas Clowes
|
300e29fe00
|
Merge branch 'Pelican' into RELEASE-3_1
|
2014-11-03 12:37:34 +11:00 |
|
Douglas Clowes
|
9daf62c299
|
Fix for the Lakeshore LS-340 RELAY command on Pelican
It's not the same as on the LS-336
|
2014-11-03 11:53:20 +11:00 |
|
Douglas Clowes
|
3bcd3fa0fb
|
Regen SC driver for west 4100/6100
|
2014-10-27 14:41:46 +11:00 |
|
Douglas Clowes
|
09cedac66d
|
Make West 4100 driveable and add permlinks
|
2014-10-27 14:40:40 +11:00 |
|
Ferdi Franceschini
|
d8f5030a8d
|
SICS-795 Bring GIT up to date with changes made on ics1-wombat.
|
2014-10-08 20:29:23 +11:00 |
|
Douglas Clowes
|
591c602da2
|
Regen SCT drivers
|
2014-10-03 10:17:46 +10:00 |
|
Douglas Clowes
|
98b5a89225
|
There is no mkdriver_args
|
2014-09-26 15:30:25 +10:00 |
|
Ferdi Franceschini
|
cf386ec3ef
|
SICS-781 lakeshore 370 driver does not save data.
|
2014-09-19 12:16:31 +10:00 |
|
Douglas Clowes
|
0cb3f4f91c
|
Regenerated drivers
|
2014-09-11 13:29:52 +10:00 |
|
Douglas Clowes
|
a9a20b4855
|
Regenerate the ls218, nhq200 and sr630 drivers
|
2014-09-10 14:27:11 +10:00 |
|
Douglas Clowes
|
c6d2245941
|
Move ls218, nhq200, sr630 from environment to detector
|
2014-09-10 14:26:16 +10:00 |
|
Douglas Clowes
|
0867f5a315
|
Update "Decimal" processing for 4100/6100
|
2014-09-10 14:22:50 +10:00 |
|
Douglas Clowes
|
b127f49b33
|
Pullback change from Quokka 2014-09-09
|
2014-09-09 16:56:29 +10:00 |
|
Douglas Clowes
|
e6925423e3
|
Regenerate the SR630 driver with 600 second polls
|
2014-09-08 13:45:40 +10:00 |
|
Douglas Clowes
|
55a0055bd3
|
West 6100 driver
|
2014-09-05 16:09:36 +10:00 |
|
Douglas Clowes
|
24c8792467
|
SR630 reduce to 8 channels and 600 second polls, change driver name
|
2014-09-04 09:26:03 +10:00 |
|
Douglas Clowes
|
8af9116667
|
Update the Stanford SR630 SCT file for ten channels
|
2014-09-03 13:01:35 +10:00 |
|
Douglas Clowes
|
6070706571
|
Stanford Research Systems Model SR630 Thermocouple Monitor
|
2014-09-02 12:01:47 +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 |
|
Ferdi Franceschini
|
639e4dc3c8
|
Generated sct tcl drivers from sct templates.
|
2014-08-06 11:20:46 +10:00 |
|
Douglas Clowes
|
a761136b48
|
Regenerate modified drivers
|
2014-08-05 12:23:33 +10:00 |
|
Douglas Clowes
|
17315b15c7
|
Remove hand-coded config for generated in Oxford ITC-500
|
2014-08-04 15:46:16 +10:00 |
|
Douglas Clowes
|
39519d8c1c
|
Don't register poll/write when simulating in LS-3xx drivers
|
2014-08-04 15:45:59 +10:00 |
|