zolliker
2f6954c4f3
magfield: add persistent_limit parameter
...
- use update_switch_heater instead of write_switch_heater
for detecting switch time
- switch_time split into switch_on_time/switch_off_time
Change-Id: Id90a8b2c2520e24f3ee4a34aee25d41210e5d6d4
2022-08-16 10:05:01 +02:00
zolliker
b81fc7b122
remove tm from ill5.cfg
...
only one SeaDrivable per sea drivable allowed!
2022-08-15 16:22:02 +02:00
zolliker
704bba292a
add mb11 stick
2022-08-12 15:13:07 +02:00
zolliker
f1e642b1b0
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2022-08-12 15:12:23 +02:00
zolliker
8e3cdc80e4
improvements in magfiels/ips_mercury
...
- read voltage
- fix a bug with ._init name conflict
2022-08-12 15:10:23 +02:00
zolliker
3496e391f6
check for last_target in conditions for redo
2022-08-02 11:19:30 +02:00
zolliker
bb40a0820c
use flag instead tolerance for redo check
...
when target is changed, a flag is set, and
this is used to jump back in the sequence to the right step
for redoing
2022-07-29 15:12:44 +02:00
8f739b11dc
ILL1 .cfg created and ILL1stick
2022-07-06 16:14:16 +02:00
7ef386424c
Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip
2022-07-06 11:24:56 +02:00
53b3dd2fad
fix stick motor port number on ma02-ts
2022-07-06 11:24:27 +02:00
zolliker
6554e5de47
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2022-07-05 11:02:15 +02:00
zolliker
60ec1edb32
fix He-fill enum
2022-07-05 11:00:35 +02:00
zolliker
131082313d
added stick-motor addon
2022-07-05 10:57:43 +02:00
zolliker
f12b0b3da0
add ill5 gas pressure stick
...
not yet tested
2022-07-04 14:23:51 +02:00
zolliker
5ecd9557a3
add lev to ill5 cfg
2022-07-04 14:23:08 +02:00
3769ddca75
Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip
2022-06-29 11:51:01 +02:00
a4dec7b832
fix ill5 cfg
2022-06-29 11:49:51 +02:00
zolliker
390af7eff7
improve general config
...
for easier configuration of multiple servers on the same machine,
FRAPPY_* env. variables are overriding the values from the
general config file
Change-Id: Ifb00dae482dd366bd4b7951c76164af91cad9fc2
2022-06-29 11:42:33 +02:00
zolliker
f495313018
dil2/3/4: added more temperatures, added dil3
2022-06-28 08:22:13 +02:00
zolliker
18ded2159c
changed mf from Readable to Drivable
2022-06-28 08:09:00 +02:00
zolliker
760fc9eb40
added jtccr sea cfg
2022-06-27 11:06:45 +02:00
zolliker
5d348eb7b1
fix ma6 stick motor port
2022-06-27 11:06:00 +02:00
zolliker
86767e2fa1
add still and sorb heaters to dil5
2022-06-21 15:32:15 +02:00
zolliker
8a995aafed
fix issue with non matching persistent field
2022-06-21 15:31:44 +02:00
zolliker
7379ea91e5
fix issue sending numbers in exp. format
...
numbers must be fixed point, with maximum 8 digits
2022-06-21 15:30:20 +02:00
zolliker
cf42119f85
fix handling of persistent_field parameter
...
'persistent_field' parameter should be updated as long as the
switch is turning off
Change-Id: I76b592077ceb0a2a20beb8e6390487c620764650
2022-06-17 08:24:38 +02:00
zolliker
80d9a790ec
fixed proper parameter inheritance
2022-06-15 16:02:38 +02:00
zolliker
5951312d40
fixes to make pylint happy
...
Change-Id: I95baf4e585603a640d4ec71076a4d509082775ed
2022-06-14 15:24:42 +02:00
zolliker
778ac17172
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2022-06-14 15:08:35 +02:00
zolliker
dfbc1c757a
fixes in mercury an triton
...
- Valve is now a drivable, as it will check success, and retry,
which might take around 1 second
+ some more
2022-06-14 15:07:17 +02:00
zolliker
54b58f2188
step_size instead of speed_factor
...
no longer need to pre configure a speed_factor,
the proper units of speed and accel are taken from
the hardware
2022-06-14 15:03:53 +02:00
zolliker
f855b9db40
fixes in convergence and statemachine
...
- set spent_inside to 0 on set_target
- additional debug log messages in statemachine
2022-06-14 14:07:24 +02:00
zolliker
6fd365197a
sea driver: no events for unexported params
...
Change-Id: Ia4b5f5f742d0240010218ee24dc147bb535c7c64
2022-06-13 14:09:13 +02:00
zolliker
8b2abf7044
fix iodev to io in ill4stick.cfg
2022-06-10 14:31:44 +02:00
zolliker
182a8c7e49
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2022-06-10 13:22:04 +02:00
zolliker
6da1a89459
add dil4/variox, fix ma10 in cfg
2022-06-10 13:21:20 +02:00
zolliker
f1d5e82bb4
remove unneccessary fiels in cfg/sea
2022-06-10 13:20:12 +02:00
zolliker
e6fdd79df4
start SEA server if not running
...
before connecting to SEA
Change-Id: I75c02f25e023e0e1769810a180430efd48b9c550
2022-06-08 16:28:39 +02:00
zolliker
a35231f5bd
fixes in mb11/dil5
...
- no need fro second slot in TemperatureLoop, PressureLoop
- only ValvePos needs two slots
- added testwise heater to mix chamber
Change-Id: Iac4592d037a5e6a4f586041762992d75cc77e3de
2022-06-07 14:26:30 +02:00
zolliker
9c7b6aeb94
various fixes on mb11/dil5
2022-06-07 11:45:25 +02:00
zolliker
68e2e06905
fixes in convergence, mercury, phytron, triton
2022-06-01 09:21:47 +02:00
3563a0db16
fix ill4
2022-05-31 16:44:53 +02:00
zolliker
4cb0031302
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2022-05-30 12:10:51 +02:00
zolliker
4bfb76ca82
IPS mercury
...
+ mb11, dil5, dil2, variox configs
2022-05-30 12:09:57 +02:00
zolliker
3e6f1bebf7
added features
2022-05-30 12:07:33 +02:00
efca358c72
add adq_mr and iqplot
2022-05-23 15:30:23 -04:00
319f3b4649
upgrade upltrasound to newer version of frappy
2022-05-23 15:25:41 -04:00
7fc030191d
Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip
2022-05-19 18:10:14 +02:00
3959da6847
stick rotatation is either om or stickrot
2022-05-19 18:10:02 +02:00
zolliker
39171fe06e
add limits to phytron
...
Change-Id: I431374efab7a858db6a652f78533b13b12ba6d57
2022-05-19 18:05:52 +02:00
zolliker
l_samenv