linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,217 Commits 18 Branches 1 Tag
Commit Graph

1217 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jenkins system
d0794a7803 [deb] Release v0.13.1 2022-08-02 15:31:52 +02:00
Enrico Faulhaber
dc76ac92de secop_mlz: minor rework entangle client 
Change-Id: Ie406b4220c22cdbf302a1fd36f2d7407d81a47fa
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28951
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2022-08-02 15:30:53 +02:00
Markus Zolliker
8579368259 make startup faster in case of errors 
When the io of one SECoP module fails, it takes ages to startup
because each parameter poll takes the time to wait for a timeout.
After the first communication error on an io, no more startup polls
are tried on the modules using this io.

Change-Id: I0d250953dfe91a7d68d2d2b108395cc25d471afe
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28588
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2022-08-02 11:52:57 +02:00
Markus Zolliker
cd90385e6c an enum with value 0 should be interpreted as False 
for example: bool(Enum(off=0, on=1)('off')) is False

Change-Id: Ieb200b4ecf0eed50b657ecc00f73a69810ad828f
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28586
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2022-08-02 11:37:56 +02:00
camea
3496e391f6 check for last_target in conditions for redo 2022-08-02 11:19:30 +02:00
Jenkins system
3acea5f7c7 [deb] Release v0.13.0 2022-08-02 09:47:07 +02:00
Enrico Faulhaber
c564ae392c default unit to UTF8 
Change-Id: Ic958346beb1a3b164c8d7b2826d59cf7e3991e15
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28946
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2022-08-02 09:46:02 +02:00
camea
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
l_samenv
8f739b11dc ILL1 .cfg created and ILL1stick 2022-07-06 16:14:16 +02:00
l_samenv
7ef386424c Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip 2022-07-06 11:24:56 +02:00
l_samenv
53b3dd2fad fix stick motor port number on ma02-ts 2022-07-06 11:24:27 +02:00
focus
6554e5de47 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2022-07-05 11:02:15 +02:00
focus
60ec1edb32 fix He-fill enum 2022-07-05 11:00:35 +02:00
focus
131082313d added stick-motor addon 2022-07-05 10:57:43 +02:00
tasp
f12b0b3da0 add ill5 gas pressure stick 
not yet tested
 2022-07-04 14:23:51 +02:00
tasp
5ecd9557a3 add lev to ill5 cfg 2022-07-04 14:23:08 +02:00
l_samenv
3769ddca75 Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip 2022-06-29 11:51:01 +02:00
l_samenv
a4dec7b832 fix ill5 cfg 2022-06-29 11:49:51 +02:00
Markus 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
focus
f495313018 dil2/3/4: added more temperatures, added dil3 2022-06-28 08:22:13 +02:00
zebra
18ded2159c changed mf from Readable to Drivable 2022-06-28 08:09:00 +02:00
zebra
760fc9eb40 added jtccr sea cfg 2022-06-27 11:06:45 +02:00
zebra
5d348eb7b1 fix ma6 stick motor port 2022-06-27 11:06:00 +02:00
camea
86767e2fa1 add still and sorb heaters to dil5 2022-06-21 15:32:15 +02:00
camea
8a995aafed fix issue with non matching persistent field 2022-06-21 15:31:44 +02:00
camea
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
Markus 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
zebra
80d9a790ec fixed proper parameter inheritance 2022-06-15 16:02:38 +02:00
Markus Zolliker
5951312d40 fixes to make pylint happy 
Change-Id: I95baf4e585603a640d4ec71076a4d509082775ed
 2022-06-14 15:24:42 +02:00
camea
778ac17172 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2022-06-14 15:08:35 +02:00
camea
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
camea
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
camea
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
Markus Zolliker
6fd365197a sea driver: no events for unexported params 
Change-Id: Ia4b5f5f742d0240010218ee24dc147bb535c7c64
 2022-06-13 14:09:13 +02:00
focus
8b2abf7044 fix iodev to io in ill4stick.cfg 2022-06-10 14:31:44 +02:00
zebra
182a8c7e49 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2022-06-10 13:22:04 +02:00
zebra
6da1a89459 add dil4/variox, fix ma10 in cfg 2022-06-10 13:21:20 +02:00
zebra
f1d5e82bb4 remove unneccessary fiels in cfg/sea 2022-06-10 13:20:12 +02:00
Markus Zolliker
e6fdd79df4 start SEA server if not running 
before connecting to SEA

Change-Id: I75c02f25e023e0e1769810a180430efd48b9c550
 2022-06-08 16:28:39 +02:00
Markus 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
zebra
9c7b6aeb94 various fixes on mb11/dil5 2022-06-07 11:45:25 +02:00
zebra
68e2e06905 fixes in convergence, mercury, phytron, triton 2022-06-01 09:21:47 +02:00
l_samenv
3563a0db16 fix ill4 2022-05-31 16:44:53 +02:00
zebra
4cb0031302 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2022-05-30 12:10:51 +02:00
zebra
4bfb76ca82 IPS mercury 
+ mb11, dil5, dil2, variox configs
 2022-05-30 12:09:57 +02:00
zebra
3e6f1bebf7 added features 2022-05-30 12:07:33 +02:00
Markus Zolliker
1357ead435 remove IOHandler stuff 
as all code using IO handlers has been changed to use
secop.rwhandler, IO handlers can be removed

Change-Id: Id57fbc4ce2744dbe73bb8792fd45449373f76bb5
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28526
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2022-05-30 09:58:00 +02:00
Markus Zolliker
6a0261c728 allow to convert numpy arrays to ArrayOf 
accept all sequences instead of just tuple / list
+ change Module.announceUpdate to convert value before
  comparing with previous one (comparing will not work with numpy arrays)

Change-Id: I5eceef4297607107e2dde688af2833d3651a8775
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28525
Tested-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2022-05-25 14:22:30 +02:00
Markus Zolliker
d717a481d7 feature implementation 
implement features including two proposed features
HasOffset and HasLimits

Change-Id: I7949f12dc8abe28fb2ee040e64e7db19d1b23b9a
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28485
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2022-05-25 14:21:21 +02:00
Markus Zolliker
4c94580cb9 channel switcher for Lakeshore 370 with scanner 
- add a general channel switcher module
- change ls370res code from IOHandler to rwhandlers
+ fix an issue with the poller when io module is placed below
  using modules in cfg file

after this, IOHandler stuff may be removed from Frappy

Change-Id: I787101fc1e365ae3e0453bfe59291e2011a1fe53
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28512
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2022-05-25 07:47:32 +02:00